1.5

Jo0001 · Jun 22, 2024 · ec28ce6 · ec28ce6
1 parent 5d240f4
commit ec28ce6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.jo0001</groupId>
     <artifactId>ViaTesting</artifactId>
-    <version>1.5-SNAPSHOT</version>
+    <version>1.5</version>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>

diff --git a/src/main/java/de/jo0001/viaTesting/core/Controller.java b/src/main/java/de/jo0001/viaTesting/core/Controller.java
@@ -40,7 +40,6 @@ public class Controller implements Initializable {
     private final HashMap<String, String> mojangjars = new HashMap<>();
 
     public Controller() {
-        System.out.println("Controller loading");
     }
 
 
@@ -50,6 +49,7 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
         new UpdateCheck().start();
 
         try {
+            logger.log(Level.INFO, "Fetching Mojang data");
             DownloadUtil.getVersions().forEach(e -> mcVersionsPaper.add(e.getAsString()));
             JsonObject mojangData = DownloadUtil.getMojangData();
             mojangData.getAsJsonArray("versions").forEach(e -> {
@@ -65,6 +65,8 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
             });
         } catch (IOException e) {
             e.printStackTrace();
+        } finally {
+            logger.log(Level.INFO, "Finished fetching Mojang data");
         }
 
         Platform.runLater(() -> {

diff --git a/src/main/java/de/jo0001/viaTesting/core/Downloader.java b/src/main/java/de/jo0001/viaTesting/core/Downloader.java
@@ -19,8 +19,7 @@
 
 public class Downloader extends Thread {
     private final Controller controller;
-    private File root;
-    private File proxyRoot;
+    private final File root;
     private final String proxySettings;
     private boolean withProxy;
     private String proxy;
@@ -51,8 +50,6 @@ public void run() {
 
         withProxy = !proxySettings.equalsIgnoreCase("None");
         if (withProxy) {
-            File defaultRoot = root;
-            //root = new File(root.getAbsolutePath() + "/Paper-Server");
             downloads.add(CompletableFuture.runAsync(() -> {
                 try {
                     downloadPaperServer();
@@ -70,7 +67,6 @@ public void run() {
 
             if (proxySettings.contains("Bungee")) {
                 proxy = "bungee";
-                //proxyRoot = new File(defaultRoot.getAbsolutePath() + "/Bungee-Server");
                 downloads.add(CompletableFuture.runAsync(() -> {
                     try {
                         downloadBungee();
@@ -80,8 +76,6 @@ public void run() {
                 }));
             } else if (proxySettings.contains("Velocity")) {
                 proxy = "velocity";
-                //proxyRoot = new File(defaultRoot.getAbsolutePath() + "/Velocity-Server");
-
                 downloads.add(CompletableFuture.runAsync(() -> {
                     try {
                         downloadVelocityServer();
@@ -91,7 +85,6 @@ public void run() {
                 }));
             } else {
                 proxy = "waterfall";
-                //proxyRoot = new File(defaultRoot.getAbsolutePath() + "/Waterfall-Server");
                 downloads.add(CompletableFuture.runAsync(() -> {
                     try {
                         downloadWaterfallServer();
@@ -101,10 +94,6 @@ public void run() {
                 }));
             }
 
-          /*  if (!proxySettings.contains("with Via")) {
-                root = new File(defaultRoot.getAbsolutePath() + "/Paper-Server");
-            }*/
-
             downloads.add(CompletableFuture.runAsync(() -> {
                 try {
                     downloadVia();
@@ -233,19 +222,16 @@ private String getBase(String type) {
                 return root.getPath();
             }
         }
-
         if (type.equals("plugin")) {
             if (withProxy) {
                 return (proxySettings.contains("Via") ? getBase(proxy) : getBase("paper")) + "/plugins";
             } else {
-                return root.getPath() + "/plugins";//todo fix
+                return root.getPath() + "/plugins";
             }
         }
-
         if (withProxy) {
             return root.getPath() + "/" + proxy + "-server";
         }
-
         return null;
     }
 }
diff --git a/src/main/java/de/jo0001/viaTesting/util/UpdateCheck.java b/src/main/java/de/jo0001/viaTesting/util/UpdateCheck.java
@@ -45,6 +45,8 @@ public void run() {
                         }
                     }
                 });
+            } else {
+                logger.log(Level.INFO, "No newer version found");
             }
         } catch (IOException e) {
             e.printStackTrace();