Compare commits

...
25 Commits
Author SHA1 Message Date
Glavo 67432bf614 Add cooldown to launch button action (#5759) 2026-03-08 22:14:40 +08:00
辞庐 378c06656d fix: 无法导入部分 Modrinth 整合包 (#5669) 2026-03-08 22:09:45 +08:00
辞庐 e2d6904269 fix: 游戏进程是 Java 11 以下时无法导出游戏运行栈 (#5662) 2026-03-08 22:09:29 +08:00
辞庐 8ef2f8be1b 修正运行路径非法字符 = 提示 (#5737) 2026-03-08 22:06:48 +08:00
辞庐 584f0f39bc 优化安装实例时自动补全模组加载器名称 (#5698) 2026-03-08 22:05:23 +08:00
辞庐 6529a3bb03 fix: 导出游戏运行栈不兼容 Tooltip 未正确展示 (#5659) 2026-03-08 22:05:01 +08:00
辞庐 0e6f43ccba feat: 支持键盘↑↓选择 LineSelectButton (#5636)
resolves #5452
2026-03-08 22:04:01 +08:00
Glavo 94b10a8b29 将 -jfx-toggle-line-color 调整为 -monet-secondary-container (#5760) 2026-03-08 21:48:03 +08:00
辞庐 dc60af6d96 移除下载页面超链接多余 tooltip (#5739) 2026-03-08 21:47:49 +08:00
辞庐andGlavo 272c5d1b57 转换 Curseforge 整合包元数据为 Record (#5625)
Co-authored-by: Glavo <[email protected]>
2026-03-08 21:35:17 +08:00
辞庐 5bfe945fd0 Bump Gradle to 9.4.0 (#5731) 2026-03-08 20:56:19 +08:00
mineDiamond 3e8a295cf2 feat: 添加新版本存档数据获取支持 (#5675)
在[26.1-snapshot-6](https://zh.minecraft.wiki/w/Java%E7%89%8826.1-snapshot-6)中,mojang对整个[存档格式](https://zh.minecraft.wiki/w/Java%E7%89%88%E5%AD%98%E6%A1%A3%E6%A0%BC%E5%BC%8F)和[存档基础数据存储格式](https://zh.minecraft.wiki/w/%E5%AD%98%E6%A1%A3%E5%9F%BA%E7%A1%80%E6%95%B0%E6%8D%AE%E5%AD%98%E5%82%A8%E6%A0%BC%E5%BC%8F)进行了非常深的破坏性变更,这导致HMCL几乎无法正确读取新版本的世界数据,本PR将添加对新版本的新格式支持

此PR与 #5419 实现的功能一致,但是使用OpenNBT。

close https://github.com/HMCL-dev/HMCL/issues/5436
2026-03-08 12:49:36 +00:00
辞庐 0d717b84c4 清理 WizardNavigationResult (#5665) 2026-03-07 21:27:17 +08:00
辞庐 13672a57ff fix: #5682 安装整合包界面文件名重复的提示显示不全 (#5691) 2026-03-07 21:25:54 +08:00
MovTery b19151a811 fix: 导出 Modrinth 整合包时,不要求填写作者 (#5710) 2026-03-07 21:18:02 +08:00
辞庐 c7d9bc696a 优化 LineSelectButton Popup Label 配色 (#5707) 2026-03-07 21:15:31 +08:00
辞庐 f426ea48fa 整合包安装页面 文件名 -> 游戏实例名 (#5692) 2026-03-07 20:52:04 +08:00
辞庐 8b9eeb68f7 修正 BAT 脚本限制为 32767 (#5697)
Close #4044
2026-03-07 20:51:09 +08:00
辞庐 413069d334 fix: LineComponent 副标题样式未正确应用 (#5706) 2026-03-07 20:46:57 +08:00
Calboot bab81da466 [Enhancement] ScrollBar 圆角 (#5716) 2026-03-07 20:43:26 +08:00
Hommam-Prom 1138d063d2 Arabic Translition Update (#5714)
15 Ramadan 1447 - 5 March 2026
By Hommam-Prom
2026-03-07 20:39:43 +08:00
Glavo 041eedb765 Bump jetbrains-annotations to 26.1.0 (#5717) 2026-03-06 18:38:52 +08:00
辞庐 48046cd416 fix: SpinnerPane 裁切元素 (#5693) 2026-03-03 21:46:44 +08:00
辞庐 9372c0903c 优化 FileSelector 按钮样式 (#5690) 2026-03-03 21:42:12 +08:00
辞庐 ee79c50dea fix: 手动取消模组更新检查会弹窗操作失败 (#5705) 2026-03-03 21:37:47 +08:00
37 changed files with 1312 additions and 1150 deletions

No files matched your search

@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.ui;
import com.jfoenix.controls.*;
import javafx.animation.Animation;
import javafx.animation.Interpolator;
import javafx.animation.PauseTransition;
import javafx.application.Platform;
import javafx.beans.InvalidationListener;
import javafx.beans.Observable;
@@ -66,6 +67,7 @@ import org.jackhuang.hmcl.task.CacheFileTask;
import org.jackhuang.hmcl.task.Schedulers;
import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.ui.animation.AnimationUtils;
import org.jackhuang.hmcl.ui.animation.Motion;
import org.jackhuang.hmcl.ui.construct.IconedMenuItem;
import org.jackhuang.hmcl.ui.construct.MenuSeparator;
import org.jackhuang.hmcl.ui.construct.PopupMenu;
@@ -1288,6 +1290,23 @@ public final class FXUtils {
return button;
}
public static void setOnActionWithCooldown(ButtonBase button, Runnable action) {
setOnActionWithCooldown(button, action, Motion.SHORT4);
}
public static void setOnActionWithCooldown(ButtonBase button, Runnable action, Duration cooldown) {
button.setOnAction(e -> {
button.setDisable(true);
var pause = new PauseTransition(cooldown);
pause.setOnFinished(event -> button.setDisable(false));
pause.play();
action.run();
e.consume();
});
}
public static Label newSafeTruncatedLabel() {
Label label = new Label();
label.setTextOverrun(OverrunStyle.CENTER_WORD_ELLIPSIS);
@@ -415,7 +415,7 @@ public final class LogWindow extends Stage {
if (SystemUtils.supportJVMAttachment()) {
exportDumpButton.setOnAction(e -> getSkinnable().onExportDump(exportDumpPane));
} else {
exportDumpButton.setTooltip(new Tooltip(i18n("logwindow.export_dump.no_dependency")));
FXUtils.installFastTooltip(exportDumpPane, i18n("logwindow.export_dump.no_dependency"));
exportDumpButton.setDisable(true);
}
exportDumpPane.setContent(exportDumpButton);
@@ -80,8 +80,7 @@ public class FileSelector extends HBox {
JFXTextField customField = new JFXTextField();
FXUtils.bindString(customField, valueProperty());
JFXButton selectButton = new JFXButton();
selectButton.setGraphic(SVG.FOLDER_OPEN.createIcon(15));
JFXButton selectButton = FXUtils.newToggleButton4(SVG.FOLDER_OPEN, 15);
selectButton.setOnAction(e -> {
if (directory) {
DirectoryChooser chooser = new DirectoryChooser();
@@ -129,12 +129,12 @@ public class FloatScrollBarSkin implements Skin<ScrollBar> {
track.heightProperty().unbind();
if (scrollBar.getOrientation() == Orientation.HORIZONTAL) {
track.relocate(0, -5);
track.relocate(0, -8);
track.widthProperty().bind(scrollBar.widthProperty());
track.setHeight(5);
track.setHeight(8);
} else {
track.relocate(-5, 0);
track.setWidth(5);
track.relocate(-8, 0);
track.setWidth(8);
track.heightProperty().bind(scrollBar.heightProperty());
}
@@ -144,13 +144,13 @@ public class FloatScrollBarSkin implements Skin<ScrollBar> {
thumb.heightProperty().unbind();
if (scrollBar.getOrientation() == Orientation.HORIZONTAL) {
thumb.relocate(0, -5);
thumb.relocate(0, -8);
thumb.widthProperty().bind(Bindings.max(20, scrollBar.visibleAmountProperty().divide(range).multiply(scrollBar.widthProperty())));
thumb.setHeight(5);
thumb.setHeight(8);
thumb.xProperty().bind(Bindings.subtract(scrollBar.widthProperty(), thumb.widthProperty()).multiply(position));
} else {
thumb.relocate(-5, 0);
thumb.setWidth(5);
thumb.relocate(-8, 0);
thumb.setWidth(8);
thumb.heightProperty().bind(Bindings.max(20, scrollBar.visibleAmountProperty().divide(range).multiply(scrollBar.heightProperty())));
thumb.yProperty().bind(Bindings.subtract(scrollBar.heightProperty(), thumb.heightProperty()).multiply(position));
}
@@ -162,7 +162,7 @@ public class FloatScrollBarSkin implements Skin<ScrollBar> {
return Double.MAX_VALUE;
}
return 5;
return 8;
}
@Override
@@ -171,7 +171,7 @@ public class FloatScrollBarSkin implements Skin<ScrollBar> {
return Double.MAX_VALUE;
}
return 5;
return 8;
}
};
}
@@ -20,16 +20,18 @@ package org.jackhuang.hmcl.ui.construct;
import com.jfoenix.controls.JFXPopup;
import javafx.beans.InvalidationListener;
import javafx.beans.binding.Bindings;
import javafx.beans.property.*;
import javafx.beans.property.ListProperty;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleListProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.css.PseudoClass;
import javafx.geometry.Pos;
import javafx.scene.control.Label;
import javafx.scene.input.MouseButton;
import javafx.scene.input.MouseEvent;
import javafx.scene.input.ScrollEvent;
import javafx.scene.layout.*;
import javafx.scene.input.*;
import javafx.scene.layout.StackPane;
import javafx.scene.layout.VBox;
import org.jackhuang.hmcl.ui.FXUtils;
import org.jackhuang.hmcl.ui.SVG;
import org.jackhuang.hmcl.util.javafx.MappedObservableList;
@@ -81,6 +83,8 @@ public final class LineSelectButton<T> extends LineButton {
PopupMenu popupMenu = new PopupMenu();
this.popup = new JFXPopup(popupMenu);
popupMenu.addEventHandler(KeyEvent.KEY_PRESSED, this::handleKeyEvent);
ripplerContainer.addEventFilter(ScrollEvent.ANY, ignored -> popup.hide());
Bindings.bindContent(popupMenu.getContent(), MappedObservableList.create(itemsProperty(), item -> {
@@ -213,4 +217,32 @@ public final class LineSelectButton<T> extends LineButton {
return items.get();
}
private void handleKeyEvent(KeyEvent event) {
ObservableList<T> list = getItems();
if (list == null || list.isEmpty()) return;
int index = list.indexOf(getValue());
var code = event.getCode();
if (code == KeyCode.UP) {
if (index > 0) {
setValue(list.get(index - 1));
} else {
setValue(list.get(list.size() - 1));
}
event.consume();
} else if (code == KeyCode.DOWN) {
if (index < list.size() - 1) {
setValue(list.get(index + 1));
} else {
setValue(list.get(0));
}
event.consume();
} else if (code == KeyCode.ENTER || code == KeyCode.ESCAPE) {
if (popup != null && popup.isShowing()) {
popup.hide();
event.consume();
}
}
}
}
@@ -189,6 +189,7 @@ public class SpinnerPane extends Control {
Skin(SpinnerPane control) {
super(control);
root.setClip(null);
updateContent();
this.getChildren().setAll(root);
@@ -124,14 +124,14 @@ public class InstallersPage extends AbstractInstallersPage {
if (libraryType != null) {
String loaderName = switch (libraryType) {
case FORGE -> "forge";
case NEO_FORGE -> "neoforge";
case CLEANROOM -> "cleanroom";
case LEGACY_FABRIC -> "legacy_fabric";
case FABRIC -> "fabric";
case LITELOADER -> "liteloader";
case QUILT -> "quilt";
case OPTIFINE -> "optifine";
case FORGE -> "Forge";
case NEO_FORGE -> "NeoForge";
case CLEANROOM -> "Cleanroom";
case LEGACY_FABRIC -> "LegacyFabric";
case FABRIC -> "Fabric";
case LITELOADER -> "LiteLoader";
case QUILT -> "Quilt";
case OPTIFINE -> "OptiFine";
default -> null;
};
@@ -42,11 +42,11 @@ public abstract class ModpackPage extends SpinnerPane implements WizardPage {
{
var archiveNamePane = new LinePane();
{
archiveNamePane.setTitle(i18n("archive.file.name"));
archiveNamePane.setTitle(i18n("version.name"));
txtModpackName = new JFXTextField();
txtModpackName.setPrefWidth(300);
// FIXME: Validator are not shown properly
FXUtils.setLimitHeight(archiveNamePane, 75);
// BorderPane.setMargin(txtModpackName, new Insets(0, 0, 8, 32));
BorderPane.setAlignment(txtModpackName, Pos.CENTER_RIGHT);
archiveNamePane.setRight(txtModpackName);
@@ -221,10 +221,15 @@ public final class ModpackInfoPage extends Control implements WizardPage {
list.getContent().addAll(
createTextFieldLinePane(i18n("modpack.name"), skinnable.name, new RequiredValidator()),
createTextFieldLinePane(i18n("archive.author"), skinnable.author, new RequiredValidator()),
createTextFieldLinePane(i18n("archive.version"), skinnable.version, new RequiredValidator())
);
if (skinnable.options.isRequireAuthor()) {
list.getContent().add(
createTextFieldLinePane(i18n("archive.author"), skinnable.author, new RequiredValidator())
);
}
if (skinnable.options.isRequireFileApi()) {
list.getContent().add(createTextFieldLinePane(
i18n("modpack.file_api"), skinnable.fileApi,
@@ -227,7 +227,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
launchLabel.setText(i18n("version.launch.empty"));
currentLabel.setText(null);
graphic.getChildren().setAll(launchLabel);
launchButton.setOnAction(e -> MainPage.this.launchNoGame());
FXUtils.setOnActionWithCooldown(launchButton, MainPage.this::launchNoGame);
if (tooltip == null)
tooltip = new Tooltip(i18n("version.launch.empty.tooltip"));
FXUtils.installFastTooltip(launchButton, tooltip);
@@ -235,7 +235,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
launchLabel.setText(i18n("version.launch"));
currentLabel.setText(currentGame);
graphic.getChildren().setAll(launchLabel, currentLabel);
launchButton.setOnAction(e -> MainPage.this.launch());
FXUtils.setOnActionWithCooldown(launchButton, MainPage.this::launch);
if (tooltip != null)
Tooltip.uninstall(launchButton, tooltip);
}
@@ -252,14 +252,12 @@ public class DownloadPage extends Control implements DecoratorPage {
openMcmodButton.setExternalLink(getSkinnable().translations.getMcmodUrl(getSkinnable().mod));
descriptionPane.getChildren().add(openMcmodButton);
openMcmodButton.setMinWidth(Region.USE_PREF_SIZE);
FXUtils.installFastTooltip(openMcmodButton, i18n("mods.mcmod"));
}
JFXHyperlink openUrlButton = new JFXHyperlink(control.page.getLocalizedOfficialPage());
openUrlButton.setExternalLink(getSkinnable().addon.getPageUrl());
descriptionPane.getChildren().add(openUrlButton);
openUrlButton.setMinWidth(Region.USE_PREF_SIZE);
FXUtils.installFastTooltip(openUrlButton, control.page.getLocalizedOfficialPage());
}
SpinnerPane spinnerPane = new SpinnerPane();
@@ -43,6 +43,7 @@ import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.file.Path;
import java.util.*;
import java.util.concurrent.CancellationException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.locks.ReentrantLock;
@@ -244,6 +245,7 @@ public final class ModListPage extends ListPageBase<ModListPageSkin.ModInfoObjec
return null;
})
.whenComplete(Schedulers.javafx(), (result, exception) -> {
if (exception instanceof CancellationException) return;
if (exception != null || result == null) {
Controllers.dialog(i18n("mods.check_updates.failed_check"), i18n("message.failed"), MessageDialogPane.MessageType.ERROR);
} else if (result.isEmpty()) {
@@ -35,8 +35,6 @@ import javafx.scene.layout.StackPane;
import javafx.scene.layout.VBox;
import javafx.stage.FileChooser;
import org.jackhuang.hmcl.game.World;
import org.jackhuang.hmcl.task.Schedulers;
import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.ui.Controllers;
import org.jackhuang.hmcl.ui.FXUtils;
import org.jackhuang.hmcl.ui.SVG;
@@ -66,7 +64,8 @@ public final class WorldInfoPage extends SpinnerPane implements WorldManagePage.
private final WorldManagePage worldManagePage;
private boolean isReadOnly;
private final World world;
private CompoundTag levelDat;
private CompoundTag levelData;
private CompoundTag playerData;
private final ImageContainer iconImageView = new ImageContainer(32);
@@ -76,15 +75,9 @@ public final class WorldInfoPage extends SpinnerPane implements WorldManagePage.
refresh();
}
private CompoundTag loadWorldInfo() throws IOException {
if (!Files.isDirectory(world.getFile()))
throw new IOException("Not a valid world directory");
return world.getLevelData();
}
private void updateControls() {
CompoundTag dataTag = levelDat.get("Data");
CompoundTag dataTag = levelData.get("Data");
CompoundTag playerTag = playerData;
ScrollPane scrollPane = new ScrollPane();
scrollPane.setFitToHeight(true);
@@ -205,12 +198,14 @@ public final class WorldInfoPage extends SpinnerPane implements WorldManagePage.
worldSpawnPoint.setTitle(i18n("world.info.spawn"));
String value;
// Valid after 1.21.9-pre1
if (dataTag.get("spawn") instanceof CompoundTag spawnTag && spawnTag.get("pos") instanceof IntArrayTag posTag) {
value = Dimension.of(spawnTag.get("dimension") instanceof StringTag dimensionTag
? dimensionTag
: new StringTag("SpawnDimension", "minecraft:overworld"))
.formatPosition(posTag);
} else if (dataTag.get("SpawnX") instanceof IntTag intX
value = (spawnTag.get("dimension") instanceof StringTag dimensionTag)
? Dimension.of(dimensionTag).formatPosition(posTag)
: Dimension.OVERWORLD.formatPosition(posTag);
}
// Valid before 1.21.9-pre1
else if (dataTag.get("SpawnX") instanceof IntTag intX
&& dataTag.get("SpawnY") instanceof IntTag intY
&& dataTag.get("SpawnZ") instanceof IntTag intZ) {
value = Dimension.OVERWORLD.formatPosition(intX.getValue(), intY.getValue(), intZ.getValue());
@@ -248,34 +243,51 @@ public final class WorldInfoPage extends SpinnerPane implements WorldManagePage.
{
generateFeaturesButton.setTitle(i18n("world.info.generate_features"));
generateFeaturesButton.setDisable(isReadOnly);
// generate_features was valid after 20w20a and MapFeatures was before that
if (dataTag.get("WorldGenSettings") instanceof CompoundTag worldGenSettings) {
bindTagAndToggleButton(worldGenSettings.get("generate_features"), generateFeaturesButton);
// Valid before (1.16)20w20a
if (dataTag.get("MapFeatures") instanceof ByteTag generateFeaturesTag) {
bindTagAndToggleButton(generateFeaturesTag, generateFeaturesButton);
}
// Valid after (1.16)20w20a
else if (world.getNormalizedWorldGenSettingsData() != null) {
CompoundTag unifiedWorldGenSettingsDataTag = world.getNormalizedWorldGenSettingsData();
Tag tag = unifiedWorldGenSettingsDataTag.get("generate_features"); // Valid between (1.16)20w20a and 26.1-snapshot-6
if (tag == null)
tag = unifiedWorldGenSettingsDataTag.get("generate_structures"); // Valid after 26.1-snapshot-6
bindTagAndToggleButton(tag, generateFeaturesButton);
} else {
bindTagAndToggleButton(dataTag.get("MapFeatures"), generateFeaturesButton);
generateFeaturesButton.setDisable(true);
}
}
var difficultyButton = new LineSelectButton<Difficulty>();
{
difficultyButton.setTitle(i18n("world.info.difficulty"));
difficultyButton.setDisable(worldManagePage.isReadOnly());
difficultyButton.setDisable(isReadOnly);
difficultyButton.setItems(Difficulty.items);
if (dataTag.get("Difficulty") instanceof ByteTag difficultyTag) {
Difficulty difficulty = Difficulty.of(difficultyTag.getValue());
if (difficulty != null) {
difficultyButton.setValue(difficulty);
difficultyButton.valueProperty().addListener((o, oldValue, newValue) -> {
if (newValue != null) {
difficultyTag.setValue((byte) newValue.ordinal());
saveLevelDat();
}
});
} else {
difficultyButton.setDisable(true);
}
Difficulty difficulty;
// Valid before 26.1-snapshot-6
if (dataTag.get("Difficulty") instanceof ByteTag difficultyTag
&& (difficulty = Difficulty.of(difficultyTag.getValue())) != null) {
difficultyButton.setValue(difficulty);
difficultyButton.valueProperty().addListener((o, oldValue, newValue) -> {
if (newValue != null) {
difficultyTag.setValue((byte) newValue.ordinal());
saveWorldData();
}
});
}
// Valid after 26.1-snapshot-6
else if (dataTag.get("difficulty_settings") instanceof CompoundTag difficultySettingTag
&& difficultySettingTag.get("difficulty") instanceof StringTag difficultyTag
&& (difficulty = Difficulty.of(difficultyTag.getValue())) != null) {
difficultyButton.setValue(difficulty);
difficultyButton.valueProperty().addListener((o, oldValue, newValue) -> {
if (newValue != null) {
difficultyTag.setValue(newValue.getTagStringValue());
saveWorldData();
}
});
} else {
difficultyButton.setDisable(true);
}
@@ -285,8 +297,17 @@ public final class WorldInfoPage extends SpinnerPane implements WorldManagePage.
{
difficultyLockPane.setTitle(i18n("world.info.difficulty_lock"));
difficultyLockPane.setDisable(isReadOnly);
bindTagAndToggleButton(dataTag.get("DifficultyLocked"), difficultyLockPane);
// Valid before 26.1-snapshot-6
if (dataTag.get("DifficultyLocked") instanceof ByteTag difficultyLockedTag) {
bindTagAndToggleButton(difficultyLockedTag, difficultyLockPane);
}
// Valid after 26.1-snapshot-6
else if (dataTag.get("difficulty_settings") instanceof CompoundTag difficultySettingTag
&& difficultySettingTag.get("locked") instanceof ByteTag lockedTag) {
bindTagAndToggleButton(lockedTag, difficultyLockPane);
} else {
difficultyLockPane.setDisable(true);
}
}
worldInfo.getContent().setAll(
@@ -296,7 +317,7 @@ public final class WorldInfoPage extends SpinnerPane implements WorldManagePage.
rootPane.getChildren().addAll(ComponentList.createComponentListTitle(i18n("world.info")), worldInfo);
}
if (dataTag.get("Player") instanceof CompoundTag playerTag) {
if (playerTag != null) {
ComponentList playerInfo = new ComponentList();
var locationPane = new LineTextPane();
@@ -343,8 +364,14 @@ public final class WorldInfoPage extends SpinnerPane implements WorldManagePage.
playerGameTypePane.setDisable(worldManagePage.isReadOnly());
playerGameTypePane.setItems(GameType.items);
if (playerTag.get("playerGameType") instanceof IntTag playerGameTypeTag
&& dataTag.get("hardcore") instanceof ByteTag hardcoreTag) {
// Valid before 26.1-snapshot-6
Tag rawHardcoreTag = dataTag.get("hardcore");
// Valid after 26.1-snapshot-6
if (rawHardcoreTag == null && dataTag.get("difficulty_settings") instanceof CompoundTag difficultySettingsTag) {
rawHardcoreTag = difficultySettingsTag.get("hardcore");
}
if (playerTag.get("playerGameType") instanceof IntTag playerGameTypeTag && rawHardcoreTag instanceof ByteTag hardcoreTag) {
boolean isHardcore = hardcoreTag.getValue() == 1;
GameType gameType = GameType.of(playerGameTypeTag.getValue(), isHardcore);
if (gameType != null) {
@@ -358,7 +385,7 @@ public final class WorldInfoPage extends SpinnerPane implements WorldManagePage.
playerGameTypeTag.setValue(newValue.ordinal());
hardcoreTag.setValue((byte) 0);
}
saveLevelDat();
saveWorldData();
}
});
} else {
@@ -428,10 +455,10 @@ public final class WorldInfoPage extends SpinnerPane implements WorldManagePage.
toggleButton.selectedProperty().addListener((o, oldValue, newValue) -> {
try {
byteTag.setValue((byte) (newValue ? 1 : 0));
saveLevelDat();
saveWorldData();
} catch (Exception e) {
toggleButton.setSelected(oldValue);
LOG.warning("Exception happened when saving level.dat", e);
LOG.warning("Exception happened when saving world info", e);
}
});
} else {
@@ -451,11 +478,11 @@ public final class WorldInfoPage extends SpinnerPane implements WorldManagePage.
Integer integer = Lang.toIntOrNull(newValue);
if (integer != null) {
intTag.setValue(integer);
saveLevelDat();
saveWorldData();
}
} catch (Exception e) {
jfxTextField.setText(oldValue);
LOG.warning("Exception happened when saving level.dat", e);
LOG.warning("Exception happened when saving world data", e);
}
}
});
@@ -472,11 +499,11 @@ public final class WorldInfoPage extends SpinnerPane implements WorldManagePage.
Float floatValue = Lang.toFloatOrNull(newValue);
if (floatValue != null) {
floatTag.setValue(floatValue);
saveLevelDat();
saveWorldData();
}
} catch (Exception e) {
jfxTextField.setText(oldValue);
LOG.warning("Exception happened when saving level.dat", e);
LOG.warning("Exception happened when saving world data", e);
}
}
});
@@ -484,30 +511,27 @@ public final class WorldInfoPage extends SpinnerPane implements WorldManagePage.
jfxTextField.setValidators(new DoubleValidator(i18n("input.number"), true));
}
private void saveLevelDat() {
LOG.info("Saving level.dat of world " + world.getWorldName());
private void saveWorldData() {
LOG.info("Saving data of world " + world.getWorldName());
try {
this.world.writeLevelDat(levelDat);
this.world.writeWorldData();
} catch (IOException e) {
LOG.warning("Failed to save level.dat of world " + world.getWorldName(), e);
LOG.warning("Failed to save world data", e);
}
}
@Override
public void refresh() {
this.isReadOnly = worldManagePage.isReadOnly();
this.setLoading(true);
Task.supplyAsync(this::loadWorldInfo)
.whenComplete(Schedulers.javafx(), ((result, exception) -> {
if (exception == null) {
this.levelDat = result;
updateControls();
setLoading(false);
} else {
LOG.warning("Failed to load level.dat", exception);
setFailedReason(i18n("world.info.failed"));
}
})).start();
setFailedReason(null);
try {
this.isReadOnly = worldManagePage.isReadOnly();
this.levelData = world.getLevelData();
this.playerData = world.getPlayerData();
updateControls();
} catch (Exception e) {
LOG.warning("Failed to refresh world info", e);
setFailedReason(i18n("world.info.failed"));
}
}
private record Dimension(String name) {
@@ -588,6 +612,15 @@ public final class WorldInfoPage extends SpinnerPane implements WorldManagePage.
return (d >= 0 && d < items.size()) ? items.get(d) : null;
}
static Difficulty of(String name) {
for (Difficulty d : items) if (d.name().toLowerCase(Locale.ROOT).equals(name)) return d;
return null;
}
String getTagStringValue() {
return this.name().toLowerCase(Locale.ROOT);
}
@Override
public String toString() {
return i18n("world.info.difficulty." + name().toLowerCase(Locale.ROOT));
@@ -653,7 +686,7 @@ public final class WorldInfoPage extends SpinnerPane implements WorldManagePage.
Files.deleteIfExists(output);
iconImageView.setImage(FXUtils.newBuiltinImage("/assets/img/unknown_server.png"));
} catch (IOException e) {
LOG.warning("Failed to delete world icon " + e.getMessage());
LOG.warning("Failed to delete world icon ", e);
}
}
}
@@ -78,9 +78,9 @@ public final class WorldManagePage extends DecoratorAnimatedPage implements Deco
updateSessionLockChannel();
try {
this.world.reloadLevelDat();
this.world.reloadWorldData();
} catch (IOException e) {
LOG.warning("Can not load world level.dat of world: " + this.world.getFile(), e);
LOG.warning("Can not load world data of world: " + this.world.getFile(), e);
this.addEventHandler(Navigator.NavigationEvent.NAVIGATED, event -> closePageForLoadingFail());
}
@@ -106,9 +106,9 @@ public final class WorldManagePage extends DecoratorAnimatedPage implements Deco
public void refresh() {
updateSessionLockChannel();
try {
world.reloadLevelDat();
world.reloadWorldData();
} catch (IOException e) {
LOG.warning("Can not load world level.dat of world: " + world.getFile(), e);
LOG.warning("Can not load world data of world: " + world.getFile(), e);
closePageForLoadingFail();
return;
}
@@ -1,35 +0,0 @@
/*
* Hello Minecraft! Launcher
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package org.jackhuang.hmcl.ui.wizard;
public enum WizardNavigationResult {
PROCEED {
@Override
public boolean getDeferredComputation() {
return true;
}
},
DENY {
@Override
public boolean getDeferredComputation() {
return false;
}
};
public abstract boolean getDeferredComputation();
}
+17 -4
View File
@@ -29,8 +29,8 @@
.scroll-bar .thumb {
-fx-fill: -monet-surface-tint;
-fx-arc-width: 0;
-fx-arc-height: 0;
-fx-arc-width: 8;
-fx-arc-height: 8;
}
.title-label {
@@ -445,6 +445,7 @@
-fx-max-height: 55px;
-fx-min-height: 55px;
-fx-background-color: -monet-primary-container;
-fx-opacity: 1; /* Override the opacity of disabled button */
-fx-cursor: hand;
}
@@ -1170,7 +1171,7 @@
-fx-background-insets: 0px;
-jfx-toggle-color: -monet-primary;
-jfx-toggle-line-color: -monet-primary-container;
-jfx-toggle-line-color: -monet-secondary-container;
-jfx-untoggle-color: -monet-outline;
-jfx-untoggle-line-color: -monet-surface-container-highest;
-jfx-size: 10;
@@ -1941,6 +1942,10 @@
-fx-padding: 10 16 10 16;
}
.line-component .subtitle-label {
-fx-text-fill: -monet-on-surface-variant;
}
.line-component.no-padding .line-component-container {
-fx-padding: 0;
}
@@ -1970,12 +1975,20 @@
-fx-font-size: 13px;
}
.line-select-button .menu-container .title-label {
-fx-text-fill: -monet-on-surface;
}
.line-select-button .menu-container .subtitle-label {
-fx-text-fill: -monet-on-surface-variant;
}
.line-select-button .menu-container:selected .title-label {
-fx-text-fill: -monet-primary;
}
.line-select-button .menu-container:selected .subtitle-label {
-fx-text-fill: -monet-primary;
-fx-text-fill: -monet-primary-container;
}
.line-toggle-button .jfx-toggle-button {
@@ -439,7 +439,7 @@ You can continue to keep the old version of Java.\
HMCL can recognize and manage multiple Java versions and will automatically select the appropriate Java for you based on the game version.
fatal.deprecated_java_version.download_link=Download Java %d
fatal.samba=If you opened Hello Minecraft! Launcher from a Samba network drive, some features might not be working. Please try updating your Java or moving the launcher to another directory.
fatal.illegal_char=Your user path contains an illegal character "=". You will not be able to use authlib-injector or change the skin of your offline account.
fatal.illegal_char=Your working directory contains an illegal character "=". You will not be able to use authlib-injector or change the skin of your offline account.
fatal.unsupported_platform=Minecraft is not fully supported on your platform yet, so you may experience missing features or even be unable to launch the game.\n\
\n\
If you cannot launch Minecraft 1.17 and later, you can try switching the "Renderer" to "Mesa LLVMpipe" in "Global/Instance-specific Settings → Advanced Settings" to use CPU rendering for better compatibility.
File diff suppressed because it is too large. Load diff
@@ -408,7 +408,7 @@ fatal.deprecated_java_version=HMCL 未來需要 Java 17 或更高版本才能執
fatal.deprecated_java_version.update=更高版本的 HMCL 需要 Java 17 或更高版本才能執行,請安裝最新版本的 Java 以確保 HMCL 能夠完成升級。\n你可以繼續保留舊版本 Java。HMCL 能夠識別與管理多個 Java,並會自動根據遊戲版本為你選取合適的 Java。
fatal.deprecated_java_version.download_link=下載 Java %d
fatal.samba=如果您正在透過 Samba 共亯的目錄中開啟 Hello Minecraft! Launcher,啟動器可能無法正常工作,請嘗試更新您的 Java 或在本機目錄內開啟 HMCL。
fatal.illegal_char=由於您的使用者目錄路徑中存在無效字元『=』,您將無法使用外部登入帳戶以及離線登入更換外觀功能。
fatal.illegal_char=由於您的執行路徑中存在無效字元『=』,您將無法使用外部登入帳戶以及離線登入更換外觀功能。
fatal.unsupported_platform=Minecraft 尚未對您的平臺提供完善支援,所以可能影響遊戲體驗或無法啟動遊戲。\n\
若無法啟動 Minecraft 1.17 及更高版本,可以嘗試在「(全域/實例特定) 遊戲設定 → 進階設定 → 除錯選項」中將「繪製器」切換為「Mesa LLVMpipe」,以獲得更好的相容性。
fatal.unsupported_platform.loongarch=Hello Minecraft! Launcher 已為龍芯提供支援。\n如果遇到問題,你可以點擊右上角幫助按鈕進行求助。
@@ -411,7 +411,7 @@ fatal.deprecated_java_version=HMCL 未来需要 Java 17 或更高版本才能运
fatal.deprecated_java_version.update=更高版本的 HMCL 需要 Java 17 或更高版本才能运行,请安装最新版本的 Java 以确保 HMCL 能够完成升级。\n你可以继续保留旧版本 Java。HMCL 能够识别与管理多个 Java,并会自动根据游戏版本为你选择合适的 Java。
fatal.deprecated_java_version.download_link=下载 Java %d
fatal.samba=如果你正在通过 Samba 共享的文件夹中运行 Hello Minecraft! Launcher,启动器可能无法正常工作。请尝试更新你的 Java 或在本地文件夹内运行 HMCL。\n你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。
fatal.illegal_char=由于你的用户文件夹路径中存在非法字符“=”,你将无法使用外置登录账户以及离线登录更换皮肤功能。\n你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。
fatal.illegal_char=由于你的运行路径中存在非法字符“=”,你将无法使用外置登录账户以及离线登录更换皮肤功能。\n你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。
fatal.unsupported_platform=Minecraft 尚未对你的平台提供完善支持,所以可能影响游戏体验或无法启动游戏。\n\
若无法启动 Minecraft 1.17 及更高版本,可以尝试在“(全局/实例特定) 游戏设置 → 高级设置 → 调试选项”中将“渲染器”切换为“Mesa LLVMpipe”,以获得更好的兼容性。\n\
如遇到问题,你可以点击右上角帮助按钮进行求助。
@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.game;
import com.sun.tools.attach.AttachNotSupportedException;
import com.sun.tools.attach.VirtualMachine;
import org.jackhuang.hmcl.java.JavaInfo;
import org.jackhuang.hmcl.util.logging.Logger;
import org.jackhuang.hmcl.util.StringUtils;
import org.jackhuang.hmcl.util.platform.OperatingSystem;
@@ -128,7 +129,20 @@ public final class GameDumpGenerator {
}
private static void writeDumpBodyTo(VirtualMachine vm, Writer writer) throws IOException {
execute(vm, "Thread.print -e -l", writer);
int vmVersion = -1;
try {
if (vm.getSystemProperties().get("java.version") instanceof String javaVersion)
vmVersion = JavaInfo.parseVersion(javaVersion);
} catch (Throwable e) {
LOG.warning("Failed to get VM system properties", e);
}
if (vmVersion >= 11)
execute(vm, "Thread.print -e -l", writer);
else
execute(vm, "Thread.print -l", writer);
}
private static VirtualMachine attachVM(String lvmid, Writer writer) throws IOException, InterruptedException {
@@ -34,6 +34,7 @@ import java.nio.channels.OverlappingFileLockException;
import java.nio.charset.StandardCharsets;
import java.nio.file.*;
import java.util.List;
import java.util.UUID;
import java.util.stream.Stream;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
@@ -44,10 +45,18 @@ public final class World {
private final Path file;
private String fileName;
private CompoundTag levelData;
private Image icon;
private CompoundTag levelData;
private Path levelDataPath;
private CompoundTag worldGenSettingsDataBackingTag; // Use for writing back to the file
private CompoundTag normalizedWorldGenSettingsData; // Use for reading/modification
private Path worldGenSettingsDataPath;
private CompoundTag playerData; // Use for both reading/modification and writing back to the file
private Path playerDataPath;
public World(Path file) throws IOException {
this.file = file;
@@ -76,14 +85,10 @@ public final class World {
public void setWorldName(String worldName) throws IOException {
if (levelData.get("Data") instanceof CompoundTag data && data.get("LevelName") instanceof StringTag levelNameTag) {
levelNameTag.setValue(worldName);
writeLevelDat(levelData);
writeLevelData();
}
}
public Path getLevelDatFile() {
return file.resolve("level.dat");
}
public Path getSessionLockFile() {
return file.resolve("session.lock");
}
@@ -92,6 +97,14 @@ public final class World {
return levelData;
}
public @Nullable CompoundTag getNormalizedWorldGenSettingsData() {
return normalizedWorldGenSettingsData;
}
public @Nullable CompoundTag getPlayerData() {
return playerData;
}
public long getLastPlayed() {
CompoundTag data = levelData.get("Data");
LongTag lastPlayedTag = data.get("LastPlayed");
@@ -108,10 +121,12 @@ public final class World {
}
public @Nullable Long getSeed() {
CompoundTag data = levelData.get("Data");
if (data.get("WorldGenSettings") instanceof CompoundTag worldGenSettingsTag && worldGenSettingsTag.get("seed") instanceof LongTag seedTag) { //Valid after 1.16
// Valid after 1.16(20w20a)
if (normalizedWorldGenSettingsData != null && normalizedWorldGenSettingsData.get("seed") instanceof LongTag seedTag) {
return seedTag.getValue();
} else if (data.get("RandomSeed") instanceof LongTag seedTag) { //Valid before 1.16
}
// Valid before 1.16(20w20a)
if (levelData.get("Data") instanceof CompoundTag data && data.get("RandomSeed") instanceof LongTag seedTag) {
return seedTag.getValue();
}
return null;
@@ -119,22 +134,28 @@ public final class World {
public boolean isLargeBiomes() {
CompoundTag data = levelData.get("Data");
if (data.get("generatorName") instanceof StringTag generatorNameTag) { //Valid before 1.16
// Valid before 1.16(20w20a)
if (data.get("generatorName") instanceof StringTag generatorNameTag) {
return "largeBiomes".equals(generatorNameTag.getValue());
} else {
if (data.get("WorldGenSettings") instanceof CompoundTag worldGenSettingsTag
&& worldGenSettingsTag.get("dimensions") instanceof CompoundTag dimensionsTag
&& dimensionsTag.get("minecraft:overworld") instanceof CompoundTag overworldTag
}
// Unified handling of logic after version 1.16
else if (normalizedWorldGenSettingsData != null
&& normalizedWorldGenSettingsData.get("dimensions") instanceof CompoundTag dimensionsTag) {
if (dimensionsTag.get("minecraft:overworld") instanceof CompoundTag overworldTag
&& overworldTag.get("generator") instanceof CompoundTag generatorTag) {
// Valid between 1.16(20w20a) and 1.18(21w37a)
if (generatorTag.get("biome_source") instanceof CompoundTag biomeSourceTag
&& biomeSourceTag.get("large_biomes") instanceof ByteTag largeBiomesTag) { //Valid between 1.16 and 1.16.2
&& biomeSourceTag.get("large_biomes") instanceof ByteTag largeBiomesTag) {
return largeBiomesTag.getValue() == (byte) 1;
} else if (generatorTag.get("settings") instanceof StringTag settingsTag) { //Valid after 1.16.2
}
// Valid after 1.18(21w37a)
else if (generatorTag.get("settings") instanceof StringTag settingsTag) {
return "minecraft:large_biomes".equals(settingsTag.getValue());
}
}
return false;
}
return false;
}
public Image getIcon() {
@@ -166,8 +187,8 @@ public final class World {
if (!Files.exists(levelDat)) {
throw new IOException("Not a valid world directory since level.dat or special_level.dat cannot be found.");
}
loadAndCheckLevelDat(levelDat);
this.levelDataPath = levelDat;
loadAndCheckWorldData();
Path iconFile = file.resolve("icon.png");
if (Files.isRegularFile(iconFile)) {
@@ -189,7 +210,7 @@ public final class World {
if (!Files.exists(levelDat)) {
throw new IOException("Not a valid world zip file since level.dat or special_level.dat cannot be found.");
}
loadAndCheckLevelDat(levelDat);
loadAndCheckLevelData(levelDat);
Path iconFile = root.resolve("icon.png");
if (Files.isRegularFile(iconFile)) {
@@ -221,8 +242,13 @@ public final class World {
}
}
private void loadAndCheckLevelDat(Path levelDat) throws IOException {
this.levelData = parseLevelDat(levelDat);
private void loadAndCheckWorldData() throws IOException {
loadAndCheckLevelData(levelDataPath);
loadOtherData();
}
private void loadAndCheckLevelData(Path levelDat) throws IOException {
this.levelData = readTag(levelDat);
CompoundTag data = levelData.get("Data");
if (data == null)
throw new IOException("level.dat missing Data");
@@ -234,10 +260,54 @@ public final class World {
throw new IOException("level.dat missing LastPlayed");
}
public void reloadLevelDat() throws IOException {
if (levelDataPath != null) {
loadAndCheckLevelDat(this.levelDataPath);
private void loadOtherData() throws IOException {
if (!(levelData.get("Data") instanceof CompoundTag data)) return;
Path worldGenSettingsDatPath = file.resolve("data/minecraft/world_gen_settings.dat");
if (data.get("WorldGenSettings") instanceof CompoundTag worldGenSettingsTag) {
setWorldGenSettingsData(null, worldGenSettingsTag, worldGenSettingsTag);
} else if (Files.isRegularFile(worldGenSettingsDatPath)) {
CompoundTag raw = readTag(worldGenSettingsDatPath);
if (raw.get("data") instanceof CompoundTag compoundTag) {
setWorldGenSettingsData(worldGenSettingsDatPath, raw, compoundTag);
} else {
setWorldGenSettingsData(null, null, null);
}
} else {
setWorldGenSettingsData(null, null, null);
}
if (data.get("Player") instanceof CompoundTag playerTag) {
setPlayerData(null, playerTag);
} else if (data.get("singleplayer_uuid") instanceof IntArrayTag uuidTag && uuidTag.getValue().length == 4) {
int[] uuidValue = uuidTag.getValue();
long mostSigBits = ((long) uuidValue[0] << 32) | (uuidValue[1] & 0xFFFFFFFFL);
long leastSigBits = ((long) uuidValue[2] << 32) | (uuidValue[3] & 0xFFFFFFFFL);
String playerUUID = new UUID(mostSigBits, leastSigBits).toString();
Path playerDatPath = file.resolve("players/data/" + playerUUID + ".dat");
if (Files.exists(playerDatPath)) {
setPlayerData(playerDatPath, readTag(playerDatPath));
} else {
setPlayerData(null, null);
}
} else {
setPlayerData(null, null);
}
}
private void setWorldGenSettingsData(Path worldGenSettingsDataPath, CompoundTag worldGenSettingsDataBackingTag, CompoundTag unifiedWorldGenSettingsData) {
this.worldGenSettingsDataPath = worldGenSettingsDataPath;
this.worldGenSettingsDataBackingTag = worldGenSettingsDataBackingTag;
this.normalizedWorldGenSettingsData = unifiedWorldGenSettingsData;
}
private void setPlayerData(Path playerDataPath, CompoundTag playerData) {
this.playerDataPath = playerDataPath;
this.playerData = playerData;
}
public void reloadWorldData() throws IOException {
loadAndCheckWorldData();
}
// The rename method is used to rename temporary world object during installation and copying,
@@ -249,7 +319,7 @@ public final class World {
// Change the name recorded in level.dat
CompoundTag data = levelData.get("Data");
data.put(new StringTag("LevelName", newName));
writeLevelDat(levelData);
writeLevelData();
// then change the folder's name
Files.move(file, file.resolveSibling(newName));
@@ -345,27 +415,41 @@ public final class World {
}
}
public void writeLevelDat(CompoundTag nbt) throws IOException {
if (!Files.isDirectory(file))
throw new IOException("Not a valid world directory");
public void writeWorldData() throws IOException {
if (!Files.isDirectory(file)) throw new IOException("Not a valid world directory");
FileUtils.saveSafely(getLevelDatFile(), os -> {
writeLevelData();
if (worldGenSettingsDataPath != null && worldGenSettingsDataBackingTag != null) {
writeTag(worldGenSettingsDataBackingTag, worldGenSettingsDataPath);
}
if (playerDataPath != null && playerData != null) {
writeTag(playerData, playerDataPath);
}
}
public void writeLevelData() throws IOException {
writeTag(levelData, levelDataPath);
}
private CompoundTag readTag(Path path) throws IOException {
try (InputStream is = new GZIPInputStream(Files.newInputStream(path))) {
Tag tag = NBTIO.readTag(is);
if (tag instanceof CompoundTag compoundTag) return compoundTag;
throw new IOException("NBT file malformed: " + path);
}
}
private void writeTag(CompoundTag nbt, Path path) throws IOException {
if (!Files.isDirectory(file)) throw new IOException("Not a valid world directory");
FileUtils.saveSafely(path, os -> {
try (OutputStream gos = new GZIPOutputStream(os)) {
NBTIO.writeTag(gos, nbt);
}
});
}
private static CompoundTag parseLevelDat(Path path) throws IOException {
try (InputStream is = new GZIPInputStream(Files.newInputStream(path))) {
Tag nbt = NBTIO.readTag(is);
if (nbt instanceof CompoundTag compoundTag)
return compoundTag;
else
throw new IOException("level.dat malformed");
}
}
private static boolean isLocked(Path sessionLockFile) {
try (FileChannel fileChannel = FileChannel.open(sessionLockFile, StandardOpenOption.WRITE)) {
return fileChannel.tryLock() == null;
@@ -650,8 +650,10 @@ public class DefaultLauncher extends Launcher {
final String command = usePowerShell ? null : commandLine.commandLine.toString();
Map<String, String> envVars = getEnvVars();
if (!usePowerShell && isWindows) {
if (command.length() > 8192) { // maximum length of the command in cmd
if (isWindows && !usePowerShell) {
// https://stackoverflow.com/a/28452546
// https://learn.microsoft.com/troubleshoot/windows-client/shell-experience/command-line-string-limitation
if (command.length() > 32767) {
throw new CommandTooLongException();
}
}
@@ -210,6 +210,7 @@ public class ModpackExportInfo {
}
public static class Options {
private boolean requireAuthor;
private boolean requireUrl;
private boolean requireForceUpdate;
private boolean requireFileApi;
@@ -225,6 +226,10 @@ public class ModpackExportInfo {
public Options() {
}
public boolean isRequireAuthor() {
return requireAuthor;
}
public boolean isRequireUrl() {
return requireUrl;
}
@@ -269,6 +274,11 @@ public class ModpackExportInfo {
return requireSkipCurseForgeRemoteFiles;
}
public Options requireAuthor() {
requireAuthor = true;
return this;
}
public Options requireUrl() {
requireUrl = true;
return this;
@@ -115,19 +115,19 @@ public final class CurseCompletionTask extends Task<Void> {
// Because in China, Curse is too difficult to visit,
// if failed, ignore it and retry next time.
CurseManifest newManifest = manifest.setFiles(
manifest.getFiles().parallelStream()
manifest.files().parallelStream()
.map(file -> {
updateProgress(finished.incrementAndGet(), manifest.getFiles().size());
if (StringUtils.isBlank(file.getFileName()) || file.getUrl() == null) {
updateProgress(finished.incrementAndGet(), manifest.files().size());
if (StringUtils.isBlank(file.fileName()) || file.url() == null) {
try {
RemoteMod.File remoteFile = CurseForgeRemoteModRepository.MODS.getModFile(Integer.toString(file.getProjectID()), Integer.toString(file.getFileID()));
RemoteMod.File remoteFile = CurseForgeRemoteModRepository.MODS.getModFile(Integer.toString(file.projectID()), Integer.toString(file.fileID()));
return file.withFileName(remoteFile.getFilename()).withURL(remoteFile.getUrl());
} catch (FileNotFoundException fof) {
LOG.warning("Could not query api.curseforge.com for deleted mods: " + file.getProjectID() + ", " + file.getFileID(), fof);
LOG.warning("Could not query api.curseforge.com for deleted mods: " + file.projectID() + ", " + file.fileID(), fof);
notFound.set(true);
return file;
} catch (IOException | JsonParseException e) {
LOG.warning("Unable to fetch the file name projectID=" + file.getProjectID() + ", fileID=" + file.getFileID(), e);
LOG.warning("Unable to fetch the file name projectID=" + file.projectID() + ", fileID=" + file.fileID(), e);
allNameKnown.set(false);
return file;
}
@@ -142,9 +142,9 @@ public final class CurseCompletionTask extends Task<Void> {
Path resourcePacksRoot = versionRoot.resolve("resourcepacks");
Path shaderPacksRoot = versionRoot.resolve("shaderpacks");
finished.set(0);
dependencies = newManifest.getFiles()
dependencies = newManifest.files()
.stream().parallel()
.filter(f -> f.getFileName() != null)
.filter(f -> f.fileName() != null)
.flatMap(f -> {
try {
Path path = guessFilePath(f, resourcePacksRoot, shaderPacksRoot);
@@ -152,15 +152,15 @@ public final class CurseCompletionTask extends Task<Void> {
return Stream.empty();
}
var task = new FileDownloadTask(f.getUrl(), path);
var task = new FileDownloadTask(f.url(), path);
task.setCacheRepository(dependency.getCacheRepository());
task.setCaching(true);
return Stream.of(task.withCounter("hmcl.modpack.download"));
} catch (IOException e) {
LOG.warning("Could not query api.curseforge.com for mod: " + f.getProjectID() + ", " + f.getFileID(), e);
LOG.warning("Could not query api.curseforge.com for mod: " + f.projectID() + ", " + f.fileID(), e);
return Stream.empty(); // Ignore this file.
} finally {
updateProgress(finished.incrementAndGet(), newManifest.getFiles().size());
updateProgress(finished.incrementAndGet(), newManifest.files().size());
}
})
.collect(Collectors.toList());
@@ -181,9 +181,9 @@ public final class CurseCompletionTask extends Task<Void> {
* @throws IOException If IOException was encountered during getting data from CurseForge.
*/
private Path guessFilePath(CurseManifestFile file, Path resourcePacksRoot, Path shaderPacksRoot) throws IOException {
RemoteMod mod = CurseForgeRemoteModRepository.MODS.getModById(Integer.toString(file.getProjectID()));
RemoteMod mod = CurseForgeRemoteModRepository.MODS.getModById(Integer.toString(file.projectID()));
int classID = ((CurseAddon) mod.getData()).getClassId();
String fileName = file.getFileName();
String fileName = file.fileName();
return switch (classID) {
case 12, // Resource pack
6552 -> { // Shader pack
@@ -73,14 +73,14 @@ public final class CurseInstallTask extends Task<Void> {
if (repository.hasVersion(name) && Files.notExists(json))
throw new IllegalArgumentException("Version " + name + " already exists.");
GameBuilder builder = dependencyManager.gameBuilder().name(name).gameVersion(manifest.getMinecraft().getGameVersion());
for (CurseManifestModLoader modLoader : manifest.getMinecraft().getModLoaders()) {
if (modLoader.getId().startsWith("forge-")) {
builder.version("forge", modLoader.getId().substring("forge-".length()));
} else if (modLoader.getId().startsWith("fabric-")) {
builder.version("fabric", modLoader.getId().substring("fabric-".length()));
} else if (modLoader.getId().startsWith("neoforge-")) {
builder.version("neoforge", modLoader.getId().substring("neoforge-".length()));
GameBuilder builder = dependencyManager.gameBuilder().name(name).gameVersion(manifest.minecraft().gameVersion());
for (CurseManifestModLoader modLoader : manifest.minecraft().modLoaders()) {
if (modLoader.id().startsWith("forge-")) {
builder.version("forge", modLoader.id().substring("forge-".length()));
} else if (modLoader.id().startsWith("fabric-")) {
builder.version("fabric", modLoader.id().substring("fabric-".length()));
} else if (modLoader.id().startsWith("neoforge-")) {
builder.version("neoforge", modLoader.id().substring("neoforge-".length()));
}
}
dependents.add(builder.buildAsync());
@@ -105,8 +105,8 @@ public final class CurseInstallTask extends Task<Void> {
} catch (JsonParseException | IOException ignore) {
}
this.config = config;
dependents.add(new ModpackInstallTask<>(zipFile, run, modpack.getEncoding(), Collections.singletonList(manifest.getOverrides()), any -> true, config).withStage("hmcl.modpack"));
dependents.add(new MinecraftInstanceTask<>(zipFile, modpack.getEncoding(), Collections.singletonList(manifest.getOverrides()), manifest, CurseModpackProvider.INSTANCE, manifest.getName(), manifest.getVersion(), repository.getModpackConfiguration(name)).withStage("hmcl.modpack"));
dependents.add(new ModpackInstallTask<>(zipFile, run, modpack.getEncoding(), Collections.singletonList(manifest.overrides()), any -> true, config).withStage("hmcl.modpack"));
dependents.add(new MinecraftInstanceTask<>(zipFile, modpack.getEncoding(), Collections.singletonList(manifest.overrides()), manifest, CurseModpackProvider.INSTANCE, manifest.name(), manifest.version(), repository.getModpackConfiguration(name)).withStage("hmcl.modpack"));
dependencies.add(new CurseCompletionTask(dependencyManager, name, manifest));
}
@@ -125,11 +125,11 @@ public final class CurseInstallTask extends Task<Void> {
public void execute() throws Exception {
if (config != null) {
// For update, remove mods not listed in new manifest
for (CurseManifestFile oldCurseManifestFile : config.getManifest().getFiles()) {
if (StringUtils.isBlank(oldCurseManifestFile.getFileName())) continue;
Path oldFile = run.resolve("mods/" + oldCurseManifestFile.getFileName());
for (CurseManifestFile oldCurseManifestFile : config.getManifest().files()) {
if (StringUtils.isBlank(oldCurseManifestFile.fileName())) continue;
Path oldFile = run.resolve("mods/" + oldCurseManifestFile.fileName());
if (Files.notExists(oldFile)) continue;
if (manifest.getFiles().stream().noneMatch(oldCurseManifestFile::equals))
if (manifest.files().stream().noneMatch(oldCurseManifestFile::equals))
Files.deleteIfExists(oldFile);
}
}
@@ -20,88 +20,21 @@ package org.jackhuang.hmcl.mod.curse;
import com.google.gson.annotations.SerializedName;
import org.jackhuang.hmcl.mod.ModpackManifest;
import org.jackhuang.hmcl.mod.ModpackProvider;
import org.jackhuang.hmcl.util.Immutable;
import org.jackhuang.hmcl.util.gson.JsonSerializable;
import org.jetbrains.annotations.Unmodifiable;
import java.util.Collections;
import java.util.List;
/**
*
* @author huangyuhui
*/
@Immutable
public final class CurseManifest implements ModpackManifest {
@SerializedName("manifestType")
private final String manifestType;
@SerializedName("manifestVersion")
private final int manifestVersion;
@SerializedName("name")
private final String name;
@SerializedName("version")
private final String version;
@SerializedName("author")
private final String author;
@SerializedName("overrides")
private final String overrides;
@SerializedName("minecraft")
private final CurseManifestMinecraft minecraft;
@SerializedName("files")
private final List<CurseManifestFile> files;
public CurseManifest() {
this(MINECRAFT_MODPACK, 1, "", "1.0", "", "overrides", new CurseManifestMinecraft(), Collections.emptyList());
}
public CurseManifest(String manifestType, int manifestVersion, String name, String version, String author, String overrides, CurseManifestMinecraft minecraft, List<CurseManifestFile> files) {
this.manifestType = manifestType;
this.manifestVersion = manifestVersion;
this.name = name;
this.version = version;
this.author = author;
this.overrides = overrides;
this.minecraft = minecraft;
this.files = files;
}
public String getManifestType() {
return manifestType;
}
public int getManifestVersion() {
return manifestVersion;
}
public String getName() {
return name;
}
public String getVersion() {
return version;
}
public String getAuthor() {
return author;
}
public String getOverrides() {
return overrides;
}
public CurseManifestMinecraft getMinecraft() {
return minecraft;
}
public List<CurseManifestFile> getFiles() {
return files;
}
/// @author huangyuhui
@JsonSerializable
public record CurseManifest(@SerializedName("manifestType") String manifestType,
@SerializedName("manifestVersion") int manifestVersion,
@SerializedName("name") String name,
@SerializedName("version") String version,
@SerializedName("author") String author,
@SerializedName("overrides") String overrides,
@SerializedName("minecraft") CurseManifestMinecraft minecraft,
@SerializedName("files") @Unmodifiable List<CurseManifestFile> files) implements ModpackManifest {
public CurseManifest setFiles(List<CurseManifestFile> files) {
return new CurseManifest(manifestType, manifestVersion, name, version, author, overrides, minecraft, files);
@@ -19,61 +19,19 @@ package org.jackhuang.hmcl.mod.curse;
import com.google.gson.JsonParseException;
import com.google.gson.annotations.SerializedName;
import org.jackhuang.hmcl.util.Immutable;
import org.jackhuang.hmcl.util.gson.JsonSerializable;
import org.jackhuang.hmcl.util.gson.Validation;
import org.jetbrains.annotations.Nullable;
import java.util.Objects;
/**
*
* @author huangyuhui
*/
@Immutable
public final class CurseManifestFile implements Validation {
@SerializedName("projectID")
private final int projectID;
@SerializedName("fileID")
private final int fileID;
@SerializedName("fileName")
private final String fileName;
@SerializedName("url")
private final String url;
@SerializedName("required")
private final boolean required;
public CurseManifestFile() {
this(0, 0, null, null, true);
}
public CurseManifestFile(int projectID, int fileID, String fileName, String url, boolean required) {
this.projectID = projectID;
this.fileID = fileID;
this.fileName = fileName;
this.url = url;
this.required = required;
}
public int getProjectID() {
return projectID;
}
public int getFileID() {
return fileID;
}
public String getFileName() {
return fileName;
}
public boolean isRequired() {
return required;
}
/// @author huangyuhui
@JsonSerializable
public record CurseManifestFile(@SerializedName("projectID") int projectID,
@SerializedName("fileID") int fileID,
@SerializedName("fileName") String fileName,
@SerializedName("url") String url,
@SerializedName("required") boolean required) implements Validation {
@Override
public void validate() throws JsonParseException {
@@ -81,8 +39,9 @@ public final class CurseManifestFile implements Validation {
throw new JsonParseException("Missing Project ID or File ID.");
}
@Override
@Nullable
public String getUrl() {
public String url() {
if (url == null) {
return fileName != null
? String.format("https://edge.forgecdn.net/files/%d/%d/%s", fileID / 1000, fileID % 1000, fileName)
@@ -102,11 +61,9 @@ public final class CurseManifestFile implements Validation {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
CurseManifestFile that = (CurseManifestFile) o;
return projectID == that.projectID &&
fileID == that.fileID;
return this == o || o instanceof CurseManifestFile that
&& this.projectID == that.projectID
&& this.fileID == that.fileID;
}
@Override
@@ -19,42 +19,27 @@ package org.jackhuang.hmcl.mod.curse;
import com.google.gson.JsonParseException;
import com.google.gson.annotations.SerializedName;
import org.jackhuang.hmcl.util.Immutable;
import org.jackhuang.hmcl.util.StringUtils;
import org.jackhuang.hmcl.util.gson.JsonSerializable;
import org.jackhuang.hmcl.util.gson.Validation;
import org.jetbrains.annotations.Unmodifiable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
*
* @author huangyuhui
*/
@Immutable
public final class CurseManifestMinecraft implements Validation {
@SerializedName("version")
private final String gameVersion;
@SerializedName("modLoaders")
private final List<CurseManifestModLoader> modLoaders;
public CurseManifestMinecraft() {
this.gameVersion = "";
this.modLoaders = Collections.emptyList();
}
/// @author huangyuhui
@JsonSerializable
public record CurseManifestMinecraft(@SerializedName("version") String gameVersion,
@SerializedName("modLoaders") @Unmodifiable List<CurseManifestModLoader> modLoaders) implements Validation {
public CurseManifestMinecraft(String gameVersion, List<CurseManifestModLoader> modLoaders) {
this.gameVersion = gameVersion;
this.modLoaders = new ArrayList<>(modLoaders);
this.modLoaders = Collections.unmodifiableList(new ArrayList<>(modLoaders)); // TODO: Is the modLoaders nullable?
}
public String getGameVersion() {
return gameVersion;
}
public List<CurseManifestModLoader> getModLoaders() {
@Override
public List<CurseManifestModLoader> modLoaders() {
return Collections.unmodifiableList(modLoaders);
}
@@ -28,31 +28,12 @@ import org.jackhuang.hmcl.util.gson.Validation;
* @author huangyuhui
*/
@Immutable
public final class CurseManifestModLoader implements Validation {
@SerializedName("id")
private final String id;
@SerializedName("primary")
private final boolean primary;
public record CurseManifestModLoader(@SerializedName("id") String id,
@SerializedName("primary") boolean primary) implements Validation {
public CurseManifestModLoader() {
this("", false);
}
public CurseManifestModLoader(String id, boolean primary) {
this.id = id;
this.primary = primary;
}
public String getId() {
return id;
}
public boolean isPrimary() {
return primary;
}
@Override
public void validate() throws JsonParseException {
if (StringUtils.isBlank(id))
@@ -66,7 +66,7 @@ public final class CurseModpackProvider implements ModpackProvider {
} catch (Throwable ignored) {
}
return new Modpack(manifest.getName(), manifest.getAuthor(), manifest.getVersion(), manifest.getMinecraft().getGameVersion(), description, encoding, manifest) {
return new Modpack(manifest.name(), manifest.author(), manifest.version(), manifest.minecraft().gameVersion(), description, encoding, manifest) {
@Override
public Task<?> getInstallTask(DefaultDependencyManager dependencyManager, Path zipFile, String name, String iconUrl) {
return new CurseInstallTask(dependencyManager, zipFile, this, manifest, name);
@@ -143,6 +143,7 @@ public class McbbsModpackExportTask extends Task<Void> {
.requireAuthlibInjectorServer()
.requireJavaArguments()
.requireLaunchArguments()
.requireOrigins();
.requireOrigins()
.requireAuthor();
}
@@ -34,8 +34,7 @@ public class ModrinthManifest implements ModpackManifest, Validation {
private final int formatVersion;
private final String versionId;
private final String name;
@Nullable
private final String summary;
private final @Nullable String summary;
private final List<File> files;
private final Map<String, String> dependencies;
@@ -96,11 +95,12 @@ public class ModrinthManifest implements ModpackManifest, Validation {
public static class File {
private final String path;
private final Map<String, String> hashes;
@Nullable
private final Map<String, String> env;
private final List<String> downloads;
private final int fileSize;
public File(String path, Map<String, String> hashes, Map<String, String> env, List<String> downloads, int fileSize) {
public File(String path, Map<String, String> hashes, @Nullable Map<String, String> env, List<String> downloads, int fileSize) {
this.path = path;
this.hashes = hashes;
this.env = env;
@@ -116,6 +116,7 @@ public class ModrinthManifest implements ModpackManifest, Validation {
return hashes;
}
@Nullable
public Map<String, String> getEnv() {
return env;
}
@@ -133,7 +134,7 @@ public class ModrinthManifest implements ModpackManifest, Validation {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
File file = (File) o;
return fileSize == file.fileSize && path.equals(file.path) && hashes.equals(file.hashes) && env.equals(file.env) && downloads.equals(file.downloads);
return fileSize == file.fileSize && path.equals(file.path) && hashes.equals(file.hashes) && Objects.equals(this.env, file.env) && downloads.equals(file.downloads);
}
@Override
@@ -103,5 +103,7 @@ public class MultiMCModpackExportTask extends Task<Void> {
}
}
public static final ModpackExportInfo.Options OPTION = new ModpackExportInfo.Options().requireMinMemory();
public static final ModpackExportInfo.Options OPTION = new ModpackExportInfo.Options()
.requireAuthor()
.requireMinMemory();
}
@@ -107,5 +107,6 @@ public class ServerModpackExportTask extends Task<Void> {
}
public static final ModpackExportInfo.Options OPTION = new ModpackExportInfo.Options()
.requireAuthor()
.requireFileApi(false);
}
+1 -1
View File
@@ -1,6 +1,6 @@
[versions]
hmclauncher = "3.7.0.1"
jetbrains-annotations = "26.0.1"
jetbrains-annotations = "26.1.0"
kala-compress = "1.27.1-1"
simple-png-javafx = "0.3.0"
gson = "2.13.2"
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
networkTimeout=120000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME