From 227e9141e9dd12f557d365a4830fa563091796d0 Mon Sep 17 00:00:00 2001 From: Kristian Knarvik Date: Fri, 19 Jan 2018 20:43:03 +0000 Subject: [PATCH] Fixes mistakes and adds comments --- Main.java | 82 +++++++++++++++++++++++++++++++++++++++---------- Server.java | 13 ++++++-- ServerType.java | 6 +++- 3 files changed, 81 insertions(+), 20 deletions(-) diff --git a/Main.java b/Main.java index 92ebff1..5f67c5a 100644 --- a/Main.java +++ b/Main.java @@ -2,48 +2,98 @@ import java.lang.Runtime; import java.util.ArrayList; import java.net.URL; import java.util.Scanner; +import java.io.InputStream; +import java.io.IOException; +import java.nio.file.StandardCopyOption; +import java.nio.file.*; +import java.net.MalformedURLException; public class Main { - public ArrayList servers = new ArrayList(); - public ArrayList serverTypes = new ArrayList(); + public static ArrayList servers = new ArrayList(); + public static ArrayList serverTypes = new ArrayList(); - private final BASEURL = "https://knarcraft.net/Api/Download/bungeeminecraftserverlauncher/jars"; - private final BUKKITURL = BASEURL + "/Bukkit/"; - private final MCPCURL = BASEURL + "/MCPC+/"; - private final SPIGOT = BASEURL + "/Spigot/"; + final String BASEURL = "https://knarcraft.net/Api/Download/bungeeminecraftserverlauncher/jars"; //The url we download jar files from. + final String BUKKITURL = BASEURL + "/Bukkit/"; + final String MCPCURL = BASEURL + "/MCPC+/"; + final String SPIGOT = BASEURL + "/Spigot/"; public static void main(String[] args) { addServerTypes(); } + /** + * Adds all the valid server types and versions. + */ public static void addServerTypes() { - serverTypes.add(new ServerType("Vanilla", {"Latest", "1.12", "1.11.2", "1.10.2", "1.9.4", "1.8.9", "1.7.10", "1.6.4", "1.5.2", "1.4.7", "1.3.2", "1.2.5"})); - serverTypes.add(new ServerType("Snapshot", {"Latest"})); - serverTypes.add(new ServerType("SpongeVanilla", {"1.11.2", "1.10.2", "1.8.9"})); - serverTypes.add(new ServerType("Spigot", {"1.12", "1.11.2", "1.10.2", "1.9.4", "1.9", "1.8.8", "1.7.10", "1.6.4", "1.5.2", "1.4.7"})); - serverTypes.add(new ServerType("MCPCplus", {"1.6.4", "1.6.2", "1.5.2", "1.4.7"})); - serverTypes.add(new ServerType("Craftbukkit", {"1.12", "1.11.2", "1.10.2", "1.9.4", "1.8.8", "1.7.10", "1.6.4", "1.5.2", "1.4.6", "1.3.2", "1.2.5", "1.1", "1.0"})); - serverTypes.add(new ServerType("Custom", {""})); + //This could be changed to read from a list which is downloaded to the user's computer. + serverTypes.add(new ServerType("Vanilla", new String[]{"Latest", "1.12", "1.11.2", "1.10.2", "1.9.4", "1.8.9", "1.7.10", "1.6.4", "1.5.2", "1.4.7", "1.3.2", "1.2.5"})); + serverTypes.add(new ServerType("Snapshot", new String[]{"Latest"})); + serverTypes.add(new ServerType("SpongeVanilla", new String[]{"1.11.2", "1.10.2", "1.8.9"})); + serverTypes.add(new ServerType("Spigot", new String[]{"1.12", "1.11.2", "1.10.2", "1.9.4", "1.9", "1.8.8", "1.7.10", "1.6.4", "1.5.2", "1.4.7"})); + serverTypes.add(new ServerType("MCPCplus", new String[]{"1.6.4", "1.6.2", "1.5.2", "1.4.7"})); + serverTypes.add(new ServerType("Craftbukkit", new String[]{"1.12", "1.11.2", "1.10.2", "1.9.4", "1.8.8", "1.7.10", "1.6.4", "1.5.2", "1.4.6", "1.3.2", "1.2.5", "1.1", "1.0"})); + serverTypes.add(new ServerType("Custom", new String[]{""})); } + /** + * Runs all enabled servers with their settings. + */ public static void startServers() { + //This should update the server status to running. The output should display in a custom commandline interface. for (Server server : servers) { if (server.isEnabled()) { String path = server.getPath(); String type = server.getType(); String ram = server.maxRam(); Runtime rt = Runtime.getRuntime(); - Process pr = rt.exec("java -Xmx" + ram + " -Xms512M -jar " + '"' + path + "\\" + type + '" nogui'); + try { + Process pr = rt.exec("java -Xmx" + ram + " -Xms512M -jar " + "\"" + path + "\\" + type + "\" nogui"); + long pid = pr.pid(); + server.updatePid(pid); + System.out.println("Success"); + } catch (IOException e) { + System.out.println(e); + } } } } - public static void readFile(String path) { + /** + * Reads the first line of a file from a website. + * This is used to find the newest version of the software. + * + * @param path The full url of the file to read. + * @return True if successfull. False otherwise. + */ + public static boolean readFile(String path) { + //We might need to change this to look for specific lines in the file to find vanilla and snapshot versions. + //The version should probably be returned. Empty or null on failiure. try { URL url = new URL(path); Scanner s = new Scanner(url.openStream()); System.out.println(s.next()); - } catch (java.io.IOException e) { + return true; + } catch (IOException e) { System.out.println(e); + return false; + } + } + + /** + * Downloads a file from a website. + * + * @param path The full url of the file to download. + * @param outfile The file to save to. + * @return True if successful. False otherwise. + */ + public static boolean downloadFile(String path, Path outfile) { + try { + URL url = new URL("https://knarcraft.net/Api/View/Jawns/Jawns%20instructions.txt"); + InputStream in = url.openStream(); + Files.copy(in, outfile, StandardCopyOption.REPLACE_EXISTING); + return true; + } catch (IOException e) { + System.out.println(e); + return false; } } } \ No newline at end of file diff --git a/Server.java b/Server.java index 9b90aba..d616ddc 100644 --- a/Server.java +++ b/Server.java @@ -1,6 +1,7 @@ import java.util.ArrayList; +//Contains all necessary information to create, run and manage a Minecraft server. public class Server { - private static String[17] ramList = {"512M", "1G", "2G", "3G", "4G", "5G", "6G", "7G", "8G", "9G", "10G", "11G", "12G", "13G", "14G", "15G", "16G"}; + private static String[] ramList = {"512M", "1G", "2G", "3G", "4G", "5G", "6G", "7G", "8G", "9G", "10G", "11G", "12G", "13G", "14G", "15G", "16G"}; private String name; private String path; private boolean enabled; @@ -8,15 +9,17 @@ public class Server { private ServerType type; private String serverVersion; private String maxRam; + private long pid; public Server(String name) { this.name = name; this.path = ""; - this.isEnabled = false; + this.enabled = false; this.playerList = new ArrayList(); this.type = null; this.serverVersion = null; this.maxRam = ramList[0]; + this.pid = -1; } public void addPlayer(String name) { @@ -37,7 +40,7 @@ public class Server { } public String getType() { - return this.type.getName() + this.version; + return this.type.getName() + this.serverVersion; } public boolean isEnabled() { @@ -47,4 +50,8 @@ public class Server { public String maxRam() { return this.maxRam; } + + public void updatePid(long pid) { + this.pid = pid; + } } \ No newline at end of file diff --git a/ServerType.java b/ServerType.java index 7203de2..bf62023 100644 --- a/ServerType.java +++ b/ServerType.java @@ -1,3 +1,7 @@ +import java.util.ArrayList; +/** + * Has a name and contains a list of valid server versions. + */ public class ServerType { private String name; private String[] versions; @@ -11,7 +15,7 @@ public class ServerType { return this.name; } - public ArrayList getVersions() { + public String[] getVersions() { return this.versions; } } \ No newline at end of file