From 729fca77220057a87546d645f4cd9b77f46d2b98 Mon Sep 17 00:00:00 2001 From: Choonster Date: Fri, 6 Nov 2015 06:52:09 +1100 Subject: [PATCH] Fix texture error message for broken textures -- Fixes #2100 -- Iterates over badTextureDomains instead of missingTextures.keySet() as a domain can have broken textures without any missing textures --- .../minecraftforge/fml/client/FMLClientHandler.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java index 3fc95c606..978b753b1 100644 --- a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java +++ b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java @@ -928,7 +928,7 @@ public class FMLClientHandler implements IFMLSidedHandler logger.error(Strings.repeat("+=", 25)); logger.error("The following texture errors were found."); Map resManagers = ObfuscationReflectionHelper.getPrivateValue(SimpleReloadableResourceManager.class, (SimpleReloadableResourceManager)Minecraft.getMinecraft().getResourceManager(), "domainResourceManagers", "field_110548"+"_a"); - for (String resourceDomain : missingTextures.keySet()) + for (String resourceDomain : badTextureDomains) { Set missing = missingTextures.get(resourceDomain); logger.error(Strings.repeat("=", 50)); @@ -964,12 +964,13 @@ public class FMLClientHandler implements IFMLSidedHandler } } logger.error(Strings.repeat("-", 25)); - logger.error(" The missing resources for domain {} are:",resourceDomain); - for (ResourceLocation rl : missing) - { - logger.error(" {}",rl.getResourcePath()); + if (missingTextures.containsKey(resourceDomain)) { + logger.error(" The missing resources for domain {} are:", resourceDomain); + for (ResourceLocation rl : missing) { + logger.error(" {}", rl.getResourcePath()); + } + logger.error(Strings.repeat("-", 25)); } - logger.error(Strings.repeat("-", 25)); if (!brokenTextures.containsRow(resourceDomain)) { logger.error(" No other errors exist for domain {}", resourceDomain);