KnarCraft/Minecraft-Server-Launcher
KnarCraft/Minecraft-Server-Launcher
1
0
Fork 0
Code Issues 3 Pull Requests Releases 12 Wiki Activity

Comment and code additions

Browse Source 
More comments are added.
More work on downloading server jars is done.
Server test added.
This commit is contained in:
Kristian Knarvik 2018-01-25 11:38:47 +01:00
parent b6685edc6f
commit 0c2c26e153
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/knarcraft/serverlauncher/server/Server.java
View File

@ -127,6 +127,7 @@ public class Server {
throw new FileNotFoundException("Version file could not be downloaded."); throw new FileNotFoundException("Version file could not be downloaded.");
} }
newestVersion = stringBetween(versionText, type.getSrcStart(), type.getSrcEnd()); newestVersion = stringBetween(versionText, type.getSrcStart(), type.getSrcEnd());
System.out.println(newestVersion);
success = downloadFile(type.getDownloadURL() + newestVersion + type.getDownloadURLPart() + newestVersion + ".jar", filePath); success = downloadFile(type.getDownloadURL() + newestVersion + type.getDownloadURLPart() + newestVersion + ".jar", filePath);
//TODO: Register the new version number, and only download if version mismatch or missing file. //TODO: Register the new version number, and only download if version mismatch or missing file.
if (!success) { if (!success) {
@ -208,6 +209,7 @@ public class Server {
* @return The wanted substring. * @return The wanted substring.
*/ */
private String stringBetween(String string, String start, String end) { private String stringBetween(String string, String start, String end) {
return string.substring(string.indexOf(start) + 1 + start.length(), string.indexOf(end)); int startPos = string.indexOf(start) + start.length();
return string.substring(startPos, string.indexOf(end, startPos));
} }
} }

16
test/ServerTest.java
View File

@ -1,7 +1,6 @@
import net.knarcraft.serverlauncher.server.*; import net.knarcraft.serverlauncher.server.*;
import java.io.FileNotFoundException; import java.io.*;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
public class ServerTest { public class ServerTest {
@ -44,17 +43,24 @@ public class ServerTest {
if (server.isEnabled()) { if (server.isEnabled()) {
String path = server.getPath(); String path = server.getPath();
String type = server.getType(); String type = server.getType();
try { /* try {
server.downloadJar(); server.downloadJar();
System.out.println("File downloaded."); System.out.println("File downloaded.");
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
System.out.println("File was not found."); System.out.println("File was not found.");
return; return;
} }*/
String ram = server.maxRam(); String ram = server.maxRam();
Runtime rt = Runtime.getRuntime(); Runtime rt = Runtime.getRuntime();
try { try {
Process pr = rt.exec("java -Xmx" + ram + " -Xms512M -jar " + "\"" + path + "\\" + type + "\" nogui"); Process pr = rt.exec("java -Xmx" + ram + " -Xms512M -jar " + "\"" + path + "\\" + type + "\"", null, new File(server.getPath()));
String line;
BufferedReader in = new BufferedReader(
new InputStreamReader(pr.getInputStream()) );
while ((line = in.readLine()) != null) {
System.out.println(line);
}
in.close();
long pid = pr.pid(); long pid = pr.pid();
server.updatePid(pid); server.updatePid(pid);
System.out.println("Success"); System.out.println("Success");