Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
v1.6.2_5 デフォルト言語の読み取り方を変更 色変換コードの修正
  • Loading branch information
hide92795 committed Oct 22, 2013
1 parent 5693bf8 commit 280138a
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 9 deletions.
Binary file not shown.
23 changes: 15 additions & 8 deletions hide92795CoreLib/src/hide92795/bukkit/plugin/corelib/Localize.java
Expand Up @@ -25,18 +25,25 @@ public void reload(String lang, String default_lang) throws Exception {
config = LanguageConfiguration.loadConfiguration(configFile);
config.options().copyDefaults(true);

InputStream defConfigStream = plugin.getResource(default_lang + ".yml");
if (defConfigStream != null) {
LanguageConfiguration defConfig = LanguageConfiguration.loadConfiguration(defConfigStream);
config.setDefaults(defConfig);
} else {
plugin.getLogger().warning("Can't load Default laungage.");
try (InputStream inJarConfigStream = plugin.getResource(lang + ".yml")) {
if (inJarConfigStream != null) {
LanguageConfiguration inJarConfig = LanguageConfiguration.loadConfiguration(inJarConfigStream);
config.setDefaults(inJarConfig);
} else {
try (InputStream defConfigStream = plugin.getResource(default_lang + ".yml")) {
if (defConfigStream != null) {
LanguageConfiguration defConfig = LanguageConfiguration.loadConfiguration(defConfigStream);
config.setDefaults(defConfig);
} else {
plugin.getLogger().warning("Can't load Default laungage.");
}
}
}
}

config.save(configFile);
}

public String getString(Localizable path) {
return ChatColor.translateAlternateColorCodes('$', config.getString(path.getName()));
return ChatColor.translateAlternateColorCodes('&', config.getString(path.getName()));
}
}
2 changes: 1 addition & 1 deletion hide92795CoreLib/src/plugin.yml
@@ -1,5 +1,5 @@
name: hide92795CoreLib
main: hide92795.bukkit.plugin.corelib.CoreLib
version: 1.6.2_4
version: 1.6.2_5
description: Core Library for my plugins.
author: hide92795

0 comments on commit 280138a

Please sign in to comment.