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

Improves writing speed when not using a GUI
All checks were successful
KnarCraft/Minecraft-Server-Launcher/pipeline/head This commit looks good
Details

Browse Source 
Uses buffered writers instead of System.out
Uses a GUI for writing JarBuilder messages
Adds some missing comments to the jar builder
This commit is contained in:
Kristian Knarvik
2021-08-02 16:49:35 +02:00
parent 52eacb9980
commit 32c17c6005
4 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/net/knarcraft/minecraftserverlauncher/utility/JarBuilder.java
View File

@ -2,6 +2,7 @@ package net.knarcraft.minecraftserverlauncher.utility;
import net.knarcraft.minecraftserverlauncher.Main;
import net.knarcraft.minecraftserverlauncher.server.ServerVersionContainer;
import net.knarcraft.minecraftserverlauncher.userinterface.GUI;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@ -11,16 +12,27 @@ import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.nio.file.Paths;
/**
* The jar builder is responsible for building the newest Spigot and CraftBukkit .jar files using BuildTools
*/
public class JarBuilder {
private final String buildDirectory;
private final String jarDirectory;
private final ServerVersionContainer versionContainer;
private final GUI gui;
public JarBuilder(String buildDirectory, String jarDirectory, ServerVersionContainer versionContainer) {
/**
* 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>
*/
public JarBuilder(String buildDirectory, String jarDirectory, GUI gui) {
this.buildDirectory = buildDirectory;
this.jarDirectory = jarDirectory;
this.versionContainer = versionContainer;
this.gui = gui;
this.versionContainer = ServerVersionContainer.getInstance();
}
/**
@ -31,9 +43,9 @@ public class JarBuilder {
ProcessBuilder processBuilder = new ProcessBuilder("java", "-jar", "BuildTools.jar", "--rev",
"latest", "--output-dir", jarDirectory);
executeBuildProcess(processBuilder);
System.out.println("Finished building spigot .jar. Moving it to the correct location");
gui.setStatus("Finished building spigot .jar. Moving it to the correct location");
moveBuiltJar("spigot-", "SpigotLatest.jar");
System.out.println("Finished moving spigot .jar");
gui.setStatus("Finished moving spigot .jar");
}
/**
@ -44,9 +56,9 @@ public class JarBuilder {
ProcessBuilder processBuilder = new ProcessBuilder("java", "-jar", "BuildTools.jar", "--compile",
"craftbukkit", "--rev", "latest", "--output-dir", jarDirectory);
executeBuildProcess(processBuilder);
System.out.println("Finished building craftbukkit .jar. Moving it to the correct location");
gui.setStatus("Finished building craftbukkit .jar. Moving it to the correct location");
moveBuiltJar("craftbukkit-", "BukkitLatest.jar");
System.out.println("Finished moving craftbukkit .jar");
gui.setStatus("Finished moving craftbukkit .jar");
}
/**
@ -111,7 +123,7 @@ public class JarBuilder {
writer.flush();
if (process.exitValue() == 0) {
System.out.println("Jar building process finished successfully.");
gui.setStatus("Jar building process finished successfully.");
} else {
throw new RuntimeException("Jar building process failed with exit code " + process.exitValue() + ".");
}