lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New launcher visibility mode: hide and reopen later

Browse Source
This commit is contained in:
huangyuhui
2017-02-26 21:19:21 +08:00
parent 7436736040
commit a34875e804
25 changed files with 93 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/MinecraftRemoteVersions.java
View File

@@ -21,7 +21,7 @@ import com.google.gson.annotations.SerializedName;
import java.util.ArrayList;
import org.jackhuang.hmcl.util.C;
import org.jackhuang.hmcl.util.net.NetUtils;
import org.jackhuang.hmcl.util.AbstractSwingWorker;
import org.jackhuang.hmcl.util.task.TaskWorker;
/**
*
@@ -40,12 +40,12 @@ public class MinecraftRemoteVersions {
public static RemoteVersionsTask getRemoteVersions(DownloadType type) {
return new RemoteVersionsTask(type) {
@Override
public void work() throws Exception {
public void executeTask(boolean b) throws Exception {
synchronized (INSTANCE_LOCK) {
if (INSTANCE != null)
send(INSTANCE.versions.toArray(new MinecraftRemoteVersion[INSTANCE.versions.size()]));
else
super.work();
super.executeTask(b);
}
}
};
@@ -55,7 +55,7 @@ public class MinecraftRemoteVersions {
return new RemoteVersionsTask(type);
}
public static class RemoteVersionsTask extends AbstractSwingWorker<MinecraftRemoteVersion> {
public static class RemoteVersionsTask extends TaskWorker<MinecraftRemoteVersion> {
DownloadType type;
@@ -64,7 +64,7 @@ public class MinecraftRemoteVersions {
}
@Override
public void work() throws Exception {
public void executeTask(boolean b) throws Exception {
MinecraftRemoteVersions r = C.GSON.fromJson(NetUtils.get(type.getProvider().getVersionsListDownloadURL()), MinecraftRemoteVersions.class);
if (r != null && r.versions != null) {
INSTANCE = r;

2
HMCLCore/src/main/java/org/jackhuang/hmcl/util/AbstractSwingWorker.java
View File

@@ -66,7 +66,7 @@ public abstract class AbstractSwingWorker<T> extends SwingWorker<Void, T> {
final List<T> lastChunks = new ArrayList<>();
protected void send(T... t) {
public void send(T... t) {
lastChunks.addAll(Arrays.asList(t));
publish(t);
}

2
HMCLCore/src/main/java/org/jackhuang/hmcl/util/net/FileDownloadTask.java
View File

@@ -98,7 +98,7 @@ public class FileDownloadTask extends Task implements PreviousResult<File>, Prev
// Download file.
@Override
public void executeTask(boolean areDependTasksSucceeded) throws Throwable {
public void executeTask(boolean areDependTasksSucceeded) throws Exception {
for (PreviousResult<String> p : al)
this.url = IOUtils.parseURL(p.getResult());

18
HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/ProcessMonitor.java
View File

@@ -28,6 +28,8 @@ import org.jackhuang.hmcl.util.StrUtils;
import org.jackhuang.hmcl.api.HMCLog;
import org.jackhuang.hmcl.util.log.Level;
import org.jackhuang.hmcl.api.IProcess;
import org.jackhuang.hmcl.api.event.SimpleEvent;
import org.jackhuang.hmcl.api.func.Consumer;
/**
*
@@ -42,6 +44,11 @@ public class ProcessMonitor {
public ProcessMonitor(IProcess p) {
this.p = p;
inputThread = new ProcessThread(this, false);
errorThread = new ProcessThread(this, true);
inputThread.stopEvent.register(this::threadStopped);
inputThread.stopEvent.register(event -> processThreadStopped((ProcessThread) event.getSource()));
errorThread.stopEvent.register(this::threadStopped);
}
public IProcess getProcess() {
@@ -57,16 +64,17 @@ public class ProcessMonitor {
public void setTag(Object tag) {
this.tag = tag;
}
public void registerPrintlnEvent(Consumer<SimpleEvent<String>> c) {
inputThread.printlnEvent.register(c);
errorThread.printlnEvent.register(c);
}
public void start() {
MONITORS.add(this);
HMCLApi.EVENT_BUS.fireChannel(new JavaProcessStartingEvent(this, p));
inputThread = new ProcessThread(p, false);
errorThread = new ProcessThread(p, true);
inputThread.stopEvent.register(this::threadStopped);
inputThread.stopEvent.register(event -> processThreadStopped((ProcessThread) event.getSource()));
errorThread.stopEvent.register(this::threadStopped);
inputThread.start();
errorThread.start();
}
private void threadStopped() {

13
HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/ProcessThread.java
View File

@@ -33,25 +33,26 @@ import org.jackhuang.hmcl.api.IProcess;
*/
public class ProcessThread extends Thread {
IProcess p;
ProcessMonitor monitor;
boolean readError;
public final EventHandler<SimpleEvent<String>> printlnEvent = new EventHandler<>();
public final EventHandler<SimpleEvent<IProcess>> stopEvent = new EventHandler<>();
public ProcessThread(IProcess process, boolean readError) {
p = process;
public ProcessThread(ProcessMonitor monitor, boolean readError) {
this.monitor = monitor;
this.readError = readError;
setDaemon(readError);
}
public IProcess getProcess() {
return p;
return monitor.getProcess();
}
@Override
public void run() {
setName("ProcessMonitor");
BufferedReader br = null;
IProcess p = monitor.getProcess();
try {
InputStream in = readError ? p.getRawProcess().getErrorStream() : p.getRawProcess().getInputStream();
br = new BufferedReader(new InputStreamReader(in, Charsets.toCharset()));
@@ -59,12 +60,12 @@ public class ProcessThread extends Thread {
String line;
while (p.isRunning())
while ((line = br.readLine()) != null) {
printlnEvent.fire(new SimpleEvent<>(this, line));
printlnEvent.fire(new SimpleEvent<>(monitor, line));
System.out.println("MC: " + line);
p.getStdOutLines().add(line);
}
while ((line = br.readLine()) != null) {
printlnEvent.fire(new SimpleEvent<>(this, line));
printlnEvent.fire(new SimpleEvent<>(monitor, line));
System.out.println("MC: " + line);
p.getStdOutLines().add(line);
}

2
HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/DeleteFileTask.java
View File

@@ -33,7 +33,7 @@ public class DeleteFileTask extends Task {
}
@Override
public void executeTask(boolean areDependTasksSucceeded) throws Throwable {
public void executeTask(boolean areDependTasksSucceeded) throws IOException {
if (!f.delete()) throw new IOException("Failed to delete" + f);
}

2
HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/DoubleTask.java
View File

@@ -50,7 +50,7 @@ public class DoubleTask extends TaskInfo {
}
@Override
public void executeTask(boolean areDependTasksSucceeded) throws Throwable {
public void executeTask(boolean areDependTasksSucceeded) throws IllegalStateException {
if (!areDependTasksSucceeded)
throw new IllegalStateException("Depend tasks failed.");
}

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

@@ -31,7 +31,7 @@ public abstract class Task {
* @param areDependTasksSucceeded Would be true if all of tasks which this task depends on have succeed.
* @throws java.lang.Throwable If a task throws an exception, this task will be marked as `failed`.
*/
public abstract void executeTask(boolean areDependTasksSucceeded) throws Throwable;
public abstract void executeTask(boolean areDependTasksSucceeded) throws Exception;
/**
* if this func returns false, TaskList will force abort the thread. run in
@@ -56,10 +56,10 @@ public abstract class Task {
return hidden;
}
public Throwable getFailReason() {
public Exception getFailReason() {
return failReason;
}
protected Throwable failReason = null;
protected Exception failReason = null;
/**
* This method can be only invoked by TaskList.

2
HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N.lang
View File

@@ -33,6 +33,7 @@ launch.state.logging_in=Logging In
launch.state.generating_launching_codes=Generating Launching Codes
launch.state.downloading_libraries=Downloading dependencies
launch.state.decompressing_natives=Decompressing natives
launch.state.waiting_launching=Waiting for game launching
install.no_version=The version is not found.
install.no_version_if_intall=The required version is not found, do you wish to install the version automatically?
@@ -288,6 +289,7 @@ advancedsettings.Minecraft_arguments=Minecraft Arguments
advancedsettings.launcher_visibility.close=Close the launcher when the game launched.
advancedsettings.launcher_visibility.hide=Hide the launcher when the game launched.
advancedsettings.launcher_visibility.keep=Keep the launcher visible.
advancedsettings.launcher_visibility.hide_reopen=Hide the launcher and re-open when game closes.
advancedsettings.game_dir.default=Default (.minecraft/)
advancedsettings.game_dir.independent=Independent (.minecraft/versions/<version name>/, except assets,libraries)
advancedsettings.no_jvm_args=No Default JVM Args

2
HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N.properties
View File

@@ -33,6 +33,7 @@ launch.state.logging_in=Logging In
launch.state.generating_launching_codes=Generating Launching Codes
launch.state.downloading_libraries=Downloading dependencies
launch.state.decompressing_natives=Decompressing natives
launch.state.waiting_launching=Waiting for game launching
install.no_version=The version is not found.
install.no_version_if_intall=The required version is not found, do you wish to install the version automatically?
@@ -288,6 +289,7 @@ advancedsettings.Minecraft_arguments=Minecraft Arguments
advancedsettings.launcher_visibility.close=Close the launcher when the game launched.
advancedsettings.launcher_visibility.hide=Hide the launcher when the game launched.
advancedsettings.launcher_visibility.keep=Keep the launcher visible.
advancedsettings.launcher_visibility.hide_reopen=Hide the launcher and re-open when game closes.
advancedsettings.game_dir.default=Default (.minecraft/)
advancedsettings.game_dir.independent=Independent (.minecraft/versions/<version name>/, except assets,libraries)
advancedsettings.no_jvm_args=No Default JVM Args

2
HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_vi.lang
View File

@@ -33,6 +33,7 @@ launch.state.logging_in=Đang đăng nhập...
launch.state.generating_launching_codes=Đang tạo code chạy minecraft
launch.state.downloading_libraries=Downloading...
launch.state.decompressing_natives=Giải nén...
launch.state.waiting_launching=Waiting for game launching
install.no_version=Không tìm thấy phiên bản minecraft.
install.no_version_if_intall=Phiên bản cần thiết không thấy, có nên cài đặt phiên bản tự động không?
@@ -286,6 +287,7 @@ advancedsettings.Minecraft_arguments=Arguments của minecraft
advancedsettings.launcher_visibility.close=Đóng launcher sau khi minecraft được mở.
advancedsettings.launcher_visibility.hide=Ẩn launcher sau khi minecraft được mở.
advancedsettings.launcher_visibility.keep=Để cho launcher hiển thị.
advancedsettings.launcher_visibility.hide_reopen=Hide the launcher and re-open when game closes.
advancedsettings.game_dir.default=Mặc định (.minecraft/)
advancedsettings.game_dir.independent=Independent (.minecraft/versions/<version name>/, trừ thư mục assets,libraries)
advancedsettings.no_jvm_args=Không có arguments mặc định cho máy ảo java

2
HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_vi.properties
View File

@@ -33,6 +33,7 @@ launch.state.logging_in=\u0110ang \u0111\u0103ng nh\u1eadp...
launch.state.generating_launching_codes=\u0110ang t\u1ea1o code ch\u1ea1y minecraft
launch.state.downloading_libraries=Downloading...
launch.state.decompressing_natives=Gi\u1ea3i n\u00e9n...
launch.state.waiting_launching=Waiting for game launching
install.no_version=Kh\u00f4ng t\u00ecm th\u1ea5y phi\u00ean b\u1ea3n minecraft.
install.no_version_if_intall=Phi\u00ean b\u1ea3n c\u1ea7n thi\u1ebft kh\u00f4ng th\u1ea5y, c\u00f3 n\u00ean c\u00e0i \u0111\u1eb7t phi\u00ean b\u1ea3n t\u1ef1 \u0111\u1ed9ng kh\u00f4ng?
@@ -286,6 +287,7 @@ advancedsettings.Minecraft_arguments=Arguments c\u1ee7a minecraft
advancedsettings.launcher_visibility.close=\u0110\u00f3ng launcher sau khi minecraft \u0111\u01b0\u1ee3c m\u1edf.
advancedsettings.launcher_visibility.hide=\u1ea8n launcher sau khi minecraft \u0111\u01b0\u1ee3c m\u1edf.
advancedsettings.launcher_visibility.keep=\u0110\u1ec3 cho launcher hi\u1ec3n th\u1ecb.
advancedsettings.launcher_visibility.hide_reopen=Hide the launcher and re-open when game closes.
advancedsettings.game_dir.default=M\u1eb7c \u0111\u1ecbnh (.minecraft/)
advancedsettings.game_dir.independent=Independent (.minecraft/versions/<version name>/, tr\u1eeb th\u01b0 m\u1ee5c assets,libraries)
advancedsettings.no_jvm_args=Kh\u00f4ng c\u00f3 arguments m\u1eb7c \u0111\u1ecbnh cho m\u00e1y \u1ea3o java

2
HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh.lang
View File

@@ -33,6 +33,7 @@ launch.state.logging_in=登錄中
launch.state.generating_launching_codes=正在生成啟動代碼
launch.state.downloading_libraries=正在下載必要文件
launch.state.decompressing_natives=正在釋放執行庫
launch.state.waiting_launching=等待遊戲啟動
install.no_version=未找到要安裝的對應MC版本
install.no_version_if_intall=未找到要安裝的對應MC版本，是否自動安裝需要的MC版本？
@@ -288,6 +289,7 @@ advancedsettings.Minecraft_arguments=Minecraft額外參數(不必填寫)
advancedsettings.launcher_visibility.close=遊戲啟動後結束啟動器
advancedsettings.launcher_visibility.hide=遊戲啟動後隱藏啟動器
advancedsettings.launcher_visibility.keep=保持啟動器可見
advancedsettings.launcher_visibility.hide_reopen=隱藏啟動器並在遊戲結束後重新打開
advancedsettings.game_dir.default=預設(.minecraft/)
advancedsettings.game_dir.independent=各版本獨立(.minecraft/versions/<版本名>/,除assets,libraries)
advancedsettings.no_jvm_args=不添加預設的JVM參數(使用Java9時必勾)

2
HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh.properties
View File

@@ -33,6 +33,7 @@ launch.state.logging_in=\u767b\u9304\u4e2d
launch.state.generating_launching_codes=\u6b63\u5728\u751f\u6210\u555f\u52d5\u4ee3\u78bc
launch.state.downloading_libraries=\u6b63\u5728\u4e0b\u8f09\u5fc5\u8981\u6587\u4ef6
launch.state.decompressing_natives=\u6b63\u5728\u91cb\u653e\u57f7\u884c\u5eab
launch.state.waiting_launching=\u7b49\u5f85\u904a\u6232\u555f\u52d5
install.no_version=\u672a\u627e\u5230\u8981\u5b89\u88dd\u7684\u5c0d\u61c9MC\u7248\u672c
install.no_version_if_intall=\u672a\u627e\u5230\u8981\u5b89\u88dd\u7684\u5c0d\u61c9MC\u7248\u672c\uff0c\u662f\u5426\u81ea\u52d5\u5b89\u88dd\u9700\u8981\u7684MC\u7248\u672c\uff1f
@@ -288,6 +289,7 @@ advancedsettings.Minecraft_arguments=Minecraft\u984d\u5916\u53c3\u6578(\u4e0d\u5
advancedsettings.launcher_visibility.close=\u904a\u6232\u555f\u52d5\u5f8c\u7d50\u675f\u555f\u52d5\u5668
advancedsettings.launcher_visibility.hide=\u904a\u6232\u555f\u52d5\u5f8c\u96b1\u85cf\u555f\u52d5\u5668
advancedsettings.launcher_visibility.keep=\u4fdd\u6301\u555f\u52d5\u5668\u53ef\u898b
advancedsettings.launcher_visibility.hide_reopen=\u96b1\u85cf\u555f\u52d5\u5668\u4e26\u5728\u904a\u6232\u7d50\u675f\u5f8c\u91cd\u65b0\u6253\u958b
advancedsettings.game_dir.default=\u9810\u8a2d(.minecraft/)
advancedsettings.game_dir.independent=\u5404\u7248\u672c\u7368\u7acb(.minecraft/versions/<\u7248\u672c\u540d>/,\u9664assets,libraries)
advancedsettings.no_jvm_args=\u4e0d\u6dfb\u52a0\u9810\u8a2d\u7684JVM\u53c3\u6578(\u4f7f\u7528Java9\u6642\u5fc5\u52fe)

2
HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh_CN.lang
View File

@@ -33,6 +33,7 @@ launch.state.logging_in=登录中
launch.state.generating_launching_codes=正在生成启动代码
launch.state.downloading_libraries=正在下载必要文件
launch.state.decompressing_natives=正在释放本地文件
launch.state.waiting_launching=等待游戏启动
install.no_version=未找到要安装的对应MC版本
install.no_version_if_intall=未找到要安装的对应MC版本，是否自动安装需要的MC版本？
@@ -288,6 +289,7 @@ advancedsettings.Minecraft_arguments=Minecraft额外参数(不必填写)
advancedsettings.launcher_visibility.close=游戏启动后结束启动器
advancedsettings.launcher_visibility.hide=游戏启动后隐藏启动器
advancedsettings.launcher_visibility.keep=保持启动器可见
advancedsettings.launcher_visibility.hide_reopen=隐藏启动器并在游戏结束后重新打开
advancedsettings.game_dir.default=默认(.minecraft/)
advancedsettings.game_dir.independent=各版本独立(.minecraft/versions/<版本名>/,除assets,libraries)
advancedsettings.no_jvm_args=不添加默认的JVM参数(使用Java9时必勾)

2
HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh_CN.properties
View File

@@ -33,6 +33,7 @@ launch.state.logging_in=\u767b\u5f55\u4e2d
launch.state.generating_launching_codes=\u6b63\u5728\u751f\u6210\u542f\u52a8\u4ee3\u7801
launch.state.downloading_libraries=\u6b63\u5728\u4e0b\u8f7d\u5fc5\u8981\u6587\u4ef6
launch.state.decompressing_natives=\u6b63\u5728\u91ca\u653e\u672c\u5730\u6587\u4ef6
launch.state.waiting_launching=\u7b49\u5f85\u6e38\u620f\u542f\u52a8
install.no_version=\u672a\u627e\u5230\u8981\u5b89\u88c5\u7684\u5bf9\u5e94MC\u7248\u672c
install.no_version_if_intall=\u672a\u627e\u5230\u8981\u5b89\u88c5\u7684\u5bf9\u5e94MC\u7248\u672c\uff0c\u662f\u5426\u81ea\u52a8\u5b89\u88c5\u9700\u8981\u7684MC\u7248\u672c\uff1f
@@ -288,6 +289,7 @@ advancedsettings.Minecraft_arguments=Minecraft\u989d\u5916\u53c2\u6570(\u4e0d\u5
advancedsettings.launcher_visibility.close=\u6e38\u620f\u542f\u52a8\u540e\u7ed3\u675f\u542f\u52a8\u5668
advancedsettings.launcher_visibility.hide=\u6e38\u620f\u542f\u52a8\u540e\u9690\u85cf\u542f\u52a8\u5668
advancedsettings.launcher_visibility.keep=\u4fdd\u6301\u542f\u52a8\u5668\u53ef\u89c1
advancedsettings.launcher_visibility.hide_reopen=\u9690\u85cf\u542f\u52a8\u5668\u5e76\u5728\u6e38\u620f\u7ed3\u675f\u540e\u91cd\u65b0\u6253\u5f00
advancedsettings.game_dir.default=\u9ed8\u8ba4(.minecraft/)
advancedsettings.game_dir.independent=\u5404\u7248\u672c\u72ec\u7acb(.minecraft/versions/<\u7248\u672c\u540d>/,\u9664assets,libraries)
advancedsettings.no_jvm_args=\u4e0d\u6dfb\u52a0\u9ed8\u8ba4\u7684JVM\u53c2\u6570(\u4f7f\u7528Java9\u65f6\u5fc5\u52fe)