Support downloading bytes to memory, closes #7 (#11)

Author: PaintNinja

download-utils/src/java11/java/net/minecraftforge/util/download/DownloadUtils.java

@@ -98,20 +98,49 @@ private static InputStream connect(String address) throws IOException, Interrupt
     }
 
     /**
-     * Downloads a string from the given URL, effectively acting as {@code curl}.
+     * Downloads raw bytes from the given URL.
      *
      * @param url The URL to download from
-     * @return The downloaded string
+     * @return The downloaded bytes, stored in memory
      * @throws IOException If the download failed
      */
-    public static String downloadString(String url) throws IOException {
+    public static byte[] downloadBytes(String url) throws IOException {
         try (InputStream stream = connect(url)) {
-            return new String(stream.readAllBytes(), StandardCharsets.UTF_8);
+            return stream.readAllBytes();
         } catch (Exception e) {
             throw new DownloadFailedException(url, e);
         }
     }
 
+    /**
+     * Downloads raw bytes from the given URL.
+     * <p>Returns {@code null} on failure.</p>
+     *
+     * @param url The URL to download from
+     * @return The downloaded bytes, stored in memory, or {@code null} if the download failed
+     */
+    public static byte @Nullable [] tryDownloadBytes(boolean silent, String url) {
+        try {
+            return downloadBytes(url);
+        } catch (IOException e) {
+            if (!silent) {
+                e.printStackTrace(Log.WARN);
+            }
+            return null;
+        }
+    }
+
+    /**
+     * Downloads a string from the given URL, effectively acting as {@code curl}.
+     *
+     * @param url The URL to download from
+     * @return The downloaded string
+     * @throws IOException If the download failed
+     */
+    public static String downloadString(String url) throws IOException {
+        return new String(downloadBytes(url), StandardCharsets.UTF_8);
+    }
+
     /**
      * Downloads a string from the given URL, effectively acting as {@code curl}.
      * <p>Returns {@code null} on failure.</p>

download-utils/src/main/java/net/minecraftforge/util/download/DownloadUtils.java

@@ -93,13 +93,13 @@ private static <R, E extends Throwable> R sneak(Throwable t) throws E {
     }
 
     /**
-     * Downloads a string from the given URL, effectively acting as {@code curl}.
+     * Downloads raw bytes from the given URL.
      *
      * @param url The URL to download from
-     * @return The downloaded string
+     * @return The downloaded bytes, stored in memory
      * @throws IOException If the download failed
      */
-    public static String downloadString(String url) throws IOException {
+    public static byte[] downloadBytes(String url) throws IOException {
         try (InputStream stream = connect(url);
              ByteArrayOutputStream out = new ByteArrayOutputStream()
         ) {
@@ -110,12 +110,41 @@ public static String downloadString(String url) throws IOException {
                 out.write(buf, 0, n);
             }
 
-            return new String(out.toByteArray(), StandardCharsets.UTF_8);
+            return out.toByteArray();
         } catch (Exception e) {
             throw new DownloadFailedException(url, e);
         }
     }
 
+    /**
+     * Downloads raw bytes from the given URL.
+     * <p>Returns {@code null} on failure.</p>
+     *
+     * @param url The URL to download from
+     * @return The downloaded bytes, stored in memory, or {@code null} if the download failed
+     */
+    public static byte @Nullable [] tryDownloadBytes(boolean silent, String url) {
+        try {
+            return downloadBytes(url);
+        } catch (IOException e) {
+            if (!silent) {
+                e.printStackTrace(Log.WARN);
+            }
+            return null;
+        }
+    }
+
+    /**
+     * Downloads a string from the given URL, effectively acting as {@code curl}.
+     *
+     * @param url The URL to download from
+     * @return The downloaded string
+     * @throws IOException If the download failed
+     */
+    public static String downloadString(String url) throws IOException {
+        return new String(downloadBytes(url), StandardCharsets.UTF_8);
+    }
+
     /**
      * Downloads a string from the given URL, effectively acting as {@code curl}.
      * <p>Returns {@code null} on failure.</p>