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

Merge remote-tracking branch 'origin/1.7.10'

Browse source 
Conflicts:
	fml
This commit is contained in:
cpw 2015-04-01 17:43:25 -04:00
commit 8fe5d26e94
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,7 +61,18 @@
}
}
@@ -341,11 +367,12 @@
@@ -260,7 +286,9 @@
GlStateManager.func_179143_c(518);
GlStateManager.func_179094_E();
GlStateManager.func_179109_b((float)k1, (float)l1, -200.0F);
- GlStateManager.func_179152_a(1.0F / this.field_146570_r, 1.0F / this.field_146570_r, 0.0F);
+ // FIXES models rendering weirdly in the acheivements pane
+ // see https://github.com/MinecraftForge/MinecraftForge/commit/1b7ce7592caafb760ec93066184182ae0711e793#commitcomment-10512284
+ GlStateManager.func_179152_a(1.0F / this.field_146570_r, 1.0F / this.field_146570_r, 1.0F);
GlStateManager.func_179098_w();
GlStateManager.func_179140_f();
GlStateManager.func_179091_B();
@@ -341,11 +369,12 @@
int i4;
int l4;
@ -77,7 +88,7 @@
{
j3 = achievement1.field_75993_a * 24 - k + 11;
k3 = achievement1.field_75991_b * 24 - l + 11;
@@ -401,9 +428,9 @@
@@ -401,9 +430,9 @@
int i5;
int j5;
@ -89,7 +100,7 @@
l4 = achievement2.field_75993_a * 24 - k;
i5 = achievement2.field_75991_b * 24 - l;
@@ -445,6 +472,7 @@
@@ -445,6 +474,7 @@
this.field_146297_k.func_110434_K().func_110577_a(field_146561_C);
@ -97,7 +108,7 @@
if (achievement2.func_75984_f())
{
this.func_73729_b(l4 - 2, i5 - 2, 26, 202, 26, 26);
@@ -453,6 +481,7 @@
@@ -453,6 +483,7 @@
{
this.func_73729_b(l4 - 2, i5 - 2, 0, 202, 26, 26);
}
@ -105,7 +116,7 @@
if (!this.field_146556_E.func_77442_b(achievement2))
{
@@ -461,7 +490,7 @@
@@ -461,7 +492,7 @@
this.field_146296_j.func_175039_a(false);
}