diff options
author | modmuss50 <modmuss50@gmail.com> | 2021-05-12 20:31:05 +0100 |
---|---|---|
committer | modmuss50 <modmuss50@gmail.com> | 2021-05-12 20:31:05 +0100 |
commit | 2f38c747a1c93893d0c797500c9d226b569d51b5 (patch) | |
tree | e9a2b638a672b675eb13a87acf155f01398e6a72 /src/main/java/net/fabricmc/loom | |
parent | 258578f142dbae864c0a3a9932cd4b9f6414d7cf (diff) | |
download | architectury-loom-2f38c747a1c93893d0c797500c9d226b569d51b5.tar.gz architectury-loom-2f38c747a1c93893d0c797500c9d226b569d51b5.tar.bz2 architectury-loom-2f38c747a1c93893d0c797500c9d226b569d51b5.zip |
Catch all when merging jars
Diffstat (limited to 'src/main/java/net/fabricmc/loom')
-rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java index d95406fb..8ea88b7c 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java @@ -31,7 +31,6 @@ import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.Optional; import java.util.function.Consumer; -import java.util.zip.ZipError; import com.google.common.io.Files; import com.google.gson.GsonBuilder; @@ -101,13 +100,13 @@ public class MinecraftProvider extends DependencyProvider { if (!minecraftMergedJar.exists() || isRefreshDeps()) { try { mergeJars(getProject().getLogger()); - } catch (ZipError e) { + } catch (Throwable e) { HashedDownloadUtil.delete(minecraftClientJar); HashedDownloadUtil.delete(minecraftServerJar); minecraftMergedJar.delete(); getProject().getLogger().error("Could not merge JARs! Deleting source JARs - please re-run the command and move on.", e); - throw new RuntimeException(); + throw e; } } } |