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

Some fixes and additions

Browse Source 
Added log for GUI label.
Removed quotes around jar path to make things work on linux.
This commit is contained in:
Kristian Knarvik 2018-02-23 21:38:42 +01:00
parent c40c5fb131
commit 5ed0236888
5 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
out/production/Minecraft-Server-Launcher/META-INF/MANIFEST.MF
View File

@ -1,3 +0,0 @@
Manifest-Version: 1.0
Main-Class: net.knarcraft.serverlauncher.Main

11
src/net/knarcraft/serverlauncher/Main.java
View File

@ -27,7 +27,7 @@ import static net.knarcraft.serverlauncher.Shared.stringBetween;
public class Main {
@SuppressWarnings("CanBeFinal")
public static String appDir;
private static String appDir;
private static boolean running = false;
static {
@ -37,6 +37,11 @@ public class Main {
e.printStackTrace();
System.exit(1);
}
try (PrintWriter file = new PrintWriter(Main.getAppDir() + File.separator + "latestrun.log")) {
file.print("");
} catch (IOException e ) {
e.printStackTrace();
}
}
public static void main(String[] args) {
@ -63,6 +68,10 @@ public class Main {
}
}
public static String getAppDir() {
return appDir;
}
/**
* Reads from server processes, and writes the output to consoles.
*/

11
src/net/knarcraft/serverlauncher/profile/Profile.java
View File

@ -32,9 +32,9 @@ public class Profile {
private static final ArrayList<Profile> profiles = new ArrayList<>();
private static Profile current;
private static GUI gui;
private static final String profilesDir = Main.appDir + File.separator + "files";
private static final String profilesFile = Main.appDir + File.separator + "files" + File.separator + "Profiles.txt";
private static final String jarDir = Main.appDir + File.separator + "files" + File.separator + "Jars" + File.separator;
private static final String profilesDir = Main.getAppDir() + File.separator + "files";
private static final String profilesFile = Main.getAppDir() + File.separator + "files" + File.separator + "Profiles.txt";
private static final String jarDir = Main.getAppDir() + File.separator + "files" + File.separator + "Jars" + File.separator;
private final ArrayList<Collection> collections;
private final String name;
@ -139,6 +139,11 @@ public class Profile {
this.downloadJars = value;
}
/**
* Set the current profile to the profile with a certain name.
*
* @param name The name of the profile
*/
public static void setCurrent(String name) {
for (Profile profile : profiles) {
if (profile.name.equals(name)) {

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

@ -25,7 +25,7 @@ public class Server {
private static final String[] ramList = {
"512M", "1G", "2G", "3G", "4G", "5G", "6G", "7G", "8G", "9G", "10G","11G", "12G", "13G", "14G", "15G", "16G"
};
private static final String jarDir = Main.appDir + File.separator + "files" + File.separator + "Jars" + File.separator;
private static final String jarDir = Main.getAppDir() + File.separator + "files" + File.separator + "Jars" + File.separator;
private final String name;
private String path;
@ -293,9 +293,9 @@ public class Server {
ProcessBuilder builder;
String serverPath;
if (Profile.getCurrent().getDownloadJars() && !type.getName().equals("Custom")) {
serverPath = "\"" + jarDir + this.getType() + "\"";
serverPath = jarDir + this.getType();
} else {
serverPath = "\"" + this.path + File.separator + this.getType() + "\"";
serverPath = this.path + File.separator + this.getType();
}
builder = new ProcessBuilder(
"java",

6
src/net/knarcraft/serverlauncher/userinterface/GUI.java
View File

@ -1,5 +1,6 @@
package net.knarcraft.serverlauncher.userinterface;
import net.knarcraft.serverlauncher.Main;
import net.knarcraft.serverlauncher.profile.Collection;
import net.knarcraft.serverlauncher.server.Server;
import net.knarcraft.serverlauncher.profile.Profile;
@ -93,6 +94,11 @@ public class GUI implements ActionListener {
*/
public void setStatus(String text) {
this.lblStatuslabel.setText(text);
try (PrintWriter file = new PrintWriter(new FileWriter(Main.getAppDir() + File.separator + "latestrun.log", true))) {
file.println(text);
} catch (IOException e ) {
e.printStackTrace();
}
}
/**