diff --git a/JavaApp/libs/ExagearApacheCommons.jar b/JavaApp/libs/ExagearApacheCommons.jar deleted file mode 100644 index 59f9b9e6..00000000 Binary files a/JavaApp/libs/ExagearApacheCommons.jar and /dev/null differ diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java index 722753de..306c306f 100644 --- a/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -12,8 +12,10 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FileWriter; +import java.io.InputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.PrintWriter; import java.io.StringWriter; import java.lang.reflect.Field; @@ -589,6 +591,14 @@ public final class Tools return out; } + public static void copy(final InputStream input, final OutputStream output) throws IOException { + final byte[] buffer = new byte[8192]; + int n = 0; + while ((n = input.read(buffer)) != -1) { + output.write(buffer, 0, n); + } + } + public static File lastFileModified(String dir) { File fl = new File(dir); @@ -610,7 +620,6 @@ public final class Tools return choice; } - public static String read(InputStream is) throws IOException { String out = ""; int len; diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/YggdrasilAuthenticator.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/YggdrasilAuthenticator.java index 6f769fc5..5247e146 100644 --- a/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/YggdrasilAuthenticator.java +++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/YggdrasilAuthenticator.java @@ -5,7 +5,6 @@ import java.net.*; import java.nio.charset.*; import java.util.*; import net.kdt.pojavlaunch.*; -import org.apache.commons.io.*; public class YggdrasilAuthenticator { private static final String API_URL = "https://authserver.mojang.com/"; @@ -46,7 +45,7 @@ public class YggdrasilAuthenticator { } if (is != null) { - IOUtils.copy(is, bos); + Tools.copy(is, bos); try { is.close(); } catch (Exception e) { diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/DownloadUtils.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/DownloadUtils.java index 4dd85d8c..1ff8c08e 100644 --- a/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/DownloadUtils.java +++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/DownloadUtils.java @@ -6,8 +6,6 @@ import java.nio.charset.*; import net.kdt.pojavlaunch.*; -import org.apache.commons.io.*; - public class DownloadUtils { public static final String USER_AGENT = Tools.APP_NAME; public static final Charset utf8 = Charset.forName("UTF-8"); @@ -30,7 +28,7 @@ public class DownloadUtils { + ": " + conn.getResponseMessage()); } is = conn.getInputStream(); - IOUtils.copy(is, os); + Tools.copy(is, os); } catch (IOException e) { throw new IOException("Unable to download from " + url.toString(), e); } finally { diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/FileUtils.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/FileUtils.java deleted file mode 100644 index 3467b7ca..00000000 --- a/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/FileUtils.java +++ /dev/null @@ -1,5 +0,0 @@ -package net.kdt.pojavlaunch.utils; - -public class FileUtils -{ -} \ No newline at end of file