diff --git a/src/main/java/net/runelite/cache/fs/DataFile.java b/src/main/java/net/runelite/cache/fs/DataFile.java index b85e1f0a27..0480e6739d 100644 --- a/src/main/java/net/runelite/cache/fs/DataFile.java +++ b/src/main/java/net/runelite/cache/fs/DataFile.java @@ -10,7 +10,7 @@ import java.util.Objects; import net.runelite.cache.fs.io.InputStream; import net.runelite.cache.fs.io.OutputStream; import net.runelite.cache.fs.util.BZip2Decompressor; -import net.runelite.cache.fs.util.GZipDecompressor; +import net.runelite.cache.fs.util.GZip; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -302,7 +302,7 @@ public class DataFile implements Closeable int length = stream.readInt(); data = new byte[length]; revision = this.checkRevision(stream, compressedLength); - GZipDecompressor.decompress(stream, data); + GZip.decompress(stream, data); } } diff --git a/src/main/java/net/runelite/cache/fs/Index.java b/src/main/java/net/runelite/cache/fs/Index.java index 6ad4df24dd..cb116f833b 100644 --- a/src/main/java/net/runelite/cache/fs/Index.java +++ b/src/main/java/net/runelite/cache/fs/Index.java @@ -9,8 +9,6 @@ import java.util.List; import java.util.Objects; import net.runelite.cache.fs.io.InputStream; import net.runelite.cache.fs.io.OutputStream; -import net.runelite.cache.fs.util.BZip2Decompressor; -import net.runelite.cache.fs.util.GZipDecompressor; public class Index implements Closeable { diff --git a/src/main/java/net/runelite/cache/fs/util/CRC32HGenerator.java b/src/main/java/net/runelite/cache/fs/util/CRC32HGenerator.java index 179dddb68d..a81189f211 100644 --- a/src/main/java/net/runelite/cache/fs/util/CRC32HGenerator.java +++ b/src/main/java/net/runelite/cache/fs/util/CRC32HGenerator.java @@ -2,20 +2,18 @@ package net.runelite.cache.fs.util; import java.util.zip.CRC32; -public final class CRC32HGenerator { - public static final CRC32 CRC32Instance = new CRC32(); +public final class CRC32HGenerator +{ + public static final CRC32 CRC32Instance = new CRC32(); - public static int getHash(byte[] data) { - return getHash(data, 0, data.length); - } - - public static int getHash(byte[] data, int offset, int length) { - CRC32 var3 = CRC32Instance; - synchronized(CRC32Instance) { - CRC32Instance.update(data, offset, length); - int hash = (int)CRC32Instance.getValue(); - CRC32Instance.reset(); - return hash; - } - } + public static int getHash(byte[] data) + { + synchronized (CRC32Instance) + { + CRC32Instance.update(data, 0, data.length); + int hash = (int) CRC32Instance.getValue(); + CRC32Instance.reset(); + return hash; + } + } }