Merge branch 'javafx' of https://github.com/huanghongxun/HMCL into ja…

…vafx

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -8,16 +8,16 @@ body:
  attributes:
  value: |
  提交前请确认：
- * 该问题确实是 **HMCL 的错误**，而**不是 Minecraft 非正常退出**，如果你的 Minecraft 非正常退出，请前往 [QQ 群](https://docs.hmcl.net/groups.html)/[KOOK 频道](https://kook.top/Kx7n3t)/[Discord 频道](https://discord.gg/jVvC7HfM6U) 中获取帮助。
+ * 该问题确实是 **HMCL 的错误**，而**不是 Minecraft 非正常退出**，如果你的 Minecraft 非正常退出，请前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 频道](https://discord.gg/jVvC7HfM6U) 中获取帮助。
  * 你的启动器版本是**最新的快照版本**，可以点击 [此处](https://github.com/burningtnt/HMCL-Snapshot-Update/raw/master/datas/HMCL-dev.jar) 下载最新快照版本。
  
- 如果你的问题并不属于上述两类，你可以选取另一种 Issue 类型，或者直接前往 [QQ 群](https://docs.hmcl.net/groups.html)/[KOOK 频道](https://kook.top/Kx7n3t)/[Discord 频道](https://discord.gg/jVvC7HfM6U) 中获取帮助。
+ 如果你的问题并不属于上述两类，你可以选取另一种 Issue 类型，或者直接前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 频道](https://discord.gg/jVvC7HfM6U) 中获取帮助。
 
  Before submitting, please confirm:
- * The issue is indeed **an error of HMCL**, not **Minecraft abnormal exit**. If your Minecraft exits abnormally, please go to the [QQ group](https://docs.hmcl.net/groups.html) or [KOOK channel](https://kook.top/Kx7n3t) or [Discord channel](https://discord.gg/jVvC7HfM6U) for help.
+ * The issue is indeed **an error of HMCL**, not **Minecraft abnormal exit**. If your Minecraft exits abnormally, please go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord channel](https://discord.gg/jVvC7HfM6U) for help.
  * Your launcher version is **the latest snapshot version**. You can click [here](https://github.com/burningtnt/HMCL-Snapshot-Update/raw/master/datas/HMCL-dev.jar) to download the latest snapshot version.
 
- If your issue does not fall into the above two categories, you can choose another type of issue or directly go to the [QQ group](https://docs.hmcl.net/groups.html) or [KOOK channel](https://kook.top/Kx7n3t) or [Discord channel](https://discord.gg/jVvC7HfM6U) for help.
+ If your issue does not fall into the above two categories, you can choose another type of issue or directly go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord channel](https://discord.gg/jVvC7HfM6U) for help.
  - type: input
  id: platform
  attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -1,14 +1,11 @@
 blank_issues_enabled: false
 contact_links:
- - name: KOOK 频道 | KOOK Channel
- url: https://kook.top/Kx7n3t
- about: Hello Minecraft! Launcher 的官方 KOOK 频道。| The official KOOK channel of Hello Minecraft! Laucher.
- - name: Discord 频道 | Discord Channel
- url: https://discord.gg/jVvC7HfM6U
- about: Hello Minecraft! Launcher 的官方 Discord 频道。| The official Discord channel of Hello Minecraft! Launcher.
  - name: QQ 群 | QQ Groups
  url: https://docs.hmcl.net/groups.html
  about: Hello Minecraft! Launcher 的官方 QQ 交流群。| The official QQ groups of Hello Minecraft! Laucher.
+ - name: Discord 频道 | Discord Channel
+ url: https://discord.gg/jVvC7HfM6U
+ about: Hello Minecraft! Launcher 的官方 Discord 频道。| The official Discord channel of Hello Minecraft! Launcher.
  - name: 其他反馈 | Others
  url: https://github.com/HMCL-dev/HMCL/discussions/new/choose
  about: 通过 Discussions 反馈其他问题。| Report other problems in Discussions.

.github/workflows/gitee.yml

@@ -9,7 +9,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Mirror GitHub to Gitee
- uses: Yikun/hub-mirror-action@v1.3
+ uses: Yikun/hub-mirror-action@v1.4
  with:
  src: github/HMCL-dev
  dst: gitee/huanghongxun

HMCL/build.gradle.kts

@@ -118,7 +118,7 @@ tasks.getByName<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("sha
 
  manifest {
  attributes(
- "Created-By" to "Copyright(c) 2013-2023 huangyuhui.",
+ "Created-By" to "Copyright(c) 2013-2024 huangyuhui.",
  "Main-Class" to "org.jackhuang.hmcl.Main",
  "Multi-Release" to "true",
  "Implementation-Version" to project.version,

HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java

@@ -354,7 +354,9 @@ private static Task<JavaVersion> checkGameState(Profile profile, VersionSetting
 
  if (org.jackhuang.hmcl.util.platform.Platform.isCompatibleWithX86Java()) {
  JavaVersionConstraint.VersionRanges range = JavaVersionConstraint.findSuitableJavaVersionRange(gameVersion, version);
- if (range.getMandatory().contains(VersionNumber.asVersion("17.0.1"))) {
+ if (range.getMandatory().contains(VersionNumber.asVersion("21.0.3"))) {
+ targetJavaVersion = GameJavaVersion.JAVA_21;
+ } else if (range.getMandatory().contains(VersionNumber.asVersion("17.0.1"))) {
  targetJavaVersion = GameJavaVersion.JAVA_17;
  } else if (range.getMandatory().contains(VersionNumber.asVersion("16.0.1"))) {
  targetJavaVersion = GameJavaVersion.JAVA_16;
@@ -465,6 +467,11 @@ private static Task<JavaVersion> checkGameState(Profile profile, VersionSetting
  () -> FXUtils.openLink(OPENJDK_DOWNLOAD_LINK), null);
  breakAction.run();
  return Task.fromCompletableFuture(future);
+ case VANILLA_JAVA_21:
+ Controllers.confirm(i18n("launch.advice.require_newer_java_version", gameVersion.toString(), 21), i18n("message.warning"),
+ () -> FXUtils.openLink(OPENJDK_DOWNLOAD_LINK), null);
+ breakAction.run();
+ return Task.fromCompletableFuture(future);
  case VANILLA_JAVA_8:
  Controllers.dialog(i18n("launch.advice.java8_1_13"), i18n("message.error"), MessageType.ERROR, breakAction);
  return Task.fromCompletableFuture(future);

HMCL/src/main/java/org/jackhuang/hmcl/ui/GameCrashWindow.java

@@ -202,6 +202,7 @@ private void analyzeCrashReport() {
  case TWILIGHT_FOREST_OPTIFINE:
  case PERFORMANT_FOREST_OPTIFINE:
  case JADE_FOREST_OPTIFINE:
+ case NEOFORGE_FOREST_OPTIFINE:
  message = i18n("game.crash.reason.mod", "OptiFine");
  LOG.info("Crash cause: " + result.getRule() + ": " + i18n("game.crash.reason.mod", "OptiFine"));
  break;

HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerItem.java

@@ -270,10 +270,12 @@ public static class InstallerItemSkin extends SkinBase<InstallerItem> {
  return i18n("install.installer.incompatible", i18n("install.installer." + incompatibleWith));
  } else if (version == null) {
  return i18n("install.installer.not_installed");
- } else {
+ } else if (control.id.equals(MINECRAFT.getPatchId()) || control.removable.get() || control.upgradable.get()) {
  return i18n("install.installer.version", version);
+ } else {
+ return i18n("install.installer.external_version", version);
  }
- }, control.incompatibleLibraryName, control.incompatibleWithGame, control.libraryVersion));
+ }, control.incompatibleLibraryName, control.incompatibleWithGame, control.libraryVersion, control.installable, control.removable, control.upgradable));
  BorderPane.setMargin(statusLabel, new Insets(0, 0, 0, 8));
  BorderPane.setAlignment(statusLabel, Pos.CENTER_LEFT);
 
@@ -297,8 +299,9 @@ public static class InstallerItemSkin extends SkinBase<InstallerItem> {
  control.upgradable));
  arrowButton.getStyleClass().add("toggle-icon4");
  arrowButton.visibleProperty().bind(Bindings.createBooleanBinding(
- () -> control.installable.get() && control.incompatibleLibraryName.get() == null,
- control.installable, control.incompatibleLibraryName));
+ () -> control.installable.get() && control.libraryVersion.get() == null && control.incompatibleLibraryName.get() == null,
+ control.installable, control.libraryVersion, control.incompatibleLibraryName
+ ));
  arrowButton.managedProperty().bind(arrowButton.visibleProperty());
  arrowButton.onMouseClickedProperty().bind(control.action);
  buttonsContainer.getChildren().add(arrowButton);

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/AboutPage.java

@@ -109,6 +109,11 @@ public AboutPage() {
  mcmod.setSubtitle(i18n("about.thanks_to.mcmod.statement"));
  mcmod.setExternalLink("https://www.mcmod.cn/");
 
+ IconedTwoLineListItem mcbbs = new IconedTwoLineListItem();
+ mcbbs.setImage(FXUtils.newBuiltinImage("/assets/img/chest.png"));
+ mcbbs.setTitle(i18n("about.thanks_to.mcbbs"));
+ mcbbs.setSubtitle(i18n("about.thanks_to.mcbbs.statement"));
+
  IconedTwoLineListItem contributors = new IconedTwoLineListItem();
  contributors.setImage(FXUtils.newBuiltinImage("/assets/img/github.png"));
  contributors.setTitle(i18n("about.thanks_to.contributors"));
@@ -121,7 +126,7 @@ public AboutPage() {
  users.setSubtitle(i18n("about.thanks_to.users.statement"));
  users.setExternalLink("https://docs.hmcl.net/groups.html");
 
- thanks.getContent().setAll(yushijinhun, bangbang93, glavo, zekerzhayard, zkitefly, burningtnt, mcmod, shulkerSakura, gamerteam, redLnn, contributors, users);
+ thanks.getContent().setAll(yushijinhun, bangbang93, glavo, zekerzhayard, zkitefly, burningtnt, mcmod, mcbbs, shulkerSakura, gamerteam, redLnn, contributors, users);
  }
 
  ComponentList dep = new ComponentList();
@@ -144,7 +149,7 @@ public AboutPage() {
  IconedTwoLineListItem xz = new IconedTwoLineListItem();
  xz.setTitle("XZ for Java");
  xz.setSubtitle("Lasse Collin, Igor Pavlov, and/or Brett Okken.\nPublic Domain.");
- xz.setExternalLink("https://xz.tukaani.org/xz-for-java/");
+ xz.setExternalLink("https://tukaani.org/xz/java.html");
 
  IconedTwoLineListItem fxgson = new IconedTwoLineListItem();
  fxgson.setTitle("fx-gson");

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/FeedbackPage.java

@@ -59,13 +59,7 @@ public FeedbackPage() {
  discord.setSubtitle(i18n("feedback.discord.statement"));
  discord.setExternalLink("https://discord.gg/jVvC7HfM6U");
 
- IconedTwoLineListItem kookapp = new IconedTwoLineListItem();
- kookapp.setImage(FXUtils.newBuiltinImage("/assets/img/kookapp.png"));
- kookapp.setTitle(i18n("feedback.kookapp"));
- kookapp.setSubtitle(i18n("feedback.kookapp.statement"));
- kookapp.setExternalLink("https://kook.top/Kx7n3t");
-
- community.getContent().setAll(users, github, discord, kookapp);
+ community.getContent().setAll(users, github, discord);
  }
 
  content.getChildren().addAll(

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java

@@ -94,22 +94,11 @@ public DownloadPage(DownloadListPage page, RemoteMod addon, Profile.ProfileVersi
  }
 
  private void loadModVersions() {
- File versionJar = StringUtils.isNotBlank(version.getVersion())
- ? version.getProfile().getRepository().getVersionJar(version.getVersion())
- : null;
-
  setLoading(true);
  setFailed(false);
 
  Task.supplyAsync(() -> {
  Stream<RemoteMod.Version> versions = addon.getData().loadVersions(repository);
-// if (StringUtils.isNotBlank(version.getVersion())) {
-// Optional<String> gameVersion = GameVersion.minecraftVersion(versionJar);
-// if (gameVersion.isPresent()) {
-// return sortVersions(
-// .filter(file -> file.getGameVersions().contains(gameVersion.get())));
-// }
-// }
  return sortVersions(versions);
  }).whenComplete(Schedulers.javafx(), (result, exception) -> {
  if (exception == null) {
@@ -286,19 +275,27 @@ protected ModDownloadPageSkin(DownloadPage control) {
  if (control.version.getProfile() != null && control.version.getVersion() != null) {
  HMCLGameRepository repository = control.version.getProfile().getRepository();
  Version game = repository.getResolvedPreservingPatchesVersion(control.version.getVersion());
- LibraryAnalyzer libraryAnalyzer = LibraryAnalyzer.analyze(game, repository.getGameVersion(game).orElse(null));
- libraryAnalyzer.getVersion(LibraryAnalyzer.LibraryType.MINECRAFT).ifPresent(currentGameVersion -> {
- Set<ModLoaderType> currentGameModLoaders = libraryAnalyzer.getModLoaders();
- if (control.versions.containsKey(currentGameVersion)) {
- control.versions.get(currentGameVersion).stream()
- .filter(version1 -> version1.getLoaders().isEmpty() || version1.getLoaders().stream().anyMatch(currentGameModLoaders::contains))
- .findFirst()
- .ifPresent(value -> list.getContent().addAll(
- ComponentList.createComponentListTitle(i18n("mods.download.recommend", currentGameVersion)),
- new ModItem(value, control)
- ));
+ String gameVersion = repository.getGameVersion(game).orElse(null);
+
+ if (gameVersion != null) {
+ List<RemoteMod.Version> modVersions = control.versions.get(gameVersion);
+ if (modVersions != null && !modVersions.isEmpty()) {
+ Set<ModLoaderType> targetLoaders = LibraryAnalyzer.analyze(game, gameVersion).getModLoaders();
+
+ resolve:
+ for (RemoteMod.Version modVersion : modVersions) {
+ for (ModLoaderType loader : modVersion.getLoaders()) {
+ if (targetLoaders.contains(loader)) {
+ list.getContent().addAll(
+ ComponentList.createComponentListTitle(i18n("mods.download.recommend", gameVersion)),
+ new ModItem(modVersion, control)
+ );
+ break resolve;
+ }
+ }
+ }
  }
- });
+ }
  }
 
  for (String gameVersion : control.versions.keys().stream()

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/InstallerListPage.java

@@ -30,7 +30,6 @@
 import org.jackhuang.hmcl.task.TaskListener;
 import org.jackhuang.hmcl.ui.*;
 import org.jackhuang.hmcl.ui.download.UpdateInstallerWizardProvider;
-import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.TaskCancellationAction;
 import org.jackhuang.hmcl.util.io.FileUtils;
 
@@ -90,13 +89,15 @@ public void loadVersion(Profile profile, String versionId) {
  for (InstallerItem installerItem : group.getLibraries()) {
  String libraryId = installerItem.getLibraryId();
  String libraryVersion = analyzer.getVersion(libraryId).orElse(null);
+ boolean libraryConfigurable = libraryVersion != null && analyzer.getLibraryStatus(libraryId) == LibraryAnalyzer.LibraryMark.LibraryStatus.CLEAR;
+
  installerItem.libraryVersion.set(libraryVersion);
- installerItem.upgradable.set(libraryVersion != null);
+ installerItem.upgradable.set(libraryConfigurable);
  installerItem.installable.set(true);
  installerItem.action.set(e -> {
  Controllers.getDecorator().startWizard(new UpdateInstallerWizardProvider(profile, gameVersion, version, libraryId, libraryVersion));
  });
- boolean removable = !LibraryAnalyzer.LibraryType.MINECRAFT.getPatchId().equals(libraryId) && libraryVersion != null;
+ boolean removable = !LibraryAnalyzer.LibraryType.MINECRAFT.getPatchId().equals(libraryId) && libraryConfigurable;
  installerItem.removable.set(removable);
  if (removable) {
  Runnable action = removeAction.apply(libraryId);
@@ -119,17 +120,10 @@ public void loadVersion(Profile profile, String versionId) {
  InstallerItem installerItem = new InstallerItem(libraryId);
  installerItem.libraryVersion.set(libraryVersion);
  installerItem.installable.set(false);
- installerItem.upgradable.bind(installerItem.installable);
+ installerItem.upgradable.set(false);
  installerItem.removable.set(true);
  installerItem.removeAction.set(e -> action.run());
 
- if (libraryVersion != null && Lang.test(() -> profile.getDependency().getVersionList(libraryId))) {
- installerItem.installable.set(true);
- installerItem.action.set(e -> {
- Controllers.getDecorator().startWizard(new UpdateInstallerWizardProvider(profile, gameVersion, version, libraryId, libraryVersion));
- });
- }
-
  itemsProperty().add(installerItem);
  }
  }, Platform::runLater);
@@ -175,7 +169,8 @@ private class InstallerListPageSkin extends ToolbarListPageSkin<InstallerListPag
  @Override
  protected List<Node> initializeToolbar(InstallerListPage skinnable) {
  return Collections.singletonList(
- createToolbarButton2(i18n("install.installer.install_offline"), SVG.PLUS, skinnable::installOffline));
+ createToolbarButton2(i18n("install.installer.install_offline"), SVG.PLUS, skinnable::installOffline)
+ );
  }
  }
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java

@@ -33,6 +33,7 @@
 import org.jackhuang.hmcl.event.EventPriority;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
 import org.jackhuang.hmcl.game.GameRepository;
+import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
@@ -164,9 +165,11 @@ private void clearLibraries() {
  }
 
  private void clearAssets() {
- File baseDirectory = getProfile().getRepository().getBaseDirectory();
- FileUtils.deleteDirectoryQuietly(new File(baseDirectory, "assets"));
- FileUtils.deleteDirectoryQuietly(new File(baseDirectory, "resources"));
+ HMCLGameRepository baseDirectory = getProfile().getRepository();
+ FileUtils.deleteDirectoryQuietly(new File(baseDirectory.getBaseDirectory(), "assets"));
+ if (version.get() != null) {
+ FileUtils.deleteDirectoryQuietly(new File(baseDirectory.getRunDirectory(version.get().getVersion()), "resources"));
+ }
  }
 
  private void clearJunkFiles() {