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

Some patch offsets

Browse source 
MinecraftForge/FML@7219061b05 Also patch in warnings for Vec3Pool - similarly removed.
MinecraftForge/FML@dff2204558 FML now sets a security manager (FINALLY!). It's primary purpose at this point is to catch rogue calls to System.exit so that they can cause a proper crash report, rather than silently abandoning the game.
This commit is contained in:
Christian 2014-06-21 17:10:16 -04:00
parent 755dd9b954
commit ea7c11baf4
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fml

@ -1 +1 @@
Subproject commit 1a99ec7db612f258983c6ac685da906bf7cde0a6 Subproject commit dff22045587b37282adeb2167486a572f51f1f16

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

@ -72,7 +72,7 @@
if (p_147108_1_ instanceof GuiMainMenu) if (p_147108_1_ instanceof GuiMainMenu)
{ {
this.field_71474_y.field_74330_P = false; this.field_71474_y.field_74330_P = false;
@@ -1297,7 +1311,7 @@ @@ -1296,7 +1310,7 @@
if (this.field_71439_g.func_82246_f(i, j, k)) if (this.field_71439_g.func_82246_f(i, j, k))
{ {
@ -81,7 +81,7 @@
this.field_71439_g.func_71038_i(); this.field_71439_g.func_71038_i();
} }
} }
@@ -1378,11 +1392,12 @@ @@ -1377,11 +1391,12 @@
int j = this.field_71476_x.field_72312_c; int j = this.field_71476_x.field_72312_c;
int k = this.field_71476_x.field_72309_d; int k = this.field_71476_x.field_72309_d;
@ -96,7 +96,7 @@
{ {
flag = false; flag = false;
this.field_71439_g.func_71038_i(); this.field_71439_g.func_71038_i();
@@ -1409,7 +1424,8 @@ @@ -1408,7 +1423,8 @@
{ {
ItemStack itemstack1 = this.field_71439_g.field_71071_by.func_70448_g(); ItemStack itemstack1 = this.field_71439_g.field_71071_by.func_70448_g();
@ -106,7 +106,7 @@
{ {
this.field_71460_t.field_78516_c.func_78445_c(); this.field_71460_t.field_78516_c.func_78445_c();
} }
@@ -1608,6 +1624,8 @@ @@ -1607,6 +1623,8 @@
while (Mouse.next()) while (Mouse.next())
{ {
@ -115,7 +115,7 @@
i = Mouse.getEventButton(); i = Mouse.getEventButton();
if (field_142025_a && i == 0 && (Keyboard.isKeyDown(29) || Keyboard.isKeyDown(157))) if (field_142025_a && i == 0 && (Keyboard.isKeyDown(29) || Keyboard.isKeyDown(157)))
@@ -2081,6 +2099,11 @@ @@ -2080,6 +2098,11 @@
public void func_71353_a(WorldClient p_71353_1_, String p_71353_2_) public void func_71353_a(WorldClient p_71353_1_, String p_71353_2_)
{ {
@ -127,7 +127,7 @@
if (p_71353_1_ == null) if (p_71353_1_ == null)
{ {
NetHandlerPlayClient nethandlerplayclient = this.func_147114_u(); NetHandlerPlayClient nethandlerplayclient = this.func_147114_u();
@@ -2093,6 +2116,18 @@ @@ -2092,6 +2115,18 @@
if (this.field_71437_Z != null) if (this.field_71437_Z != null)
{ {
this.field_71437_Z.func_71263_m(); this.field_71437_Z.func_71263_m();
@ -146,7 +146,7 @@
} }
this.field_71437_Z = null; this.field_71437_Z = null;
@@ -2241,113 +2276,10 @@ @@ -2240,113 +2275,10 @@
if (this.field_71476_x != null) if (this.field_71476_x != null)
{ {
boolean flag = this.field_71439_g.field_71075_bZ.field_75098_d; boolean flag = this.field_71439_g.field_71075_bZ.field_75098_d;
@ -262,7 +262,7 @@
if (flag) 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; j = this.field_71439_g.field_71069_bz.field_75151_b.size() - 9 + this.field_71439_g.field_71071_by.field_70461_c;
@@ -2514,8 +2446,15 @@ @@ -2513,8 +2445,15 @@
p_70001_1_.func_76472_a("gl_max_texture_size", Integer.valueOf(func_71369_N())); p_70001_1_.func_76472_a("gl_max_texture_size", Integer.valueOf(func_71369_N()));
} }
@ -278,7 +278,7 @@
for (int i = 16384; i > 0; i >>= 1) 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); GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)null);
@@ -2523,6 +2462,7 @@ @@ -2522,6 +2461,7 @@
if (j != 0) if (j != 0)
{ {

4
patches/minecraft/net/minecraft/world/ChunkCache.java.patch
View file

@ -26,7 +26,7 @@
return this.field_72817_c[l][i1].func_76628_c(p_72805_1_ & 15, p_72805_2_, p_72805_3_ & 15); return this.field_72817_c[l][i1].func_76628_c(p_72805_1_ & 15, p_72805_2_, p_72805_3_ & 15);
} }
} }
@@ -138,10 +143,9 @@ @@ -139,10 +144,9 @@
return this.field_72815_e.func_82732_R(); return this.field_72815_e.func_82732_R();
} }
@ -38,7 +38,7 @@
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@@ -247,4 +251,15 @@ @@ -248,4 +252,15 @@
{ {
return this.func_147439_a(p_72879_1_, p_72879_2_, p_72879_3_).func_149748_c(this, p_72879_1_, p_72879_2_, p_72879_3_, p_72879_4_); return this.func_147439_a(p_72879_1_, p_72879_2_, p_72879_3_).func_149748_c(this, p_72879_1_, p_72879_2_, p_72879_3_, p_72879_4_);
} }

2
patches/minecraft/net/minecraft/world/IBlockAccess.java.patch
View file

@ -16,7 +16,7 @@
boolean func_147437_c(int var1, int var2, int var3); boolean func_147437_c(int var1, int var2, int var3);
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@@ -33,4 +33,16 @@ @@ -34,4 +34,16 @@
Vec3Pool func_82732_R(); Vec3Pool func_82732_R();
int func_72879_k(int var1, int var2, int var3, int var4); int func_72879_k(int var1, int var2, int var3, int var4);

4
patches/minecraft/net/minecraft/world/World.java.patch
View file

@ -753,7 +753,7 @@
} }
public CrashReportCategory func_72914_a(CrashReport p_72914_1_) public CrashReportCategory func_72914_a(CrashReport p_72914_1_)
@@ -3640,25 +3790,24 @@ @@ -3641,25 +3791,24 @@
public void func_147453_f(int p_147453_1_, int p_147453_2_, int p_147453_3_, Block p_147453_4_) public void func_147453_f(int p_147453_1_, int p_147453_2_, int p_147453_3_, Block p_147453_4_)
{ {
@ -792,7 +792,7 @@
} }
} }
} }
@@ -3699,4 +3848,110 @@ @@ -3700,4 +3849,110 @@
iworldaccess.func_147584_b(); iworldaccess.func_147584_b();
} }
} }