diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java index 3ae2ea3a2..ee029a625 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java @@ -23,6 +23,7 @@ import javafx.scene.input.TransferMode; import javafx.stage.FileChooser; import org.jackhuang.hmcl.mod.ModInfo; import org.jackhuang.hmcl.mod.ModManager; +import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.ui.Controllers; @@ -77,6 +78,10 @@ public final class ModListPage extends ListPage { }); } + public void loadVersion(Profile profile, String id) { + loadMods(profile.getModManager(), id); + } + public void loadMods(ModManager modManager, String versionId) { this.modManager = modManager; this.versionId = versionId; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java index 404867f66..0377fc9b1 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java @@ -26,7 +26,6 @@ import javafx.beans.property.ReadOnlyStringWrapper; import javafx.fxml.FXML; import javafx.scene.control.Tab; import javafx.scene.layout.StackPane; -import javafx.scene.layout.VBox; import org.jackhuang.hmcl.download.game.GameAssetIndexDownloadTask; import org.jackhuang.hmcl.setting.Profile; 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); - versionSettings.loadVersionSetting(profile, id); + versionSettings.loadVersion(profile, id); mod.setParentTab(tabPane); modTab.setUserData(mod); - mod.loadMods(profile.getModManager(), id); + mod.loadVersion(profile, id); installer.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 // and back to this page, we should return to main page. if (!this.profile.getRepository().isLoaded() || - !this.profile.getRepository().hasVersion(version)) { + !this.profile.getRepository().hasVersion(version)) { Platform.runLater(() -> fireEvent(new PageCloseEvent())); return; } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java index e62734c5c..374d72382 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java @@ -139,7 +139,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag else profile.getRepository().globalizeVersionSetting(versionId); - Platform.runLater(() -> loadVersionSetting(profile, versionId)); + Platform.runLater(() -> loadVersion(profile, versionId)); }); specificSettingsListener = o -> { @@ -150,7 +150,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag advancedSettingsPane.disableProperty().bind(chkEnableSpecificSettings.selectedProperty().not()); } - public void loadVersionSetting(Profile profile, String versionId) { + public void loadVersion(Profile profile, String versionId) { this.profile = profile; this.versionId = versionId; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java index b37dbb536..70c770d31 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java @@ -141,7 +141,7 @@ public class Versions { public static void modifyGlobalSettings(Profile profile) { VersionSettingsPage page = new VersionSettingsPage(); - page.loadVersionSetting(profile, null); + page.loadVersion(profile, null); Controllers.navigate(page); } diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 2e3a562e0..4150bb78b 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -163,8 +163,8 @@ launcher=Launcher launcher.background=Background Image launcher.background.choose=Choose background path. launcher.background.default=Default -launcher.common_directory=Common Directory -launcher.common_directory.choose=Choose common directory. +launcher.common_directory=Cache Directory +launcher.common_directory.choose=Choose cache directory. launcher.common_directory.default=Default launcher.common_directory.disabled=Disabled launcher.contact=Contact Us diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index 7c7d0e4f9..4c36bae70 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -163,8 +163,8 @@ launcher=啟動器 launcher.background=背景位址 launcher.background.choose=選擇背景路徑 launcher.background.default=預設(自動尋找啟動器同目錄下的 background.png/jpg 及 bg 資料夾內的圖片) -launcher.common_directory=公共資料夾 -launcher.common_directory.choose=選擇公共資料夾 +launcher.common_directory=緩存目錄(存放遊戲資源檔案,加快下載速度) +launcher.common_directory.choose=選擇緩存目錄 launcher.common_directory.default=預設 launcher.common_directory.disabled=停用 launcher.contact=聯絡我們 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 d3318921e..a8c136297 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -163,8 +163,8 @@ launcher=启动器 launcher.background=背景地址 launcher.background.choose=选择背景路径 launcher.background.default=默认(自动检索启动器同目录下的 background.png/jpg 及 bg 文件夹内的图片) -launcher.common_directory=公共文件夹(统一存放游戏资源文件,减少游戏体积) -launcher.common_directory.choose=选择公共文件夹 +launcher.common_directory=缓存目录(存放游戏资源文件,加快下载速度) +launcher.common_directory.choose=选择缓存目录 launcher.common_directory.default=默认(%AppData%/.minecraft 或者 ~/.minecraft) launcher.common_directory.disabled=禁用(总是使用游戏路径) launcher.contact=联系我们