5 Commits

Author SHA1 Message Date
46bb3a9e29 Merge branch 'master' of github.com:EpicKnarvik97/Minecraft-Server-Launcher 2018-02-27 10:59:17 +01:00
cf0d1f7fff More comments 2018-02-27 10:58:05 +01:00
6ba2397e40 Update README.md 2018-02-26 00:54:12 +00:00
2476e379e5 Merge branch 'master' of github.com:EpicKnarvik97/Minecraft-Server-Launcher 2018-02-23 21:44:21 +01:00
5ed0236888 Some fixes and additions
Added log for GUI label.
Removed quotes around jar path to make things work on linux.
2018-02-23 21:38:42 +01:00
6 changed files with 39 additions and 9 deletions

View File

@ -1,5 +1,5 @@
# Minecraft-Server-Launcher
I originally created this software in 2013 using AutoIt. Since I am now learning Java, and I have wanted to rewrite it for a long time, I am trying to recreate it in Java. It is currently missing mostly everything, but it's nothing a lot of work can't fix.
I originally created this software in 2013 using AutoIt. Since I am now learning Java, I have recreated it in Java.
The original version can be found at: https://knarcraft.net/Downloads/Bungeeminecraftserverlauncher/
Its goal is to do everything the original does, just better. The original is 1595 lines of code repetition and dirty code. I had no prior programming experience when I first started working on the original, which is why it became such a mess.

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) {
@ -45,7 +50,6 @@ public class Main {
setup();
new ServerConsoles();
Profile.load();
ScheduledExecutorService exec = Executors.newSingleThreadScheduledExecutor();
exec.scheduleAtFixedRate(Main::updateConsoles, 10, 500, TimeUnit.MILLISECONDS);
} catch (Exception e) {
@ -63,6 +67,10 @@ public class Main {
}
}
public static String getAppDir() {
return appDir;
}
/**
* Reads from server processes, and writes the output to consoles.
*/

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)) {

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",

View File

@ -42,6 +42,11 @@ public class ServerType {
return serverTypes;
}
/**
* Gets a list of all server types' names.
*
* @return A list of strings
*/
public static String[] getTypeNames() {
ArrayList<ServerType> types = ServerType.getServerTypes();
String[] serverTypes = new String[types.size()];
@ -51,6 +56,12 @@ public class ServerType {
return serverTypes;
}
/**
* Gets a server type by name.
*
* @param name Then name of the server type
* @return A ServerType
*/
public static ServerType getByName(String name) {
for (ServerType serverType : serverTypes) {
if (serverType.getName().equals(name)) {

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();
}
}
/**