From 2b17095c88cf94116a251d271031a4a8a2aefdfb Mon Sep 17 00:00:00 2001 From: huanghongxun Date: Thu, 17 Dec 2015 18:06:19 +0800 Subject: [PATCH] add i18n --- .../hellominecraft/launcher/Main.java | 1 + .../launch/AbstractMinecraftLoader.java | 4 +- .../utils/auth/UserProfileProvider.java | 12 +- .../launcher/version/ServerInfo.java | 48 +++++++ .../views/ServerListCellRenderer.form | 79 ++++++++++ .../views/ServerListCellRenderer.java | 122 ++++++++++++++++ .../launcher/views/ServerListView.form | 81 +++++++++++ .../launcher/views/ServerListView.java | 135 ++++++++++++++++++ .../tasks/download/FileDownloadTask.java | 6 +- .../jackhuang/hellominecraft/utils/Utils.java | 17 ++- .../hellominecraft/views/Selector.java | 6 +- .../hellominecraft/launcher/I18N.properties | 6 + .../launcher/I18N_en.properties | 6 + .../launcher/I18N_zh.properties | 6 + .../launcher/I18N_zh_CN.properties | 6 + 15 files changed, 521 insertions(+), 14 deletions(-) create mode 100644 HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/ServerInfo.java create mode 100644 HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListCellRenderer.form create mode 100644 HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListCellRenderer.java create mode 100644 HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListView.form create mode 100644 HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListView.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java index d76b4cd37..2b706087b 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java @@ -42,6 +42,7 @@ import org.jackhuang.hellominecraft.views.LogWindow; import org.jackhuang.hellominecraft.launcher.settings.Settings; import org.jackhuang.hellominecraft.launcher.utils.upgrade.IUpgrader; import org.jackhuang.hellominecraft.launcher.views.MainFrame; +import org.jackhuang.hellominecraft.launcher.views.ServerListView; import org.jackhuang.hellominecraft.lookandfeel.HelloMinecraftLookAndFeel; import org.jackhuang.hellominecraft.utils.MathUtils; import org.jackhuang.hellominecraft.utils.StrUtils; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/AbstractMinecraftLoader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/AbstractMinecraftLoader.java index cd93c3fc0..3da01a2ac 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/AbstractMinecraftLoader.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/AbstractMinecraftLoader.java @@ -160,7 +160,7 @@ public abstract class AbstractMinecraftLoader implements IMinecraftLoader { } String serverIp = v.getServerIp(); - if (lr.getServerIp() != null) serverIp = lr.getServerIp(); + if (lr.getServer() != null) serverIp = lr.getServer().addr; if (StrUtils.isNotBlank(serverIp)) { String[] args = serverIp.split(":"); res.add("--server"); @@ -191,7 +191,7 @@ public abstract class AbstractMinecraftLoader implements IMinecraftLoader { } /** - * You must do these things:
+ * You must do these things: *