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

Fixed not showing prompt when no version here

Browse Source
This commit is contained in:
huangyuhui
2017-02-12 22:56:44 +08:00
parent f756f32bda
commit 80599013f2
80 changed files with 1637 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java
View File

@@ -44,8 +44,8 @@ import org.jackhuang.hellominecraft.svrmgr.setting.SettingsManager;
import org.jackhuang.hellominecraft.svrmgr.util.MonitorThread;
import org.jackhuang.hellominecraft.svrmgr.util.WaitForThread;
import org.jackhuang.hellominecraft.svrmgr.util.Utilities;
import org.jackhuang.hellominecraft.util.Event;
import org.jackhuang.hellominecraft.util.EventHandler;
import org.jackhuang.hellominecraft.api.Event;
import org.jackhuang.hellominecraft.api.EventHandler;
import org.jackhuang.hellominecraft.util.code.Charsets;
import org.jackhuang.hellominecraft.util.func.Consumer;
@@ -133,7 +133,7 @@ public class Server implements Event<Integer>, MonitorThread.MonitorThreadListen
registerThreadC(server);
bw = new BufferedWriter(new OutputStreamWriter(server.getOutputStream(), Charsets.toCharset()));
isRunning = true;
startedEvent.execute(null);
startedEvent.fire(null);
sendStatus("*** 启动服务端中 ***");
} catch (IOException ex) {
Logger.getLogger(Server.class.getName()).log(Level.SEVERE, null, ex);
@@ -342,7 +342,7 @@ public class Server implements Event<Integer>, MonitorThread.MonitorThreadListen
Pattern p = Pattern.compile("\\[INFO\\] Done \\([0-9]*\\.[0-9]*s\\)! For help, type \"help\" or \"\\?\"");
Matcher m = p.matcher(status);
if (m.find()) {
stoppedEvent.execute(null);
stoppedEvent.fire(null);
timer = new Timer();
timerTasks.clear();
for (int i = 0; i < schedules.size(); i++) {

2
HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/MainWindow.java
View File

@@ -87,7 +87,7 @@ import org.jackhuang.hellominecraft.svrmgr.util.Utilities;
import org.jackhuang.hellominecraft.util.ui.SwingUtils;
import org.jackhuang.hellominecraft.svrmgr.util.version.MinecraftRemoteVersion;
import org.jackhuang.hellominecraft.lookandfeel.ConstomButton;
import org.jackhuang.hellominecraft.util.Event;
import org.jackhuang.hellominecraft.api.Event;
import org.jackhuang.hellominecraft.util.StrUtils;
/**

6
HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/WaitForThread.java
View File

@@ -17,7 +17,7 @@
*/
package org.jackhuang.hellominecraft.svrmgr.util;
import org.jackhuang.hellominecraft.util.EventHandler;
import org.jackhuang.hellominecraft.api.EventHandler;
import org.jackhuang.hellominecraft.util.log.HMCLog;
/**
@@ -37,10 +37,10 @@ public class WaitForThread extends Thread {
public void run() {
try {
int exitCode = p.waitFor();
event.execute(exitCode);
event.fire(exitCode);
} catch (InterruptedException ex) {
HMCLog.err("Game has been interrupted.", ex);
event.execute(-1);
event.fire(-1);
}
}