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

Fix language registry additions, closes #113

Browse source
This commit is contained in:
Christian 2012-09-27 17:40:46 -04:00
parent 52da67717f
commit 639039dd18
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fml/common/cpw/mods/fml/common/registry/LanguageRegistry.java
View file

@ -25,7 +25,7 @@ public class LanguageRegistry
public String getStringLocalization(String key)
{
return getStringLocalization(key, StringTranslate.getInstance().getCurrentLanguage());
return getStringLocalization(key, StringTranslate.func_74808_a().func_74811_c());
}
public String getStringLocalization(String key, String lang)
@ -74,9 +74,9 @@ public class LanguageRegistry
public static void reloadLanguageTable()
{
// reload language table by forcing lang to null and reloading the properties file
String lang = StringTranslate.getInstance().getCurrentLanguage();
StringTranslate.getInstance().currentLanguage = null;
StringTranslate.getInstance().setLanguage(lang);
String lang = StringTranslate.func_74808_a().func_74811_c();
StringTranslate.func_74808_a().field_74813_d = null;
StringTranslate.func_74808_a().func_74810_a(lang);
}
@ -84,11 +84,11 @@ public class LanguageRegistry
{
String objectName;
if (objectToName instanceof Item) {
objectName=((Item)objectToName).getItemName();
objectName=((Item)objectToName).func_77658_a();
} else if (objectToName instanceof Block) {
objectName=((Block)objectToName).getBlockName();
objectName=((Block)objectToName).func_71917_a();
} else if (objectToName instanceof ItemStack) {
objectName=((ItemStack)objectToName).getItem().getItemNameIS((ItemStack)objectToName);
objectName=((ItemStack)objectToName).func_77973_b().func_77667_c((ItemStack)objectToName);
} else {
throw new IllegalArgumentException(String.format("Illegal object for naming %s",objectToName));
}