From 9125e65e60723675e7f0d11f85ac1d646af95fed Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sat, 17 Oct 2015 15:28:07 -0400
Subject: [PATCH] After some digging, it looks like this is bzip1 and not bzip2

---
 .../java/net/runelite/cache/fs/DataFile.java  |  2 +-
 ...ip2BlockEntry.java => BZipBlockEntry.java} |  2 +-
 ...ecompressor.java => BZipDecompressor.java} | 20 +++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename src/main/java/net/runelite/cache/fs/util/{BZip2BlockEntry.java => BZipBlockEntry.java} (97%)
 rename src/main/java/net/runelite/cache/fs/util/{BZip2Decompressor.java => BZipDecompressor.java} (96%)

diff --git a/src/main/java/net/runelite/cache/fs/DataFile.java b/src/main/java/net/runelite/cache/fs/DataFile.java
index 9c11dd9046..0ec7d75605 100644
--- a/src/main/java/net/runelite/cache/fs/DataFile.java
+++ b/src/main/java/net/runelite/cache/fs/DataFile.java
@@ -294,7 +294,7 @@ public class DataFile implements Closeable
 				int length = stream.readInt();
 				data = new byte[length];
 				revision = this.checkRevision(stream, compressedLength);
-				BZip2Decompressor.decompress(data, b, compressedLength, 9);
+				BZipDecompressor.decompress(data, b, compressedLength, 9);
 				break;
 			}
 			default:
diff --git a/src/main/java/net/runelite/cache/fs/util/BZip2BlockEntry.java b/src/main/java/net/runelite/cache/fs/util/BZipBlockEntry.java
similarity index 97%
rename from src/main/java/net/runelite/cache/fs/util/BZip2BlockEntry.java
rename to src/main/java/net/runelite/cache/fs/util/BZipBlockEntry.java
index c4c65bdde4..b996f0d513 100644
--- a/src/main/java/net/runelite/cache/fs/util/BZip2BlockEntry.java
+++ b/src/main/java/net/runelite/cache/fs/util/BZipBlockEntry.java
@@ -1,6 +1,6 @@
 package net.runelite.cache.fs.util;
 
-public class BZip2BlockEntry {
+public class BZipBlockEntry {
    boolean[] aBooleanArray2205 = new boolean[16];
    boolean[] aBooleanArray2213 = new boolean[256];
    byte aByte2201;
diff --git a/src/main/java/net/runelite/cache/fs/util/BZip2Decompressor.java b/src/main/java/net/runelite/cache/fs/util/BZipDecompressor.java
similarity index 96%
rename from src/main/java/net/runelite/cache/fs/util/BZip2Decompressor.java
rename to src/main/java/net/runelite/cache/fs/util/BZipDecompressor.java
index bb8eaf7387..8c6ffeef3c 100644
--- a/src/main/java/net/runelite/cache/fs/util/BZip2Decompressor.java
+++ b/src/main/java/net/runelite/cache/fs/util/BZipDecompressor.java
@@ -1,13 +1,13 @@
 package net.runelite.cache.fs.util;
 
-import net.runelite.cache.fs.util.BZip2BlockEntry;
+import net.runelite.cache.fs.util.BZipBlockEntry;
 
-public class BZip2Decompressor {
+public class BZipDecompressor {
    private static int[] anIntArray257;
-   private static BZip2BlockEntry entryInstance = new BZip2BlockEntry();
+   private static BZipBlockEntry entryInstance = new BZipBlockEntry();
 
    public static final void decompress(byte[] decompressedData, byte[] packedData, int containerSize, int blockSize) {
-      BZip2BlockEntry var4 = entryInstance;
+      BZipBlockEntry var4 = entryInstance;
       synchronized(entryInstance) {
          entryInstance.aByteArray2224 = packedData;
          entryInstance.anInt2209 = blockSize;
@@ -24,7 +24,7 @@ public class BZip2Decompressor {
       }
    }
 
-   private static final void method1785(BZip2BlockEntry entry) {
+   private static final void method1785(BZipBlockEntry entry) {
       entry.anInt2215 = 0;
 
       for(int i = 0; i < 256; ++i) {
@@ -80,7 +80,7 @@ public class BZip2Decompressor {
 
    }
 
-   private static final void method1787(BZip2BlockEntry entry) {
+   private static final void method1787(BZipBlockEntry entry) {
       byte byte4 = entry.aByte2201;
       int i = entry.anInt2222;
       int j = entry.anInt2227;
@@ -203,15 +203,15 @@ public class BZip2Decompressor {
       entry.anInt2206 = j1;
    }
 
-   private static final byte method1788(BZip2BlockEntry entry) {
+   private static final byte method1788(BZipBlockEntry entry) {
       return (byte)method1790(1, entry);
    }
 
-   private static final byte method1789(BZip2BlockEntry entry) {
+   private static final byte method1789(BZipBlockEntry entry) {
       return (byte)method1790(8, entry);
    }
 
-   private static final int method1790(int i, BZip2BlockEntry entry) {
+   private static final int method1790(int i, BZipBlockEntry entry) {
       while(entry.anInt2232 < i) {
          entry.anInt2207 = entry.anInt2207 << 8 | entry.aByteArray2224[entry.anInt2209] & 255;
          entry.anInt2232 += 8;
@@ -228,7 +228,7 @@ public class BZip2Decompressor {
       entryInstance = null;
    }
 
-   private static final void method1793(BZip2BlockEntry entry) {
+   private static final void method1793(BZipBlockEntry entry) {
       int j8 = 0;
       int[] ai = (int[])null;
       int[] ai1 = (int[])null;