ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

More cleanup

Browse Source
This commit is contained in:
Adam
2015-10-16 20:45:54 -04:00
parent d4c19592e1
commit 62f3fb1671
3 changed files with 6 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/net/runelite/cache/fs/Archive.java vendored
View File

@@ -91,27 +91,7 @@ public class Archive
File file = new File(this, fileId); File file = new File(this, fileId);
this.files.add(file); 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) public void loadNames(InputStream stream, int numberOfFiles)

10
src/main/java/net/runelite/cache/fs/DataFile.java vendored
View File

@@ -99,9 +99,9 @@ public class DataFile implements Closeable
if (0xFFFF < archiveId) if (0xFFFF < archiveId)
{ {
headerSize = 10; 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); int i = dat.read(this.readCachedBuffer, 0, headerSize + dataBlockSize);
@@ -119,9 +119,9 @@ public class DataFile implements Closeable
else else
{ {
headerSize = 8; 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); int i = dat.read(this.readCachedBuffer, 0, headerSize + dataBlockSize);
@@ -142,7 +142,7 @@ public class DataFile implements Closeable
return null; return null;
} }
if (nextSector < 0 || dat.length() / 520L < (long) nextSector) if (nextSector < 0 || dat.length() / SECTOR_SIZE < (long) nextSector)
{ {
return null; return null;
} }

7
src/main/java/net/runelite/cache/fs/Store.java vendored
View File

@@ -28,10 +28,6 @@ public class Store implements Closeable
for (int i = 0; i < index255.getIndexCount(); ++i) for (int i = 0; i < index255.getIndexCount(); ++i)
{ {
this.addIndex(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(); data.close();
index255.close(); index255.close();
for (Index i : indexes) for (Index i : indexes)
//for (IndexFile i : indexFiles)
i.close(); i.close();
} }
@@ -87,7 +82,7 @@ public class Store implements Closeable
return true; return true;
} }
public Index addIndex(int id) throws FileNotFoundException public final Index addIndex(int id) throws FileNotFoundException
{ {
for (Index i : indexes) for (Index i : indexes)
if (i.getIndex().getIndexFileId() == id) if (i.getIndex().getIndexFileId() == id)