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

Update patches for Fixed FF in FG 1.2.

Browse source
This commit is contained in:
Lex Manos 2014-03-31 16:02:54 -07:00
parent e35a3538a6
commit 0586c2b1aa
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
View file

@ -65,7 +65,7 @@
Display.setVSyncEnabled(this.field_71474_y.field_74352_v); Display.setVSyncEnabled(this.field_71474_y.field_74352_v);
} }
@@ -915,9 +925,11 @@ @@ -916,9 +926,11 @@
if (!this.field_71454_w) if (!this.field_71454_w)
{ {
@ -77,7 +77,7 @@
} }
GL11.glFlush(); GL11.glFlush();
@@ -1495,6 +1507,8 @@ @@ -1496,6 +1508,8 @@
--this.field_71467_ac; --this.field_71467_ac;
} }
@ -86,7 +86,7 @@
this.field_71424_I.func_76320_a("gui"); this.field_71424_I.func_76320_a("gui");
if (!this.field_71445_n) if (!this.field_71445_n)
@@ -1645,6 +1659,7 @@ @@ -1646,6 +1660,7 @@
this.field_71462_r.func_146274_d(); this.field_71462_r.func_146274_d();
} }
} }
@ -94,7 +94,7 @@
} }
if (this.field_71429_W > 0) if (this.field_71429_W > 0)
@@ -1786,6 +1801,7 @@ @@ -1787,6 +1802,7 @@
} }
} }
} }
@ -102,7 +102,7 @@
} }
} }
@@ -1977,12 +1993,15 @@ @@ -1978,12 +1994,15 @@
this.field_71453_ak.func_74428_b(); this.field_71453_ak.func_74428_b();
} }
@ -118,7 +118,7 @@
this.func_71403_a((WorldClient)null); this.func_71403_a((WorldClient)null);
System.gc(); System.gc();
ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false); ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false);
@@ -2093,6 +2112,7 @@ @@ -2094,6 +2113,7 @@
this.field_110448_aq.func_148529_f(); this.field_110448_aq.func_148529_f();
this.func_71351_a((ServerData)null); this.func_71351_a((ServerData)null);
this.field_71455_al = false; this.field_71455_al = false;

2
fml/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch
View file

@ -9,7 +9,7 @@
import java.awt.Color; import java.awt.Color;
@@ -312,6 +313,11 @@ @@ -312,6 +313,11 @@
this.func_73731_b(fontrenderer, s, k - fontrenderer.func_78256_a(s) - 2, 2, 14737632); this.func_73731_b(fontrenderer, s, k - fontrenderer.func_78256_a(s) - 2, 2, 14737632);
s = "Allocated memory: " + k5 * 100L / i5 + "% (" + k5 / 1024L / 1024L + "MB)"; s = "Allocated memory: " + j5 * 100L / i5 + "% (" + j5 / 1024L / 1024L + "MB)";
this.func_73731_b(fontrenderer, s, k - fontrenderer.func_78256_a(s) - 2, 12, 14737632); this.func_73731_b(fontrenderer, s, k - fontrenderer.func_78256_a(s) - 2, 12, 14737632);
+ int offset = 22; + int offset = 22;
+ for (String brd : FMLCommonHandler.instance().getBrandings(false)) + for (String brd : FMLCommonHandler.instance().getBrandings(false))

4
fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
View file

@ -26,8 +26,8 @@
} }
public int func_82145_z() public int func_82145_z()
@@ -1986,6 +1991,11 @@ @@ -2032,6 +2037,11 @@
return uuid; }
} }
+ public void openGui(Object mod, int modGuiId, World world, int x, int y, int z) + public void openGui(Object mod, int modGuiId, World world, int x, int y, int z)