Compare commits

...

3 Commits

Author SHA1 Message Date
ee99312a12 Updates paper and vanilla versions to 1.18.1
All checks were successful
KnarCraft/Minecraft-Server-Launcher/pipeline/head This commit looks good
2021-12-16 21:11:30 +01:00
545e7bacc6 Updates Paper, Vanilla and Waterfall verisions to 1.18
All checks were successful
KnarCraft/Minecraft-Server-Launcher/pipeline/head This commit looks good
2021-11-30 23:28:46 +01:00
b142b6d05e Small fix to use Paper/Travertine/Waterfall's updated API for downloading .jar files
All checks were successful
KnarCraft/Minecraft-Server-Launcher/pipeline/head This commit looks good
Additionally fixes some formatting mistakes
Updates version to 1.4.1
2021-11-24 19:54:59 +01:00
18 changed files with 64 additions and 42 deletions

View File

@ -1,13 +1,14 @@
# Minecraft-Server-Launcher # Minecraft-Server-Launcher
I originally created this software in 2013 using AutoIt. After learning Java, I recreated it in Java.
The original version can be found at: https://archive.knarcraft.net/Scripts/BungeeMinecraftServerLauncher/ I originally created this software in 2013 using AutoIt. After learning Java, I recreated it in Java. The original
This version's goal is to do everything the original does, just better. The original is 1595 lines of code repetition version can be found at: https://archive.knarcraft.net/Scripts/BungeeMinecraftServerLauncher/
and dirty code. I had no prior programming experience when I first started working on the original, which is why it This version's 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. became such a mess.
The software is in a fully working stage with a functional updater. The software is still in beta because there are still The software is in a fully working stage with a functional updater. The software is still in beta because there are
a lot of things I want to change and small annoyances. The software is fully portable. Make sure to put it in its own still a lot of things I want to change and small annoyances. The software is fully portable. Make sure to put it in its
folder as it will create lots of files. own folder as it will create lots of files.
The updater will move the new version to minecraft-server-launcher.jar, so you should rename the downloaded The updater will move the new version to minecraft-server-launcher.jar, so you should rename the downloaded file to this
file to this if it's named something else to avoid confusion. if it's named something else to avoid confusion.

View File

@ -1,3 +1,3 @@
As this is a personal one-man project, I prefer to stay in charge of the code. As this is a personal one-man project, I prefer to stay in charge of the code. I appreciate code fixing mistakes, or
I appreciate code fixing mistakes, or code improvements, but the software's functionality or purpose, should not be changed. code improvements, but the software's functionality or purpose, should not be changed. I might change anything at any
I might change anything at any time, so you might want to keep that in mind before doing big changes yourself. time, so you might want to keep that in mind before doing big changes yourself.

View File

@ -1,6 +1,7 @@
Fixes # . Fixes # .
Proposed changes: Proposed changes:
- -
- -
- -

View File

@ -1,10 +1,10 @@
package net.knarcraft.minecraftserverlauncher.utility; package net.knarcraft.minecraftserverlauncher.server;
import net.knarcraft.minecraftserverlauncher.Main; import net.knarcraft.minecraftserverlauncher.Main;
import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController; import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController;
import net.knarcraft.minecraftserverlauncher.server.ServerVersionContainer;
import net.knarcraft.minecraftserverlauncher.userinterface.GUI; import net.knarcraft.minecraftserverlauncher.userinterface.GUI;
import net.knarcraft.minecraftserverlauncher.userinterface.ServerLauncherGUI; import net.knarcraft.minecraftserverlauncher.userinterface.ServerLauncherGUI;
import net.knarcraft.minecraftserverlauncher.utility.CommonFunctions;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.BufferedWriter; import java.io.BufferedWriter;

View File

@ -377,7 +377,8 @@ public class Server {
if (Integer.parseInt(serverVersion.split("\\.")[1]) >= 17) { if (Integer.parseInt(serverVersion.split("\\.")[1]) >= 17) {
return controller.getJavaCommand(); return controller.getJavaCommand();
} }
} catch (NumberFormatException ignored) {} } catch (NumberFormatException ignored) {
}
} }
return controller.getOldJavaCommand(); return controller.getOldJavaCommand();
} }

View File

@ -311,7 +311,7 @@ public class ServerVersionContainer {
/** /**
* Sets the current version for a given paper version * Sets the current version for a given paper version
* *
* @param mapKey <p>The version key to set version for</p> * @param mapKey <p>The version key to set version for</p>
* @param newValue <p>The new current version</p> * @param newValue <p>The new current version</p>
*/ */
public void setPaperVersion(String mapKey, String newValue) { public void setPaperVersion(String mapKey, String newValue) {

View File

@ -2,8 +2,8 @@ package net.knarcraft.minecraftserverlauncher.server.servertypes;
import net.knarcraft.minecraftserverlauncher.Main; import net.knarcraft.minecraftserverlauncher.Main;
import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController; import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController;
import net.knarcraft.minecraftserverlauncher.server.JarBuilder;
import net.knarcraft.minecraftserverlauncher.userinterface.GUI; import net.knarcraft.minecraftserverlauncher.userinterface.GUI;
import net.knarcraft.minecraftserverlauncher.utility.JarBuilder;
import java.io.File; import java.io.File;
import java.nio.file.Paths; import java.nio.file.Paths;

View File

@ -50,13 +50,21 @@ public class Waterfall extends AbstractServerType {
public boolean downloadJar(String folder, String version) throws IOException { public boolean downloadJar(String folder, String version) throws IOException {
String file = this.getName() + version + ".jar"; String file = this.getName() + version + ".jar";
File filePath = new File(folder + file); File filePath = new File(folder + file);
String newestVersion = stringBetween(readRemoteFile(versionURL + version), srcStart, srcEnd); String versionFileContents = readRemoteFile(versionURL + version);
String fullURL = downloadURL + version + "/" + newestVersion + "/download"; String[] versions = stringBetween(versionFileContents, srcStart, srcEnd).split(",");
String newestVersion = versions[versions.length - 1];
String oldVersion = oldVersionFunction.apply(version); String oldVersion = oldVersionFunction.apply(version);
//The file is already the newest version //The file is already the newest version
if (filePath.isFile() && newestVersion.equals(oldVersion)) { if (filePath.isFile() && newestVersion.equals(oldVersion)) {
return true; return true;
} }
//Get necessary information for downloading the latest version
String newestVersionInfoURL = versionURL + version + "/builds/" + newestVersion;
String fileName = stringBetween(readRemoteFile(newestVersionInfoURL), "\"name\":\"", "\"");
String fullURL = downloadURL + version + "/builds/" + newestVersion + "/downloads/" + fileName;
//The new jar file could not be downloaded //The new jar file could not be downloaded
if (!downloadFile(fullURL, Paths.get(filePath.toURI()))) { if (!downloadFile(fullURL, Paths.get(filePath.toURI()))) {
return false; return false;
@ -64,4 +72,5 @@ public class Waterfall extends AbstractServerType {
versionUpdateFunction.accept(version, newestVersion); versionUpdateFunction.accept(version, newestVersion);
return true; return true;
} }
} }

View File

@ -51,7 +51,7 @@ public class BackupGUI implements ActionListener {
JPanel panel = new JPanel(); JPanel panel = new JPanel();
panel.setLayout(new BoxLayout(panel, BoxLayout.PAGE_AXIS)); panel.setLayout(new BoxLayout(panel, BoxLayout.PAGE_AXIS));
panel.add(progressTextArea); panel.add(progressTextArea);
panel.add(Box.createRigidArea(new Dimension(0,5))); panel.add(Box.createRigidArea(new Dimension(0, 5)));
panel.add(progressBar); panel.add(progressBar);
JPanel buttonPane = new JPanel(); JPanel buttonPane = new JPanel();
@ -71,7 +71,7 @@ public class BackupGUI implements ActionListener {
/** /**
* Updates information about the backup progress * Updates information about the backup progress
* *
* @param infoText <p>The text to display</p> * @param infoText <p>The text to display</p>
* @param progressPercent <p>The new percent of the progress bar</p> * @param progressPercent <p>The new percent of the progress bar</p>
*/ */
public static void updateProgress(String infoText, int progressPercent) { public static void updateProgress(String infoText, int progressPercent) {

View File

@ -17,6 +17,7 @@ public class CloseTabActionListener implements ActionListener {
/** /**
* Instantiates a new close tab action listener * Instantiates a new close tab action listener
*
* @param tabPane <p>The tab pane containing all tabs</p> * @param tabPane <p>The tab pane containing all tabs</p>
* @param tabName <p>The name of the tab connected to this action listener</p> * @param tabName <p>The name of the tab connected to this action listener</p>
*/ */

View File

@ -33,6 +33,7 @@ public class ControlPanelTab implements ActionListener {
/** /**
* Sets the text of the status label * Sets the text of the status label
*
* @param text <p>The new text of the status label</p> * @param text <p>The new text of the status label</p>
*/ */
public void setStatusText(String text) { public void setStatusText(String text) {

View File

@ -93,6 +93,7 @@ public class ServerLauncherGUI extends MessageHandler implements ActionListener,
/** /**
* Gets this GUI's control panel tab * Gets this GUI's control panel tab
*
* @return <p>The control panel tab for this GUI</p> * @return <p>The control panel tab for this GUI</p>
*/ */
public ControlPanelTab getControlPanelTab() { public ControlPanelTab getControlPanelTab() {
@ -168,7 +169,7 @@ public class ServerLauncherGUI extends MessageHandler implements ActionListener,
addServerTabButton.addActionListener(this); addServerTabButton.addActionListener(this);
addServerPaneButton = getAddServerButton(false); addServerPaneButton = getAddServerButton(false);
addServerPaneButton.addActionListener(this); addServerPaneButton.addActionListener(this);
tabContentsPanel.add(addServerTabButton); tabContentsPanel.add(addServerTabButton);
tabPanel.add(addServerPaneButton); tabPanel.add(addServerPaneButton);
serversPane.setTabComponentAt(serversPane.getTabCount() - 1, tabPanel); serversPane.setTabComponentAt(serversPane.getTabCount() - 1, tabPanel);
@ -176,6 +177,7 @@ public class ServerLauncherGUI extends MessageHandler implements ActionListener,
/** /**
* Gets a button for adding a new server * Gets a button for adding a new server
*
* @param displayButtonStyle <p>Whether to show or hide the button's style</p> * @param displayButtonStyle <p>Whether to show or hide the button's style</p>
* @return <p>A new add server button</p> * @return <p>A new add server button</p>
*/ */
@ -193,7 +195,6 @@ public class ServerLauncherGUI extends MessageHandler implements ActionListener,
} }
/** /**
*
* @param serverName <p>The name of the server/tab to add a close button to</p> * @param serverName <p>The name of the server/tab to add a close button to</p>
*/ */
private void addCloseButtonToServerTab(String serverName) { private void addCloseButtonToServerTab(String serverName) {

View File

@ -164,7 +164,7 @@ public class ServerLauncherMenu implements ActionListener {
* Creates a checkbox menu item * Creates a checkbox menu item
* *
* @param itemName <p>The name of the new checkbox item</p> * @param itemName <p>The name of the new checkbox item</p>
* @param parent <p>The parent menu the item belongs to</p> * @param parent <p>The parent menu the item belongs to</p>
* @return <p>The created checkbox menu item</p> * @return <p>The created checkbox menu item</p>
*/ */
private JCheckBoxMenuItem createCheckBoxMenuItem(String itemName, JMenu parent) { private JCheckBoxMenuItem createCheckBoxMenuItem(String itemName, JMenu parent) {
@ -178,7 +178,7 @@ public class ServerLauncherMenu implements ActionListener {
* Creates a menu item * Creates a menu item
* *
* @param itemName <p>The name of the new item</p> * @param itemName <p>The name of the new item</p>
* @param parent <p>The parent menu the item belongs to</p> * @param parent <p>The parent menu the item belongs to</p>
* @return <p>The created menu item</p> * @return <p>The created menu item</p>
*/ */
private JMenuItem createMenuItem(String itemName, JMenu parent) { private JMenuItem createMenuItem(String itemName, JMenu parent) {
@ -190,6 +190,7 @@ public class ServerLauncherMenu implements ActionListener {
/** /**
* Asks the user for the new Java path * Asks the user for the new Java path
*
* @param old <p>Whether asking for the path to the old java version</p> * @param old <p>Whether asking for the path to the old java version</p>
*/ */
private void configureJava(boolean old) { private void configureJava(boolean old) {

View File

@ -22,11 +22,15 @@ import java.util.stream.Stream;
/** /**
* A helper class for performing server backup * A helper class for performing server backup
*/ */
public class BackupUtil { public final class BackupUtil {
private static boolean backupAborted; private static boolean backupAborted;
private static boolean backupRunning = false; private static boolean backupRunning = false;
private BackupUtil() {
}
/** /**
* Aborts the currently running backup * Aborts the currently running backup
*/ */
@ -44,7 +48,7 @@ public class BackupUtil {
* @throws IOException <p>If we can't start a file stream</p> * @throws IOException <p>If we can't start a file stream</p>
*/ */
private static long backupFolder(File source, File destination, long backupFileSize, private static long backupFolder(File source, File destination, long backupFileSize,
long alreadyCopied) throws IOException { long alreadyCopied) throws IOException {
if (backupAborted) { if (backupAborted) {
return 0L; return 0L;
} }
@ -136,8 +140,9 @@ public class BackupUtil {
/** /**
* Performs the actual backup after checks have passed and necessary info is available * Performs the actual backup after checks have passed and necessary info is available
* @param gui <p>The GUI to use for informing the user</p> *
* @param serverFolders <p>The folders of the servers to backup</p> * @param gui <p>The GUI to use for informing the user</p>
* @param serverFolders <p>The folders of the servers to backup</p>
* @param backupFileSize <p>The total size of the folders to backup</p> * @param backupFileSize <p>The total size of the folders to backup</p>
*/ */
private static void performBackup(GUI gui, List<List<File>> serverFolders, long backupFileSize) { private static void performBackup(GUI gui, List<List<File>> serverFolders, long backupFileSize) {
@ -164,10 +169,10 @@ public class BackupUtil {
/** /**
* Backs up the files for a single server * Backs up the files for a single server
* *
* @param gui <p>The GUI to use for informing the user</p> * @param gui <p>The GUI to use for informing the user</p>
* @param serverFolder <p>The server's input and output folders</p> * @param serverFolder <p>The server's input and output folders</p>
* @param backupFileSize <p>The total size of the files to backup</p> * @param backupFileSize <p>The total size of the files to backup</p>
* @param alreadyCopied <p>The amount of bytes already copied</p> * @param alreadyCopied <p>The amount of bytes already copied</p>
* @return <p>The new amount of bytes copied</p> * @return <p>The new amount of bytes copied</p>
*/ */
private static long backupServerFiles(GUI gui, List<File> serverFolder, long backupFileSize, long alreadyCopied) { private static long backupServerFiles(GUI gui, List<File> serverFolder, long backupFileSize, long alreadyCopied) {

View File

@ -126,6 +126,7 @@ public final class CommonFunctions {
/** /**
* Gets a buffered writer for writing to a given file * Gets a buffered writer for writing to a given file
*
* @param path <p>The path to the file to write to</p> * @param path <p>The path to the file to write to</p>
* @return <p>A buffered writer for writing to the file</p> * @return <p>A buffered writer for writing to the file</p>
* @throws FileNotFoundException <p>If the file does not exist</p> * @throws FileNotFoundException <p>If the file does not exist</p>
@ -149,8 +150,8 @@ public final class CommonFunctions {
/** /**
* Writes text to a file and adds a trailing newline * Writes text to a file and adds a trailing newline
* *
* @param path <p>The path of the file to write to</p> * @param path <p>The path of the file to write to</p>
* @param text <p>The text to write</p> * @param text <p>The text to write</p>
* @throws IOException <p>If unable to write to the file</p> * @throws IOException <p>If unable to write to the file</p>
*/ */
public static void writeFile(String path, String text) throws IOException { public static void writeFile(String path, String text) throws IOException {
@ -243,7 +244,6 @@ public final class CommonFunctions {
} }
/** /**
* Validates that a name is not empty and does not contain invalid characters * Validates that a name is not empty and does not contain invalid characters
* *
@ -259,7 +259,7 @@ public final class CommonFunctions {
* *
* @param target <p>The folder to delete from</p> * @param target <p>The folder to delete from</p>
*/ */
static void removeFilesRecursively(File target) { public static void removeFilesRecursively(File target) {
File[] oldFiles = target.listFiles(); File[] oldFiles = target.listFiles();
if (oldFiles == null) { if (oldFiles == null) {
throw new IllegalArgumentException("Unable to list files in directory"); throw new IllegalArgumentException("Unable to list files in directory");

View File

@ -1,2 +1,2 @@
beta beta
1.4.0 1.4.3
1 beta
2 1.4.0 1.4.3

View File

@ -1,11 +1,11 @@
Vanilla;Latest,Snapshot,1.17.1,1.16.5,1.15.2,1.14.4,1.13.2,1.12.2,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;https://launchermeta.mojang.com/mc/game/version_manifest.json;"release":";";https://s3.amazonaws.com/Minecraft.Download/versions/ Vanilla;Latest,Snapshot,1.18.1,1.17.1,1.16.5,1.15.2,1.14.4,1.13.2,1.12.2,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;https://launchermeta.mojang.com/mc/game/version_manifest.json;"release":";";https://s3.amazonaws.com/Minecraft.Download/versions/
Spigot;Latest,1.17.1,1.16.5,1.15.2,1.14.4,1.13.2,1.12.2,1.11.2,1.10.2,1.9.4,1.9.4,1.8.8,1.7.10,1.6.4-R2.1,1.5.2-R1.1,1.4.7-R1.1;https://static.knarcraft.net/archive/downloads/minecraftserverjars/Spigot/;spigot- Spigot;Latest,1.17.1,1.16.5,1.15.2,1.14.4,1.13.2,1.12.2,1.11.2,1.10.2,1.9.4,1.9.4,1.8.8,1.7.10,1.6.4-R2.1,1.5.2-R1.1,1.4.7-R1.1;https://static.knarcraft.net/archive/downloads/minecraftserverjars/Spigot/;spigot-
Paper;1.17.1,1.16.5,1.15.2,1.14.4,1.13.2,1.12.2,1.11.2,1.10.2,1.9.4,1.8.8;https://papermc.io/api/v1/paper/;"latest":;,;https://papermc.io/api/v1/paper/ Paper;1.18.1,1.17.1,1.16.5,1.15.2,1.14.4,1.13.2,1.12.2,1.11.2,1.10.2,1.9.4,1.8.8;https://papermc.io/api/v2/projects/paper/versions/;"builds":[;];https://papermc.io/api/v2/projects/paper/versions/
#SpongeVanilla;1.12.2,1.11.2,1.10.2,1.8.9;https://dl-api.spongepowered.org/v1/org.spongepowered/spongevanilla/downloads?type=stable&minecraft=;"version":";",;https://repo.spongepowered.org/maven/org/spongepowered/spongevanilla/;/spongevanilla- #SpongeVanilla;1.12.2,1.11.2,1.10.2,1.8.9;https://dl-api.spongepowered.org/v1/org.spongepowered/spongevanilla/downloads?type=stable&minecraft=;"version":";",;https://repo.spongepowered.org/maven/org/spongepowered/spongevanilla/;/spongevanilla-
Craftbukkit;Latest,1.17.1,1.16.5,1.15.2,1.14.4,1.13.2,1.12.2,1.11.2,1.10.2,1.9.4,1.8.8,1.7.10-R0.1,1.6.4-R2.0,1.5.2-R1.0,1.4.6-R0.3,1.3.2-R3.0,1.2.5-R2.0,1.1-R6,1.0.1-R1,b1.8.1,b1.7.3;https://static.knarcraft.net/archive/downloads/minecraftserverjars/Bukkit/;craftbukkit- Craftbukkit;Latest,1.17.1,1.16.5,1.15.2,1.14.4,1.13.2,1.12.2,1.11.2,1.10.2,1.9.4,1.8.8,1.7.10-R0.1,1.6.4-R2.0,1.5.2-R1.0,1.4.6-R0.3,1.3.2-R3.0,1.2.5-R2.0,1.1-R6,1.0.1-R1,b1.8.1,b1.7.3;https://static.knarcraft.net/archive/downloads/minecraftserverjars/Bukkit/;craftbukkit-
#SpongeForge;1.12.2,1.11.2,1.10.2;https://dl-api.spongepowered.org/v1/org.spongepowered/spongeforge/downloads?type=stable&minecraft=;"version":";",;https://repo.spongepowered.org/maven/org/spongepowered/spongeforge/;/spongeforge- #SpongeForge;1.12.2,1.11.2,1.10.2;https://dl-api.spongepowered.org/v1/org.spongepowered/spongeforge/downloads?type=stable&minecraft=;"version":";",;https://repo.spongepowered.org/maven/org/spongepowered/spongeforge/;/spongeforge-
MCPCplus;1.6.4,1.6.2,1.5.2,1.4.7;https://static.knarcraft.net/archive/downloads/minecraftserverjars/MCPC+/;mcpcplus MCPCplus;1.6.4,1.6.2,1.5.2,1.4.7;https://static.knarcraft.net/archive/downloads/minecraftserverjars/MCPC+/;mcpcplus
Bungee;Latest,1.7.10,1.6.4,1.5.2,1.4.7;https://ci.md-5.net/job/BungeeCord/lastSuccessfulBuild/artifact/bootstrap/target/;Artifacts of BungeeCord #; ;http://ci.md-5.net/job/BungeeCord/lastSuccessfulBuild/artifact/bootstrap/target/BungeeCord.jar;https://static.knarcraft.net/archive/downloads/minecraftserverjars/BungeeCord/;BungeeCord- Bungee;Latest,1.7.10,1.6.4,1.5.2,1.4.7;https://ci.md-5.net/job/BungeeCord/lastSuccessfulBuild/artifact/bootstrap/target/;Artifacts of BungeeCord #; ;http://ci.md-5.net/job/BungeeCord/lastSuccessfulBuild/artifact/bootstrap/target/BungeeCord.jar;https://static.knarcraft.net/archive/downloads/minecraftserverjars/BungeeCord/;BungeeCord-
Waterfall;1.17,1.16,1.15,1.14,1.13,1.12,1.11;https://papermc.io/api/v1/waterfall/;"latest":;,;https://papermc.io/api/v1/waterfall/ Waterfall;1.18,1.17,1.16,1.15,1.14,1.13,1.12,1.11;https://papermc.io/api/v2/projects/waterfall/versions/;"builds":[;];https://papermc.io/api/v2/projects/waterfall/versions/
Travertine;1.16,1.15,1.14,1.13,1.12;https://papermc.io/api/v1/travertine/;"latest":;,;https://papermc.io/api/v1/travertine/ Travertine;1.16,1.15,1.14,1.13,1.12;https://papermc.io/api/v2/projects/travertine/versions/;"builds":[;];https://papermc.io/api/v2/projects/travertine/versions/
Custom; Custom;
Can't render this file because it contains an unexpected character in line 1 and column 200.

View File

@ -1,8 +1,9 @@
package net.knarcraft.minecraftserverlauncher.utility; package net.knarcraft.minecraftserverlauncher.server;
import net.knarcraft.minecraftserverlauncher.Main; import net.knarcraft.minecraftserverlauncher.Main;
import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController; import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController;
import net.knarcraft.minecraftserverlauncher.userinterface.FakeGUI; import net.knarcraft.minecraftserverlauncher.userinterface.FakeGUI;
import net.knarcraft.minecraftserverlauncher.utility.CommonFunctions;
import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;