Changeable path for the output spigot.jar in Paper/SpigotBuilder

Author: derrop

cloudnet-cord/cloudnet-setup/src/main/java/de/dytanic/cloudnet/setup/spigot/PaperBuilder.java

@@ -10,6 +10,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.Arrays;
@@ -29,7 +30,7 @@ public final class PaperBuilder {
      *
      * @param reader Read the answer from console
      */
-    public static void start(ConsoleReader reader) {
+    public static void start(ConsoleReader reader, Path outputPath) {
         try {
             System.out.println("Fetch Versions");
             URLConnection connection = new URL(apiProjectUrl).openConnection();
@@ -55,7 +56,7 @@ public static void start(ConsoleReader reader) {
                 String finalAnswer = name;
                 if (Arrays.stream(paperMCProject.getVersions()).anyMatch(e -> e.equalsIgnoreCase(finalAnswer))) {
                     answer = name;
-                    buildPaperVersion(answer);
+                    buildPaperVersion(answer, outputPath);
                 } else if (Arrays.stream(paperMCProject.getVersions()).noneMatch(e -> e.equalsIgnoreCase(finalAnswer))) {
                     System.out.println("This version does not exist!");
                 }
@@ -72,7 +73,7 @@ public static void start(ConsoleReader reader) {
      *
      * @throws Exception If a connection error or something
      */
-    private static void buildPaperVersion(String version) throws Exception {
+    private static void buildPaperVersion(String version, Path outputPath) throws Exception {
         System.out.println(String.format("Fetching build %s", version));
         URLConnection connection = new URL(String.format(API_PROJECT_VERSION_URL, version)).openConnection();
         connection.setRequestProperty("User-Agent",
@@ -92,22 +93,22 @@ private static void buildPaperVersion(String version) throws Exception {
         Files.createDirectories(buildFolder.toPath());
         File paperclip = new File(buildFolder, "paperclip.jar");
         if (!paperclip.exists()) {
-            runPaperClip(connection, buildFolder, paperclip);
+            runPaperClip(connection, buildFolder, paperclip, outputPath);
         } else {
             File[] paperclips = buildFolder.listFiles(pathname -> pathname.getName().startsWith("paper"));
             if (Objects.requireNonNull(paperclips).length > 0) {
                 System.out.println("Skipping build");
                 System.out.println("Copying spigot.jar");
                 try {
                     Files.copy(new FileInputStream(Objects.requireNonNull(paperclips)[0]),
-                               Paths.get("local/spigot.jar"),
+                               outputPath,
                                StandardCopyOption.REPLACE_EXISTING);
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
             } else {
                 SpigotBuilder.deleteBuildFolder(buildFolder);
-                runPaperClip(connection, buildFolder, paperclip);
+                runPaperClip(connection, buildFolder, paperclip, outputPath);
             }
 
         }
@@ -123,7 +124,7 @@ private static void buildPaperVersion(String version) throws Exception {
      *
      * @throws IOException Throws if input stream null
      */
-    private static void runPaperClip(URLConnection connection, File buildFolder, File paperclip) throws IOException {
+    private static void runPaperClip(URLConnection connection, File buildFolder, File paperclip, Path outputPath) throws IOException {
         System.out.println("Downloading Paperclip");
         try (InputStream inputStream = connection.getInputStream()) {
             Files.copy(inputStream, Paths.get(paperclip.toURI()), StandardCopyOption.REPLACE_EXISTING);
@@ -133,7 +134,7 @@ private static void runPaperClip(URLConnection connection, File buildFolder, Fil
 
         Files.copy(new FileInputStream(Objects.requireNonNull(buildFolder.listFiles(pathname -> pathname.getName()
                                                                                                         .startsWith("paperclip")))[0]),
-                   Paths.get("local/spigot.jar"),
+                   outputPath,
                    StandardCopyOption.REPLACE_EXISTING);
     }
 

cloudnet-cord/cloudnet-setup/src/main/java/de/dytanic/cloudnet/setup/spigot/SetupSpigotVersion.java

@@ -33,7 +33,7 @@ public void accept(String url) {
                                               "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11");
                 connection.connect();
                 try (InputStream inputStream = connection.getInputStream()) {
-                    Files.copy(inputStream, target != null ? target : Paths.get("local/spigot.jar"), StandardCopyOption.REPLACE_EXISTING);
+                    Files.copy(inputStream, SetupSpigotVersion.this.getTarget(), StandardCopyOption.REPLACE_EXISTING);
                 }
                 System.out.println("Download was successfully completed!");
             } catch (Exception e) {
@@ -144,14 +144,18 @@ public void accept(ConsoleReader reader) {
                     }
                 }
             case "buildtools":
-                SpigotBuilder.start(reader);
+                SpigotBuilder.start(reader, this.getTarget());
                 break;
             case "paper":
-                PaperBuilder.start(reader);
+                PaperBuilder.start(reader, this.getTarget());
                 break;
         }
     }
 
+    public Path getTarget() {
+        return this.target != null ? this.target : Paths.get("local/spigot.jar");
+    }
+
     public void setTarget(Path target) {
         this.target = target;
     }

cloudnet-cord/cloudnet-setup/src/main/java/de/dytanic/cloudnet/setup/spigot/SpigotBuilder.java

@@ -28,7 +28,7 @@ public final class SpigotBuilder {
      *
      * @param reader to read the answer
      */
-    public static void start(final ConsoleReader reader) {
+    public static void start(final ConsoleReader reader, Path outputPath) {
         System.out.println("Fetching Spigot versions");
         List<String> versions = loadVersions();
         System.out.println("Available Spigot versions:");
@@ -47,7 +47,7 @@ public static void start(final ConsoleReader reader) {
             String finalAnswer = name;
             if (versions.stream().anyMatch(e -> e.equalsIgnoreCase(finalAnswer))) {
                 answer = name;
-                buildSpigot(finalAnswer);
+                buildSpigot(finalAnswer, outputPath);
             } else if (versions.stream().noneMatch(e -> e.equalsIgnoreCase(finalAnswer))) {
                 System.out.println("This version does not exist!");
             }
@@ -83,7 +83,7 @@ private static LinkedList<String> loadVersions() {
      *
      * @param version the version of spigot
      */
-    private static void buildSpigot(final String version) {
+    private static void buildSpigot(final String version, Path outputPath) {
         File builder = new File("local/builder/spigot");
         File buildFolder = new File(builder, version);
         try {
@@ -93,21 +93,21 @@ private static void buildSpigot(final String version) {
         }
         File buildTools = new File(buildFolder, "buildtools.jar");
         if (!buildTools.exists()) {
-            runBuildTools(version, buildFolder, buildTools);
+            runBuildTools(version, buildFolder, buildTools, outputPath);
         } else {
             if (Objects.requireNonNull(buildFolder.listFiles(pathname -> pathname.getName().startsWith("spigot-"))).length > 0) {
                 System.out.println("Skipping build");
                 System.out.println("Copying spigot.jar");
                 try {
                     Files.copy(new FileInputStream(Objects.requireNonNull(buildFolder.listFiles(pathname -> pathname.getName()
                                                                                                                     .startsWith("spigot-")))[0]),
-                               Paths.get("local/spigot.jar"),
+                               outputPath,
                                StandardCopyOption.REPLACE_EXISTING);
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
             } else {
-                runBuildTools(version, buildFolder, buildTools);
+                runBuildTools(version, buildFolder, buildTools, outputPath);
             }
         }
 
@@ -120,7 +120,7 @@ private static void buildSpigot(final String version) {
      * @param buildFolder the folder in there are build
      * @param buildTools  the path of the build tools
      */
-    private static void runBuildTools(String version, File buildFolder, File buildTools) {
+    private static void runBuildTools(String version, File buildFolder, File buildTools, Path outputPath) {
         try {
             long startTime = System.currentTimeMillis();
             Files.createDirectories(buildFolder.toPath());
@@ -139,15 +139,15 @@ private static void runBuildTools(String version, File buildFolder, File buildTo
             if (Objects.requireNonNull(buildFolder.listFiles(pathname -> pathname.getName().startsWith("spigot-"))).length > 0) {
                 Files.copy(new FileInputStream(Objects.requireNonNull(buildFolder.listFiles(pathname -> pathname.getName()
                                                                                                                 .startsWith("spigot-")))[0]),
-                           Paths.get("local/spigot.jar"),
+                           outputPath,
                            StandardCopyOption.REPLACE_EXISTING);
                 long endTime = System.currentTimeMillis();
                 long minutes = ((endTime - startTime) / 1000) / 60;
                 long seconds = ((endTime - startTime) / 1000) % 60;
                 System.out.printf("Total Build Time %dMin %dSec\n", minutes, seconds);
             } else {
                 deleteBuildFolder(buildFolder);
-                buildSpigot(version);
+                buildSpigot(version, outputPath);
             }
         } catch (Exception e) {
             e.printStackTrace();