Some fixes and additions
Added log for GUI label. Removed quotes around jar path to make things work on linux.
This commit is contained in:
parent
c40c5fb131
commit
5ed0236888
@ -1,3 +0,0 @@
|
|||||||
Manifest-Version: 1.0
|
|
||||||
Main-Class: net.knarcraft.serverlauncher.Main
|
|
||||||
|
|
@ -27,7 +27,7 @@ import static net.knarcraft.serverlauncher.Shared.stringBetween;
|
|||||||
|
|
||||||
public class Main {
|
public class Main {
|
||||||
@SuppressWarnings("CanBeFinal")
|
@SuppressWarnings("CanBeFinal")
|
||||||
public static String appDir;
|
private static String appDir;
|
||||||
private static boolean running = false;
|
private static boolean running = false;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
@ -37,6 +37,11 @@ public class Main {
|
|||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
System.exit(1);
|
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) {
|
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.
|
* Reads from server processes, and writes the output to consoles.
|
||||||
*/
|
*/
|
||||||
|
@ -32,9 +32,9 @@ public class Profile {
|
|||||||
private static final ArrayList<Profile> profiles = new ArrayList<>();
|
private static final ArrayList<Profile> profiles = new ArrayList<>();
|
||||||
private static Profile current;
|
private static Profile current;
|
||||||
private static GUI gui;
|
private static GUI gui;
|
||||||
private static final String profilesDir = Main.appDir + File.separator + "files";
|
private static final String profilesDir = Main.getAppDir() + File.separator + "files";
|
||||||
private static final String profilesFile = Main.appDir + File.separator + "files" + File.separator + "Profiles.txt";
|
private static final String profilesFile = Main.getAppDir() + 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 jarDir = Main.getAppDir() + File.separator + "files" + File.separator + "Jars" + File.separator;
|
||||||
|
|
||||||
private final ArrayList<Collection> collections;
|
private final ArrayList<Collection> collections;
|
||||||
private final String name;
|
private final String name;
|
||||||
@ -139,6 +139,11 @@ public class Profile {
|
|||||||
this.downloadJars = value;
|
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) {
|
public static void setCurrent(String name) {
|
||||||
for (Profile profile : profiles) {
|
for (Profile profile : profiles) {
|
||||||
if (profile.name.equals(name)) {
|
if (profile.name.equals(name)) {
|
||||||
|
@ -25,7 +25,7 @@ public class Server {
|
|||||||
private static final String[] ramList = {
|
private static final String[] ramList = {
|
||||||
"512M", "1G", "2G", "3G", "4G", "5G", "6G", "7G", "8G", "9G", "10G","11G", "12G", "13G", "14G", "15G", "16G"
|
"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 final String name;
|
||||||
private String path;
|
private String path;
|
||||||
@ -293,9 +293,9 @@ public class Server {
|
|||||||
ProcessBuilder builder;
|
ProcessBuilder builder;
|
||||||
String serverPath;
|
String serverPath;
|
||||||
if (Profile.getCurrent().getDownloadJars() && !type.getName().equals("Custom")) {
|
if (Profile.getCurrent().getDownloadJars() && !type.getName().equals("Custom")) {
|
||||||
serverPath = "\"" + jarDir + this.getType() + "\"";
|
serverPath = jarDir + this.getType();
|
||||||
} else {
|
} else {
|
||||||
serverPath = "\"" + this.path + File.separator + this.getType() + "\"";
|
serverPath = this.path + File.separator + this.getType();
|
||||||
}
|
}
|
||||||
builder = new ProcessBuilder(
|
builder = new ProcessBuilder(
|
||||||
"java",
|
"java",
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package net.knarcraft.serverlauncher.userinterface;
|
package net.knarcraft.serverlauncher.userinterface;
|
||||||
|
|
||||||
|
import net.knarcraft.serverlauncher.Main;
|
||||||
import net.knarcraft.serverlauncher.profile.Collection;
|
import net.knarcraft.serverlauncher.profile.Collection;
|
||||||
import net.knarcraft.serverlauncher.server.Server;
|
import net.knarcraft.serverlauncher.server.Server;
|
||||||
import net.knarcraft.serverlauncher.profile.Profile;
|
import net.knarcraft.serverlauncher.profile.Profile;
|
||||||
@ -93,6 +94,11 @@ public class GUI implements ActionListener {
|
|||||||
*/
|
*/
|
||||||
public void setStatus(String text) {
|
public void setStatus(String text) {
|
||||||
this.lblStatuslabel.setText(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();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user