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

Fix vanilla lighting issue and blending issues in achievements gui. Closes #1445

Browse source
This commit is contained in:
Lex Manos 2014-10-08 17:54:20 -07:00
parent 3c51b1a8c8
commit b0190bb50d
2 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
patches/minecraft/net/minecraft/client/Minecraft.java.patch
View file

@ -56,7 +56,7 @@
if (p_147108_1_ instanceof GuiMainMenu)
{
this.field_71474_y.field_74330_P = false;
@@ -1341,7 +1346,7 @@
@@ -1342,7 +1347,7 @@
if (this.field_71439_g.func_82246_f(i, j, k))
{
@ -65,7 +65,7 @@
this.field_71439_g.func_71038_i();
}
}
@@ -1422,11 +1427,12 @@
@@ -1423,11 +1428,12 @@
int j = this.field_71476_x.field_72312_c;
int k = this.field_71476_x.field_72309_d;
@ -80,7 +80,7 @@
{
flag = false;
this.field_71439_g.func_71038_i();
@@ -1453,7 +1459,8 @@
@@ -1454,7 +1460,8 @@
{
ItemStack itemstack1 = this.field_71439_g.field_71071_by.func_70448_g();
@ -90,7 +90,7 @@
{
this.field_71460_t.field_78516_c.func_78445_c();
}
@@ -1665,6 +1672,8 @@
@@ -1666,6 +1673,8 @@
while (Mouse.next())
{
@ -99,7 +99,7 @@
j = Mouse.getEventButton();
KeyBinding.func_74510_a(j - 100, Mouse.getEventButtonState());
@@ -2127,6 +2136,11 @@
@@ -2128,6 +2137,11 @@
public void func_71353_a(WorldClient p_71353_1_, String p_71353_2_)
{
@ -111,7 +111,7 @@
if (p_71353_1_ == null)
{
NetHandlerPlayClient nethandlerplayclient = this.func_147114_u();
@@ -2139,6 +2153,18 @@
@@ -2140,6 +2154,18 @@
if (this.field_71437_Z != null)
{
this.field_71437_Z.func_71263_m();
@ -130,7 +130,7 @@
}
this.field_71437_Z = null;
@@ -2287,113 +2313,10 @@
@@ -2288,113 +2314,10 @@
if (this.field_71476_x != null)
{
boolean flag = this.field_71439_g.field_71075_bZ.field_75098_d;
@ -246,7 +246,7 @@
if (flag)
{
j = this.field_71439_g.field_71069_bz.field_75151_b.size() - 9 + this.field_71439_g.field_71071_by.field_70461_c;
@@ -2659,8 +2582,15 @@
@@ -2660,8 +2583,15 @@
p_70001_1_.func_152767_b("gl_max_texture_size", Integer.valueOf(func_71369_N()));
}
@ -262,7 +262,7 @@
for (int i = 16384; i > 0; i >>= 1)
{
GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)null);
@@ -2668,6 +2598,7 @@
@@ -2669,6 +2599,7 @@
if (j != 0)
{

25
patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch
View file

@ -89,3 +89,28 @@
i5 = achievement2.field_75993_a * 24 - k;
j5 = achievement2.field_75991_b * 24 - l;
@@ -444,6 +471,7 @@
this.field_146297_k.func_110434_K().func_110577_a(field_146561_C);
+ GL11.glEnable(GL11.GL_BLEND);// Forge: Specifically enable blend because it is needed here. And we fix Generic RenderItem's leakage of it.
if (achievement2.func_75984_f())
{
this.func_73729_b(i5 - 2, j5 - 2, 26, 202, 26, 26);
@@ -452,6 +480,7 @@
{
this.func_73729_b(i5 - 2, j5 - 2, 0, 202, 26, 26);
}
+ GL11.glDisable(GL11.GL_BLEND); //Forge: Cleanup states we set.
if (!this.field_146556_E.func_77442_b(achievement2))
{
@@ -460,7 +489,7 @@
renderitem.field_77024_a = false;
}
- GL11.glEnable(GL11.GL_LIGHTING);
+ GL11.glDisable(GL11.GL_LIGHTING); //Forge: Make sure Lighting is disabled. Fixes MC-33065
GL11.glEnable(GL11.GL_CULL_FACE);
renderitem.func_82406_b(this.field_146297_k.field_71466_p, this.field_146297_k.func_110434_K(), achievement2.field_75990_d, i5 + 3, j5 + 3);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);