From 62f3fb167161cf022ed46eedac0ca9e8618ee76f Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Fri, 16 Oct 2015 20:45:54 -0400
Subject: [PATCH] More cleanup

---
 .../java/net/runelite/cache/fs/Archive.java   | 20 -------------------
 .../java/net/runelite/cache/fs/DataFile.java  | 10 +++++-----
 .../java/net/runelite/cache/fs/Store.java     |  7 +------
 3 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/src/main/java/net/runelite/cache/fs/Archive.java b/src/main/java/net/runelite/cache/fs/Archive.java
index 8c3b7e7c02..1790638ef5 100644
--- a/src/main/java/net/runelite/cache/fs/Archive.java
+++ b/src/main/java/net/runelite/cache/fs/Archive.java
@@ -91,27 +91,7 @@ public class Archive
 
 			File file = new File(this, fileId);
 			this.files.add(file);
-			//archive1.getValidFileIds()[index21] = fileId;
 		}
-
-		//archive1.setFiles(new FileReference[index2 + 1]);
-
-//		for (int i = 0; i < archive1.getValidFileIds().length; ++i) {
-//			archive1.getFiles()[archive1.getValidFileIds()[ki]] = new FileReference();
-//		}
-		
-//		if (this.named)
-//		{
-//			for (index = 0; index < validArchivesCount; ++index)
-//			{
-//				ArchiveReference var14 = this.archives[this.validArchiveIds[index]];
-//
-//				for (index2 = 0; index2 < var14.getValidFileIds().length; ++index2)
-//				{
-//					var14.getFiles()[var14.getValidFileIds()[index2]].setNameHash(stream.readInt());
-//				}
-//			}
-//		}
 	}
 	
 	public void loadNames(InputStream stream, int numberOfFiles)
diff --git a/src/main/java/net/runelite/cache/fs/DataFile.java b/src/main/java/net/runelite/cache/fs/DataFile.java
index 40c9c39977..bee25c46ea 100644
--- a/src/main/java/net/runelite/cache/fs/DataFile.java
+++ b/src/main/java/net/runelite/cache/fs/DataFile.java
@@ -99,9 +99,9 @@ public class DataFile implements Closeable
 			if (0xFFFF < archiveId)
 			{
 				headerSize = 10;
-				if (dataBlockSize > 510)
+				if (dataBlockSize > SECTOR_SIZE - headerSize)
 				{
-					dataBlockSize = 510;
+					dataBlockSize = SECTOR_SIZE - headerSize;
 				}
 
 				int i = dat.read(this.readCachedBuffer, 0, headerSize + dataBlockSize);
@@ -119,9 +119,9 @@ public class DataFile implements Closeable
 			else
 			{
 				headerSize = 8;
-				if (dataBlockSize > 512)
+				if (dataBlockSize > SECTOR_SIZE - headerSize)
 				{
-					dataBlockSize = 512;
+					dataBlockSize = SECTOR_SIZE - headerSize;
 				}
 
 				int i = dat.read(this.readCachedBuffer, 0, headerSize + dataBlockSize);
@@ -142,7 +142,7 @@ public class DataFile implements Closeable
 				return null;
 			}
 
-			if (nextSector < 0 || dat.length() / 520L < (long) nextSector)
+			if (nextSector < 0 || dat.length() / SECTOR_SIZE < (long) nextSector)
 			{
 				return null;
 			}
diff --git a/src/main/java/net/runelite/cache/fs/Store.java b/src/main/java/net/runelite/cache/fs/Store.java
index 6ea1ef87b7..6324d03ad5 100644
--- a/src/main/java/net/runelite/cache/fs/Store.java
+++ b/src/main/java/net/runelite/cache/fs/Store.java
@@ -28,10 +28,6 @@ public class Store implements Closeable
 		for (int i = 0; i < index255.getIndexCount(); ++i)
 		{
 			this.addIndex(i);
-//			IndexFile ifile = new IndexFile(this, i, new File(folder, MAIN_FILE_CACHE_IDX + i));
-//			Index index = new Index(this, ifile, i);
-//			
-//			indexes.add(index);
 		}
 	}
 
@@ -41,7 +37,6 @@ public class Store implements Closeable
 		data.close();
 		index255.close();
 		for (Index i : indexes)
-		//for (IndexFile i : indexFiles)
 			i.close();
 	}
 
@@ -87,7 +82,7 @@ public class Store implements Closeable
 		return true;
 	}
 	
-	public Index addIndex(int id) throws FileNotFoundException
+	public final Index addIndex(int id) throws FileNotFoundException
 	{
 		for (Index i : indexes)
 			if (i.getIndex().getIndexFileId() == id)