diff --git a/CustomSkinLoaderGUI.jar b/CustomSkinLoaderGUI.jar index 7dd9f86..1393c42 100644 Binary files a/CustomSkinLoaderGUI.jar and b/CustomSkinLoaderGUI.jar differ diff --git a/src/idv/jlchntoz/CustomSkinLoaderGUI.java b/src/idv/jlchntoz/CustomSkinLoaderGUI.java index 4735939..c5fa5e2 100644 --- a/src/idv/jlchntoz/CustomSkinLoaderGUI.java +++ b/src/idv/jlchntoz/CustomSkinLoaderGUI.java @@ -6,7 +6,7 @@ import java.util.logging.Logger; public class CustomSkinLoaderGUI { - public static final String VERSION ="1.0.3"; + public static final String VERSION ="1.0.4"; public static final Logger log=Logger.getLogger("CustomSkinLoader-GUI"); diff --git a/src/idv/jlchntoz/gui/CloakFrame.java b/src/idv/jlchntoz/gui/CloakFrame.java index 254395b..edafb7f 100644 --- a/src/idv/jlchntoz/gui/CloakFrame.java +++ b/src/idv/jlchntoz/gui/CloakFrame.java @@ -1,7 +1,7 @@ package idv.jlchntoz.gui; import idv.jlchntoz.lang.Language; -import idv.jlchntoz.lang.DefaultLang; +import idv.jlchntoz.lang.LanguageManager; import java.awt.Container; import java.awt.Font; @@ -21,7 +21,7 @@ import javax.swing.JTextArea; import javax.swing.WindowConstants; public class CloakFrame { - private static DefaultLang lang=Language.getLanguage(); + private static Language lang=LanguageManager.getLanguage(); public static boolean mod=false; public static final String[] urls={ "#"+lang.minecraftOffical(), diff --git a/src/idv/jlchntoz/gui/MainFrame.java b/src/idv/jlchntoz/gui/MainFrame.java index fc76b11..3cf158a 100644 --- a/src/idv/jlchntoz/gui/MainFrame.java +++ b/src/idv/jlchntoz/gui/MainFrame.java @@ -1,7 +1,7 @@ package idv.jlchntoz.gui; import idv.jlchntoz.lang.Language; -import idv.jlchntoz.lang.DefaultLang; +import idv.jlchntoz.lang.LanguageManager; import java.awt.Container; import java.awt.Font; @@ -14,7 +14,7 @@ import javax.swing.JLabel; import javax.swing.WindowConstants; public class MainFrame { - private static DefaultLang lang=Language.getLanguage(); + private static Language lang=LanguageManager.getLanguage(); public void init(String[] args) { diff --git a/src/idv/jlchntoz/gui/SkinFrame.java b/src/idv/jlchntoz/gui/SkinFrame.java index e8f3df5..b1f48f7 100644 --- a/src/idv/jlchntoz/gui/SkinFrame.java +++ b/src/idv/jlchntoz/gui/SkinFrame.java @@ -1,7 +1,7 @@ package idv.jlchntoz.gui; import idv.jlchntoz.lang.Language; -import idv.jlchntoz.lang.DefaultLang; +import idv.jlchntoz.lang.LanguageManager; import java.awt.Container; import java.awt.Font; @@ -21,7 +21,7 @@ import javax.swing.JTextArea; import javax.swing.WindowConstants; public class SkinFrame { - private static DefaultLang lang=Language.getLanguage(); + private static Language lang=LanguageManager.getLanguage(); public static boolean mod=false; public static final String[] urls={ "#"+lang.minecraftOffical(), diff --git a/src/idv/jlchntoz/lang/ChineseSimpLang.java b/src/idv/jlchntoz/lang/ChineseSimpLang.java index e32bd38..67bf84c 100644 --- a/src/idv/jlchntoz/lang/ChineseSimpLang.java +++ b/src/idv/jlchntoz/lang/ChineseSimpLang.java @@ -1,64 +1,49 @@ package idv.jlchntoz.lang; -public class ChineseSimpLang extends DefaultLang { - @Override +public class ChineseSimpLang implements Language { public String title(){ return "自定义皮肤加载器"; } - @Override public String gui(){ return " 图形化界面"; } - @Override public String index(){ return " 索引"; } - @Override public String first1(){ return "这是您第一次使用自定义皮肤加载器!"; } - @Override public String first2(){ return "请点击下列按钮以修改设置!"; } - @Override public String skin(){ return "皮肤"; } - @Override public String cloak(){ return "披风"; } - @Override public String loadList(){ return "加载列表"; } - @Override public String minecraftOffical(){ return "Minecraft 官方[正版]"; } - @Override public String useDefault(){ return "使用默认(官方)"; } - @Override public String useRecommended(){ return "使用推荐"; } - @Override public String save(){ return "保存"; } - @Override public String saved(){ return "已保存，请重新启动游戏!"; } - @Override public String close(){ return "关闭"; } - @Override public String yourVersion(){ return "您的皮肤模组版本:"; } diff --git a/src/idv/jlchntoz/lang/ChineseTranLang.java b/src/idv/jlchntoz/lang/ChineseTranLang.java index ab29541..f5b8000 100644 --- a/src/idv/jlchntoz/lang/ChineseTranLang.java +++ b/src/idv/jlchntoz/lang/ChineseTranLang.java @@ -1,64 +1,49 @@ package idv.jlchntoz.lang; -public class ChineseTranLang extends DefaultLang { - @Override +public class ChineseTranLang implements Language { public String title(){ return "萬用皮膚模組"; } - @Override public String gui(){ return " 用戶界面"; } - @Override public String index(){ return " 目錄"; } - @Override public String first1(){ return "這是您第一次使用本模組!"; } - @Override public String first2(){ return "請單擊下列按鈕進行配置修改!"; } - @Override public String skin(){ return "皮膚"; } - @Override public String cloak(){ return "披風"; } - @Override public String loadList(){ return "加載列表"; } - @Override public String minecraftOffical(){ return "Minecraft 官方[正版]"; } - @Override public String useDefault(){ return "使用默認(官方)"; } - @Override public String useRecommended(){ return "使用推薦"; } - @Override public String save(){ return "保存"; } - @Override public String saved(){ return "已保存，請重新開啟遊戲!"; } - @Override public String close(){ return "關閉"; } - @Override public String yourVersion(){ return "您的皮膚模組版本:"; } diff --git a/src/idv/jlchntoz/lang/DefaultLang.java b/src/idv/jlchntoz/lang/EnglishLang.java similarity index 95% rename from src/idv/jlchntoz/lang/DefaultLang.java rename to src/idv/jlchntoz/lang/EnglishLang.java index 3ff73f7..9a1d0e3 100644 --- a/src/idv/jlchntoz/lang/DefaultLang.java +++ b/src/idv/jlchntoz/lang/EnglishLang.java @@ -1,6 +1,6 @@ package idv.jlchntoz.lang; -public class DefaultLang { +public class EnglishLang implements Language{ public String title(){ return "CustomSkinLoader"; } diff --git a/src/idv/jlchntoz/lang/Language.java b/src/idv/jlchntoz/lang/Language.java index f548fe2..11bbd3c 100644 --- a/src/idv/jlchntoz/lang/Language.java +++ b/src/idv/jlchntoz/lang/Language.java @@ -1,25 +1,19 @@ package idv.jlchntoz.lang; -import java.util.Locale; - -public class Language { - - public static DefaultLang getLanguage(){ - Locale locale = Locale.getDefault(); - String l=locale.getLanguage().toLowerCase(); - String c=locale.getCountry().toLowerCase(); - if(l.equalsIgnoreCase("zh")){ - if(c.equalsIgnoreCase("cn")){ - //zh_cn - return new ChineseSimpLang(); - } - //zh - return new ChineseTranLang(); - } - //en - return new DefaultLang(); - } - - - +public interface Language { + public String title(); + public String gui(); + public String index(); + public String first1(); + public String first2(); + public String skin(); + public String cloak(); + public String loadList(); + public String minecraftOffical(); + public String useDefault(); + public String useRecommended(); + public String save(); + public String saved(); + public String close(); + public String yourVersion(); } diff --git a/src/idv/jlchntoz/lang/LanguageManager.java b/src/idv/jlchntoz/lang/LanguageManager.java new file mode 100644 index 0000000..59e5fb4 --- /dev/null +++ b/src/idv/jlchntoz/lang/LanguageManager.java @@ -0,0 +1,25 @@ +package idv.jlchntoz.lang; + +import java.util.Locale; + +public class LanguageManager { + + public static Language getLanguage(){ + Locale locale = Locale.getDefault(); + String l=locale.getLanguage().toLowerCase(); + String c=locale.getCountry().toLowerCase(); + if(l.equalsIgnoreCase("zh")){ + if(c.equalsIgnoreCase("cn")){ + //zh_cn + return new ChineseSimpLang(); + } + //zh + return new ChineseTranLang(); + } + //en + return new EnglishLang(); + } + + + +}