Name changes

This commit is contained in:
huanghongxun 2018-10-02 18:11:13 +08:00
parent caf85d2a92
commit 6ae6c9c971
7 changed files with 17 additions and 13 deletions

View File

@ -23,6 +23,7 @@ import javafx.scene.input.TransferMode;
import javafx.stage.FileChooser; import javafx.stage.FileChooser;
import org.jackhuang.hmcl.mod.ModInfo; import org.jackhuang.hmcl.mod.ModInfo;
import org.jackhuang.hmcl.mod.ModManager; import org.jackhuang.hmcl.mod.ModManager;
import org.jackhuang.hmcl.setting.Profile;
import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Schedulers;
import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.ui.Controllers; import org.jackhuang.hmcl.ui.Controllers;
@ -77,6 +78,10 @@ public final class ModListPage extends ListPage<ModItem> {
}); });
} }
public void loadVersion(Profile profile, String id) {
loadMods(profile.getModManager(), id);
}
public void loadMods(ModManager modManager, String versionId) { public void loadMods(ModManager modManager, String versionId) {
this.modManager = modManager; this.modManager = modManager;
this.versionId = versionId; this.versionId = versionId;

View File

@ -26,7 +26,6 @@ import javafx.beans.property.ReadOnlyStringWrapper;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.Tab; import javafx.scene.control.Tab;
import javafx.scene.layout.StackPane; import javafx.scene.layout.StackPane;
import javafx.scene.layout.VBox;
import org.jackhuang.hmcl.download.game.GameAssetIndexDownloadTask; import org.jackhuang.hmcl.download.game.GameAssetIndexDownloadTask;
import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.setting.Profile;
import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.FXUtils;
@ -112,10 +111,10 @@ public final class VersionPage extends StackPane implements DecoratorPage {
title.set(i18n("version.manage.manage") + " - " + id); title.set(i18n("version.manage.manage") + " - " + id);
versionSettings.loadVersionSetting(profile, id); versionSettings.loadVersion(profile, id);
mod.setParentTab(tabPane); mod.setParentTab(tabPane);
modTab.setUserData(mod); modTab.setUserData(mod);
mod.loadMods(profile.getModManager(), id); mod.loadVersion(profile, id);
installer.loadVersion(profile, id); installer.loadVersion(profile, id);
world.loadVersion(profile, id); world.loadVersion(profile, id);
} }
@ -127,7 +126,7 @@ public final class VersionPage extends StackPane implements DecoratorPage {
// If we jumped to game list page and deleted this version // If we jumped to game list page and deleted this version
// and back to this page, we should return to main page. // and back to this page, we should return to main page.
if (!this.profile.getRepository().isLoaded() || if (!this.profile.getRepository().isLoaded() ||
!this.profile.getRepository().hasVersion(version)) { !this.profile.getRepository().hasVersion(version)) {
Platform.runLater(() -> fireEvent(new PageCloseEvent())); Platform.runLater(() -> fireEvent(new PageCloseEvent()));
return; return;
} }

View File

@ -139,7 +139,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
else else
profile.getRepository().globalizeVersionSetting(versionId); profile.getRepository().globalizeVersionSetting(versionId);
Platform.runLater(() -> loadVersionSetting(profile, versionId)); Platform.runLater(() -> loadVersion(profile, versionId));
}); });
specificSettingsListener = o -> { specificSettingsListener = o -> {
@ -150,7 +150,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
advancedSettingsPane.disableProperty().bind(chkEnableSpecificSettings.selectedProperty().not()); advancedSettingsPane.disableProperty().bind(chkEnableSpecificSettings.selectedProperty().not());
} }
public void loadVersionSetting(Profile profile, String versionId) { public void loadVersion(Profile profile, String versionId) {
this.profile = profile; this.profile = profile;
this.versionId = versionId; this.versionId = versionId;

View File

@ -141,7 +141,7 @@ public class Versions {
public static void modifyGlobalSettings(Profile profile) { public static void modifyGlobalSettings(Profile profile) {
VersionSettingsPage page = new VersionSettingsPage(); VersionSettingsPage page = new VersionSettingsPage();
page.loadVersionSetting(profile, null); page.loadVersion(profile, null);
Controllers.navigate(page); Controllers.navigate(page);
} }

View File

@ -163,8 +163,8 @@ launcher=Launcher
launcher.background=Background Image launcher.background=Background Image
launcher.background.choose=Choose background path. launcher.background.choose=Choose background path.
launcher.background.default=Default launcher.background.default=Default
launcher.common_directory=Common Directory launcher.common_directory=Cache Directory
launcher.common_directory.choose=Choose common directory. launcher.common_directory.choose=Choose cache directory.
launcher.common_directory.default=Default launcher.common_directory.default=Default
launcher.common_directory.disabled=Disabled launcher.common_directory.disabled=Disabled
launcher.contact=Contact Us launcher.contact=Contact Us

View File

@ -163,8 +163,8 @@ launcher=啟動器
launcher.background=背景位址 launcher.background=背景位址
launcher.background.choose=選擇背景路徑 launcher.background.choose=選擇背景路徑
launcher.background.default=預設(自動尋找啟動器同目錄下的 background.png/jpg 及 bg 資料夾內的圖片) launcher.background.default=預設(自動尋找啟動器同目錄下的 background.png/jpg 及 bg 資料夾內的圖片)
launcher.common_directory=公共資料夾 launcher.common_directory=緩存目錄(存放遊戲資源檔案,加快下載速度)
launcher.common_directory.choose=選擇公共資料夾 launcher.common_directory.choose=選擇緩存目錄
launcher.common_directory.default=預設 launcher.common_directory.default=預設
launcher.common_directory.disabled=停用 launcher.common_directory.disabled=停用
launcher.contact=聯絡我們 launcher.contact=聯絡我們

View File

@ -163,8 +163,8 @@ launcher=启动器
launcher.background=背景地址 launcher.background=背景地址
launcher.background.choose=选择背景路径 launcher.background.choose=选择背景路径
launcher.background.default=默认(自动检索启动器同目录下的 background.png/jpg 及 bg 文件夹内的图片) launcher.background.default=默认(自动检索启动器同目录下的 background.png/jpg 及 bg 文件夹内的图片)
launcher.common_directory=公共文件夹(统一存放游戏资源文件,减少游戏体积 launcher.common_directory=缓存目录(存放游戏资源文件,加快下载速度
launcher.common_directory.choose=选择公共文件夹 launcher.common_directory.choose=选择缓存目录
launcher.common_directory.default=默认(%AppData%/.minecraft 或者 ~/.minecraft launcher.common_directory.default=默认(%AppData%/.minecraft 或者 ~/.minecraft
launcher.common_directory.disabled=禁用(总是使用游戏路径) launcher.common_directory.disabled=禁用(总是使用游戏路径)
launcher.contact=联系我们 launcher.contact=联系我们