diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
3 files changed, 31 insertions, 11 deletions
diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 204648194a..f25f7f11e6 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -2617,7 +2617,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { String uid = "gregtech.bee.species" + species; String description = "for.description." + species; String name = "for.bees.species." + lowercaseName; - GT_LanguageManager.addStringLocalization("for.bees.species." + lowercaseName, species, true); + GT_LanguageManager.addStringLocalization("for.bees.species." + lowercaseName, species); this.branch = branch; this.species = new GT_AlleleBeeSpecies( diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 738bac3540..a0abf686f8 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -170,8 +170,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { false, new Object[] { "sensorcard", "GregTech Sensor Card" }); ItemList.NC_SensorCard.set( - tItem == null - ? new GT_Generic_Item("sensorcard", "GregTech Sensor Card", "Nuclear Control not installed", false) + tItem == null ? new GT_Generic_Item("sensorcard", "GregTech Sensor Card", "Nuclear Control not installed") : tItem); Item advSensorCard = (Item) GT_Utility @@ -181,8 +180,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { ? new GT_Generic_Item( "advancedsensorcard", "GregTech Advanced Sensor Card", - "Nuclear Control not installed", - false) + "Nuclear Control not installed") : advSensorCard); ItemList.Neutron_Reflector diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java index 42bf79a102..33b023268c 100644 --- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java +++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java @@ -26,12 +26,14 @@ import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; +import net.minecraft.client.Minecraft; import net.minecraft.init.Blocks; import net.minecraft.launchwrapper.Launch; import net.minecraftforge.common.config.Configuration; import org.apache.commons.lang3.StringUtils; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.LoadController; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; @@ -91,13 +93,33 @@ public class GT_PreLoad { public static void initLocalization(File languageDir) { GT_FML_LOGGER.info("GT_Mod: Generating Lang-File"); - GT_LanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang")); - GT_LanguageManager.sEnglishFile.load(); - if (GT_LanguageManager.sEnglishFile.get("EnableLangFile", "UseThisFileAsLanguageFile", false) - .getBoolean(false)) { - GT_LanguageManager.sLanguage = GT_LanguageManager.sEnglishFile.get("EnableLangFile", "Language", "en_US") - .getString(); + + if (FMLCommonHandler.instance() + .getEffectiveSide() + .isClient()) { + String userLang = Minecraft.getMinecraft() + .getLanguageManager() + .getCurrentLanguage() + .getLanguageCode(); + GT_FML_LOGGER.info("User lang is " + userLang); + if (userLang.equals("en_US")) { + GT_FML_LOGGER.info("Loading GregTech.lang"); + GT_LanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang")); + } else { + String l10nFileName = "GregTech_" + userLang + ".lang"; + File l10nFile = new File(languageDir, l10nFileName); + if (l10nFile.isFile()) { + GT_FML_LOGGER.info("Loading l10n file: " + l10nFileName); + GT_LanguageManager.sEnglishFile = new Configuration(l10nFile); + } else { + GT_FML_LOGGER.info("Cannot find l10n file " + l10nFileName + ", fallback to GregTech.lang"); + GT_LanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang")); + } + } + } else { + GT_LanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang")); } + GT_LanguageManager.sEnglishFile.load(); Materials.getMaterialsMap() .values() |