Last minute fixes for 6.0

Author: thejudge156

src/main/java/pojlib/install/Installer.java

@@ -121,7 +121,7 @@ public static CompletableFuture<String> installLibraries(VersionInfo versionInfo
                             sha1 = artifact.sha1;
                             if (!libraryFile.exists()) {
                                 Logger.getInstance().appendToLog("Downloading: " + library.name);
-                                DownloadUtils.downloadFile(artifact.url, libraryFile);
+                                DownloadUtils.downloadFile(artifact.url, libraryFile, artifact.size);
                             }
                         }
                         if (DownloadUtils.compareSHA1(libraryFile, sha1)) {
@@ -151,14 +151,11 @@ public static CompletableFuture<String> installAssets(VersionInfo minecraftVersi
             Logger.getInstance().appendToLog("Checking assets");
             JsonObject assets = APIHandler.getFullUrl(minecraftVersionInfo.assetIndex.url, JsonObject.class);
 
-            int bytes = 0;
-
             for (Map.Entry<String, JsonElement> entry : assets.getAsJsonObject("objects").entrySet()) {
                 VersionInfo.Asset asset = new Gson().fromJson(entry.getValue(), VersionInfo.Asset.class);
-                bytes += asset.size;
+                DownloadManager.addTotalBytes(asset.size);
             }
 
-            DownloadManager.addTotalBytes(bytes);
             ThreadPoolExecutor tp = new ThreadPoolExecutor(8, 8, 100, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>());
 
             for (Map.Entry<String, JsonElement> entry : assets.getAsJsonObject("objects").entrySet()) {
@@ -226,7 +223,7 @@ public void run() {
                 if (!assetFile.exists()) {
                     Logger.getInstance().appendToLog("Downloading: " + fileName);
                     try {
-                        DownloadUtils.downloadFile(Constants.MOJANG_RESOURCES_URL + "/" + path, assetFile);
+                        DownloadUtils.downloadFile(Constants.MOJANG_RESOURCES_URL + "/" + path, assetFile, 0);
                     } catch (IOException e) {
                         throw new RuntimeException(e);
                     }

src/main/java/pojlib/util/download/DownloadManager.java

@@ -22,7 +22,7 @@ public static boolean downloadsCompleted() {
     }
 
     public static float getPercentComplete() {
-        if(totalBytes == 0) {
+        if(totalBytes == 0 || downloadedBytes > totalBytes) {
             return 100.0f;
         }
 

src/main/java/pojlib/util/download/DownloadUtils.java

@@ -16,7 +16,7 @@
 import javax.annotation.Nullable;
 
 public class DownloadUtils {
-    private static void download(URL url, OutputStream os, String fileName) throws IOException {
+    private static void download(URL url, OutputStream os, long size) throws IOException {
         final int MAX_RETRIES = 3;
         int attempts = 0;
 
@@ -29,8 +29,11 @@ private static void download(URL url, OutputStream os, String fileName) throws I
                 conn.connect();
 
                 if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
-                    int totalBytes = conn.getContentLength(); // Get the total size of the file
-                    try (InputStream is = new StreamDL(conn.getInputStream(), totalBytes)) {
+                    if(size == -1) {
+                        size = conn.getContentLengthLong();
+                    }
+
+                    try (InputStream is = new StreamDL(conn.getInputStream(), size)) {
                         IOUtils.copy(is, os);
                     }
                     return;
@@ -44,11 +47,15 @@ private static void download(URL url, OutputStream os, String fileName) throws I
     }
 
     public static void downloadFile(String url, File out) throws IOException {
+        downloadFile(url, out, -1);
+    }
+
+    public static void downloadFile(String url, File out, long size) throws IOException {
         Objects.requireNonNull(out.getParentFile()).mkdirs();
         File tempOut = File.createTempFile(out.getName(), ".part", out.getParentFile());
         try {
             try (OutputStream bos2 = new BufferedOutputStream(Files.newOutputStream(tempOut.toPath()))) {
-                download(new URL(url), bos2, out.getName());
+                download(new URL(url), bos2, size);
                 tempOut.renameTo(out);
                 bos2.close();
                 if (tempOut.exists()) tempOut.delete();

src/main/java/pojlib/util/download/StreamDL.java

@@ -10,7 +10,7 @@ public class StreamDL extends InputStream {
     private int count;
     private final Collection<StreamListener> listeners = new ArrayList<>();
 
-    public StreamDL(InputStream in, int totalBytes) {
+    public StreamDL(InputStream in, long totalBytes) {
         this.in = in;
         DownloadManager.addTotalBytes(totalBytes);
     }

src/main/java/pojlib/util/json/MinecraftInstances.java

@@ -216,7 +216,7 @@ private void updateModByType(List<ProjectInfo> newMods) throws IOException {
                             (legacyMod ? extMod.slug : extMod.fileName) + (extMod.type.equals("resourcepack") ? ".zip" : ".jar")
                     );
                     if(!mod.exists()) {
-                        DownloadUtils.downloadFile(extMod.download_link, mod);
+                        DownloadUtils.downloadFile(extMod.download_link, mod, 0);
                     }
                 }
                 newExtMods.add(extMod);
@@ -232,7 +232,7 @@ private void downloadAllMods(List<ProjectInfo> newMods) throws IOException {
                         gameDir + (newMod.type.equals("mod") ? "/mods" : "/resourcepacks"),
                         (legacyMod ? newMod.slug : newMod.fileName) + (newMod.type.equals("resourcepack") ? ".zip" : ".jar")
                 );
-                DownloadUtils.downloadFile(newMod.download_link, mod);
+                DownloadUtils.downloadFile(newMod.download_link, mod, 0);
             }
 
             extProjects = newMods.toArray(new ProjectInfo[0]);