diff --git a/src/main/java/net/fabricmc/loom/task/UnpickJarTask.java b/src/main/java/net/fabricmc/loom/task/UnpickJarTask.java index e27d2ff2..7f66aa61 100644 --- a/src/main/java/net/fabricmc/loom/task/UnpickJarTask.java +++ b/src/main/java/net/fabricmc/loom/task/UnpickJarTask.java @@ -47,7 +47,7 @@ public class UnpickJarTask extends JavaExec { public UnpickJarTask() { getOutputs().upToDateWhen(e -> false); classpath(getProject().getConfigurations().getByName(Constants.Configurations.UNPICK_CLASSPATH)); - setMain("daomephsta.unpick.cli.Main"); + getMainClass().set("daomephsta.unpick.cli.Main"); } @Override diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index f4d12355..faa82cda 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -99,7 +99,7 @@ public class Constants { * Constants for versions of dependencies. */ public static final class Versions { - public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.4"; + 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"; diff --git a/src/main/java/net/fabricmc/loom/util/DownloadUtil.java b/src/main/java/net/fabricmc/loom/util/DownloadUtil.java index 1da65ae5..56ccf8d3 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 a03126d1..abf1a335 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; @@ -106,7 +108,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;