This commit is contained in:
huangyuhui 2018-04-26 13:14:14 +08:00
parent a1e115ea6b
commit f3906a37bf
5 changed files with 14 additions and 8 deletions

View File

@ -195,10 +195,10 @@ public final class LeftPaneController {
} }
private boolean checkedModpack = false; private boolean checkedModpack = false;
private static boolean showNewAccount = true;
private void onRefreshedVersions(RefreshedVersionsEvent event) { private void onRefreshedVersions(RefreshedVersionsEvent event) {
JFXUtilities.runInFX(() -> { JFXUtilities.runInFX(() -> {
boolean flag = true;
HMCLGameRepository repository = (HMCLGameRepository) event.getSource(); HMCLGameRepository repository = (HMCLGameRepository) event.getSource();
if (!checkedModpack) { if (!checkedModpack) {
checkedModpack = true; checkedModpack = true;
@ -216,15 +216,17 @@ public final class LeftPaneController {
})).executor(); })).executor();
region.set(Controllers.taskDialog(executor, Launcher.i18n("modpack.installing"), "")); region.set(Controllers.taskDialog(executor, Launcher.i18n("modpack.installing"), ""));
executor.start(); executor.start();
flag = false; showNewAccount = false;
} catch (UnsupportedModpackException ignore) { } catch (UnsupportedModpackException ignore) {
} }
} }
} }
} }
if (flag) if (showNewAccount) {
showNewAccount = false;
checkAccount(); checkAccount();
}
}); });
} }

View File

@ -31,7 +31,7 @@
</right> </right>
</BorderPane> </BorderPane>
<FileItem fx:id="gameDir" name="%profile.instance_directory" title="%settings.choose_gamedir"/> <FileItem fx:id="gameDir" name="%profile.instance_directory" title="%profile.instance_directory.choose"/>
</ComponentList> </ComponentList>
</VBox> </VBox>

View File

@ -25,7 +25,7 @@
<MultiFileItem fx:id="javaItem" title="%settings.game.java_directory" chooserTitle="%settings.game.java_directory.choose" <MultiFileItem fx:id="javaItem" title="%settings.game.java_directory" chooserTitle="%settings.game.java_directory.choose"
hasSubtitle="true" customText="%settings.custom" directory="false" /> hasSubtitle="true" customText="%settings.custom" directory="false" />
<MultiFileItem fx:id="gameDirItem" title="%profile.instance_directory" chooserTitle="%settings.choose_gamedir" <MultiFileItem fx:id="gameDirItem" title="%settings.game.game_directory" chooserTitle="%settings.game.game_directory.choose"
hasSubtitle="true" customText="%settings.custom" directory="true" /> hasSubtitle="true" customText="%settings.custom" directory="true" />
<BorderPane> <!-- Max Memory --> <BorderPane> <!-- Max Memory -->

View File

@ -311,6 +311,7 @@ profile=Profile
profile.default=Current directory profile.default=Current directory
profile.home=User home profile.home=User home
profile.instance_directory=Game Directory profile.instance_directory=Game Directory
profile.instance_directory.choose=Choose Game Directory
profile.new=New Config profile.new=New Config
profile.new_name=New Profile Name: profile.new_name=New Profile Name:
profile.remove=Sure to remove profile %s? 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.advanced.wrapper_launcher=Wrapper Launcher(i.e. optirun...)
settings.cannot_remove_default_config=Cannot remove the default configution. settings.cannot_remove_default_config=Cannot remove the default configution.
settings.choose_gamedir=Choose Game Directory
settings.custom=Custom settings.custom=Custom
settings.default=Default settings.default=Default
settings.failed_load=Failed to load settings file. Remove it? 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.dimension=Game Window Dimension
settings.game.exploration=Explore settings.game.exploration=Explore
settings.game.fullscreen=Fullscreen 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=Java Dir
settings.game.java_directory.choose=Choose Java Directory. settings.game.java_directory.choose=Choose Java Directory.
settings.game.management=Manage settings.game.management=Manage

View File

@ -147,7 +147,7 @@ install.installer.forge=Forge
install.installer.game=游戏 install.installer.game=游戏
install.installer.install=安装%s install.installer.install=安装%s
install.installer.liteloader=LiteLoader install.installer.liteloader=LiteLoader
install.installer.not_installed=不安装%s install.installer.not_installed=不安装%s,点击此处安装
install.installer.optifine=OptiFine install.installer.optifine=OptiFine
install.installer.version=%s版本 install.installer.version=%s版本
install.modpack=安装整合包 install.modpack=安装整合包
@ -311,6 +311,7 @@ profile=配置
profile.default=当前目录 profile.default=当前目录
profile.home=主文件夹 profile.home=主文件夹
profile.instance_directory=游戏路径 profile.instance_directory=游戏路径
profile.instance_directory.choose=选择游戏路径
profile.new=新建配置 profile.new=新建配置
profile.new_name=新配置名: profile.new_name=新配置名:
profile.remove=真的要删除配置%s吗 profile.remove=真的要删除配置%s吗
@ -343,7 +344,6 @@ settings.advanced.server_ip=直入服务器ip地址(不必填写,启动游戏
settings.advanced.wrapper_launcher=前置指令(不必填写,如optirun) settings.advanced.wrapper_launcher=前置指令(不必填写,如optirun)
settings.cannot_remove_default_config=不能删除默认配置 settings.cannot_remove_default_config=不能删除默认配置
settings.choose_gamedir=选择游戏路径
settings.custom=自定义 settings.custom=自定义
settings.default=默认 settings.default=默认
settings.failed_load=设置文件加载失败,可能是升级了启动器或被人工修改造成错误,是否清除? settings.failed_load=设置文件加载失败,可能是升级了启动器或被人工修改造成错误,是否清除?
@ -352,6 +352,8 @@ settings.game=游戏设置
settings.game.dimension=游戏窗口分辨率 settings.game.dimension=游戏窗口分辨率
settings.game.exploration=浏览 settings.game.exploration=浏览
settings.game.fullscreen=全屏 settings.game.fullscreen=全屏
settings.game.game_directory=游戏路径(版本隔离)
settings.game.game_directory.choose=选择游戏路径
settings.game.java_directory=Java路径 settings.game.java_directory=Java路径
settings.game.java_directory.choose=选择Java路径 settings.game.java_directory.choose=选择Java路径
settings.game.management=管理 settings.game.management=管理