diff --git a/cache/src/main/java/dev/openrs2/cache/Js5CompressionType.kt b/cache/src/main/java/dev/openrs2/cache/Js5CompressionType.kt index 99f3e11d..83706b56 100644 --- a/cache/src/main/java/dev/openrs2/cache/Js5CompressionType.kt +++ b/cache/src/main/java/dev/openrs2/cache/Js5CompressionType.kt @@ -1,11 +1,12 @@ package dev.openrs2.cache import dev.openrs2.compress.bzip2.Bzip2 -import dev.openrs2.compress.gzip.Gzip +import dev.openrs2.compress.gzip.GzipLevelOutputStream import dev.openrs2.compress.lzma.Lzma import java.io.InputStream import java.io.OutputStream import java.util.zip.Deflater +import java.util.zip.GZIPInputStream enum class Js5CompressionType { NONE, @@ -17,7 +18,7 @@ enum class Js5CompressionType { return when (this) { NONE -> input BZIP2 -> Bzip2.createHeaderlessInputStream(input) - GZIP -> Gzip.createHeaderlessInputStream(input) + GZIP -> GZIPInputStream(input) LZMA -> Lzma.createHeaderlessInputStream(input, length.toLong()) } } @@ -26,7 +27,7 @@ enum class Js5CompressionType { return when (this) { NONE -> output BZIP2 -> Bzip2.createHeaderlessOutputStream(output) - GZIP -> Gzip.createHeaderlessOutputStream(output, Deflater.BEST_COMPRESSION) + GZIP -> GzipLevelOutputStream(output, Deflater.BEST_COMPRESSION) /* * LZMA at -9 has significantly higher CPU/memory requirements for * both compression _and_ decompression, so we use the default of diff --git a/cache/src/test/resources/dev/openrs2/cache/gzip-encrypted.dat b/cache/src/test/resources/dev/openrs2/cache/gzip-encrypted.dat index c88e3817..c186706c 100644 Binary files a/cache/src/test/resources/dev/openrs2/cache/gzip-encrypted.dat and b/cache/src/test/resources/dev/openrs2/cache/gzip-encrypted.dat differ diff --git a/cache/src/test/resources/dev/openrs2/cache/gzip.dat b/cache/src/test/resources/dev/openrs2/cache/gzip.dat index 8e2ff3cf..1b021507 100644 Binary files a/cache/src/test/resources/dev/openrs2/cache/gzip.dat and b/cache/src/test/resources/dev/openrs2/cache/gzip.dat differ