Adds various fixes to make the two java versions work as expected
Makes it possible to load a controller without generating a GUI, for better testing Makes sure not to try and parse empty profile lines Saves controller settings in a more readable and appendable format Adds code for using the correct java version for the occasion Adds a new function for writing to files
This commit is contained in:
parent
6ec44f1f92
commit
f1eead3807
@ -1,7 +1,7 @@
|
||||
package net.knarcraft.minecraftserverlauncher;
|
||||
|
||||
import net.knarcraft.minecraftserverlauncher.profile.Collection;
|
||||
import net.knarcraft.minecraftserverlauncher.profile.Controller;
|
||||
import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController;
|
||||
import net.knarcraft.minecraftserverlauncher.server.Server;
|
||||
import net.knarcraft.minecraftserverlauncher.userinterface.ServerConsoles;
|
||||
import net.knarcraft.minecraftserverlauncher.userinterface.ServerLauncherGUI;
|
||||
@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
|
||||
public class Main {
|
||||
private static final String updateChannel = "beta";
|
||||
private static final String updateURL = "https://api.knarcraft.net/minecraftserverlauncher";
|
||||
private static final Controller controller = Controller.getInstance();
|
||||
private static final ServerLauncherController controller = ServerLauncherController.getInstance();
|
||||
private static String applicationWorkDirectory;
|
||||
private static boolean serversAreRunning = false;
|
||||
private static ServerLauncherGUI gui;
|
||||
@ -42,7 +42,7 @@ public class Main {
|
||||
}
|
||||
EventQueue.invokeLater(() -> {
|
||||
try {
|
||||
new ServerConsoles();
|
||||
ServerConsoles.instantiate();
|
||||
controller.loadState();
|
||||
gui = controller.getGUI();
|
||||
ScheduledExecutorService exec = Executors.newSingleThreadScheduledExecutor();
|
||||
@ -58,7 +58,7 @@ public class Main {
|
||||
*
|
||||
* @return <p>The controller used by the software</p>
|
||||
*/
|
||||
public static Controller getController() {
|
||||
public static ServerLauncherController getController() {
|
||||
return controller;
|
||||
}
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ import net.knarcraft.minecraftserverlauncher.utility.CommonFunctions;
|
||||
|
||||
import javax.naming.ConfigurationException;
|
||||
import javax.swing.*;
|
||||
import java.io.*;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
@ -230,7 +230,9 @@ public class Profile {
|
||||
*/
|
||||
public static Profile fromString(String profileString) throws ConfigurationException {
|
||||
Profile profile;
|
||||
if (profileString.contains("?")) {
|
||||
if (profileString.equals("")) {
|
||||
return null;
|
||||
} else if (profileString.contains("?")) {
|
||||
String[] data = profileString.split("\\?");
|
||||
String[] profileData = data[0].split(";", -1);
|
||||
profile = parseProfile(profileData);
|
||||
|
||||
@ -9,16 +9,20 @@ import net.knarcraft.minecraftserverlauncher.utility.CommonFunctions;
|
||||
import net.knarcraft.minecraftserverlauncher.utility.JarDownloader;
|
||||
|
||||
import javax.naming.ConfigurationException;
|
||||
import java.io.*;
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Scanner;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
/**
|
||||
* This class handles profiles, GUI creation and session restoration
|
||||
*/
|
||||
public class Controller {
|
||||
public class ServerLauncherController {
|
||||
|
||||
private final String workingDirectory = Main.getApplicationWorkDirectory() + File.separator + "files";
|
||||
private final String profilesFile = workingDirectory + File.separator + "Profiles.txt";
|
||||
@ -28,12 +32,14 @@ public class Controller {
|
||||
private ServerLauncherGUI serverLauncherGUI;
|
||||
private Profile currentProfile;
|
||||
private boolean downloadAllJars;
|
||||
private static Controller controller;
|
||||
private static ServerLauncherController controller;
|
||||
private String javaCommand = "java";
|
||||
private String oldJavaCommand = "java";
|
||||
|
||||
/**
|
||||
* Instantiates a new controller
|
||||
*/
|
||||
private Controller() {
|
||||
private ServerLauncherController() {
|
||||
this.profileList = new ArrayList<>();
|
||||
}
|
||||
|
||||
@ -42,9 +48,9 @@ public class Controller {
|
||||
*
|
||||
* @return <p>An instance of the controller</p>
|
||||
*/
|
||||
public static Controller getInstance() {
|
||||
public static ServerLauncherController getInstance() {
|
||||
if (controller == null) {
|
||||
controller = new Controller();
|
||||
controller = new ServerLauncherController();
|
||||
}
|
||||
return controller;
|
||||
}
|
||||
@ -85,6 +91,29 @@ public class Controller {
|
||||
return currentProfile.getDelayStartup();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the command for running java
|
||||
*
|
||||
* <p>To play on the newest version of Minecraft, this needs to be JDK 16. Can be just "java" or a file path.</p>
|
||||
*
|
||||
* @return <p>The command for running java</p>
|
||||
*/
|
||||
public String getJavaCommand() {
|
||||
return javaCommand;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the command for running older versions of java
|
||||
*
|
||||
* <p>The command used to run older minecraft server versions. JRE 8 should probably work.
|
||||
* Can be just "java" or a file path.</p>
|
||||
*
|
||||
* @return <p>The command for running older versions of java</p>
|
||||
*/
|
||||
public String getOldJavaCommand() {
|
||||
return oldJavaCommand;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
int guiWidth;
|
||||
@ -96,7 +125,8 @@ public class Controller {
|
||||
guiWidth = serverLauncherGUI.getSize().width;
|
||||
guiHeight = serverLauncherGUI.getSize().height;
|
||||
}
|
||||
return String.format("%s;%d;%d;%b", currentProfile.getName(), guiWidth, guiHeight, downloadAllJars);
|
||||
return String.format("selectedProfile;%s\nguiWidth;%d\nguiHeight;%d\ndownloadAllJars;%b\njavaCommand;%s\noldJavaCommand;%s",
|
||||
currentProfile.getName(), guiWidth, guiHeight, downloadAllJars, javaCommand, oldJavaCommand);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -171,37 +201,122 @@ public class Controller {
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads data about the controller from a save string
|
||||
* Sets the download all jars option
|
||||
*
|
||||
* @param data <p>The save string to load</p>
|
||||
* @return <p>The currently selected profile</p>
|
||||
* @throws IOException <p>If unable to create the GUI</p>
|
||||
* @param downloadAllJars <p>Whether to download all jars</p>
|
||||
*/
|
||||
private String fromString(String data) throws IOException {
|
||||
String[] dataList = data.split(";");
|
||||
this.downloadAllJars = Boolean.parseBoolean(dataList[3]);
|
||||
this.serverLauncherGUI = new ServerLauncherGUI(Integer.parseInt(dataList[1]), Integer.parseInt(dataList[2]));
|
||||
return dataList[0];
|
||||
public void setDownloadAllJars(boolean downloadAllJars) {
|
||||
this.downloadAllJars = downloadAllJars;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the currently selected profile
|
||||
*
|
||||
* @param profileName <p>The name of the currently selected profile</p>
|
||||
*/
|
||||
public void setCurrentProfile(String profileName) {
|
||||
this.currentProfile = getProfileByName(profileName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Saves the state of the entire application to disk
|
||||
*/
|
||||
public void saveState() {
|
||||
saveGUIStateToServer();
|
||||
try {
|
||||
CommonFunctions.createAllFolders();
|
||||
CommonFunctions.writeFile(mainFile, this.toString());
|
||||
StringBuilder builder = new StringBuilder();
|
||||
for (Profile profile : profileList) {
|
||||
builder.append(profile.toString()).append("\n");
|
||||
}
|
||||
CommonFunctions.writeFile(profilesFile, builder.toString());
|
||||
} catch (IOException e) {
|
||||
serverLauncherGUI.showError("Unable to save data.");
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads profiles and servers from a text file
|
||||
*/
|
||||
public void loadState() throws ConfigurationException, IOException {
|
||||
loadState(false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads profiles and servers from a text file
|
||||
*
|
||||
* @param silent <p>If silent, no GUI will be created</p>
|
||||
*/
|
||||
public void loadState(boolean silent) throws ConfigurationException, IOException {
|
||||
//Loads data regarding this controller
|
||||
String currentProfile = null;
|
||||
if (new File(mainFile).exists()) {
|
||||
String controllerData = CommonFunctions.readFile(mainFile);
|
||||
currentProfile = this.fromString(controllerData);
|
||||
} else {
|
||||
currentProfile = this.fromString(silent);
|
||||
} else if (!silent) {
|
||||
this.serverLauncherGUI = new ServerLauncherGUI();
|
||||
}
|
||||
if (silent) {
|
||||
return;
|
||||
}
|
||||
//Loads all saved profiles
|
||||
loadProfiles(currentProfile);
|
||||
//Makes the GUI show the loaded data
|
||||
executeGUILoadingTasks();
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads data about the controller from a save string
|
||||
*
|
||||
* @param silent <p>If silent, no GUI will be created</p>
|
||||
* @return <p>The currently selected profile</p>
|
||||
*/
|
||||
private String fromString(boolean silent) {
|
||||
Map<String, String> loadedData = new HashMap<>();
|
||||
|
||||
try {
|
||||
String currentData = CommonFunctions.readFile(mainFile);
|
||||
for (String line : currentData.split("\n")) {
|
||||
parseSaveLine(loadedData, line);
|
||||
}
|
||||
this.downloadAllJars = Boolean.parseBoolean(loadedData.get("downloadAllJars"));
|
||||
|
||||
if (!silent) {
|
||||
this.serverLauncherGUI = new ServerLauncherGUI(Integer.parseInt(loadedData.get("guiWidth")),
|
||||
Integer.parseInt(loadedData.get("guiHeight")));
|
||||
} else {
|
||||
this.serverLauncherGUI = new ServerLauncherGUI(true);
|
||||
}
|
||||
|
||||
if (loadedData.get("javaCommand") != null) {
|
||||
this.javaCommand = loadedData.get("javaCommand");
|
||||
}
|
||||
if (loadedData.get("oldJavaCommand") != null) {
|
||||
this.oldJavaCommand = loadedData.get("oldJavaCommand");
|
||||
}
|
||||
return loadedData.get("selectedProfile");
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Saves one config line to the provided map
|
||||
*
|
||||
* @param loadedData <p>The map to save the loaded configuration to</p>
|
||||
* @param line <p>The line to read</p>
|
||||
*/
|
||||
private void parseSaveLine(Map<String, String> loadedData, String line) {
|
||||
String[] lineData = line.split(";");
|
||||
if (lineData.length != 2) {
|
||||
return;
|
||||
}
|
||||
|
||||
loadedData.put(lineData[0], lineData[1]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads all saved profiles
|
||||
*
|
||||
@ -213,6 +328,9 @@ public class Controller {
|
||||
while (in.hasNextLine()) {
|
||||
String profileData = in.nextLine();
|
||||
Profile loadedProfile = Profile.fromString(profileData);
|
||||
if (loadedProfile == null) {
|
||||
continue;
|
||||
}
|
||||
profileList.add(loadedProfile);
|
||||
}
|
||||
} catch (FileNotFoundException e) {
|
||||
@ -248,45 +366,6 @@ public class Controller {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the download all jars option
|
||||
*
|
||||
* @param downloadAllJars <p>Whether to download all jars</p>
|
||||
*/
|
||||
public void setDownloadAllJars(boolean downloadAllJars) {
|
||||
this.downloadAllJars = downloadAllJars;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the currently selected profile
|
||||
*
|
||||
* @param profileName <p>The name of the currently selected profile</p>
|
||||
*/
|
||||
public void setCurrentProfile(String profileName) {
|
||||
this.currentProfile = getProfileByName(profileName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Saves the state of the entire application to disk
|
||||
*/
|
||||
public void saveState() {
|
||||
saveGUIStateToServer();
|
||||
try {
|
||||
CommonFunctions.createAllFolders();
|
||||
PrintWriter mFile = new PrintWriter(mainFile);
|
||||
mFile.println(this);
|
||||
mFile.close();
|
||||
PrintWriter pFile = new PrintWriter(profilesFile);
|
||||
for (Profile profile : profileList) {
|
||||
pFile.println(profile.toString());
|
||||
}
|
||||
pFile.close();
|
||||
} catch (FileNotFoundException e) {
|
||||
serverLauncherGUI.showError("Unable to save data.");
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the server object with the current state of the GUI server tab
|
||||
*/
|
||||
@ -2,7 +2,7 @@ package net.knarcraft.minecraftserverlauncher.server;
|
||||
|
||||
import net.knarcraft.minecraftserverlauncher.Main;
|
||||
import net.knarcraft.minecraftserverlauncher.profile.Collection;
|
||||
import net.knarcraft.minecraftserverlauncher.profile.Controller;
|
||||
import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController;
|
||||
import net.knarcraft.minecraftserverlauncher.server.servertypes.ServerType;
|
||||
import net.knarcraft.minecraftserverlauncher.utility.CommonFunctions;
|
||||
|
||||
@ -147,6 +147,7 @@ public class Server {
|
||||
|
||||
/**
|
||||
* Kills all server processes
|
||||
*
|
||||
* @throws InterruptedException <p>If interrupted waiting for any of the servers to stop</p>
|
||||
*/
|
||||
private static void killServers() throws InterruptedException {
|
||||
@ -158,6 +159,7 @@ public class Server {
|
||||
|
||||
/**
|
||||
* Kills the given server after waiting 30 seconds for it to terminate normally
|
||||
*
|
||||
* @param server <p>The server to kill</p>
|
||||
* @throws InterruptedException <p>If interrupted waiting for the server to stop</p>
|
||||
*/
|
||||
@ -174,7 +176,7 @@ public class Server {
|
||||
* Runs all enabled servers with their settings
|
||||
*/
|
||||
public static void startServers() {
|
||||
Controller controller = Main.getController();
|
||||
ServerLauncherController controller = Main.getController();
|
||||
controller.getGUI().setStatus("Starting servers");
|
||||
int serverNum = 0;
|
||||
for (Collection collection : controller.getCurrentProfile().getCollections()) {
|
||||
@ -429,6 +431,23 @@ public class Server {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the correct java command to use for the selected server version
|
||||
*
|
||||
* @return <p>The java version to run</p>
|
||||
*/
|
||||
private String getJavaCommand() {
|
||||
ServerLauncherController controller = ServerLauncherController.getInstance();
|
||||
if (serverVersion.toLowerCase().contains("latest")) {
|
||||
return controller.getJavaCommand();
|
||||
} else if (serverVersion.contains(".") && serverVersion.split("\\.").length >= 2 &&
|
||||
Integer.parseInt(serverVersion.split("\\.")[1]) >= 17) {
|
||||
return controller.getJavaCommand();
|
||||
} else {
|
||||
return controller.getOldJavaCommand();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the process running this server
|
||||
*
|
||||
@ -443,7 +462,7 @@ public class Server {
|
||||
} else {
|
||||
serverPath = jarDirectory + this.type.getName() + serverVersion + ".jar";
|
||||
}
|
||||
builder = new ProcessBuilder("java", "-Xmx" + this.maxRam, "-Xms512M",
|
||||
builder = new ProcessBuilder(getJavaCommand(), "-Xmx" + this.maxRam, "-Xms512M",
|
||||
"-Djline.terminal=jline.UnsupportedTerminal", "-Dcom.mojang.eula.agree=true", "-jar", serverPath,
|
||||
"nogui");
|
||||
builder.directory(new File(this.path));
|
||||
@ -532,6 +551,7 @@ public class Server {
|
||||
|
||||
/**
|
||||
* Returns the first regex capture group found in a pattern
|
||||
*
|
||||
* @param pattern <p>The regex pattern to use</p>
|
||||
* @param text <p>The string to execute the pattern on</p>
|
||||
* @return <p>The first capture group if a match is found. An empty string otherwise</p>
|
||||
@ -569,7 +589,7 @@ public class Server {
|
||||
* @return <p>True if nothing went wrong</p>
|
||||
*/
|
||||
private boolean initializeJarDownload() {
|
||||
Controller controller = Main.getController();
|
||||
ServerLauncherController controller = Main.getController();
|
||||
if (!controller.getDownloadAllJars()) {
|
||||
try {
|
||||
controller.getGUI().setStatus("Downloading jar...");
|
||||
|
||||
@ -1,6 +1,17 @@
|
||||
package net.knarcraft.minecraftserverlauncher.server;
|
||||
|
||||
import net.knarcraft.minecraftserverlauncher.server.servertypes.*;
|
||||
import net.knarcraft.minecraftserverlauncher.server.servertypes.BungeeCord;
|
||||
import net.knarcraft.minecraftserverlauncher.server.servertypes.CraftBukkit;
|
||||
import net.knarcraft.minecraftserverlauncher.server.servertypes.Custom;
|
||||
import net.knarcraft.minecraftserverlauncher.server.servertypes.MCPCPlus;
|
||||
import net.knarcraft.minecraftserverlauncher.server.servertypes.Paper;
|
||||
import net.knarcraft.minecraftserverlauncher.server.servertypes.ServerType;
|
||||
import net.knarcraft.minecraftserverlauncher.server.servertypes.Spigot;
|
||||
import net.knarcraft.minecraftserverlauncher.server.servertypes.SpongeForge;
|
||||
import net.knarcraft.minecraftserverlauncher.server.servertypes.SpongeVanilla;
|
||||
import net.knarcraft.minecraftserverlauncher.server.servertypes.Travertine;
|
||||
import net.knarcraft.minecraftserverlauncher.server.servertypes.Vanilla;
|
||||
import net.knarcraft.minecraftserverlauncher.server.servertypes.Waterfall;
|
||||
|
||||
import javax.naming.ConfigurationException;
|
||||
import java.io.FileNotFoundException;
|
||||
|
||||
@ -3,7 +3,10 @@ package net.knarcraft.minecraftserverlauncher.server;
|
||||
import net.knarcraft.minecraftserverlauncher.Main;
|
||||
import net.knarcraft.minecraftserverlauncher.utility.CommonFunctions;
|
||||
|
||||
import java.io.*;
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.io.PrintWriter;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@ -122,8 +125,8 @@ public class ServerVersionContainer {
|
||||
if (!new File(versionFile).exists()) {
|
||||
return;
|
||||
}
|
||||
try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(versionFile)))) {
|
||||
String currentData = CommonFunctions.readBufferedReader(reader);
|
||||
try {
|
||||
String currentData = CommonFunctions.readFile(versionFile);
|
||||
for (String line : currentData.split("\n")) {
|
||||
parseSaveLine(line);
|
||||
}
|
||||
|
||||
@ -5,7 +5,11 @@ import net.knarcraft.minecraftserverlauncher.Main;
|
||||
import javax.swing.*;
|
||||
import javax.swing.text.DefaultCaret;
|
||||
import java.awt.*;
|
||||
import java.awt.event.*;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
import java.awt.event.KeyAdapter;
|
||||
import java.awt.event.KeyEvent;
|
||||
import java.awt.event.KeyListener;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import static javax.swing.text.DefaultCaret.ALWAYS_UPDATE;
|
||||
@ -77,6 +81,7 @@ public class Console extends KeyAdapter implements ActionListener, KeyListener {
|
||||
|
||||
/**
|
||||
* Truncates the first 50 lines if the console output has reached the max limit
|
||||
*
|
||||
* @param outputLines <p>The currently readable lines in the console output field</p>
|
||||
*/
|
||||
private void truncateConsole(int outputLines) {
|
||||
|
||||
@ -17,16 +17,22 @@ public class ServerConsoles {
|
||||
private static JFrame frame;
|
||||
private static JTabbedPane consolesTabbedPane;
|
||||
|
||||
private ServerConsoles() {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Initializes the server consoles frame
|
||||
*/
|
||||
public ServerConsoles() {
|
||||
public static void instantiate() {
|
||||
if (frame == null || consolesTabbedPane == null) {
|
||||
frame = new JFrame();
|
||||
frame.setBounds(100, 100, 450, 300);
|
||||
frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
|
||||
consolesTabbedPane = new JTabbedPane(JTabbedPane.TOP);
|
||||
frame.getContentPane().add(consolesTabbedPane, BorderLayout.CENTER);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a new console tab
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
package net.knarcraft.minecraftserverlauncher.userinterface;
|
||||
|
||||
import net.knarcraft.minecraftserverlauncher.profile.Collection;
|
||||
import net.knarcraft.minecraftserverlauncher.profile.Controller;
|
||||
import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.awt.event.ActionEvent;
|
||||
@ -25,7 +25,7 @@ public class ServerControlTab implements ActionListener {
|
||||
private JButton showConsolesButton;
|
||||
private JTextField customCommandTextField;
|
||||
|
||||
private Controller controller = Controller.getInstance();
|
||||
private final ServerLauncherController controller = ServerLauncherController.getInstance();
|
||||
private final ArrayList<String> globalPlayers;
|
||||
|
||||
/**
|
||||
@ -149,7 +149,7 @@ public class ServerControlTab implements ActionListener {
|
||||
public void update() {
|
||||
this.targetServerCombo.removeAllItems();
|
||||
this.targetServerCombo.addItem("All");
|
||||
for (Collection collection : Controller.getInstance().getCurrentProfile().getCollections()) {
|
||||
for (Collection collection : ServerLauncherController.getInstance().getCurrentProfile().getCollections()) {
|
||||
this.targetServerCombo.addItem(collection.getName());
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@ package net.knarcraft.minecraftserverlauncher.userinterface;
|
||||
|
||||
import net.knarcraft.minecraftserverlauncher.Main;
|
||||
import net.knarcraft.minecraftserverlauncher.profile.Collection;
|
||||
import net.knarcraft.minecraftserverlauncher.profile.Controller;
|
||||
import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController;
|
||||
import net.knarcraft.minecraftserverlauncher.server.Server;
|
||||
import net.knarcraft.minecraftserverlauncher.utility.CommonFunctions;
|
||||
|
||||
@ -12,15 +12,16 @@ import javax.swing.*;
|
||||
import java.awt.*;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
import java.awt.event.MouseAdapter;
|
||||
import java.awt.event.MouseEvent;
|
||||
import java.awt.event.WindowAdapter;
|
||||
import java.awt.event.WindowEvent;
|
||||
import java.io.*;
|
||||
import java.util.*;
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileWriter;
|
||||
import java.io.IOException;
|
||||
import java.io.PrintWriter;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Scanner;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
import static java.awt.Frame.NORMAL;
|
||||
import static javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE;
|
||||
import static net.knarcraft.minecraftserverlauncher.utility.CommonFunctions.getResourceAsScanner;
|
||||
import static net.knarcraft.minecraftserverlauncher.utility.CommonFunctions.getResourceAsStream;
|
||||
@ -35,7 +36,7 @@ import static net.knarcraft.minecraftserverlauncher.utility.CommonFunctions.getR
|
||||
public class ServerLauncherGUI extends MessageHandler implements ActionListener, GUI {
|
||||
|
||||
private final JLabel lblStatuslabel = new JLabel("Servers are stopped");
|
||||
private Controller controller;
|
||||
private final ServerLauncherController controller;
|
||||
private Map<String, String> textStrings;
|
||||
private Tray applicationTray;
|
||||
|
||||
@ -64,6 +65,20 @@ public class ServerLauncherGUI extends MessageHandler implements ActionListener,
|
||||
this.controller = Main.getController();
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates the application window
|
||||
*
|
||||
* @param silent <p>Whether to make the GUI silent (hidden, for testing)</p>
|
||||
*/
|
||||
public ServerLauncherGUI(boolean silent) throws IOException {
|
||||
super(silent);
|
||||
if (!silent) {
|
||||
initialize(440, 170);
|
||||
}
|
||||
loadMessages();
|
||||
this.controller = Main.getController();
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates the application window with a preferred width and height
|
||||
*
|
||||
@ -146,7 +161,7 @@ public class ServerLauncherGUI extends MessageHandler implements ActionListener,
|
||||
* Updates ServerLauncherGUI according to current profile settings
|
||||
*/
|
||||
public void updateWithSavedProfileData() {
|
||||
Controller controller = Main.getController();
|
||||
ServerLauncherController controller = Main.getController();
|
||||
serversPane.removeAll();
|
||||
serverLauncherMenu.update();
|
||||
serverControlTab.update();
|
||||
@ -311,7 +326,6 @@ public class ServerLauncherGUI extends MessageHandler implements ActionListener,
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Handles buttons and the combo on the main tab
|
||||
*
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
package net.knarcraft.minecraftserverlauncher.userinterface;
|
||||
|
||||
import net.knarcraft.minecraftserverlauncher.profile.Controller;
|
||||
import net.knarcraft.minecraftserverlauncher.profile.Profile;
|
||||
import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController;
|
||||
import net.knarcraft.minecraftserverlauncher.utility.CommonFunctions;
|
||||
|
||||
import javax.swing.*;
|
||||
@ -14,7 +14,7 @@ import java.util.Objects;
|
||||
*/
|
||||
public class ServerLauncherMenu implements ActionListener {
|
||||
|
||||
private JMenuBar menuBar;
|
||||
private final JMenuBar menuBar;
|
||||
//Options
|
||||
private JCheckBoxMenuItem runInBackgroundCheckBoxMenuItem;
|
||||
private JCheckBoxMenuItem delayStartupCheckBoxMenuItem;
|
||||
@ -31,8 +31,8 @@ public class ServerLauncherMenu implements ActionListener {
|
||||
private JMenuItem aboutMenuItem;
|
||||
private JMenuItem storyMenuItem;
|
||||
|
||||
private Controller controller;
|
||||
private ServerLauncherGUI serverLauncherGUI;
|
||||
private final ServerLauncherController controller;
|
||||
private final ServerLauncherGUI serverLauncherGUI;
|
||||
|
||||
/**
|
||||
* Initializes a new server launcher menu
|
||||
@ -41,7 +41,7 @@ public class ServerLauncherMenu implements ActionListener {
|
||||
* @param serverLauncherGUI <p>The server launcher GUI to use</p>
|
||||
*/
|
||||
public ServerLauncherMenu(JMenuBar menuBar, ServerLauncherGUI serverLauncherGUI) {
|
||||
this.controller = Controller.getInstance();
|
||||
this.controller = ServerLauncherController.getInstance();
|
||||
this.menuBar = menuBar;
|
||||
this.serverLauncherGUI = serverLauncherGUI;
|
||||
initialize();
|
||||
|
||||
@ -1,13 +1,17 @@
|
||||
package net.knarcraft.minecraftserverlauncher.userinterface;
|
||||
|
||||
import net.knarcraft.minecraftserverlauncher.Main;
|
||||
import net.knarcraft.minecraftserverlauncher.profile.Controller;
|
||||
import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController;
|
||||
import net.knarcraft.minecraftserverlauncher.utility.CommonFunctions;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
import javax.swing.*;
|
||||
import java.awt.*;
|
||||
import java.awt.event.*;
|
||||
import java.awt.event.ActionListener;
|
||||
import java.awt.event.MouseAdapter;
|
||||
import java.awt.event.MouseEvent;
|
||||
import java.awt.event.WindowAdapter;
|
||||
import java.awt.event.WindowEvent;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
@ -20,9 +24,9 @@ public class Tray {
|
||||
|
||||
private SystemTray tray;
|
||||
private TrayIcon trayIcon;
|
||||
private Controller controller;
|
||||
private ServerLauncherGUI serverLauncherGUI;
|
||||
private JFrame mainFrame;
|
||||
private final ServerLauncherController controller;
|
||||
private final ServerLauncherGUI serverLauncherGUI;
|
||||
private final JFrame mainFrame;
|
||||
|
||||
/**
|
||||
* Instantiates a new tray
|
||||
|
||||
@ -12,7 +12,8 @@ public class WebBrowser {
|
||||
private static JFrame browserFrame;
|
||||
private static JTextPane editorPane;
|
||||
|
||||
private WebBrowser() {}
|
||||
private WebBrowser() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Instantiates a new web browser
|
||||
@ -44,7 +45,8 @@ public class WebBrowser {
|
||||
editorPane.setContentType("text/html");
|
||||
editorPane.addHyperlinkListener(hyperlinkEvent -> {
|
||||
if (hyperlinkEvent.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) {
|
||||
displayPage(hyperlinkEvent.getURL().toString()); }
|
||||
displayPage(hyperlinkEvent.getURL().toString());
|
||||
}
|
||||
});
|
||||
} catch (IOException e) {
|
||||
editorPane.setContentType("text/html");
|
||||
|
||||
@ -6,7 +6,17 @@ import net.knarcraft.minecraftserverlauncher.server.Server;
|
||||
import net.knarcraft.minecraftserverlauncher.userinterface.GUI;
|
||||
import net.knarcraft.minecraftserverlauncher.userinterface.WebBrowser;
|
||||
|
||||
import java.io.*;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.OutputStream;
|
||||
import java.io.OutputStreamWriter;
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.net.URL;
|
||||
@ -107,6 +117,17 @@ public final class CommonFunctions {
|
||||
return new Scanner(url.openStream()).useDelimiter("\\Z").next();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a buffered reader for reading a given file
|
||||
*
|
||||
* @param path <p>The path of the file to read</p>
|
||||
* @return <p>A buffered reader for reading the file</p>
|
||||
* @throws FileNotFoundException <p>If the file does not exist</p>
|
||||
*/
|
||||
public static BufferedReader getFileReader(String path) throws FileNotFoundException {
|
||||
return new BufferedReader(new InputStreamReader(new FileInputStream(path)));
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads a file from disk
|
||||
*
|
||||
@ -115,7 +136,28 @@ public final class CommonFunctions {
|
||||
* @throws IOException <p>If unable to find or read the file</p>
|
||||
*/
|
||||
public static String readFile(String path) throws IOException {
|
||||
return CommonFunctions.readBufferedReader(new BufferedReader(new InputStreamReader(new FileInputStream(path))));
|
||||
return CommonFunctions.readBufferedReader(getFileReader(path));
|
||||
}
|
||||
|
||||
public static void writeFile(String path, String text) throws IOException {
|
||||
writeFile(path, text, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Writes text to a file
|
||||
*
|
||||
* @param path <p>The path of the file to write to</p>
|
||||
* @param text <p>The text to write</p>
|
||||
* @param addTrailingNewline <p>Whether to add a new line at the end of the file</p>
|
||||
* @throws IOException <p>If unable to write to the file</p>
|
||||
*/
|
||||
public static void writeFile(String path, String text, Boolean addTrailingNewline) throws IOException {
|
||||
BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(path)));
|
||||
writer.write(text);
|
||||
if (addTrailingNewline) {
|
||||
writer.newLine();
|
||||
}
|
||||
writer.close();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -262,6 +304,7 @@ public final class CommonFunctions {
|
||||
|
||||
/**
|
||||
* Removes all files within a folder
|
||||
*
|
||||
* @param target <p>The folder to delete from</p>
|
||||
*/
|
||||
static void removeFilesRecursively(File target) {
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package net.knarcraft.minecraftserverlauncher.utility;
|
||||
|
||||
import net.knarcraft.minecraftserverlauncher.Main;
|
||||
import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController;
|
||||
import net.knarcraft.minecraftserverlauncher.server.ServerVersionContainer;
|
||||
import net.knarcraft.minecraftserverlauncher.userinterface.GUI;
|
||||
|
||||
@ -21,9 +22,11 @@ public class JarBuilder {
|
||||
private final String jarDirectory;
|
||||
private final ServerVersionContainer versionContainer;
|
||||
private final GUI gui;
|
||||
private final String javaCommand;
|
||||
|
||||
/**
|
||||
* Instantiates a new jar builder
|
||||
*
|
||||
* @param buildDirectory <p>The directory containing BuildTool files</p>
|
||||
* @param jarDirectory <p>The directory containing downloaded .jar files</p>
|
||||
* @param gui <p>The GUI to write messages to</p>
|
||||
@ -33,6 +36,7 @@ public class JarBuilder {
|
||||
this.jarDirectory = jarDirectory;
|
||||
this.gui = gui;
|
||||
this.versionContainer = ServerVersionContainer.getInstance();
|
||||
this.javaCommand = ServerLauncherController.getInstance().getJavaCommand();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -40,7 +44,7 @@ public class JarBuilder {
|
||||
*/
|
||||
public void buildSpigotJar() {
|
||||
downloadBuildTools();
|
||||
ProcessBuilder processBuilder = new ProcessBuilder("java", "-jar", "BuildTools.jar", "--rev",
|
||||
ProcessBuilder processBuilder = new ProcessBuilder(javaCommand, "-jar", "BuildTools.jar", "--rev",
|
||||
"latest", "--output-dir", jarDirectory);
|
||||
if (executeBuildProcess(processBuilder) && moveBuiltJar("spigot-", "SpigotLatest.jar")) {
|
||||
gui.setStatus("Finished moving spigot.jar");
|
||||
@ -52,7 +56,7 @@ public class JarBuilder {
|
||||
*/
|
||||
public void buildBukkitJar() {
|
||||
downloadBuildTools();
|
||||
ProcessBuilder processBuilder = new ProcessBuilder("java", "-jar", "BuildTools.jar", "--compile",
|
||||
ProcessBuilder processBuilder = new ProcessBuilder(javaCommand, "-jar", "BuildTools.jar", "--compile",
|
||||
"craftbukkit", "--rev", "latest", "--output-dir", jarDirectory);
|
||||
if (executeBuildProcess(processBuilder) && moveBuiltJar("craftbukkit-", "BukkitLatest.jar")) {
|
||||
gui.setStatus("Finished moving craftbukkit.jar");
|
||||
@ -84,6 +88,7 @@ public class JarBuilder {
|
||||
|
||||
/**
|
||||
* Moves a built .jar file to its target file
|
||||
*
|
||||
* @param searchString <p>The start of the name of the built file used to find it</p>
|
||||
* @param newName <p>The new name of the built file</p>
|
||||
* @return <p>True if the .jar file was moved successfully</p>
|
||||
@ -108,6 +113,7 @@ public class JarBuilder {
|
||||
|
||||
/**
|
||||
* Starts the build process and initializes
|
||||
*
|
||||
* @param processBuilder <p>The process builder to execute</p>
|
||||
* @return <p>True if the process exited successfully</p>
|
||||
*/
|
||||
@ -141,6 +147,7 @@ public class JarBuilder {
|
||||
|
||||
/**
|
||||
* Gets the latest build tools version available
|
||||
*
|
||||
* @return <p>The latest build tools version available</p>
|
||||
* @throws IOException <p>If unable to read the version file</p>
|
||||
*/
|
||||
|
||||
@ -5,9 +5,12 @@ import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParser;
|
||||
import net.knarcraft.minecraftserverlauncher.Main;
|
||||
import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.io.*;
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.Scanner;
|
||||
|
||||
@ -81,8 +84,9 @@ public final class Updater {
|
||||
* @throws IOException <p>If unable to run the updater</p>
|
||||
*/
|
||||
private static void runUpdater(String url) throws IOException {
|
||||
String javaCommand = ServerLauncherController.getInstance().getJavaCommand();
|
||||
ProcessBuilder builder;
|
||||
builder = new ProcessBuilder("java", "-jar", "Updater.jar", url, "yes", targetFile, "5", "nogui");
|
||||
builder = new ProcessBuilder(javaCommand, "-jar", "Updater.jar", url, "yes", targetFile, "5", "nogui");
|
||||
builder.directory(new File(Main.getApplicationWorkDirectory()));
|
||||
builder.redirectErrorStream(true);
|
||||
builder.start();
|
||||
|
||||
@ -4,7 +4,6 @@ import net.knarcraft.minecraftserverlauncher.server.servertypes.ServerType;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import javax.naming.ConfigurationException;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
@ -5,7 +5,10 @@ import net.knarcraft.minecraftserverlauncher.utility.CommonFunctions;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.io.*;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
|
||||
import static net.knarcraft.minecraftserverlauncher.utility.CommonFunctions.createAllFolders;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
@ -35,14 +38,14 @@ public class ServerVersionContainerTest {
|
||||
serverVersionContainer.reset();
|
||||
System.out.println(serverVersionContainer.toString());
|
||||
assertEquals("vanillaVersion;null\nsnapshotVersion;null\nbungeeVersion;null\nwaterfallVersions;\n" +
|
||||
"travertineVersions;\nspongeVanillaVersions;\nspongeForgeVersions;",
|
||||
"travertineVersions;\nspongeVanillaVersions;\nspongeForgeVersions;\ndownloadedBuildToolsVersion;null",
|
||||
serverVersionContainer.toString());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void saveStateTest() throws IOException {
|
||||
serverVersionContainer.saveState();
|
||||
BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(versionFile)));
|
||||
BufferedReader reader = CommonFunctions.getFileReader(versionFile);
|
||||
String savedData = CommonFunctions.readBufferedReader(reader);
|
||||
reader.close();
|
||||
assertEquals(serverVersionContainer.toString(), savedData);
|
||||
|
||||
@ -1,14 +1,17 @@
|
||||
package net.knarcraft.minecraftserverlauncher.utility;
|
||||
|
||||
import net.knarcraft.minecraftserverlauncher.Main;
|
||||
import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController;
|
||||
import net.knarcraft.minecraftserverlauncher.userinterface.FakeGUI;
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.MethodOrderer;
|
||||
import org.junit.jupiter.api.Order;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.TestMethodOrder;
|
||||
|
||||
import javax.naming.ConfigurationException;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
@ -22,6 +25,15 @@ public class JarBuilderTest {
|
||||
private static String targetDirectory;
|
||||
private static String jarDirectory;
|
||||
|
||||
@BeforeAll
|
||||
public static void preSetUp() {
|
||||
try {
|
||||
ServerLauncherController.getInstance().loadState(true);
|
||||
} catch (ConfigurationException | IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
@BeforeEach
|
||||
public void setUp() {
|
||||
targetDirectory = Main.getApplicationWorkDirectory() + File.separator + "files" + File.separator +
|
||||
|
||||
Loading…
Reference in New Issue
Block a user