AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-18 08:16:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: tasks with default name will not be displayed

Browse Source
This commit is contained in:
huanghongxun 2020-02-20 14:06:03 +08:00
parent 5c25ab3eda
commit 0a68e52fca
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
View File

@ -128,12 +128,12 @@ public final class LauncherHelper {
Optional<String> gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version)); Optional<String> gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version));
TaskExecutor executor = Task.allOf( TaskExecutor executor = Task.allOf(
Task.composeAsync(null, () -> { Task.composeAsync(() -> {
if (setting.isNotCheckGame()) if (setting.isNotCheckGame())
return null; return null;
else else
return dependencyManager.checkGameCompletionAsync(version, repository.unmarkVersionLaunchedAbnormally(selectedVersion)); return dependencyManager.checkGameCompletionAsync(version, repository.unmarkVersionLaunchedAbnormally(selectedVersion));
}), Task.composeAsync(null, () -> { }), Task.composeAsync(() -> {
try { try {
ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion)); ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
if ("Curse".equals(configuration.getType())) if ("Curse".equals(configuration.getType()))
@ -146,7 +146,7 @@ public final class LauncherHelper {
return null; return null;
} }
})).withStage("launch.state.dependencies") })).withStage("launch.state.dependencies")
.thenComposeAsync(Task.supplyAsync((String) null, () -> { .thenComposeAsync(Task.supplyAsync(() -> {
try { try {
return account.logIn(); return account.logIn();
} catch (CredentialExpiredException e) { } catch (CredentialExpiredException e) {
@ -157,7 +157,7 @@ public final class LauncherHelper {
return account.playOffline().orElseThrow(() -> e); return account.playOffline().orElseThrow(() -> e);
} }
}).withStage("launch.state.logging_in")) }).withStage("launch.state.logging_in"))
.thenComposeAsync(authInfo -> Task.supplyAsync((String) null, () -> { .thenComposeAsync(authInfo -> Task.supplyAsync(() -> {
return new HMCLGameLauncher( return new HMCLGameLauncher(
repository, repository,
version.getPatches().isEmpty() ? repository.getResolvedVersion(selectedVersion) : version, version.getPatches().isEmpty() ? repository.getResolvedVersion(selectedVersion) : version,
@ -169,9 +169,9 @@ public final class LauncherHelper {
); );
}).thenComposeAsync(launcher -> { // launcher is prev task's result }).thenComposeAsync(launcher -> { // launcher is prev task's result
if (scriptFile == null) { if (scriptFile == null) {
return Task.supplyAsync((String) null, launcher::launch); return Task.supplyAsync(launcher::launch);
} else { } else {
return Task.supplyAsync((String) null, () -> { return Task.supplyAsync(() -> {
launcher.makeLaunchScript(scriptFile); launcher.makeLaunchScript(scriptFile);
return null; return null;
}); });
@ -192,7 +192,7 @@ public final class LauncherHelper {
Controllers.dialog(i18n("version.launch_script.success", scriptFile.getAbsolutePath())); Controllers.dialog(i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
}); });
} }
}).thenRunAsync(null, Schedulers.defaultScheduler(), () -> { }).thenRunAsync(Schedulers.defaultScheduler(), () -> {
launchingLatch = new CountDownLatch(1); launchingLatch = new CountDownLatch(1);
launchingLatch.await(); launchingLatch.await();
}).withStage("launch.state.waiting_launching")) }).withStage("launch.state.waiting_launching"))

2
HMCLCore/src/main/java/org/jackhuang/hmcl/download/VersionList.java
View File

@ -86,7 +86,7 @@ public abstract class VersionList<T extends RemoteVersion> {
} }
public Task<?> loadAsync(String gameVersion) { public Task<?> loadAsync(String gameVersion) {
return Task.composeAsync(null, () -> { return Task.composeAsync(() -> {
lock.readLock().lock(); lock.readLock().lock();
boolean loaded; boolean loaded;

21
HMCLCore/src/main/java/org/jackhuang/hmcl/task/Task.java
View File

@ -63,8 +63,9 @@ public abstract class Task<T> {
return significance; return significance;
} }
public final void setSignificance(TaskSignificance significance) { public final Task<T> setSignificance(TaskSignificance significance) {
this.significance = significance; this.significance = significance;
return this;
} }
// cancel // cancel
@ -419,7 +420,7 @@ public abstract class Task<T> {
* @return the new Task * @return the new Task
*/ */
public <U, E extends Exception> Task<U> thenApplyAsync(Executor executor, ExceptionalFunction<T, U, E> fn) { public <U, E extends Exception> Task<U> thenApplyAsync(Executor executor, ExceptionalFunction<T, U, E> fn) {
return thenApplyAsync(getCaller(), executor, fn); return thenApplyAsync(getCaller(), executor, fn).setSignificance(TaskSignificance.MODERATE);
} }
/** /**
@ -460,7 +461,7 @@ public abstract class Task<T> {
* @return the new Task * @return the new Task
*/ */
public <E extends Exception> Task<Void> thenAcceptAsync(Executor executor, ExceptionalConsumer<T, E> action) { public <E extends Exception> Task<Void> thenAcceptAsync(Executor executor, ExceptionalConsumer<T, E> action) {
return thenAcceptAsync(getCaller(), executor, action); return thenAcceptAsync(getCaller(), executor, action).setSignificance(TaskSignificance.MODERATE);
} }
/** /**
@ -502,7 +503,7 @@ public abstract class Task<T> {
* @return the new Task * @return the new Task
*/ */
public <E extends Exception> Task<Void> thenRunAsync(Executor executor, ExceptionalRunnable<E> action) { public <E extends Exception> Task<Void> thenRunAsync(Executor executor, ExceptionalRunnable<E> action) {
return thenRunAsync(getCaller(), executor, action); return thenRunAsync(getCaller(), executor, action).setSignificance(TaskSignificance.MODERATE);
} }
/** /**
@ -614,7 +615,7 @@ public abstract class Task<T> {
* @return the new Task * @return the new Task
*/ */
public <E extends Exception> Task<Void> withRunAsync(Executor executor, ExceptionalRunnable<E> action) { public <E extends Exception> Task<Void> withRunAsync(Executor executor, ExceptionalRunnable<E> action) {
return withRunAsync(getCaller(), executor, action); return withRunAsync(getCaller(), executor, action).setSignificance(TaskSignificance.MODERATE);
} }
/** /**
@ -701,7 +702,7 @@ public abstract class Task<T> {
public List<String> getStages() { public List<String> getStages() {
return Lang.merge(Task.this.getStages(), super.getStages()); return Lang.merge(Task.this.getStages(), super.getStages());
} }
}.setExecutor(executor).setName(getCaller()); }.setExecutor(executor).setName(getCaller()).setSignificance(TaskSignificance.MODERATE);
} }
/** /**
@ -810,7 +811,7 @@ public abstract class Task<T> {
} }
public static Task<Void> runAsync(Executor executor, ExceptionalRunnable<?> closure) { public static Task<Void> runAsync(Executor executor, ExceptionalRunnable<?> closure) {
return runAsync(getCaller(), executor, closure); return runAsync(getCaller(), executor, closure).setSignificance(TaskSignificance.MODERATE);
} }
public static Task<Void> runAsync(String name, Executor executor, ExceptionalRunnable<?> closure) { public static Task<Void> runAsync(String name, Executor executor, ExceptionalRunnable<?> closure) {
@ -818,7 +819,7 @@ public abstract class Task<T> {
} }
public static <T> Task<T> composeAsync(ExceptionalSupplier<Task<T>, ?> fn) { public static <T> Task<T> composeAsync(ExceptionalSupplier<Task<T>, ?> fn) {
return composeAsync(getCaller(), fn); return composeAsync(getCaller(), fn).setSignificance(TaskSignificance.MODERATE);
} }
public static <T> Task<T> composeAsync(String name, ExceptionalSupplier<Task<T>, ?> fn) { public static <T> Task<T> composeAsync(String name, ExceptionalSupplier<Task<T>, ?> fn) {
@ -845,11 +846,11 @@ public abstract class Task<T> {
} }
public static <V> Task<V> supplyAsync(Callable<V> callable) { public static <V> Task<V> supplyAsync(Callable<V> callable) {
return supplyAsync(getCaller(), callable); return supplyAsync(getCaller(), callable).setSignificance(TaskSignificance.MODERATE);
} }
public static <V> Task<V> supplyAsync(Executor executor, Callable<V> callable) { public static <V> Task<V> supplyAsync(Executor executor, Callable<V> callable) {
return supplyAsync(getCaller(), executor, callable); return supplyAsync(getCaller(), executor, callable).setSignificance(TaskSignificance.MODERATE);
} }
public static <V> Task<V> supplyAsync(String name, Callable<V> callable) { public static <V> Task<V> supplyAsync(String name, Callable<V> callable) {