From ef3e1260b085b0f43a9a1c043b11d5fc8af3cd38 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 8 Sep 2021 11:41:00 +0100 Subject: [PATCH 1/2] Update Mixin Compile Extensions to support upcoming mixin versions --- src/main/java/net/fabricmc/loom/util/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index 2c0ac66d..18595264 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -102,7 +102,7 @@ public class Constants { * Constants for versions of dependencies. */ public static final class Versions { - public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.3"; + public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.6"; public static final String DEV_LAUNCH_INJECTOR = "0.2.1+build.8"; public static final String TERMINAL_CONSOLE_APPENDER = "1.2.0"; public static final String JETBRAINS_ANNOTATIONS = "19.0.0"; From 72b1ca442ef0be039853a8b749840d118a3385ea Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 16 Jul 2021 22:48:50 +0100 Subject: [PATCH 2/2] Actually handle gzip encoded connections when downloading. --- src/main/java/net/fabricmc/loom/util/DownloadUtil.java | 10 +++++++++- .../net/fabricmc/loom/util/HashedDownloadUtil.java | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/util/DownloadUtil.java b/src/main/java/net/fabricmc/loom/util/DownloadUtil.java index 90131b4c..fcc79aa7 100644 --- a/src/main/java/net/fabricmc/loom/util/DownloadUtil.java +++ b/src/main/java/net/fabricmc/loom/util/DownloadUtil.java @@ -26,9 +26,11 @@ package net.fabricmc.loom.util; import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; +import java.util.zip.GZIPInputStream; import com.google.common.io.Files; import org.apache.commons.io.FileUtils; @@ -110,7 +112,13 @@ public class DownloadUtil { } try { // Try download to the output - FileUtils.copyInputStreamToFile(connection.getInputStream(), to); + InputStream inputStream = connection.getInputStream(); + + if ("gzip".equals(connection.getContentEncoding())) { + inputStream = new GZIPInputStream(inputStream); + } + + FileUtils.copyInputStreamToFile(inputStream, to); } catch (IOException e) { delete(to); // Probably isn't good if it fails to copy/save throw e; diff --git a/src/main/java/net/fabricmc/loom/util/HashedDownloadUtil.java b/src/main/java/net/fabricmc/loom/util/HashedDownloadUtil.java index 8f1f2b25..211e7dd9 100644 --- a/src/main/java/net/fabricmc/loom/util/HashedDownloadUtil.java +++ b/src/main/java/net/fabricmc/loom/util/HashedDownloadUtil.java @@ -27,9 +27,11 @@ package net.fabricmc.loom.util; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; +import java.util.zip.GZIPInputStream; import javax.annotation.Nullable; @@ -78,7 +80,13 @@ public class HashedDownloadUtil { } try { // Try download to the output - FileUtils.copyInputStreamToFile(connection.getInputStream(), to); + InputStream inputStream = connection.getInputStream(); + + if ("gzip".equals(connection.getContentEncoding())) { + inputStream = new GZIPInputStream(inputStream); + } + + FileUtils.copyInputStreamToFile(inputStream, to); } catch (IOException e) { delete(to); // Probably isn't good if it fails to copy/save throw e;