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

Merge pull request #2167 from Choonster/master

Browse source 
Fix texture error message for broken textures
This commit is contained in:
LexManos 2015-11-05 15:09:02 -08:00
commit f466a0c387
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
View file

@ -928,7 +928,7 @@ public class FMLClientHandler implements IFMLSidedHandler
logger.error(Strings.repeat("+=", 25)); logger.error(Strings.repeat("+=", 25));
logger.error("The following texture errors were found."); logger.error("The following texture errors were found.");
Map<String,FallbackResourceManager> resManagers = ObfuscationReflectionHelper.getPrivateValue(SimpleReloadableResourceManager.class, (SimpleReloadableResourceManager)Minecraft.getMinecraft().getResourceManager(), "domainResourceManagers", "field_110548"+"_a"); Map<String,FallbackResourceManager> resManagers = ObfuscationReflectionHelper.getPrivateValue(SimpleReloadableResourceManager.class, (SimpleReloadableResourceManager)Minecraft.getMinecraft().getResourceManager(), "domainResourceManagers", "field_110548"+"_a");
for (String resourceDomain : missingTextures.keySet()) for (String resourceDomain : badTextureDomains)
{ {
Set<ResourceLocation> missing = missingTextures.get(resourceDomain); Set<ResourceLocation> missing = missingTextures.get(resourceDomain);
logger.error(Strings.repeat("=", 50)); logger.error(Strings.repeat("=", 50));
@ -964,12 +964,13 @@ public class FMLClientHandler implements IFMLSidedHandler
} }
} }
logger.error(Strings.repeat("-", 25)); logger.error(Strings.repeat("-", 25));
logger.error(" The missing resources for domain {} are:",resourceDomain); if (missingTextures.containsKey(resourceDomain)) {
for (ResourceLocation rl : missing) logger.error(" The missing resources for domain {} are:", resourceDomain);
{ for (ResourceLocation rl : missing) {
logger.error(" {}",rl.getResourcePath()); logger.error(" {}", rl.getResourcePath());
}
logger.error(Strings.repeat("-", 25));
} }
logger.error(Strings.repeat("-", 25));
if (!brokenTextures.containsRow(resourceDomain)) if (!brokenTextures.containsRow(resourceDomain))
{ {
logger.error(" No other errors exist for domain {}", resourceDomain); logger.error(" No other errors exist for domain {}", resourceDomain);