From 4e6aa905f0e262ad76288d65bda1ad52713e1eba Mon Sep 17 00:00:00 2001 From: cpw Date: Sat, 25 Apr 2015 00:41:50 -0400 Subject: [PATCH] Fix trying to close the screen during error. --- .../main/java/cpw/mods/fml/client/FMLClientHandler.java | 8 ++++++-- fml/src/main/java/cpw/mods/fml/client/GuiModsMissing.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java b/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java index ae3d2644c6..42a2027b1d 100644 --- a/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java +++ b/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java @@ -394,10 +394,10 @@ public class FMLClientHandler implements IFMLSidedHandler } else { + Loader.instance().loadingComplete(); + SplashProgress.finish(); } logMissingTextureErrors(); - Loader.instance().loadingComplete(); - SplashProgress.finish(); } /** * Get the server instance @@ -921,6 +921,10 @@ public class FMLClientHandler implements IFMLSidedHandler public void logMissingTextureErrors() { + if (missingTextures.isEmpty() && brokenTextures.isEmpty()) + { + return; + } Logger logger = LogManager.getLogger("TEXTURE ERRORS"); logger.error(Strings.repeat("+=", 25)); logger.error("The following texture errors were found."); diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiModsMissing.java b/fml/src/main/java/cpw/mods/fml/client/GuiModsMissing.java index 9edb54fcea..964d7941fd 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiModsMissing.java +++ b/fml/src/main/java/cpw/mods/fml/client/GuiModsMissing.java @@ -58,6 +58,6 @@ public class GuiModsMissing extends GuiErrorScreen this.drawCenteredString(this.fontRendererObj, String.format("%s : %s", v.getLabel(), v.getRangeString()), this.width / 2, offset, 0xEEEEEE); } offset+=20; - this.drawCenteredString(this.fontRendererObj, "The file 'ForgeModLoader-client-0.log' contains more information", this.width / 2, offset, 0xFFFFFF); + this.drawCenteredString(this.fontRendererObj, "The file 'logs/fml-client-latest.log' contains more information", this.width / 2, offset, 0xFFFFFF); } }