取消了下载界面硬控用户的功能，添加了下载界面的下载列表的bug(doge #5952
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Hello Minecraft! Launcher | ||
| * Copyright (C) 2026 huangyuhui <huanghongxun2008@126.com> 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.download; | ||
|
|
||
| import org.jackhuang.hmcl.task.Task; | ||
| import org.jackhuang.hmcl.task.TaskExecutor; | ||
| import org.jackhuang.hmcl.ui.versions.DownloadTaskList; | ||
|
|
||
| public class DifferentDownloadTask2OneTask{ | ||
|
Member
There was a problem hiding this comment. 这个类和里面的方法都是什么见鬼的命名？为什么还在 |
||
|
|
||
| private static DownloadTaskList activeDownloadTaskList; | ||
|
|
||
| public static void setActiveDownloadTaskList(DownloadTaskList list) { | ||
| activeDownloadTaskList = list; | ||
| } | ||
|
|
||
| public void WizardTask2OneTask(Task<?> task) { | ||
| TaskExecutor executor = task.executor(); | ||
| if (activeDownloadTaskList != null) { | ||
| activeDownloadTaskList.addDownloadEntry(executor, task.getName()); | ||
| System.out.println("gotolist"); | ||
| } | ||
| } | ||
|
|
||
| public void ExecutorTask2OneTask(TaskExecutor executor, String name) { | ||
| if (activeDownloadTaskList != null) { | ||
| activeDownloadTaskList.addDownloadEntry(executor, name); | ||
| System.out.println("gotolist"); | ||
| } | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * Hello Minecraft! Launcher | ||
| * Copyright (C) 2026 huangyuhui <huanghongxun2008@126.com> 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.download; | ||
|
|
||
| import javafx.beans.binding.Bindings; | ||
| import javafx.beans.binding.StringBinding; | ||
| import javafx.beans.property.DoubleProperty; | ||
| import javafx.beans.property.SimpleDoubleProperty; | ||
| import javafx.beans.property.SimpleStringProperty; | ||
| import javafx.beans.property.StringProperty; | ||
| import org.jackhuang.hmcl.task.TaskExecutor; | ||
|
|
||
| import static org.jackhuang.hmcl.util.i18n.I18n.i18n; | ||
|
|
||
| public class DownloadEntry { | ||
| private final short ProgressIsUncertain = -1; | ||
|
|
||
| public static final String STATUS_WAITING = "waiting"; | ||
| public static final String STATUS_RUNNING = "running"; | ||
| public static final String STATUS_DONE = "done"; | ||
| public static final String STATUS_FAILED = "failed"; | ||
|
|
||
| private final StringProperty name = new SimpleStringProperty(); | ||
| private final StringProperty status = new SimpleStringProperty(); | ||
| private final DoubleProperty progress = new SimpleDoubleProperty(ProgressIsUncertain); | ||
| private final TaskExecutor executor; | ||
|
|
||
|
|
||
| public DownloadEntry(TaskExecutor executor, String name) { | ||
| this.executor = executor; | ||
| this.name.set(name); | ||
| this.status.set(STATUS_WAITING); | ||
| } | ||
|
|
||
|
|
||
| public String getName() { return name.get(); } | ||
| public StringProperty nameProperty() { return name; } | ||
|
|
||
| public String getStatus() { return status.get(); } | ||
| public StringProperty statusProperty() { return status; } | ||
|
|
||
| public StringBinding statusI18NBinding() { | ||
| return Bindings.createStringBinding(() -> { | ||
| String s = status.get(); | ||
| if (STATUS_DONE.equals(s)) return i18n("download.task.status.done"); | ||
| if (STATUS_FAILED.equals(s)) return i18n("download.task.status.failed"); | ||
| if (STATUS_RUNNING.equals(s)) return i18n("download.task.status.running"); | ||
| if (STATUS_WAITING.equals(s)) return i18n("download.task.status.waiting"); | ||
| return i18n("download.task.status.null"); | ||
| }, status); | ||
| } | ||
|
|
||
| public double getProgress() { return progress.get(); } | ||
| public DoubleProperty progressProperty() { return progress; } | ||
|
|
||
| public TaskExecutor getExecutor() { return executor; } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这是在做什么？