Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
pahimar 2012-10-01 15:18:52 -04:00
parent fd5e247c59 1cbfb94d86
commit e302df5b95
4 changed files with 12 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ee3_common/ee3/common/EquivalentExchange3.java
View file

@ -53,11 +53,11 @@ public class EquivalentExchange3 {
@PreInit
public void preInit(FMLPreInitializationEvent event) {
// Load the localization files into the LanguageRegistry
LocalizationHandler.loadLanguages();
// Initialize the configuration
ConfigurationHandler.init(event.getSuggestedConfigurationFile());
// Load the localization files into the LanguageRegistry
LocalizationHandler.instance().loadLanguages();
// Conduct the version check and log the result
VersionHelper.checkVersion();

60
ee3_common/ee3/common/core/handlers/LocalizationHandler.java
View file

@ -1,10 +1,5 @@
package ee3.common.core.handlers;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.Iterator;
import java.util.Properties;
import cpw.mods.fml.common.registry.LanguageRegistry;
import ee3.common.core.helper.LocalizationHelper;
import ee3.common.lib.Localizations;
@ -20,61 +15,14 @@ import ee3.common.lib.Localizations;
*/
public class LocalizationHandler {
private static final LocalizationHandler INSTANCE = new LocalizationHandler();
public static LocalizationHandler instance() {
return INSTANCE;
}
/***
* Loads in all the localization files from the Localizations library class
*/
public void loadLanguages() {
InputStream languageStream = null;
Properties languageMappings = new Properties();
Iterator<String> keyIter = null;
String currentKey, currentLang;
try {
// For every file specified in the Localization library class, load them into the Language Registry
for (String localizationFile : Localizations.localeFiles) {
URL localizationFileURL = this.getClass().getResource(localizationFile);
languageStream = localizationFileURL.openStream();
// If this file is a XML file, load it from XML
if (LocalizationHelper.isXMLLanguageFile(localizationFile)) {
languageMappings.loadFromXML(languageStream);
}
// Otherwise, load it like any other Java Properties file
else {
languageMappings.load(languageStream);
}
// Read the locale from the file name of the localization file
currentLang = LocalizationHelper.getLocaleFromFileName(localizationFile);
// For every key in the localization file, add its key:value pair to the Language Registry for the given locale
keyIter = (Iterator<String>)languageMappings.keys();
while (keyIter.hasNext()) {
currentKey = keyIter.next();
LanguageRegistry.instance().addStringLocalization(currentKey, currentLang, languageMappings.getProperty(currentKey));
}
}
} catch (Exception e) {
e.printStackTrace(System.err);
} finally {
// Close the input stream when we are done with it
try {
if (languageStream != null) {
languageStream.close();
}
} catch (IOException ex) {
ex.printStackTrace(System.err);
}
public static void loadLanguages() {
// For every file specified in the Localization library class, load them into the Language Registry
for (String localizationFile : Localizations.localeFiles) {
LanguageRegistry.instance().loadLocalization(localizationFile, LocalizationHelper.getLocaleFromFileName(localizationFile), LocalizationHelper.isXMLLanguageFile(localizationFile));
}
}
}

41
ee3_common/ee3/common/core/helper/LocalizationHelper.java
View file

@ -1,12 +1,5 @@
package ee3.common.core.helper;
import java.util.HashMap;
import java.util.Properties;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.ReflectionHelper;
import net.minecraft.src.StringTranslate;
import ee3.common.core.handlers.LocalizationHandler;
/**
* LocalizationHelper
*
@ -18,40 +11,6 @@ import ee3.common.core.handlers.LocalizationHandler;
*/
public class LocalizationHelper {
// The language data field name for localization data in the Language Registry
private static final String LANGUAGE_REGISTRY_LANGUAGE_DATA_FIELD = "modLanguageData";
/***
* Returns the localized version of the text represented by key for the current language from the Language Registry
* @param key The key that represents the text we are attempting to localize
* @return The localized string for the specified key for the current language, null if no localized version of the key exists in the Language Registry
*/
public static String localize(String key) {
return localize(StringTranslate.getInstance().getCurrentLanguage(), key);
}
/***
* Returns the localized version of the text represented by key for the specified language from the Language Registry
* @param language The language for which to search for the localized version of the key
* @param key The key that represents the text we are attempting to localize
* @return The localized string for the specified key for the specified language, null if no localized version of the key exists in the Language Registry
*/
public static String localize(String language, String key) {
String localizedValue = "";
HashMap<String,Properties> modLanguageData = null;
Properties languageMapping = null;
try {
modLanguageData = ReflectionHelper.getPrivateValue(cpw.mods.fml.common.registry.LanguageRegistry.class, LanguageRegistry.instance(), LANGUAGE_REGISTRY_LANGUAGE_DATA_FIELD);
languageMapping = modLanguageData.get(language);
localizedValue = languageMapping.getProperty(key);
} catch (Exception e) {
e.printStackTrace(System.err);
}
return localizedValue;
}
/***
* Simple test to determine if a specified file name represents a XML file or not
* @param fileName String representing the file name of the file in question

9
ee3_common/ee3/common/core/helper/VersionHelper.java
View file

@ -7,6 +7,7 @@ import java.util.logging.Level;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.LanguageRegistry;
import ee3.common.lib.Reference;
/**
@ -97,16 +98,16 @@ public class VersionHelper {
public static String getResultMessage() {
if (result == UNINITIALIZED) {
return LocalizationHelper.localize(UNINITIALIZED_MESSAGE);
return LanguageRegistry.instance().getStringLocalization(UNINITIALIZED_MESSAGE);
}
else if (result == CURRENT) {
return LocalizationHelper.localize(CURRENT_MESSAGE);
return LanguageRegistry.instance().getStringLocalization(CURRENT_MESSAGE);
}
else if (result == OUTDATED) {
return LocalizationHelper.localize(OUTDATED_MESSAGE);
return LanguageRegistry.instance().getStringLocalization(OUTDATED_MESSAGE);
}
else if (result == CONNECTION_ERROR) {
return LocalizationHelper.localize(CONNECTION_ERROR_MESSAGE);
return LanguageRegistry.instance().getStringLocalization(CONNECTION_ERROR_MESSAGE);
}
else {
return null;