From 8d57dfe1e4559e76c02d8d6c5396263c6377a795 Mon Sep 17 00:00:00 2001 From: Tobias Schulte Date: Mon, 30 Apr 2018 14:28:37 +0200 Subject: [PATCH] make ucode with pack.gz work again Closes #94 --- src/main/java/com/threerings/getdown/data/Resource.java | 3 ++- src/main/java/com/threerings/getdown/util/FileUtil.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/threerings/getdown/data/Resource.java b/src/main/java/com/threerings/getdown/data/Resource.java index c7281cc..aada5ee 100644 --- a/src/main/java/com/threerings/getdown/data/Resource.java +++ b/src/main/java/com/threerings/getdown/data/Resource.java @@ -334,7 +334,8 @@ public class Resource implements Comparable protected static boolean isPacked200Jar (String path) { - return path.endsWith(".jar.pack") || path.endsWith(".jar.pack.gz"); + return path.endsWith(".jar.pack") || path.endsWith(".jar.pack_new") || + path.endsWith(".jar.pack.gz")|| path.endsWith(".jar.pack.gz_new"); } protected String _path; diff --git a/src/main/java/com/threerings/getdown/util/FileUtil.java b/src/main/java/com/threerings/getdown/util/FileUtil.java index f59e8bc..0b26946 100644 --- a/src/main/java/com/threerings/getdown/util/FileUtil.java +++ b/src/main/java/com/threerings/getdown/util/FileUtil.java @@ -177,7 +177,7 @@ public class FileUtil extractedJarFileOut = new FileOutputStream(target); jarOutputStream = new JarOutputStream(extractedJarFileOut); packedJarIn = new FileInputStream(packedJar); - if (packedJar.getName().endsWith(".gz")) { + if (packedJar.getName().endsWith(".gz") || packedJar.getName().endsWith(".gz_new")) { packedJarIn = new GZIPInputStream(packedJarIn); } Pack200.Unpacker unpacker = Pack200.newUnpacker();