From c12bb689fbde0d5528ae3ab3b247bd28f4441913 Mon Sep 17 00:00:00 2001 From: cpw Date: Tue, 21 Apr 2015 00:30:52 -0400 Subject: [PATCH 1/6] MinecraftForge/FML@a39482c4b7ac2883f821619b47ff31e0b6e74b29 Splash screen implementation MinecraftForge/FML@01fea095cdcd80c2ae9f0ebfd1c72242b3f2dbf8 Merge branch '1.7.10-load-progress' of github.com:RainWarrior/FML into 1.7.10 MinecraftForge/FML@364b4bbbb0d4d168f9a63fa62a09e4e2fa213039 Call some loader stuffs MinecraftForge/FML@61a891280d15f9f17e28bf86a427f32de5a8983e Make sure to close the splash screen if there's gonna be an error display --- fml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fml b/fml index d14d1a8fea..61a891280d 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit d14d1a8fea4c9242c944079ab8e4cdd516dfce4c +Subproject commit 61a891280d15f9f17e28bf86a427f32de5a8983e From a297a615b9da62c3734745e13fbdd6c2f3148327 Mon Sep 17 00:00:00 2001 From: RainWarrior Date: Fri, 24 Apr 2015 05:51:44 +0300 Subject: [PATCH 2/6] MinecraftForge/FML@5785a9c9e8d76b91a03ed1f9791aeee1cb7ea00b Fix up multiple injections of cmdline files via versionspecificmoddir. Closes #645 MinecraftForge/FML@bd117be9c3e3919f3c29538cde80e3eb8fa48368 Correctly track exceptions thrown in the loading screen rendering thread --- fml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fml b/fml index 61a891280d..bd117be9c3 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 61a891280d15f9f17e28bf86a427f32de5a8983e +Subproject commit bd117be9c3e3919f3c29538cde80e3eb8fa48368 From 55cbba07642195e5ecd78fa93249b454b061a84c Mon Sep 17 00:00:00 2001 From: cpw Date: Fri, 24 Apr 2015 19:16:55 -0400 Subject: [PATCH 3/6] MinecraftForge/FML@36688e781aae67fb1e4e7047acf689edeeac7ddb Add in resource reloading to the bar. Tidy up some of the labels a bit. MinecraftForge/FML@a1dc465a55612ecdd44e6cde3adc0f1d53c6d97b More progress bar action! MinecraftForge/FML@bfcbf4ef4366fd3d8bfd20adafb63a857bb0dd53 More progress bar hooks MinecraftForge/FML@a6670c415ee97e771020921e00773c4c15e7512e Thread errors should be correctly displayed in the crash report now MinecraftForge/FML@9a16d26186d27029cae32a19c09ddf48f7cba22e fixed bar text positioning MinecraftForge/FML@0059c630281b7105c0532d2dba1bec27cf0323b2 Track mipmaps and texture upload MinecraftForge/FML@ef5f809752e87e369235e98a63027e9347185cd9 Fix broken log message in vanilla. --- fml | 2 +- .../net/minecraft/client/Minecraft.java.patch | 26 +++++++++---------- .../renderer/texture/TextureMap.java.patch | 14 +++++----- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/fml b/fml index bd117be9c3..ef5f809752 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit bd117be9c3e3919f3c29538cde80e3eb8fa48368 +Subproject commit ef5f809752e87e369235e98a63027e9347185cd9 diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index 9ec8287970..248ff1af82 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -17,8 +17,8 @@ } catch (LWJGLException lwjglexception) { -@@ -541,7 +540,7 @@ - this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o); +@@ -552,7 +551,7 @@ + cpw.mods.fml.common.ProgressManager.pop(bar); FMLClientHandler.instance().finishMinecraftLoading(); this.func_71361_d("Post startup"); - this.field_71456_v = new GuiIngame(this); @@ -26,7 +26,7 @@ if (this.field_71475_ae != null) { -@@ -761,11 +760,6 @@ +@@ -772,11 +771,6 @@ public void func_147108_a(GuiScreen p_147108_1_) { @@ -38,7 +38,7 @@ if (p_147108_1_ == null && this.field_71441_e == null) { p_147108_1_ = new GuiMainMenu(); -@@ -775,6 +769,17 @@ +@@ -786,6 +780,17 @@ p_147108_1_ = new GuiGameOver(); } @@ -56,7 +56,7 @@ if (p_147108_1_ instanceof GuiMainMenu) { this.field_71474_y.field_74330_P = false; -@@ -1341,7 +1346,7 @@ +@@ -1352,7 +1357,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 @@ +@@ -1433,11 +1438,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 @@ +@@ -1464,7 +1470,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 @@ +@@ -1676,6 +1683,8 @@ while (Mouse.next()) { @@ -99,7 +99,7 @@ j = Mouse.getEventButton(); KeyBinding.func_74510_a(j - 100, Mouse.getEventButtonState()); -@@ -2127,6 +2136,11 @@ +@@ -2138,6 +2147,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 @@ +@@ -2150,6 +2164,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 @@ +@@ -2298,113 +2324,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 @@ +@@ -2670,8 +2593,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 @@ +@@ -2679,6 +2609,7 @@ if (j != 0) { diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch index cac9df5583..ee4979668d 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch @@ -20,12 +20,12 @@ this.field_94258_i.clear(); int j = Integer.MAX_VALUE; + ForgeHooksClient.onTextureStitchedPre(this); + cpw.mods.fml.common.ProgressManager.ProgressBar bar = cpw.mods.fml.common.ProgressManager.push("Texture stitching", this.field_110574_e.size()); Iterator iterator = this.field_110574_e.entrySet().iterator(); TextureAtlasSprite textureatlassprite; - -@@ -106,6 +110,16 @@ - textureatlassprite = (TextureAtlasSprite)entry.getValue(); +@@ -108,6 +112,16 @@ ResourceLocation resourcelocation1 = this.func_147634_a(resourcelocation, 0); + bar.step(resourcelocation1.func_110623_a()); + if (textureatlassprite.hasCustomLoader(p_110571_1_, resourcelocation)) + { @@ -40,15 +40,15 @@ try { IResource iresource = p_110571_1_.func_110536_a(resourcelocation1); -@@ -276,6 +290,7 @@ +@@ -286,6 +300,7 @@ textureatlassprite = (TextureAtlasSprite)iterator2.next(); textureatlassprite.func_94217_a(this.field_94249_f); } + ForgeHooksClient.onTextureStitchedPost(this); + cpw.mods.fml.common.ProgressManager.pop(bar); } - private ResourceLocation func_147634_a(ResourceLocation p_147634_1_, int p_147634_2_) -@@ -349,7 +364,7 @@ +@@ -360,7 +375,7 @@ { throw new IllegalArgumentException("Name cannot be null!"); } @@ -57,7 +57,7 @@ { Object object = (TextureAtlasSprite)this.field_110574_e.get(p_94245_1_); -@@ -405,4 +420,37 @@ +@@ -416,4 +431,37 @@ { this.field_147637_k = p_147632_1_; } From 66a4db5fa0f6c5d4d3ee6420068e32930b48d5e1 Mon Sep 17 00:00:00 2001 From: cpw Date: Sat, 25 Apr 2015 00:47:09 -0400 Subject: [PATCH 4/6] MinecraftForge/FML@4fe7b469b5ba156d4a786cd9e105b18cca7c271a Loading screen: logo rotation is now optional; initial support for animated textures - animation rate is fixed for now. MinecraftForge/FML@31ae43590a2ba771d69b6c6513bcd5fe87ae8f8f Fix trying to close the screen during error. --- fml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fml b/fml index ef5f809752..31ae43590a 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit ef5f809752e87e369235e98a63027e9347185cd9 +Subproject commit 31ae43590a2ba771d69b6c6513bcd5fe87ae8f8f From 63e71af22939f43cd404447b5bcbddfdeaa3483e Mon Sep 17 00:00:00 2001 From: cpw Date: Sat, 25 Apr 2015 01:34:25 -0400 Subject: [PATCH 5/6] MinecraftForge/FML@94821fac98e64d9b8ad7434ed23a621850a8e11c Add a config file that lets you add additional soft dependencies at runtime - injectedDependencies.json --- fml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fml b/fml index 31ae43590a..94821fac98 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 31ae43590a2ba771d69b6c6513bcd5fe87ae8f8f +Subproject commit 94821fac98e64d9b8ad7434ed23a621850a8e11c From 37075d04372b80cc67ce52f2be4b576f7397ca83 Mon Sep 17 00:00:00 2001 From: cpw Date: Sat, 25 Apr 2015 15:06:20 -0400 Subject: [PATCH 6/6] MinecraftForge/FML@2ed00c4da0ee76eb15e28eb8ee2c07a3096155c2 Splash progress screen will not load in the presence of optifine anymore. --- fml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fml b/fml index 94821fac98..2ed00c4da0 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 94821fac98e64d9b8ad7434ed23a621850a8e11c +Subproject commit 2ed00c4da0ee76eb15e28eb8ee2c07a3096155c2