From 0fe2584b770aceb880f906cb8f06014673732f22 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Wed, 7 May 2014 12:17:52 -0700 Subject: [PATCH] Updated FML: MinecraftForge/FML@2c56c32c5aa8842cfadaf8c237396cdb75673909 Fix saving backups with the raw name. Fix air block not being assigned as the default. MinecraftForge/FML@d0f8073fa51db7426d5ded373f3404fa60d722f0 Merge pull request #413 from sfPlayer1/master MinecraftForge/FML@810b1f3075e6061ab189e1f6975bd77b20040d71 Clean some generic warnings up. Make a generic list handler. Helpful for others I think too. MinecraftForge/FML@fff86ee9d35874bdf77a1eaabe77615441644064 Fix refreshResources not happening if an error occurs. MinecraftForge/FML@76d8d0e870a4e389167634283984dc10abb08e84 Fix mod version checking MinecraftForge/FML@b84d0760ae47832e5b1e4d50237b582b2d50d520 Fix display of mod status at the server MinecraftForge/FML@251af1d09dfbf636e2fb3f323a5345c81cc07aea Fixed memory leak on the client caused by Netty holding references to the World. --- fml | 2 +- .../net/minecraft/client/Minecraft.java.patch | 26 +++++++++---------- .../server/MinecraftServer.java.patch | 10 +++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/fml b/fml index 78248da399..251af1d09d 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 78248da399c04a438586d1a5d7f36d6d752dd5c3 +Subproject commit 251af1d09dfbf636e2fb3f323a5345c81cc07aea diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index b1c023d9f9..b633eff2f9 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -24,7 +24,7 @@ this.field_71459_aj = p_i1014_5_; this.field_71443_c = p_i1014_2_; this.field_71440_d = p_i1014_3_; -@@ -417,7 +425,7 @@ +@@ -419,7 +427,7 @@ try { @@ -33,7 +33,7 @@ } catch (LWJGLException lwjglexception) { -@@ -516,7 +524,7 @@ +@@ -518,7 +526,7 @@ this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o); FMLClientHandler.instance().finishMinecraftLoading(); this.func_71361_d("Post startup"); @@ -42,7 +42,7 @@ if (this.field_71475_ae != null) { -@@ -699,11 +707,6 @@ +@@ -701,11 +709,6 @@ public void func_147108_a(GuiScreen p_147108_1_) { @@ -54,7 +54,7 @@ if (p_147108_1_ == null && this.field_71441_e == null) { p_147108_1_ = new GuiMainMenu(); -@@ -713,6 +716,17 @@ +@@ -715,6 +718,17 @@ p_147108_1_ = new GuiGameOver(); } @@ -72,7 +72,7 @@ if (p_147108_1_ instanceof GuiMainMenu) { this.field_71474_y.field_74330_P = false; -@@ -1295,7 +1309,7 @@ +@@ -1297,7 +1311,7 @@ if (this.field_71439_g.func_82246_f(i, j, k)) { @@ -81,7 +81,7 @@ this.field_71439_g.func_71038_i(); } } -@@ -1376,11 +1390,12 @@ +@@ -1378,11 +1392,12 @@ int j = this.field_71476_x.field_72312_c; int k = this.field_71476_x.field_72309_d; @@ -96,7 +96,7 @@ { flag = false; this.field_71439_g.func_71038_i(); -@@ -1407,7 +1422,8 @@ +@@ -1409,7 +1424,8 @@ { 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(); } -@@ -1606,6 +1622,8 @@ +@@ -1608,6 +1624,8 @@ while (Mouse.next()) { @@ -115,7 +115,7 @@ i = Mouse.getEventButton(); if (field_142025_a && i == 0 && (Keyboard.isKeyDown(29) || Keyboard.isKeyDown(157))) -@@ -2079,6 +2097,11 @@ +@@ -2081,6 +2099,11 @@ public void func_71353_a(WorldClient p_71353_1_, String p_71353_2_) { @@ -127,7 +127,7 @@ if (p_71353_1_ == null) { NetHandlerPlayClient nethandlerplayclient = this.func_147114_u(); -@@ -2091,6 +2114,18 @@ +@@ -2093,6 +2116,18 @@ if (this.field_71437_Z != null) { this.field_71437_Z.func_71263_m(); @@ -146,7 +146,7 @@ } this.field_71437_Z = null; -@@ -2239,113 +2274,10 @@ +@@ -2241,113 +2276,10 @@ if (this.field_71476_x != null) { boolean flag = this.field_71439_g.field_71075_bZ.field_75098_d; @@ -262,7 +262,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; -@@ -2512,8 +2444,15 @@ +@@ -2514,8 +2446,15 @@ 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) { GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)null); -@@ -2521,6 +2460,7 @@ +@@ -2523,6 +2462,7 @@ if (j != 0) { diff --git a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch index fafd4c862b..2d72a40a28 100644 --- a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch +++ b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch @@ -126,7 +126,7 @@ if (this.field_71307_n.func_76468_d()) { this.field_71307_n.func_76470_e(); -@@ -588,13 +575,15 @@ +@@ -592,13 +579,15 @@ this.field_71304_b.func_76320_a("levels"); int i; @@ -145,7 +145,7 @@ this.field_71304_b.func_76320_a(worldserver.func_72912_H().func_76065_j()); this.field_71304_b.func_76320_a("pools"); worldserver.func_82732_R().func_72343_a(); -@@ -641,9 +630,11 @@ +@@ -645,9 +634,11 @@ this.field_71304_b.func_76319_b(); } @@ -158,7 +158,7 @@ this.field_71304_b.func_76318_c("connection"); this.func_147137_ag().func_151269_c(); this.field_71304_b.func_76318_c("players"); -@@ -688,7 +679,13 @@ +@@ -692,7 +683,13 @@ public WorldServer func_71218_a(int p_71218_1_) { @@ -173,7 +173,7 @@ } public String func_71249_w() -@@ -947,6 +944,7 @@ +@@ -951,6 +948,7 @@ if (worldserver != null) { @@ -181,7 +181,7 @@ worldserver.func_73041_k(); } } -@@ -1417,7 +1415,6 @@ +@@ -1421,7 +1419,6 @@ this.field_147141_M = p_155759_1_; }