From f3906a37bfb4d9b97dfa82067c570ea8c6c73219 Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Thu, 26 Apr 2018 13:14:14 +0800 Subject: [PATCH] Fixed #321 --- .../java/org/jackhuang/hmcl/ui/LeftPaneController.java | 8 +++++--- HMCL/src/main/resources/assets/fxml/profile.fxml | 2 +- .../resources/assets/fxml/version/version-settings.fxml | 2 +- HMCL/src/main/resources/assets/lang/I18N.properties | 4 +++- HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties | 6 ++++-- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java index b10117b59..51f38a3b6 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java @@ -195,10 +195,10 @@ public final class LeftPaneController { } private boolean checkedModpack = false; + private static boolean showNewAccount = true; private void onRefreshedVersions(RefreshedVersionsEvent event) { JFXUtilities.runInFX(() -> { - boolean flag = true; HMCLGameRepository repository = (HMCLGameRepository) event.getSource(); if (!checkedModpack) { checkedModpack = true; @@ -216,15 +216,17 @@ public final class LeftPaneController { })).executor(); region.set(Controllers.taskDialog(executor, Launcher.i18n("modpack.installing"), "")); executor.start(); - flag = false; + showNewAccount = false; } catch (UnsupportedModpackException ignore) { } } } } - if (flag) + if (showNewAccount) { + showNewAccount = false; checkAccount(); + } }); } diff --git a/HMCL/src/main/resources/assets/fxml/profile.fxml b/HMCL/src/main/resources/assets/fxml/profile.fxml index c8d758c0b..9c2f80c87 100644 --- a/HMCL/src/main/resources/assets/fxml/profile.fxml +++ b/HMCL/src/main/resources/assets/fxml/profile.fxml @@ -31,7 +31,7 @@ - + diff --git a/HMCL/src/main/resources/assets/fxml/version/version-settings.fxml b/HMCL/src/main/resources/assets/fxml/version/version-settings.fxml index 29a22ecf8..1853ac4e8 100644 --- a/HMCL/src/main/resources/assets/fxml/version/version-settings.fxml +++ b/HMCL/src/main/resources/assets/fxml/version/version-settings.fxml @@ -25,7 +25,7 @@ - diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 6b85f1a36..2cbbff132 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -311,6 +311,7 @@ profile=Profile profile.default=Current directory profile.home=User home profile.instance_directory=Game Directory +profile.instance_directory.choose=Choose Game Directory profile.new=New Config profile.new_name=New Profile Name: profile.remove=Sure to remove profile %s? @@ -343,7 +344,6 @@ settings.advanced.server_ip=Server Host settings.advanced.wrapper_launcher=Wrapper Launcher(i.e. optirun...) settings.cannot_remove_default_config=Cannot remove the default configution. -settings.choose_gamedir=Choose Game Directory settings.custom=Custom settings.default=Default settings.failed_load=Failed to load settings file. Remove it? @@ -352,6 +352,8 @@ settings.game=Games settings.game.dimension=Game Window Dimension settings.game.exploration=Explore settings.game.fullscreen=Fullscreen +settings.game.game_directory=Game Directory +settings.game.game_directory.choose=Choose Game Directory settings.game.java_directory=Java Dir settings.game.java_directory.choose=Choose Java Directory. settings.game.management=Manage diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties index 25fc26582..11d352f46 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -147,7 +147,7 @@ install.installer.forge=Forge install.installer.game=游戏 install.installer.install=安装%s install.installer.liteloader=LiteLoader -install.installer.not_installed=不安装%s +install.installer.not_installed=暂不安装%s，点击此处安装 install.installer.optifine=OptiFine install.installer.version=%s版本 install.modpack=安装整合包 @@ -311,6 +311,7 @@ profile=配置 profile.default=当前目录 profile.home=主文件夹 profile.instance_directory=游戏路径 +profile.instance_directory.choose=选择游戏路径 profile.new=新建配置 profile.new_name=新配置名: profile.remove=真的要删除配置%s吗？ @@ -343,7 +344,6 @@ settings.advanced.server_ip=直入服务器ip地址(不必填写，启动游戏 settings.advanced.wrapper_launcher=前置指令(不必填写,如optirun) settings.cannot_remove_default_config=不能删除默认配置 -settings.choose_gamedir=选择游戏路径 settings.custom=自定义 settings.default=默认 settings.failed_load=设置文件加载失败，可能是升级了启动器或被人工修改造成错误，是否清除？ @@ -352,6 +352,8 @@ settings.game=游戏设置 settings.game.dimension=游戏窗口分辨率 settings.game.exploration=浏览 settings.game.fullscreen=全屏 +settings.game.game_directory=游戏路径（版本隔离） +settings.game.game_directory.choose=选择游戏路径 settings.game.java_directory=Java路径 settings.game.java_directory.choose=选择Java路径 settings.game.management=管理