From d25d70d59deae47aa2d34c65d65f0fe19e06855b Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 17 Feb 2013 16:22:58 -0500 Subject: [PATCH] Fix Language Registry, closes #163 --- .../fml/common/registry/LanguageRegistry.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/fml/common/cpw/mods/fml/common/registry/LanguageRegistry.java b/fml/common/cpw/mods/fml/common/registry/LanguageRegistry.java index 1de27d199f..65a7d2bd2d 100644 --- a/fml/common/cpw/mods/fml/common/registry/LanguageRegistry.java +++ b/fml/common/cpw/mods/fml/common/registry/LanguageRegistry.java @@ -12,6 +12,8 @@ import java.util.logging.Level; import com.google.common.base.Charsets; import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.ModContainer; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -122,7 +124,23 @@ public class LanguageRegistry public void loadLocalization(String localizationFile, String lang, boolean isXML) { - loadLocalization(this.getClass().getResource(localizationFile), lang, isXML); + URL urlResource = this.getClass().getResource(localizationFile); + if (urlResource != null) + { + loadLocalization(urlResource, lang, isXML); + } + else + { + ModContainer activeModContainer = Loader.instance().activeModContainer(); + if (activeModContainer!=null) + { + FMLLog.log(activeModContainer.getModId(), Level.SEVERE, "The language resource %s cannot be located on the classpath. This is a programming error.", localizationFile); + } + else + { + FMLLog.log(Level.SEVERE, "The language resource %s cannot be located on the classpath. This is a programming error.", localizationFile); + } + } } public void loadLocalization(URL localizationFile, String lang, boolean isXML)