From eeeafb93b7f56756de9fc4a7b92b78a46e858d07 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sun, 7 Jul 2019 06:24:17 +0200 Subject: [PATCH] Rename AbstractIndexCache to be more accurate --- ...Mixin.java => RSAbstractArchiveMixin.java} | 14 +- .../net/runelite/mixins/RSClientMixin.java | 4 +- .../java/net/runelite/mixins/SpriteMixin.java | 6 +- ...IndexCache.java => RSAbstractArchive.java} | 4 +- .../api/{RSIndexCache.java => RSArchive.java} | 2 +- .../java/net/runelite/rs/api/RSClient.java | 8 +- ...ctIndexCache.java => AbstractArchive.java} | 404 +++++++++--------- .../main/java/AbstractByteArrayCopier.java | 4 +- .../src/main/java/AbstractUserComparator.java | 2 +- .../src/main/java/AbstractWorldMapIcon.java | 2 +- runescape-client/src/main/java/Actor.java | 8 +- .../java/{IndexCache.java => Archive.java} | 63 +-- .../src/main/java/BufferedSource.java | 2 +- .../src/main/java/ByteArrayPool.java | 2 +- runescape-client/src/main/java/Canvas.java | 6 +- runescape-client/src/main/java/Client.java | 49 +-- .../src/main/java/DynamicObject.java | 8 +- .../src/main/java/EnumDefinition.java | 2 +- .../src/main/java/FloorDecoration.java | 34 +- runescape-client/src/main/java/FontName.java | 2 +- runescape-client/src/main/java/Fonts.java | 14 +- .../src/main/java/Formatting.java | 2 +- runescape-client/src/main/java/Frames.java | 8 +- runescape-client/src/main/java/GameShell.java | 4 +- .../src/main/java/GrandExchangeEvent.java | 2 +- .../src/main/java/GroundItemPile.java | 4 +- .../src/main/java/GzipDecompressor.java | 2 +- .../src/main/java/HealthBarDefinition.java | 4 +- .../src/main/java/HitSplatDefinition.java | 6 +- .../src/main/java/IndexCacheLoader.java | 18 +- .../src/main/java/IndexStoreAction.java | 2 +- .../src/main/java/Interpreter.java | 2 +- .../src/main/java/InvDefinition.java | 5 +- .../src/main/java/IsaacCipher.java | 2 +- .../src/main/java/ItemContainer.java | 10 +- .../src/main/java/ItemDefinition.java | 16 +- .../src/main/java/KitDefinition.java | 8 +- runescape-client/src/main/java/Login.java | 8 +- .../src/main/java/LoginScreenAnimation.java | 2 +- .../src/main/java/MenuAction.java | 6 +- runescape-client/src/main/java/Message.java | 2 +- .../src/main/java/MidiPcmStream.java | 2 +- runescape-client/src/main/java/ModelData.java | 4 +- .../src/main/java/MusicSample.java | 10 +- .../src/main/java/MusicTrack.java | 4 +- runescape-client/src/main/java/NPC.java | 2 +- .../src/main/java/NPCDefinition.java | 10 +- runescape-client/src/main/java/NetCache.java | 4 +- .../src/main/java/NetFileRequest.java | 2 +- runescape-client/src/main/java/NetSocket.java | 2 +- .../src/main/java/ObjectDefinition.java | 14 +- .../src/main/java/ObjectSound.java | 2 +- runescape-client/src/main/java/Occluder.java | 2 +- .../src/main/java/OverlayDefinition.java | 2 +- .../src/main/java/PacketBuffer.java | 2 +- .../src/main/java/ParamKeyDefinition.java | 2 +- runescape-client/src/main/java/Player.java | 2 +- .../src/main/java/RectangleMode.java | 2 +- .../src/main/java/RouteStrategy.java | 4 +- .../src/main/java/SecureRandomCallable.java | 2 +- .../src/main/java/SecureRandomFuture.java | 2 +- .../src/main/java/SequenceDefinition.java | 6 +- runescape-client/src/main/java/Skeleton.java | 2 +- runescape-client/src/main/java/Skills.java | 2 +- .../src/main/java/SoundCache.java | 6 +- .../src/main/java/SoundEffect.java | 4 +- .../src/main/java/SoundSystem.java | 2 +- .../main/java/SpotAnimationDefinition.java | 4 +- runescape-client/src/main/java/SpriteIds.java | 8 +- .../src/main/java/SpriteMask.java | 4 +- runescape-client/src/main/java/Strings.java | 6 +- .../src/main/java/StructDefinition.java | 4 +- .../src/main/java/StudioGame.java | 2 +- runescape-client/src/main/java/Texture.java | 4 +- .../src/main/java/TextureProvider.java | 6 +- .../src/main/java/UnderlayDefinition.java | 2 +- .../src/main/java/UnitPriceComparator.java | 2 +- .../src/main/java/UserComparator3.java | 2 +- .../src/main/java/VarbitDefinition.java | 2 +- runescape-client/src/main/java/VarcInt.java | 2 +- runescape-client/src/main/java/Varcs.java | 2 +- .../src/main/java/VarpDefinition.java | 2 +- runescape-client/src/main/java/Varps.java | 2 +- runescape-client/src/main/java/Widget.java | 4 +- .../src/main/java/WidgetGroupParent.java | 4 +- runescape-client/src/main/java/WorldMap.java | 18 +- .../src/main/java/WorldMapAreaData.java | 2 +- .../src/main/java/WorldMapDecoration.java | 4 +- .../src/main/java/WorldMapDecorationType.java | 6 +- .../src/main/java/WorldMapElement.java | 2 +- .../src/main/java/WorldMapIcon1.java | 2 +- .../main/java/WorldMapIndexCacheLoader.java | 10 +- .../src/main/java/WorldMapLabelSize.java | 2 +- .../src/main/java/WorldMapManager.java | 18 +- .../src/main/java/WorldMapRegion.java | 12 +- .../src/main/java/WorldMapSection1.java | 4 +- .../src/main/java/WorldMapSection3.java | 2 +- runescape-client/src/main/java/class1.java | 2 +- runescape-client/src/main/java/class13.java | 4 +- runescape-client/src/main/java/class16.java | 2 +- runescape-client/src/main/java/class171.java | 102 ++--- runescape-client/src/main/java/class2.java | 20 +- runescape-client/src/main/java/class204.java | 6 +- runescape-client/src/main/java/class21.java | 4 +- runescape-client/src/main/java/class211.java | 4 +- runescape-client/src/main/java/class214.java | 6 +- runescape-client/src/main/java/class22.java | 6 +- runescape-client/src/main/java/class229.java | 2 +- runescape-client/src/main/java/class238.java | 2 +- runescape-client/src/main/java/class27.java | 2 +- runescape-client/src/main/java/class30.java | 4 +- runescape-client/src/main/java/class322.java | 2 +- runescape-client/src/main/java/class4.java | 2 +- runescape-client/src/main/java/class40.java | 2 +- runescape-client/src/main/java/class50.java | 12 +- runescape-client/src/main/java/class54.java | 2 +- runescape-client/src/main/java/class60.java | 2 +- runescape-client/src/main/java/class83.java | 2 +- 118 files changed, 594 insertions(+), 591 deletions(-) rename runelite-mixins/src/main/java/net/runelite/mixins/{RSAbstractIndexCacheMixin.java => RSAbstractArchiveMixin.java} (89%) rename runescape-api/src/main/java/net/runelite/rs/api/{RSAbstractIndexCache.java => RSAbstractArchive.java} (65%) rename runescape-api/src/main/java/net/runelite/rs/api/{RSIndexCache.java => RSArchive.java} (64%) rename runescape-client/src/main/java/{AbstractIndexCache.java => AbstractArchive.java} (56%) rename runescape-client/src/main/java/{IndexCache.java => Archive.java} (88%) diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractIndexCacheMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java similarity index 89% rename from runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractIndexCacheMixin.java rename to runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java index 444be65691..5b83be84c9 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractIndexCacheMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java @@ -15,12 +15,12 @@ import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Replace; import net.runelite.api.mixins.Shadow; import org.slf4j.Logger; -import net.runelite.rs.api.RSAbstractIndexCache; +import net.runelite.rs.api.RSAbstractArchive; import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSIndexCache; +import net.runelite.rs.api.RSArchive; -@Mixin(RSAbstractIndexCache.class) -public abstract class RSAbstractIndexCacheMixin implements RSAbstractIndexCache +@Mixin(RSAbstractArchive.class) +public abstract class RSAbstractArchiveMixin implements RSAbstractArchive { @Shadow("client") private static RSClient client; @@ -35,14 +35,14 @@ public abstract class RSAbstractIndexCacheMixin implements RSAbstractIndexCache return overlayOutdated; } - @Copy("takeRecord") + @Copy("takeFile") abstract byte[] rs$getConfigData(int archiveId, int fileId); - @Replace("takeRecord") + @Replace("takeFile") public byte[] rl$getConfigData(int archiveId, int fileId) { byte[] rsData = rs$getConfigData(archiveId, fileId); - RSIndexCache indexData = (RSIndexCache) this; + RSArchive indexData = (RSArchive) this; if (!OverlayIndex.hasOverlay(indexData.getIndex(), archiveId)) { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 782f01915b..6923447978 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -112,7 +112,7 @@ import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Replace; import net.runelite.api.mixins.Shadow; import org.slf4j.Logger; -import net.runelite.rs.api.RSAbstractIndexCache; +import net.runelite.rs.api.RSAbstractArchive; import net.runelite.rs.api.RSChatChannel; import net.runelite.rs.api.RSClanChat; import net.runelite.rs.api.RSClient; @@ -1464,7 +1464,7 @@ public abstract class RSClientMixin implements RSClient @Override public RSSprite[] getSprites(IndexDataBase source, int archiveId, int fileId) { - RSAbstractIndexCache rsSource = (RSAbstractIndexCache) source; + RSAbstractArchive rsSource = (RSAbstractArchive) source; byte[] configData = rsSource.getConfigData(archiveId, fileId); if (configData == null) { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java index 6bb2f91a8b..b08827b18a 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java @@ -7,7 +7,7 @@ import net.runelite.api.mixins.Copy; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Replace; -import net.runelite.rs.api.RSAbstractIndexCache; +import net.runelite.rs.api.RSAbstractArchive; import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSSprite; @@ -35,13 +35,13 @@ public abstract class SpriteMixin implements RSClient } @Copy("readSprite") - public static RSSprite rs$loadSprite(RSAbstractIndexCache var0, int var1, int var2) + public static RSSprite rs$loadSprite(RSAbstractArchive var0, int var1, int var2) { throw new RuntimeException(); } @Replace("readSprite") - public static RSSprite rl$loadSprite(RSAbstractIndexCache var0, int var1, int var2) + public static RSSprite rl$loadSprite(RSAbstractArchive var0, int var1, int var2) { Sprite sprite = spriteOverrides.get(var1); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractIndexCache.java b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java similarity index 65% rename from runescape-api/src/main/java/net/runelite/rs/api/RSAbstractIndexCache.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java index f561f1e562..052bc4ee74 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractIndexCache.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java @@ -3,8 +3,8 @@ package net.runelite.rs.api; import net.runelite.api.IndexDataBase; import net.runelite.mapping.Import; -public interface RSAbstractIndexCache extends IndexDataBase +public interface RSAbstractArchive extends IndexDataBase { - @Import("takeRecord") + @Import("takeFile") byte[] getConfigData(int archiveId, int fileId); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexCache.java b/runescape-api/src/main/java/net/runelite/rs/api/RSArchive.java similarity index 64% rename from runescape-api/src/main/java/net/runelite/rs/api/RSIndexCache.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSArchive.java index bf68b6cba4..25f1cb2cef 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexCache.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSArchive.java @@ -2,7 +2,7 @@ package net.runelite.rs.api; import net.runelite.mapping.Import; -public interface RSIndexCache extends RSAbstractIndexCache +public interface RSArchive extends RSAbstractArchive { @Import("index") int getIndex(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index a17b549563..df17fc3b39 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -443,11 +443,11 @@ public interface RSClient extends RSGameShell, Client @Import("indexCache8") @Override - RSAbstractIndexCache getIndexSprites(); + RSAbstractArchive getIndexSprites(); @Import("indexCache12") @Override - RSAbstractIndexCache getIndexScripts(); + RSAbstractArchive getIndexScripts(); @Import("widgetClickMasks") @Override @@ -1015,7 +1015,7 @@ public interface RSClient extends RSGameShell, Client boolean isSpellSelected(); @Import("readSoundEffect") - RSSoundEffect getTrack(RSAbstractIndexCache indexData, int id, int var0); + RSSoundEffect getTrack(RSAbstractArchive indexData, int id, int var0); @Import("createRawPcmStream") RSRawPcmStream createRawPcmStream(RSRawSound audioNode, int var0, int volume); @@ -1024,7 +1024,7 @@ public interface RSClient extends RSGameShell, Client RSPcmStreamMixer getSoundEffectAudioQueue(); @Import("indexCache4") - RSAbstractIndexCache getIndexCache4(); + RSAbstractArchive getIndexCache4(); @Import("decimator") RSDecimator getSoundEffectResampler(); diff --git a/runescape-client/src/main/java/AbstractIndexCache.java b/runescape-client/src/main/java/AbstractArchive.java similarity index 56% rename from runescape-client/src/main/java/AbstractIndexCache.java rename to runescape-client/src/main/java/AbstractArchive.java index 8ba4da29ff..2d7243c121 100644 --- a/runescape-client/src/main/java/AbstractIndexCache.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -6,8 +6,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ir") -@Implements("AbstractIndexCache") -public abstract class AbstractIndexCache { +@Implements("AbstractArchive") +public abstract class AbstractArchive { @ObfuscatedName("qb") @ObfuscatedSignature( signature = "Lco;" @@ -38,52 +38,52 @@ public abstract class AbstractIndexCache { signature = "Lit;" ) @Export("indexCache0") - static IndexCache indexCache0; + static Archive indexCache0; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1694798923 ) - @Export("archiveCount") - int archiveCount; + @Export("groupCount") + int groupCount; @ObfuscatedName("q") - @Export("archiveIds") - int[] archiveIds; + @Export("groupIds") + int[] groupIds; @ObfuscatedName("w") - @Export("archiveNameHashes") - int[] archiveNameHashes; + @Export("groupNameHashes") + int[] groupNameHashes; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Llv;" ) - @Export("archiveNameHashTable") - IntHashTable archiveNameHashTable; + @Export("groupNameHashTable") + IntHashTable groupNameHashTable; @ObfuscatedName("u") - @Export("archiveCrcs") - int[] archiveCrcs; + @Export("groupCrcs") + int[] groupCrcs; @ObfuscatedName("g") - @Export("archiveVersions") - int[] archiveVersions; + @Export("groupVersions") + int[] groupVersions; @ObfuscatedName("l") - @Export("recordCounts") - int[] recordCounts; + @Export("fileCounts") + int[] fileCounts; @ObfuscatedName("e") - @Export("recordIds") - int[][] recordIds; + @Export("fileIds") + int[][] fileIds; @ObfuscatedName("x") - @Export("recordNameHashes") - int[][] recordNameHashes; + @Export("fileNameHashes") + int[][] fileNameHashes; @ObfuscatedName("d") @ObfuscatedSignature( signature = "[Llv;" ) - @Export("recordNameHashTables") - IntHashTable[] recordNameHashTables; + @Export("fileNameHashTables") + IntHashTable[] fileNameHashTables; @ObfuscatedName("k") - @Export("archives") - Object[] archives; + @Export("groups") + Object[] groups; @ObfuscatedName("n") - @Export("records") - Object[][] records; + @Export("files") + Object[][] files; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -530370811 @@ -91,15 +91,15 @@ public abstract class AbstractIndexCache { @Export("hash") public int hash; @ObfuscatedName("z") - @Export("releaseArchives") - boolean releaseArchives; + @Export("releaseGroups") + boolean releaseGroups; @ObfuscatedName("j") - @Export("shallowRecords") - boolean shallowRecords; + @Export("shallowFiles") + boolean shallowFiles; - AbstractIndexCache(boolean var1, boolean var2) { - this.releaseArchives = var1; - this.shallowRecords = var2; + AbstractArchive(boolean var1, boolean var2) { + this.releaseGroups = var1; + this.shallowFiles = var2; } @ObfuscatedName("m") @@ -107,8 +107,8 @@ public abstract class AbstractIndexCache { signature = "([BB)V", garbageValue = "0" ) - @Export("setIndexReference") - void setIndexReference(byte[] var1) { + @Export("decodeIndex") + void decodeIndex(byte[] var1) { this.hash = WallDecoration.method3257(var1, var1.length); Buffer var2 = new Buffer(Strings.decompressBytes(var1)); int var3 = var2.readUnsignedByte(); @@ -119,57 +119,57 @@ public abstract class AbstractIndexCache { int var4 = var2.readUnsignedByte(); if (var3 >= 7) { - this.archiveCount = var2.method50(); + this.groupCount = var2.method50(); } else { - this.archiveCount = var2.readUnsignedShort(); + this.groupCount = var2.readUnsignedShort(); } int var5 = 0; int var6 = -1; - this.archiveIds = new int[this.archiveCount]; + this.groupIds = new int[this.groupCount]; int var7; if (var3 >= 7) { - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveIds[var7] = var5 += var2.method50(); - if (this.archiveIds[var7] > var6) { - var6 = this.archiveIds[var7]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupIds[var7] = var5 += var2.method50(); + if (this.groupIds[var7] > var6) { + var6 = this.groupIds[var7]; } } } else { - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveIds[var7] = var5 += var2.readUnsignedShort(); - if (this.archiveIds[var7] > var6) { - var6 = this.archiveIds[var7]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupIds[var7] = var5 += var2.readUnsignedShort(); + if (this.groupIds[var7] > var6) { + var6 = this.groupIds[var7]; } } } - this.archiveCrcs = new int[var6 + 1]; - this.archiveVersions = new int[var6 + 1]; - this.recordCounts = new int[var6 + 1]; - this.recordIds = new int[var6 + 1][]; - this.archives = new Object[var6 + 1]; - this.records = new Object[var6 + 1][]; + this.groupCrcs = new int[var6 + 1]; + this.groupVersions = new int[var6 + 1]; + this.fileCounts = new int[var6 + 1]; + this.fileIds = new int[var6 + 1][]; + this.groups = new Object[var6 + 1]; + this.files = new Object[var6 + 1][]; if (var4 != 0) { - this.archiveNameHashes = new int[var6 + 1]; + this.groupNameHashes = new int[var6 + 1]; - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveNameHashes[this.archiveIds[var7]] = var2.readInt(); + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupNameHashes[this.groupIds[var7]] = var2.readInt(); } - this.archiveNameHashTable = new IntHashTable(this.archiveNameHashes); + this.groupNameHashTable = new IntHashTable(this.groupNameHashes); } - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveCrcs[this.archiveIds[var7]] = var2.readInt(); + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupCrcs[this.groupIds[var7]] = var2.readInt(); } - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveVersions[this.archiveIds[var7]] = var2.readInt(); + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupVersions[this.groupIds[var7]] = var2.readInt(); } - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.recordCounts[this.archiveIds[var7]] = var2.readUnsignedShort(); + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort(); } int var8; @@ -178,55 +178,55 @@ public abstract class AbstractIndexCache { int var11; int var12; if (var3 >= 7) { - for (var7 = 0; var7 < this.archiveCount; ++var7) { - var8 = this.archiveIds[var7]; - var9 = this.recordCounts[var8]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + var8 = this.groupIds[var7]; + var9 = this.fileCounts[var8]; var5 = 0; var10 = -1; - this.recordIds[var8] = new int[var9]; + this.fileIds[var8] = new int[var9]; for (var11 = 0; var11 < var9; ++var11) { - var12 = this.recordIds[var8][var11] = var5 += var2.method50(); + var12 = this.fileIds[var8][var11] = var5 += var2.method50(); if (var12 > var10) { var10 = var12; } } - this.records[var8] = new Object[var10 + 1]; + this.files[var8] = new Object[var10 + 1]; } } else { - for (var7 = 0; var7 < this.archiveCount; ++var7) { - var8 = this.archiveIds[var7]; - var9 = this.recordCounts[var8]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + var8 = this.groupIds[var7]; + var9 = this.fileCounts[var8]; var5 = 0; var10 = -1; - this.recordIds[var8] = new int[var9]; + this.fileIds[var8] = new int[var9]; for (var11 = 0; var11 < var9; ++var11) { - var12 = this.recordIds[var8][var11] = var5 += var2.readUnsignedShort(); + var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort(); if (var12 > var10) { var10 = var12; } } - this.records[var8] = new Object[var10 + 1]; + this.files[var8] = new Object[var10 + 1]; } } if (var4 != 0) { - this.recordNameHashes = new int[var6 + 1][]; - this.recordNameHashTables = new IntHashTable[var6 + 1]; + this.fileNameHashes = new int[var6 + 1][]; + this.fileNameHashTables = new IntHashTable[var6 + 1]; - for (var7 = 0; var7 < this.archiveCount; ++var7) { - var8 = this.archiveIds[var7]; - var9 = this.recordCounts[var8]; - this.recordNameHashes[var8] = new int[this.records[var8].length]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + var8 = this.groupIds[var7]; + var9 = this.fileCounts[var8]; + this.fileNameHashes[var8] = new int[this.files[var8].length]; for (var10 = 0; var10 < var9; ++var10) { - this.recordNameHashes[var8][this.recordIds[var8][var10]] = var2.readInt(); + this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt(); } - this.recordNameHashTables[var8] = new IntHashTable(this.recordNameHashes[var8]); + this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]); } } @@ -248,9 +248,9 @@ public abstract class AbstractIndexCache { signature = "(III)[B", garbageValue = "1945577069" ) - @Export("takeRecord") - public byte[] takeRecord(int var1, int var2) { - return this.takeRecordEncrypted(var1, var2, (int[])null); + @Export("takeFile") + public byte[] takeFile(int group, int file) { + return this.takeFileEncrypted(group, file, (int[])null); } @ObfuscatedName("w") @@ -258,23 +258,23 @@ public abstract class AbstractIndexCache { signature = "(II[II)[B", garbageValue = "-1363136655" ) - @Export("takeRecordEncrypted") - public byte[] takeRecordEncrypted(int var1, int var2, int[] var3) { - if (var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) { - if (this.records[var1][var2] == null) { - boolean var4 = this.buildRecords(var1, var3); + @Export("takeFileEncrypted") + public byte[] takeFileEncrypted(int group, int file, int[] xteaKey) { + if (group >= 0 && group < this.files.length && this.files[group] != null && file >= 0 && file < this.files[group].length) { + if (this.files[group][file] == null) { + boolean var4 = this.buildFiles(group, xteaKey); if (!var4) { - this.loadArchive(var1); - var4 = this.buildRecords(var1, var3); + this.loadGroup(group); + var4 = this.buildFiles(group, xteaKey); if (!var4) { return null; } } } - byte[] var5 = TextureProvider.byteArrayFromObject(this.records[var1][var2], false); - if (this.shallowRecords) { - this.records[var1][var2] = null; + byte[] var5 = TextureProvider.byteArrayFromObject(this.files[group][file], false); + if (this.shallowFiles) { + this.files[group][file] = null; } return var5; @@ -288,16 +288,16 @@ public abstract class AbstractIndexCache { signature = "(III)Z", garbageValue = "-1822260214" ) - @Export("tryLoadRecord") - public boolean tryLoadRecord(int var1, int var2) { - if (var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) { - if (this.records[var1][var2] != null) { + @Export("tryLoadFile") + public boolean tryLoadFile(int group, int file) { + if (group >= 0 && group < this.files.length && this.files[group] != null && file >= 0 && file < this.files[group].length) { + if (this.files[group][file] != null) { return true; - } else if (this.archives[var1] != null) { + } else if (this.groups[group] != null) { return true; } else { - this.loadArchive(var1); - return this.archives[var1] != null; + this.loadGroup(group); + return this.groups[group] != null; } } else { return false; @@ -310,10 +310,10 @@ public abstract class AbstractIndexCache { garbageValue = "-1923759754" ) public boolean method1(int var1) { - if (this.records.length == 1) { - return this.tryLoadRecord(0, var1); - } else if (this.records[var1].length == 1) { - return this.tryLoadRecord(var1, 0); + if (this.files.length == 1) { + return this.tryLoadFile(0, var1); + } else if (this.files[var1].length == 1) { + return this.tryLoadFile(var1, 0); } else { throw new RuntimeException(); } @@ -324,13 +324,13 @@ public abstract class AbstractIndexCache { signature = "(II)Z", garbageValue = "-374594123" ) - @Export("tryLoadArchive") - public boolean tryLoadArchive(int var1) { - if (this.archives[var1] != null) { + @Export("tryLoadGroup") + public boolean tryLoadGroup(int group) { + if (this.groups[group] != null) { return true; } else { - this.loadArchive(var1); - return this.archives[var1] != null; + this.loadGroup(group); + return this.groups[group] != null; } } @@ -342,11 +342,11 @@ public abstract class AbstractIndexCache { public boolean method2() { boolean var1 = true; - for (int var2 = 0; var2 < this.archiveIds.length; ++var2) { - int var3 = this.archiveIds[var2]; - if (this.archives[var3] == null) { - this.loadArchive(var3); - if (this.archives[var3] == null) { + for (int var2 = 0; var2 < this.groupIds.length; ++var2) { + int var3 = this.groupIds[var2]; + if (this.groups[var3] == null) { + this.loadGroup(var3); + if (this.groups[var3] == null) { var1 = false; } } @@ -360,9 +360,9 @@ public abstract class AbstractIndexCache { signature = "(II)I", garbageValue = "-1809769865" ) - @Export("archiveLoadPercent") - int archiveLoadPercent(int var1) { - return this.archives[var1] != null ? 100 : 0; + @Export("groupLoadPercent") + int groupLoadPercent(int var1) { + return this.groups[var1] != null ? 100 : 0; } @ObfuscatedName("x") @@ -370,12 +370,12 @@ public abstract class AbstractIndexCache { signature = "(IS)[B", garbageValue = "-10015" ) - @Export("takeRecordFlat") - public byte[] takeRecordFlat(int var1) { - if (this.records.length == 1) { - return this.takeRecord(0, var1); - } else if (this.records[var1].length == 1) { - return this.takeRecord(var1, 0); + @Export("takeFileFlat") + public byte[] takeFileFlat(int groupOrFile) { + if (this.files.length == 1) { + return this.takeFile(0, groupOrFile); + } else if (this.files[groupOrFile].length == 1) { + return this.takeFile(groupOrFile, 0); } else { throw new RuntimeException(); } @@ -386,21 +386,21 @@ public abstract class AbstractIndexCache { signature = "(III)[B", garbageValue = "-755739011" ) - @Export("getRecord") - public byte[] getRecord(int var1, int var2) { - if (var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) { - if (this.records[var1][var2] == null) { - boolean var3 = this.buildRecords(var1, (int[])null); + @Export("getFile") + public byte[] getFile(int group, int file) { + if (group >= 0 && group < this.files.length && this.files[group] != null && file >= 0 && file < this.files[group].length) { + if (this.files[group][file] == null) { + boolean var3 = this.buildFiles(group, (int[])null); if (!var3) { - this.loadArchive(var1); - var3 = this.buildRecords(var1, (int[])null); + this.loadGroup(group); + var3 = this.buildFiles(group, (int[])null); if (!var3) { return null; } } } - byte[] var4 = TextureProvider.byteArrayFromObject(this.records[var1][var2], false); + byte[] var4 = TextureProvider.byteArrayFromObject(this.files[group][file], false); return var4; } else { return null; @@ -412,12 +412,12 @@ public abstract class AbstractIndexCache { signature = "(IB)[B", garbageValue = "68" ) - @Export("getRecordFlat") - public byte[] getRecordFlat(int var1) { - if (this.records.length == 1) { - return this.getRecord(0, var1); - } else if (this.records[var1].length == 1) { - return this.getRecord(var1, 0); + @Export("getFileFlat") + public byte[] getFileFlat(int groupOrFile) { + if (this.files.length == 1) { + return this.getFile(0, groupOrFile); + } else if (this.files[groupOrFile].length == 1) { + return this.getFile(groupOrFile, 0); } else { throw new RuntimeException(); } @@ -428,8 +428,8 @@ public abstract class AbstractIndexCache { signature = "(II)V", garbageValue = "-1829145107" ) - @Export("loadArchive") - void loadArchive(int var1) { + @Export("loadGroup") + void loadGroup(int group) { } @ObfuscatedName("j") @@ -438,7 +438,7 @@ public abstract class AbstractIndexCache { garbageValue = "28" ) public int[] method3(int var1) { - return var1 >= 0 && var1 < this.recordIds.length ? this.recordIds[var1] : null; + return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; } @ObfuscatedName("s") @@ -447,7 +447,7 @@ public abstract class AbstractIndexCache { garbageValue = "1178362496" ) public int method4(int var1) { - return this.records[var1].length; + return this.files[var1].length; } @ObfuscatedName("t") @@ -456,7 +456,7 @@ public abstract class AbstractIndexCache { garbageValue = "1702434573" ) public int method5() { - return this.records.length; + return this.files.length; } @ObfuscatedName("y") @@ -465,8 +465,8 @@ public abstract class AbstractIndexCache { garbageValue = "38" ) public void method6() { - for (int var1 = 0; var1 < this.archives.length; ++var1) { - this.archives[var1] = null; + for (int var1 = 0; var1 < this.groups.length; ++var1) { + this.groups[var1] = null; } } @@ -477,8 +477,8 @@ public abstract class AbstractIndexCache { garbageValue = "330258899" ) public void method7(int var1) { - for (int var2 = 0; var2 < this.records[var1].length; ++var2) { - this.records[var1][var2] = null; + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { + this.files[var1][var2] = null; } } @@ -489,10 +489,10 @@ public abstract class AbstractIndexCache { garbageValue = "-709581639" ) public void method8() { - for (int var1 = 0; var1 < this.records.length; ++var1) { - if (this.records[var1] != null) { - for (int var2 = 0; var2 < this.records[var1].length; ++var2) { - this.records[var1][var2] = null; + for (int var1 = 0; var1 < this.files.length; ++var1) { + if (this.files[var1] != null) { + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { + this.files[var1][var2] = null; } } } @@ -504,14 +504,14 @@ public abstract class AbstractIndexCache { signature = "(I[II)Z", garbageValue = "-1835696874" ) - @Export("buildRecords") - boolean buildRecords(int var1, int[] var2) { - if (this.archives[var1] == null) { + @Export("buildFiles") + boolean buildFiles(int group, int[] xteaKey) { + if (this.groups[group] == null) { return false; } else { - int var3 = this.recordCounts[var1]; - int[] var4 = this.recordIds[var1]; - Object[] var5 = this.records[var1]; + int var3 = this.fileCounts[group]; + int[] var4 = this.fileIds[group]; + Object[] var5 = this.files[group]; boolean var6 = true; for (int var7 = 0; var7 < var3; ++var7) { @@ -525,17 +525,17 @@ public abstract class AbstractIndexCache { return true; } else { byte[] var18; - if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { - var18 = TextureProvider.byteArrayFromObject(this.archives[var1], false); + if (xteaKey == null || xteaKey[0] == 0 && xteaKey[1] == 0 && xteaKey[2] == 0 && xteaKey[3] == 0) { + var18 = TextureProvider.byteArrayFromObject(this.groups[group], false); } else { - var18 = TextureProvider.byteArrayFromObject(this.archives[var1], true); + var18 = TextureProvider.byteArrayFromObject(this.groups[group], true); Buffer var8 = new Buffer(var18); - var8.xteaDecrypt(var2, 5, var8.array.length); + var8.xteaDecrypt(xteaKey, 5, var8.array.length); } byte[] var19 = Strings.decompressBytes(var18); - if (this.releaseArchives) { - this.archives[var1] = null; + if (this.releaseGroups) { + this.groups[group] = null; } if (var3 > 1) { @@ -580,13 +580,13 @@ public abstract class AbstractIndexCache { } for (var14 = 0; var14 < var3; ++var14) { - if (!this.shallowRecords) { + if (!this.shallowFiles) { var5[var4[var14]] = Projectile.byteArrayToObject(var20[var14], false); } else { var5[var4[var14]] = var20[var14]; } } - } else if (!this.shallowRecords) { + } else if (!this.shallowFiles) { var5[var4[0]] = Projectile.byteArrayToObject(var19, false); } else { var5[var4[0]] = var19; @@ -602,10 +602,10 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;I)I", garbageValue = "-224510300" ) - @Export("getArchiveId") - public int getArchiveId(String var1) { - var1 = var1.toLowerCase(); - return this.archiveNameHashTable.get(Client.hashString(var1)); + @Export("getGroupId") + public int getGroupId(String groupName) { + groupName = groupName.toLowerCase(); + return this.groupNameHashTable.get(Client.hashString(groupName)); } @ObfuscatedName("v") @@ -613,10 +613,10 @@ public abstract class AbstractIndexCache { signature = "(ILjava/lang/String;I)I", garbageValue = "-443631072" ) - @Export("getRecordId") - public int getRecordId(int var1, String var2) { - var2 = var2.toLowerCase(); - return this.recordNameHashTables[var1].get(Client.hashString(var2)); + @Export("getFileId") + public int getFileId(int group, String fileName) { + fileName = fileName.toLowerCase(); + return this.fileNameHashTables[group].get(Client.hashString(fileName)); } @ObfuscatedName("ag") @@ -627,11 +627,11 @@ public abstract class AbstractIndexCache { public boolean method9(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.archiveNameHashTable.get(Client.hashString(var1)); + int var3 = this.groupNameHashTable.get(Client.hashString(var1)); if (var3 < 0) { return false; } else { - int var4 = this.recordNameHashTables[var3].get(Client.hashString(var2)); + int var4 = this.fileNameHashTables[var3].get(Client.hashString(var2)); return var4 >= 0; } } @@ -641,13 +641,13 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;Ljava/lang/String;S)[B", garbageValue = "-22726" ) - @Export("takeRecordByNames") - public byte[] takeRecordByNames(String var1, String var2) { - var1 = var1.toLowerCase(); - var2 = var2.toLowerCase(); - int var3 = this.archiveNameHashTable.get(Client.hashString(var1)); - int var4 = this.recordNameHashTables[var3].get(Client.hashString(var2)); - return this.takeRecord(var3, var4); + @Export("takeFileByNames") + public byte[] takeFileByNames(String groupName, String fileName) { + groupName = groupName.toLowerCase(); + fileName = fileName.toLowerCase(); + int var3 = this.groupNameHashTable.get(Client.hashString(groupName)); + int var4 = this.fileNameHashTables[var3].get(Client.hashString(fileName)); + return this.takeFile(var3, var4); } @ObfuscatedName("aj") @@ -655,13 +655,13 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;Ljava/lang/String;I)Z", garbageValue = "2140743930" ) - @Export("tryLoadRecordByNames") - public boolean tryLoadRecordByNames(String var1, String var2) { - var1 = var1.toLowerCase(); - var2 = var2.toLowerCase(); - int var3 = this.archiveNameHashTable.get(Client.hashString(var1)); - int var4 = this.recordNameHashTables[var3].get(Client.hashString(var2)); - return this.tryLoadRecord(var3, var4); + @Export("tryLoadFileByNames") + public boolean tryLoadFileByNames(String groupName, String fileName) { + groupName = groupName.toLowerCase(); + fileName = fileName.toLowerCase(); + int var3 = this.groupNameHashTable.get(Client.hashString(groupName)); + int var4 = this.fileNameHashTables[var3].get(Client.hashString(fileName)); + return this.tryLoadFile(var3, var4); } @ObfuscatedName("av") @@ -669,11 +669,11 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;I)Z", garbageValue = "-1282569336" ) - @Export("tryLoadArchiveByName") - public boolean tryLoadArchiveByName(String var1) { - var1 = var1.toLowerCase(); - int var2 = this.archiveNameHashTable.get(Client.hashString(var1)); - return this.tryLoadArchive(var2); + @Export("tryLoadGroupByName") + public boolean tryLoadGroupByName(String groupName) { + groupName = groupName.toLowerCase(); + int var2 = this.groupNameHashTable.get(Client.hashString(groupName)); + return this.tryLoadGroup(var2); } @ObfuscatedName("ar") @@ -683,7 +683,7 @@ public abstract class AbstractIndexCache { ) public void method10(String var1) { var1 = var1.toLowerCase(); - int var2 = this.archiveNameHashTable.get(Client.hashString(var1)); + int var2 = this.groupNameHashTable.get(Client.hashString(var1)); if (var2 >= 0) { this.vmethod129(var2); } @@ -695,11 +695,11 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;I)I", garbageValue = "-1645224643" ) - @Export("archiveLoadPercentByName") - public int archiveLoadPercentByName(String var1) { - var1 = var1.toLowerCase(); - int var2 = this.archiveNameHashTable.get(Client.hashString(var1)); - return this.archiveLoadPercent(var2); + @Export("groupLoadPercentByName") + public int groupLoadPercentByName(String groupName) { + groupName = groupName.toLowerCase(); + int var2 = this.groupNameHashTable.get(Client.hashString(groupName)); + return this.groupLoadPercent(var2); } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 87e40aa100..b94849ba66 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -13,7 +13,7 @@ public abstract class AbstractByteArrayCopier { @ObfuscatedSignature( signature = "Lit;" ) - static IndexCache field0; + static Archive field0; @ObfuscatedName("m") @ObfuscatedSignature( @@ -42,7 +42,7 @@ public abstract class AbstractByteArrayCopier { if (var1 != null) { return var1; } else { - byte[] var2 = VarcInt.field942.takeRecord(19, var0); + byte[] var2 = VarcInt.field942.takeFile(19, var0); var1 = new VarcInt(); if (var2 != null) { var1.method354(new Buffer(var2)); diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 0d2b77c0d2..9031a63059 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -48,7 +48,7 @@ public abstract class AbstractUserComparator implements Comparator { class214.field1129 = 1; class214.field1130 = null; } else if (var0 != -1 && var0 != Client.field112 && Client.field128 != 0 && !Client.field107) { - IndexCache var1 = UserComparator3.indexCache6; + Archive var1 = UserComparator3.indexCache6; int var2 = Client.field128; class214.field1129 = 1; class214.field1130 = var1; diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index b6ed56b3b4..16874b170e 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -162,7 +162,7 @@ public abstract class AbstractWorldMapIcon { signature = "(Lit;Ljava/lang/String;I)V", garbageValue = "-1018878027" ) - static void method625(IndexCache var0, String var1) { + static void method625(Archive var0, String var1) { IndexCacheLoader var2 = new IndexCacheLoader(var0, var1); Client.indexCacheLoaders.add(var2); Client.field140 += var2.field408; diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index e720a2944f..57b27c3a67 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -478,7 +478,7 @@ public abstract class Actor extends Entity { if (var7 != null) { var8 = var7; } else { - byte[] var9 = HealthBarDefinition.field379.takeRecord(33, var1); + byte[] var9 = HealthBarDefinition.field379.takeFile(33, var1); var7 = new HealthBarDefinition(); if (var9 != null) { var7.read(new Buffer(var9)); @@ -540,7 +540,7 @@ public abstract class Actor extends Entity { if (var2 != null) { var3 = var2; } else { - byte[] var4 = HealthBarDefinition.field379.takeRecord(33, var1); + byte[] var4 = HealthBarDefinition.field379.takeFile(33, var1); var2 = new HealthBarDefinition(); if (var4 != null) { var2.read(new Buffer(var4)); @@ -949,7 +949,7 @@ public abstract class Actor extends Entity { if (var15.cs1Instructions != null && var15.cs1Instructions[0][0] == 5) { var17 = var15.cs1Instructions[0][1]; Varps.Varps_main[var17] = 1 - Varps.Varps_main[var17]; - IndexCache.method4703(var17); + Archive.method4703(var17); } } else if (var2 == 29) { var8 = Interpreter.method1915(ClientPacket.field291, Client.packetWriter.isaacCipher); @@ -960,7 +960,7 @@ public abstract class Actor extends Entity { var17 = var15.cs1Instructions[0][1]; if (Varps.Varps_main[var17] != var15.cs1ComparisonValues[0]) { Varps.Varps_main[var17] = var15.cs1ComparisonValues[0]; - IndexCache.method4703(var17); + Archive.method4703(var17); } } } else if (var2 == 30) { diff --git a/runescape-client/src/main/java/IndexCache.java b/runescape-client/src/main/java/Archive.java similarity index 88% rename from runescape-client/src/main/java/IndexCache.java rename to runescape-client/src/main/java/Archive.java index 20676bbfbe..b7d51a67f1 100644 --- a/runescape-client/src/main/java/IndexCache.java +++ b/runescape-client/src/main/java/Archive.java @@ -6,8 +6,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("it") -@Implements("IndexCache") -public class IndexCache extends AbstractIndexCache { +@Implements("Archive") +public class Archive extends AbstractArchive { @ObfuscatedName("aj") @Export("IndexCache_crc") static CRC32 IndexCache_crc; @@ -57,7 +57,7 @@ public class IndexCache extends AbstractIndexCache { @ObfuscatedSignature( signature = "(Lff;Lff;IZZZ)V" ) - public IndexCache(IndexStore var1, IndexStore var2, int var3, boolean var4, boolean var5, boolean var6) { + public Archive(IndexStore var1, IndexStore var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); this.field403 = false; this.field404 = false; @@ -73,7 +73,7 @@ public class IndexCache extends AbstractIndexCache { int var9 = Players.NetCache_reference.readInt(); this.loadIndexReference(var8, var9); } else { - PacketBuffer.requestNetFile((IndexCache)null, 255, 255, 0, (byte)0, true); + PacketBuffer.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); NetCache.NetCache_indexCaches[var7] = this; } @@ -99,9 +99,9 @@ public class IndexCache extends AbstractIndexCache { signature = "(II)I", garbageValue = "-1809769865" ) - @Export("archiveLoadPercent") - int archiveLoadPercent(int var1) { - return super.archives[var1] != null ? 100 : (this.validArchives[var1] ? 100 : class54.method1086(this.index, var1)); + @Export("groupLoadPercent") + int groupLoadPercent(int var1) { + return super.groups[var1] != null ? 100 : (this.validArchives[var1] ? 100 : class54.method1086(this.index, var1)); } @ObfuscatedName("z") @@ -109,15 +109,15 @@ public class IndexCache extends AbstractIndexCache { signature = "(II)V", garbageValue = "-1829145107" ) - @Export("loadArchive") - void loadArchive(int var1) { - if (this.indexStore != null && this.validArchives != null && this.validArchives[var1]) { + @Export("loadGroup") + void loadGroup(int group) { + if (this.indexStore != null && this.validArchives != null && this.validArchives[group]) { IndexStore var2 = this.indexStore; byte[] var3 = null; NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { for (IndexStoreAction var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var6 != null; var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) { - if (var6.key == (long)var1 && var2 == var6.indexStore && var6.type == 0) { + if (var6.key == (long) group && var2 == var6.indexStore && var6.type == 0) { var3 = var6.data; break; } @@ -125,13 +125,13 @@ public class IndexCache extends AbstractIndexCache { } if (var3 != null) { - this.load(var2, var1, var3, true); + this.load(var2, group, var3, true); } else { - byte[] var5 = var2.read(var1); - this.load(var2, var1, var5, true); + byte[] var5 = var2.read(group); + this.load(var2, group, var5, true); } } else { - PacketBuffer.requestNetFile(this, this.index, var1, super.archiveCrcs[var1], (byte)2, true); + PacketBuffer.requestNetFile(this, this.index, group, super.groupCrcs[group], (byte)2, true); } } @@ -150,10 +150,11 @@ public class IndexCache extends AbstractIndexCache { signature = "(I)I", garbageValue = "1671499504" ) - public int method131() { + @Export("percentage") + public int percentage() { if (this.field403) { return 100; - } else if (super.archives != null) { + } else if (super.groups != null) { return 99; } else { int var1 = class54.method1086(255, this.index); @@ -216,18 +217,18 @@ public class IndexCache extends AbstractIndexCache { Widget.method4499(this.index, var2, this.referenceStore); } - this.setIndexReference(var2); + this.decodeIndex(var2); this.loadAllLocal(); } else { - var2[var2.length - 2] = (byte)(super.archiveVersions[var1] >> 8); - var2[var2.length - 1] = (byte)super.archiveVersions[var1]; + var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); + var2[var2.length - 1] = (byte)super.groupVersions[var1]; if (this.indexStore != null) { Widget.method4499(var1, var2, this.indexStore); this.validArchives[var1] = true; } if (var4) { - super.archives[var1] = Projectile.byteArrayToObject(var2, false); + super.groups[var1] = Projectile.byteArrayToObject(var2, false); } } @@ -266,7 +267,7 @@ public class IndexCache extends AbstractIndexCache { if (var8 != this.indexReferenceVersion) { PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true); } else { - this.setIndexReference(var3); + this.decodeIndex(var3); this.loadAllLocal(); } } @@ -282,23 +283,23 @@ public class IndexCache extends AbstractIndexCache { IndexCache_crc.update(var3, 0, var3.length - 2); var5 = (int)IndexCache_crc.getValue(); int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); - if (var5 == super.archiveCrcs[var2] && var6 == super.archiveVersions[var2]) { + if (var5 == super.groupCrcs[var2] && var6 == super.groupVersions[var2]) { this.validArchives[var2] = true; if (var4) { - super.archives[var2] = Projectile.byteArrayToObject(var3, false); + super.groups[var2] = Projectile.byteArrayToObject(var3, false); } } else { this.validArchives[var2] = false; if (this.field404 || var4) { - PacketBuffer.requestNetFile(this, this.index, var2, super.archiveCrcs[var2], (byte)2, var4); + PacketBuffer.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } } } else { this.validArchives[var2] = false; if (this.field404 || var4) { - PacketBuffer.requestNetFile(this, this.index, var2, super.archiveCrcs[var2], (byte)2, var4); + PacketBuffer.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } } @@ -312,7 +313,7 @@ public class IndexCache extends AbstractIndexCache { ) @Export("loadAllLocal") void loadAllLocal() { - this.validArchives = new boolean[super.archives.length]; + this.validArchives = new boolean[super.groups.length]; int var1; for (var1 = 0; var1 < this.validArchives.length; ++var1) { @@ -325,7 +326,7 @@ public class IndexCache extends AbstractIndexCache { this.field405 = -1; for (var1 = 0; var1 < this.validArchives.length; ++var1) { - if (super.recordCounts[var1] > 0) { + if (super.fileCounts[var1] > 0) { NPC.method2009(var1, this.indexStore, this); this.field405 = var1; } @@ -367,10 +368,10 @@ public class IndexCache extends AbstractIndexCache { int var2 = 0; int var3; - for (var3 = 0; var3 < super.archives.length; ++var3) { - if (super.recordCounts[var3] > 0) { + for (var3 = 0; var3 < super.groups.length; ++var3) { + if (super.fileCounts[var3] > 0) { var1 += 100; - var2 += this.archiveLoadPercent(var3); + var2 += this.groupLoadPercent(var3); } } diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index e4ac03e286..0f7ba7377b 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -14,7 +14,7 @@ public class BufferedSource implements Runnable { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field54; + public static AbstractArchive field54; @ObfuscatedName("m") @Export("thread") Thread thread; diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index ca26e844a9..794223d4ef 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -41,7 +41,7 @@ public class ByteArrayPool { signature = "Lit;" ) @Export("indexCache13") - static IndexCache indexCache13; + static Archive indexCache13; @ObfuscatedName("f") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index b3e2f4efd7..79705785be 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -218,9 +218,9 @@ public final class Canvas extends java.awt.Canvas { signature = "(ILir;Ljava/lang/String;Ljava/lang/String;IZS)V", garbageValue = "-9124" ) - public static void method858(int var0, AbstractIndexCache var1, String var2, String var3, int var4, boolean var5) { - int var6 = var1.getArchiveId(var2); - int var7 = var1.getRecordId(var6, var3); + public static void method858(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { + int var6 = var1.getGroupId(var2); + int var7 = var1.getFileId(var6, var3); class214.field1129 = 1; class214.field1130 = var1; class30.musicTrackArchiveId = var6; diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 9410707adf..d2712f716f 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1299,7 +1299,8 @@ public final class Client extends GameShell implements Usernamed { signature = "(I)V", garbageValue = "1445885427" ) - protected final void vmethod112() { + @Export("packetHandler") + protected final void packetHandler() { ++cycle; this.doCycleJs5(); class3.method41(); @@ -1376,7 +1377,7 @@ public final class Client extends GameShell implements Usernamed { int var4; for (var4 = 0; var4 < class40.regionLandArchives.length; ++var4) { if (IndexCacheLoader.regionMapArchiveIds[var4] != -1 && class40.regionLandArchives[var4] == null) { - class40.regionLandArchives[var4] = SecureRandomFuture.indexCache5.takeRecord(IndexCacheLoader.regionMapArchiveIds[var4], 0); + class40.regionLandArchives[var4] = SecureRandomFuture.indexCache5.takeFile(IndexCacheLoader.regionMapArchiveIds[var4], 0); if (class40.regionLandArchives[var4] == null) { var3 = false; ++field177; @@ -1384,7 +1385,7 @@ public final class Client extends GameShell implements Usernamed { } if (MouseHandler.regionLandArchiveIds[var4] != -1 && HealthBarUpdate.regionMapArchives[var4] == null) { - HealthBarUpdate.regionMapArchives[var4] = SecureRandomFuture.indexCache5.takeRecordEncrypted(MouseHandler.regionLandArchiveIds[var4], 0, class190.xteaKeys[var4]); + HealthBarUpdate.regionMapArchives[var4] = SecureRandomFuture.indexCache5.takeFileEncrypted(MouseHandler.regionLandArchiveIds[var4], 0, class190.xteaKeys[var4]); if (HealthBarUpdate.regionMapArchives[var4] == null) { var3 = false; ++field177; @@ -1843,7 +1844,7 @@ public final class Client extends GameShell implements Usernamed { if (var43 != null) { var45 = var43; } else { - byte[] var46 = OverlayDefinition.field663.takeRecord(4, var42); + byte[] var46 = OverlayDefinition.field663.takeFile(4, var42); var43 = new OverlayDefinition(); if (var46 != null) { var43.read(new Buffer(var46), var42); @@ -1880,7 +1881,7 @@ public final class Client extends GameShell implements Usernamed { if (var68 != null) { var43 = var68; } else { - byte[] var47 = OverlayDefinition.field663.takeRecord(4, var67); + byte[] var47 = OverlayDefinition.field663.takeFile(4, var67); var68 = new OverlayDefinition(); if (var47 != null) { var68.read(new Buffer(var47), var67); @@ -2359,8 +2360,8 @@ public final class Client extends GameShell implements Usernamed { WorldMapCacheName.pcmPlayer0.shutdown(); } - if (AbstractIndexCache.pcmPlayer1 != null) { - AbstractIndexCache.pcmPlayer1.shutdown(); + if (AbstractArchive.pcmPlayer1 != null) { + AbstractArchive.pcmPlayer1.shutdown(); } if (NetCache.NetCache_socket != null) { @@ -2687,7 +2688,7 @@ public final class Client extends GameShell implements Usernamed { worldId = Integer.parseInt(var5); break; case 14: - AbstractIndexCache.field2 = Integer.parseInt(var5); + AbstractArchive.field2 = Integer.parseInt(var5); break; case 15: gameBuild = Integer.parseInt(var5); @@ -2866,7 +2867,7 @@ public final class Client extends GameShell implements Usernamed { Players.NetCache_reference = class22.NetCache_responseArchiveBuffer; for (var12 = 0; var12 < 256; ++var12) { - IndexCache var22 = NetCache.NetCache_indexCaches[var12]; + Archive var22 = NetCache.NetCache_indexCaches[var12]; if (var22 != null) { Players.NetCache_reference.index = var12 * 8 + 5; var13 = Players.NetCache_reference.readInt(); @@ -3196,8 +3197,8 @@ public final class Client extends GameShell implements Usernamed { WorldMapCacheName.pcmPlayer0.method242(); } - if (AbstractIndexCache.pcmPlayer1 != null) { - AbstractIndexCache.pcmPlayer1.method242(); + if (AbstractArchive.pcmPlayer1 != null) { + AbstractArchive.pcmPlayer1.method242(); } var16 = true; @@ -3211,8 +3212,8 @@ public final class Client extends GameShell implements Usernamed { WorldMapCacheName.pcmPlayer0.method242(); } - if (AbstractIndexCache.pcmPlayer1 != null) { - AbstractIndexCache.pcmPlayer1.method242(); + if (AbstractArchive.pcmPlayer1 != null) { + AbstractArchive.pcmPlayer1.method242(); } if (var4 != 0) { @@ -3314,13 +3315,13 @@ public final class Client extends GameShell implements Usernamed { var8.packetBuffer.writeShort(Huffman.canvasHeight); Varps.method4400(var8.packetBuffer); var8.packetBuffer.writeStringCp1252NullTerminated(class21.field1123); - var8.packetBuffer.writeInt(AbstractIndexCache.field2); + var8.packetBuffer.writeInt(AbstractArchive.field2); Buffer var11 = new Buffer(WorldMapLabelSize.platformInfo.size()); WorldMapLabelSize.platformInfo.write(var11); var8.packetBuffer.method38(var11.array, 0, var11.array.length); var8.packetBuffer.writeByte(clientType); var8.packetBuffer.writeInt(0); - var8.packetBuffer.writeInt(AbstractIndexCache.indexCache0.hash); + var8.packetBuffer.writeInt(AbstractArchive.indexCache0.hash); var8.packetBuffer.writeInt(Skeleton.indexCache1.hash); var8.packetBuffer.writeInt(ObjectSound.indexCache2.hash); var8.packetBuffer.writeInt(WorldMapIcon1.indexCache3.hash); @@ -4220,7 +4221,7 @@ public final class Client extends GameShell implements Usernamed { var34 = Huffman.getWidget(var23.parentId); } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]); - AbstractIndexCache.runScript(var24); + AbstractArchive.runScript(var24); } } @@ -4232,7 +4233,7 @@ public final class Client extends GameShell implements Usernamed { var34 = Huffman.getWidget(var23.parentId); } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]); - AbstractIndexCache.runScript(var24); + AbstractArchive.runScript(var24); } } @@ -4244,7 +4245,7 @@ public final class Client extends GameShell implements Usernamed { var34 = Huffman.getWidget(var23.parentId); } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]); - AbstractIndexCache.runScript(var24); + AbstractArchive.runScript(var24); } } @@ -4751,7 +4752,7 @@ public final class Client extends GameShell implements Usernamed { Varps.Varps_main[var6] = var39; } - IndexCache.method4703(var6); + Archive.method4703(var6); field121[++field123 - 1 & 31] = var6; var1.serverPacket0 = null; return true; @@ -5066,7 +5067,7 @@ public final class Client extends GameShell implements Usernamed { var46[0] = new Integer(var3.readInt()); ScriptEvent var49 = new ScriptEvent(); var49.args0 = var46; - AbstractIndexCache.runScript(var49); + AbstractArchive.runScript(var49); var1.serverPacket0 = null; return true; } @@ -5677,7 +5678,7 @@ public final class Client extends GameShell implements Usernamed { Varps.Varps_main[var37] = var6; } - IndexCache.method4703(var37); + Archive.method4703(var37); field121[++field123 - 1 & 31] = var37; var1.serverPacket0 = null; return true; @@ -5709,7 +5710,7 @@ public final class Client extends GameShell implements Usernamed { for (var37 = 0; var37 < Varps.Varps_main.length; ++var37) { if (Varps.Varps_temp[var37] != Varps.Varps_main[var37]) { Varps.Varps_main[var37] = Varps.Varps_temp[var37]; - IndexCache.method4703(var37); + Archive.method4703(var37); field121[++field123 - 1 & 31] = var37; } } @@ -6140,7 +6141,7 @@ public final class Client extends GameShell implements Usernamed { var8.mouseX = var6; var8.mouseY = var7; var8.args0 = clickedWidget.onDrag; - AbstractIndexCache.runScript(var8); + AbstractArchive.runScript(var8); } if (MouseHandler.MouseHandler_currentButton == 0) { @@ -6153,7 +6154,7 @@ public final class Client extends GameShell implements Usernamed { var8.mouseY = var7; var8.dragTarget = draggedOnWidget; var8.args0 = clickedWidget.onDragComplete; - AbstractIndexCache.runScript(var8); + AbstractArchive.runScript(var8); } if (draggedOnWidget != null) { diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 45781a3bb1..ec577df93e 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -491,14 +491,14 @@ public class DynamicObject extends Entity { ) protected static int method2222() { int var0 = 0; - if (AbstractIndexCache.garbageCollector == null || !AbstractIndexCache.garbageCollector.isValid()) { + if (AbstractArchive.garbageCollector == null || !AbstractArchive.garbageCollector.isValid()) { try { Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); while (var1.hasNext()) { GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); if (var2.isValid()) { - AbstractIndexCache.garbageCollector = var2; + AbstractArchive.garbageCollector = var2; GameShell.garbageCollectorLastCheckTimeMs = -1L; GameShell.garbageCollectorLastCollectionTime = -1L; } @@ -507,9 +507,9 @@ public class DynamicObject extends Entity { } } - if (AbstractIndexCache.garbageCollector != null) { + if (AbstractArchive.garbageCollector != null) { long var10 = class203.currentTimeMs(); - long var3 = AbstractIndexCache.garbageCollector.getCollectionTime(); + long var3 = AbstractArchive.garbageCollector.getCollectionTime(); if (GameShell.garbageCollectorLastCollectionTime != -1L) { long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; long var7 = var10 - GameShell.garbageCollectorLastCheckTimeMs; diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index dbd78a607c..66bd5d7647 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -12,7 +12,7 @@ public class EnumDefinition extends DualNode { signature = "Lir;" ) @Export("EnumDefinition_indexCache") - public static AbstractIndexCache EnumDefinition_indexCache; + public static AbstractArchive EnumDefinition_indexCache; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 83b04eb080..b5f03505cc 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -61,57 +61,57 @@ public final class FloorDecoration { signature = "(Lir;Lir;I)I", garbageValue = "-1749538901" ) - static int method2853(AbstractIndexCache var0, AbstractIndexCache var1) { + static int method2853(AbstractArchive var0, AbstractArchive var1) { int var2 = 0; - if (var0.tryLoadRecordByNames("title.jpg", "")) { + if (var0.tryLoadFileByNames("title.jpg", "")) { ++var2; } - if (var1.tryLoadRecordByNames("logo", "")) { + if (var1.tryLoadFileByNames("logo", "")) { ++var2; } - if (var1.tryLoadRecordByNames("logo_deadman_mode", "")) { + if (var1.tryLoadFileByNames("logo_deadman_mode", "")) { ++var2; } - if (var1.tryLoadRecordByNames("titlebox", "")) { + if (var1.tryLoadFileByNames("titlebox", "")) { ++var2; } - if (var1.tryLoadRecordByNames("titlebutton", "")) { + if (var1.tryLoadFileByNames("titlebutton", "")) { ++var2; } - if (var1.tryLoadRecordByNames("runes", "")) { + if (var1.tryLoadFileByNames("runes", "")) { ++var2; } - if (var1.tryLoadRecordByNames("title_mute", "")) { + if (var1.tryLoadFileByNames("title_mute", "")) { ++var2; } - if (var1.tryLoadRecordByNames("options_radio_buttons,0", "")) { + if (var1.tryLoadFileByNames("options_radio_buttons,0", "")) { ++var2; } - if (var1.tryLoadRecordByNames("options_radio_buttons,2", "")) { + if (var1.tryLoadFileByNames("options_radio_buttons,2", "")) { ++var2; } - if (var1.tryLoadRecordByNames("options_radio_buttons,4", "")) { + if (var1.tryLoadFileByNames("options_radio_buttons,4", "")) { ++var2; } - if (var1.tryLoadRecordByNames("options_radio_buttons,6", "")) { + if (var1.tryLoadFileByNames("options_radio_buttons,6", "")) { ++var2; } - var1.tryLoadRecordByNames("sl_back", ""); - var1.tryLoadRecordByNames("sl_flags", ""); - var1.tryLoadRecordByNames("sl_arrows", ""); - var1.tryLoadRecordByNames("sl_stars", ""); - var1.tryLoadRecordByNames("sl_button", ""); + var1.tryLoadFileByNames("sl_back", ""); + var1.tryLoadFileByNames("sl_flags", ""); + var1.tryLoadFileByNames("sl_arrows", ""); + var1.tryLoadFileByNames("sl_stars", ""); + var1.tryLoadFileByNames("sl_button", ""); return var2; } } diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 9bb25b8305..3f876c0605 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -478,7 +478,7 @@ public class FontName { class157.method3382(); ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); Script.Script_cached.clear(); - AbstractIndexCache.indexCache0.method8(); + AbstractArchive.indexCache0.method8(); Skeleton.indexCache1.method8(); WorldMapIcon1.indexCache3.method8(); WorldMapDecoration.indexCache4.method8(); diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index dd41db27c5..7d97edc6f7 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -25,12 +25,12 @@ public class Fonts { @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache field351; + AbstractArchive field351; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache field352; + AbstractArchive field352; @ObfuscatedName("q") @Export("map") HashMap map; @@ -38,7 +38,7 @@ public class Fonts { @ObfuscatedSignature( signature = "(Lir;Lir;)V" ) - public Fonts(AbstractIndexCache var1, AbstractIndexCache var2) { + public Fonts(AbstractArchive var1, AbstractArchive var2) { this.field351 = var1; this.field352 = var2; this.map = new HashMap(); @@ -59,11 +59,11 @@ public class Fonts { if (this.map.containsKey(var5)) { var2.put(var5, this.map.get(var5)); } else { - AbstractIndexCache var6 = this.field351; - AbstractIndexCache var7 = this.field352; + AbstractArchive var6 = this.field351; + AbstractArchive var7 = this.field352; String var8 = var5.field349; - int var9 = var6.getArchiveId(var8); - int var10 = var6.getRecordId(var9, ""); + int var9 = var6.getGroupId(var8); + int var10 = var6.getFileId(var9, ""); Font var11 = SpriteIds.method5823(var6, var7, var9, var10); if (var11 != null) { this.map.put(var5, var11); diff --git a/runescape-client/src/main/java/Formatting.java b/runescape-client/src/main/java/Formatting.java index 77227fd4ca..dd3cd2ee5c 100644 --- a/runescape-client/src/main/java/Formatting.java +++ b/runescape-client/src/main/java/Formatting.java @@ -14,7 +14,7 @@ public class Formatting { signature = "Lit;" ) @Export("indexCache12") - static IndexCache indexCache12; + static Archive indexCache12; @ObfuscatedName("s") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 434c8880c6..809513ef75 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -26,14 +26,14 @@ public class Frames extends DualNode { signature = "(Lir;Lir;IZ)V", garbageValue = "0" ) - public Frames(AbstractIndexCache var1, AbstractIndexCache var2, int var3, boolean var4) { + public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { NodeDeque var5 = new NodeDeque(); int var6 = var1.method4(var3); this.frames = new Animation[var6]; int[] var7 = var1.method3(var3); for (int var8 = 0; var8 < var7.length; ++var8) { - byte[] var9 = var1.takeRecord(var3, var7[var8]); + byte[] var9 = var1.takeFile(var3, var7[var8]); Skeleton var10 = null; int var11 = (var9[0] & 255) << 8 | var9[1] & 255; @@ -45,7 +45,7 @@ public class Frames extends DualNode { } if (var10 == null) { - byte[] var13 = var2.getRecord(var11, 0); + byte[] var13 = var2.getFile(var11, 0); var10 = new Skeleton(var11, var13); var5.addFirst(var10); } @@ -70,7 +70,7 @@ public class Frames extends DualNode { signature = "(Lir;I)V", garbageValue = "1204337492" ) - public static void method3241(AbstractIndexCache var0) { + public static void method3241(AbstractArchive var0) { VarcInt.field942 = var0; } diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 371bfe564f..96c8b98a20 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -598,7 +598,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene class230.field1138 = hasFocus; } - this.vmethod112(); + this.packetHandler(); } @ObfuscatedName("ar") @@ -718,7 +718,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "1445885427" ) - protected abstract void vmethod112(); + protected abstract void packetHandler(); @ObfuscatedName("ab") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index 0e2a1ebe00..28158757fe 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -197,7 +197,7 @@ public class GrandExchangeEvent { } else if (var13 == ScriptOpcodes.SET_VARP) { var11 = var6[var4]; Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - IndexCache.method4703(var11); + Archive.method4703(var11); } else if (var13 == ScriptOpcodes.SCONST) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var4]; } else if (var13 == ScriptOpcodes.JUMP) { diff --git a/runescape-client/src/main/java/GroundItemPile.java b/runescape-client/src/main/java/GroundItemPile.java index dbbc9aa6d2..095db79c18 100644 --- a/runescape-client/src/main/java/GroundItemPile.java +++ b/runescape-client/src/main/java/GroundItemPile.java @@ -71,7 +71,7 @@ public final class GroundItemPile { public static boolean loadWidgetGroup(int var0) { if (Widget.loadedWidgetGroups[var0]) { return true; - } else if (!Widget.Widget_indexCache.tryLoadArchive(var0)) { + } else if (!Widget.Widget_indexCache.tryLoadGroup(var0)) { return false; } else { int var1 = Widget.Widget_indexCache.method4(var0); @@ -85,7 +85,7 @@ public final class GroundItemPile { for (int var2 = 0; var2 < var1; ++var2) { if (Widget.widgets[var0][var2] == null) { - byte[] var3 = Widget.Widget_indexCache.takeRecord(var0, var2); + byte[] var3 = Widget.Widget_indexCache.takeFile(var0, var2); if (var3 != null) { Widget.widgets[var0][var2] = new Widget(); Widget.widgets[var0][var2].id = var2 + (var0 << 16); diff --git a/runescape-client/src/main/java/GzipDecompressor.java b/runescape-client/src/main/java/GzipDecompressor.java index 2c1a5225b7..71887acd38 100644 --- a/runescape-client/src/main/java/GzipDecompressor.java +++ b/runescape-client/src/main/java/GzipDecompressor.java @@ -60,7 +60,7 @@ public class GzipDecompressor { if (var1 != null) { return var1; } else { - byte[] var2 = StructDefinition.field885.takeRecord(34, var0); + byte[] var2 = StructDefinition.field885.takeFile(34, var0); var1 = new StructDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index a60a84437d..1c6a8614da 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -11,12 +11,12 @@ public class HealthBarDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field379; + public static AbstractArchive field379; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field380; + public static AbstractArchive field380; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 4251fa3e2c..b33ca4df3e 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -11,17 +11,17 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache field382; + static AbstractArchive field382; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache field383; + static AbstractArchive field383; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache field384; + static AbstractArchive field384; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/IndexCacheLoader.java b/runescape-client/src/main/java/IndexCacheLoader.java index c4c05568d9..00fc3b8ad2 100644 --- a/runescape-client/src/main/java/IndexCacheLoader.java +++ b/runescape-client/src/main/java/IndexCacheLoader.java @@ -33,7 +33,7 @@ public class IndexCacheLoader { signature = "Lit;" ) @Export("indexCache") - final IndexCache indexCache; + final Archive indexCache; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1459455501 @@ -48,7 +48,7 @@ public class IndexCacheLoader { @ObfuscatedSignature( signature = "(Lit;Ljava/lang/String;)V" ) - IndexCacheLoader(IndexCache var1, String var2) { + IndexCacheLoader(Archive var1, String var2) { this.field409 = 0; this.indexCache = var1; this.field408 = var1.method5(); @@ -95,14 +95,14 @@ public class IndexCacheLoader { class30.worldSelectBackSprites = class2.method20(WorldMapSection3.indexCache8, "sl_back", ""); } - IndexCache var11; + Archive var11; int var12; int var13; IndexedSprite[] var14; if (Frames.worldSelectFlagSprites == null) { var11 = WorldMapSection3.indexCache8; - var13 = var11.getArchiveId("sl_flags"); - var12 = var11.getRecordId(var13, ""); + var13 = var11.getGroupId("sl_flags"); + var12 = var11.getFileId(var13, ""); if (!SpriteMask.loadSprite(var11, var13, var12)) { var14 = null; } else { @@ -114,8 +114,8 @@ public class IndexCacheLoader { if (AttackOption.worldSelectArrows == null) { var11 = WorldMapSection3.indexCache8; - var13 = var11.getArchiveId("sl_arrows"); - var12 = var11.getRecordId(var13, ""); + var13 = var11.getGroupId("sl_arrows"); + var12 = var11.getFileId(var13, ""); if (!SpriteMask.loadSprite(var11, var13, var12)) { var14 = null; } else { @@ -127,8 +127,8 @@ public class IndexCacheLoader { if (UrlRequest.worldSelectStars == null) { var11 = WorldMapSection3.indexCache8; - var13 = var11.getArchiveId("sl_stars"); - var12 = var11.getRecordId(var13, ""); + var13 = var11.getGroupId("sl_stars"); + var12 = var11.getFileId(var13, ""); if (!SpriteMask.loadSprite(var11, var13, var12)) { var14 = null; } else { diff --git a/runescape-client/src/main/java/IndexStoreAction.java b/runescape-client/src/main/java/IndexStoreAction.java index c8b7bdd8da..7ee3684610 100644 --- a/runescape-client/src/main/java/IndexStoreAction.java +++ b/runescape-client/src/main/java/IndexStoreAction.java @@ -43,7 +43,7 @@ public class IndexStoreAction extends Node { signature = "Lit;" ) @Export("indexCache") - IndexCache indexCache; + Archive indexCache; @ObfuscatedName("fn") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 80135fddbd..b0cdeff51c 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -105,7 +105,7 @@ public class Interpreter { if (var1 != null) { return var1; } else { - byte[] var2 = EnumDefinition.EnumDefinition_indexCache.takeRecord(8, var0); + byte[] var2 = EnumDefinition.EnumDefinition_indexCache.takeFile(8, var0); var1 = new EnumDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index 0d3f76361b..b5a0acbc9b 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -11,7 +11,8 @@ public class InvDefinition extends DualNode { @ObfuscatedSignature( signature = "Ler;" ) - static EvictingDualNodeHashTable field427; + @Export("InvDefinition_cached") + static EvictingDualNodeHashTable InvDefinition_cached; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1358868971 @@ -63,6 +64,6 @@ public class InvDefinition extends DualNode { } static { - field427 = new EvictingDualNodeHashTable(64); + InvDefinition_cached = new EvictingDualNodeHashTable(64); } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index a1f33c11cd..cef1307128 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -238,7 +238,7 @@ public final class IsaacCipher { signature = "(Lir;Lir;I)V", garbageValue = "75867683" ) - public static void method4082(AbstractIndexCache var0, AbstractIndexCache var1) { + public static void method4082(AbstractArchive var0, AbstractArchive var1) { NPCDefinition.NpcDefinition_indexCache = var0; NPCDefinition.NpcDefinition_modelIndexCache = var1; } diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index 4404e399d1..b29e3ea6c9 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -22,7 +22,7 @@ public class ItemContainer extends Node { @ObfuscatedSignature( signature = "Lit;" ) - static IndexCache field434; + static Archive field434; @ObfuscatedName("f") @Export("ids") int[] ids; @@ -55,18 +55,18 @@ public class ItemContainer extends Node { if (var1 != null) { return var1; } else { - AbstractIndexCache var2 = SequenceDefinition.field773; - AbstractIndexCache var3 = SequenceDefinition.field774; + AbstractArchive var2 = SequenceDefinition.field773; + AbstractArchive var3 = SequenceDefinition.field774; boolean var4 = true; int[] var5 = var2.method3(var0); for (int var6 = 0; var6 < var5.length; ++var6) { - byte[] var7 = var2.getRecord(var0, var5[var6]); + byte[] var7 = var2.getFile(var0, var5[var6]); if (var7 == null) { var4 = false; } else { int var8 = (var7[0] & 255) << 8 | var7[1] & 255; - byte[] var9 = var3.getRecord(var8, 0); + byte[] var9 = var3.getFile(var8, 0); if (var9 == null) { var4 = false; } diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index 999e16be6f..e4ff114373 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -12,13 +12,13 @@ public class ItemDefinition extends DualNode { signature = "Lir;" ) @Export("ItemDefinition_indexCache") - public static AbstractIndexCache ItemDefinition_indexCache; + public static AbstractArchive ItemDefinition_indexCache; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Lir;" ) @Export("ItemDefinition_modelIndexCache") - public static AbstractIndexCache ItemDefinition_modelIndexCache; + public static AbstractArchive ItemDefinition_modelIndexCache; @ObfuscatedName("x") @ObfuscatedSignature( signature = "Ler;" @@ -473,7 +473,7 @@ public class ItemDefinition extends DualNode { } else if (var2 == 149) { this.placeholderTemplate = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); + this.params = AbstractArchive.readStringIntParameters(var1, this.params); } } @@ -710,15 +710,15 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var5 = true; - if (!ItemDefinition_modelIndexCache.tryLoadRecord(var2, 0)) { + if (!ItemDefinition_modelIndexCache.tryLoadFile(var2, 0)) { var5 = false; } - if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadFile(var3, 0)) { var5 = false; } - if (var4 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var4, 0)) { + if (var4 != -1 && !ItemDefinition_modelIndexCache.tryLoadFile(var4, 0)) { var5 = false; } @@ -799,11 +799,11 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var4 = true; - if (!ItemDefinition_modelIndexCache.tryLoadRecord(var2, 0)) { + if (!ItemDefinition_modelIndexCache.tryLoadFile(var2, 0)) { var4 = false; } - if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadFile(var3, 0)) { var4 = false; } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 619b4d5fa9..4705d9db1f 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -12,12 +12,12 @@ public class KitDefinition extends DualNode { signature = "Lir;" ) @Export("KitDefinition_indexCache") - public static AbstractIndexCache KitDefinition_indexCache; + public static AbstractArchive KitDefinition_indexCache; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field456; + public static AbstractArchive field456; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 235389995 @@ -139,7 +139,7 @@ public class KitDefinition extends DualNode { boolean var1 = true; for (int var2 = 0; var2 < this.modelIDs.length; ++var2) { - if (!field456.tryLoadRecord(this.modelIDs[var2], 0)) { + if (!field456.tryLoadFile(this.modelIDs[var2], 0)) { var1 = false; } } @@ -197,7 +197,7 @@ public class KitDefinition extends DualNode { boolean var1 = true; for (int var2 = 0; var2 < 5; ++var2) { - if (this.archives[var2] != -1 && !field456.tryLoadRecord(this.archives[var2], 0)) { + if (this.archives[var2] != -1 && !field456.tryLoadFile(this.archives[var2], 0)) { var1 = false; } } diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 646b5a23a1..f36bf739c3 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -140,15 +140,15 @@ public class Login { signature = "Lit;" ) @Export("indexCache11") - static IndexCache indexCache11; + static Archive indexCache11; @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Lir;II)Lhl;", garbageValue = "-1625685874" ) - static MusicPatch method2045(AbstractIndexCache var0, int var1) { - byte[] var2 = var0.takeRecordFlat(var1); + static MusicPatch method2045(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); return var2 == null ? null : new MusicPatch(var2); } @@ -186,7 +186,7 @@ public class Login { signature = "(Lir;IIIZB)V", garbageValue = "45" ) - public static void method2076(AbstractIndexCache var0, int var1, int var2, int var3, boolean var4) { + public static void method2076(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { class214.field1129 = 1; class214.field1130 = var0; class30.musicTrackArchiveId = var1; diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 5d8be7021f..062a7b3b5c 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -616,7 +616,7 @@ public class LoginScreenAnimation { if (var1 != null) { return var1; } else { - byte[] var2 = HitSplatDefinition.field382.takeRecord(32, var0); + byte[] var2 = HitSplatDefinition.field382.takeFile(32, var0); var1 = new HitSplatDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 7dea34d004..9e439052a6 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -47,9 +47,9 @@ public class MenuAction { garbageValue = "0" ) @Export("loadIndexedSpriteByName") - public static IndexedSprite loadIndexedSpriteByName(AbstractIndexCache var0, String var1, String var2) { - int var3 = var0.getArchiveId(var1); - int var4 = var0.getRecordId(var3, var2); + public static IndexedSprite loadIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); IndexedSprite var5; if (!SpriteMask.loadSprite(var0, var3, var4)) { var5 = null; diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 30ac47dfcb..024118663b 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -467,6 +467,6 @@ public class Message extends DualNode { } String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + Client.language + "/a=" + AbstractIndexCache.field2 + var3 + "/"; + return var2 + var0 + "." + var4 + "/l=" + Client.language + "/a=" + AbstractArchive.field2 + var3 + "/"; } } diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index eec4788edf..69bacc7cec 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -150,7 +150,7 @@ public class MidiPcmStream extends PcmStream { garbageValue = "-324121369" ) @Export("loadMusicTrack") - public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractIndexCache var2, SoundCache var3, int var4) { + public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { var1.method226(); boolean var5 = true; int[] var6 = null; diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 9ae3c76bc6..7aed6dfdd3 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -1606,8 +1606,8 @@ public class ModelData extends Entity { @ObfuscatedSignature( signature = "(Lir;II)Ldw;" ) - public static ModelData method2788(AbstractIndexCache var0, int var1, int var2) { - byte[] var3 = var0.takeRecord(var1, var2); + public static ModelData method2788(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); return var3 == null ? null : new ModelData(var3); } diff --git a/runescape-client/src/main/java/MusicSample.java b/runescape-client/src/main/java/MusicSample.java index 99bd23e94c..f20f348b1d 100644 --- a/runescape-client/src/main/java/MusicSample.java +++ b/runescape-client/src/main/java/MusicSample.java @@ -597,9 +597,9 @@ public class MusicSample extends Node { @ObfuscatedSignature( signature = "(Lir;)Z" ) - static boolean method2343(AbstractIndexCache var0) { + static boolean method2343(AbstractArchive var0) { if (!field610) { - byte[] var1 = var0.takeRecord(0, 0); + byte[] var1 = var0.takeFile(0, 0); if (var1 == null) { return false; } @@ -616,12 +616,12 @@ public class MusicSample extends Node { signature = "(Lir;II)Lcd;" ) @Export("readMusicSample") - static MusicSample readMusicSample(AbstractIndexCache var0, int var1, int var2) { + static MusicSample readMusicSample(AbstractArchive var0, int var1, int var2) { if (!method2343(var0)) { - var0.tryLoadRecord(var1, var2); + var0.tryLoadFile(var1, var2); return null; } else { - byte[] var3 = var0.takeRecord(var1, var2); + byte[] var3 = var0.takeFile(var1, var2); return var3 == null ? null : new MusicSample(var3); } } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 4147ba52f9..deb18fb6d6 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -427,8 +427,8 @@ public class MusicTrack extends Node { signature = "(Lir;II)Lhe;" ) @Export("readTrack") - public static MusicTrack readTrack(AbstractIndexCache var0, int var1, int var2) { - byte[] var3 = var0.takeRecord(var1, var2); + public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); return var3 == null ? null : new MusicTrack(new Buffer(var3)); } } diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 81857313b4..ef834cae34 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -167,7 +167,7 @@ public final class NPC extends Actor { signature = "(ILff;Lit;B)V", garbageValue = "-51" ) - static void method2009(int var0, IndexStore var1, IndexCache var2) { + static void method2009(int var0, IndexStore var1, Archive var2) { IndexStoreAction var3 = new IndexStoreAction(); var3.type = 1; var3.key = (long)var0; diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index 859d5d979e..d8d600a4a6 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -17,13 +17,13 @@ public class NPCDefinition extends DualNode { signature = "Lir;" ) @Export("NpcDefinition_indexCache") - static AbstractIndexCache NpcDefinition_indexCache; + static AbstractArchive NpcDefinition_indexCache; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) @Export("NpcDefinition_modelIndexCache") - static AbstractIndexCache NpcDefinition_modelIndexCache; + static AbstractArchive NpcDefinition_modelIndexCache; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Ler;" @@ -331,7 +331,7 @@ public class NPCDefinition extends DualNode { } else if (var2 == 111) { this.isFollower = true; } else if (var2 == 249) { - this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); + this.params = AbstractArchive.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -383,7 +383,7 @@ public class NPCDefinition extends DualNode { boolean var6 = false; for (int var7 = 0; var7 < this.archives.length; ++var7) { - if (!NpcDefinition_modelIndexCache.tryLoadRecord(this.archives[var7], 0)) { + if (!NpcDefinition_modelIndexCache.tryLoadFile(this.archives[var7], 0)) { var6 = true; } } @@ -457,7 +457,7 @@ public class NPCDefinition extends DualNode { boolean var1 = false; for (int var2 = 0; var2 < this.field636.length; ++var2) { - if (!NpcDefinition_modelIndexCache.tryLoadRecord(this.field636[var2], 0)) { + if (!NpcDefinition_modelIndexCache.tryLoadFile(this.field636[var2], 0)) { var1 = true; } } diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index a4c6dfc5c5..5bbfcd0e0f 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -97,7 +97,7 @@ public class NetCache { signature = "[Lit;" ) @Export("NetCache_indexCaches") - public static IndexCache[] NetCache_indexCaches; + public static Archive[] NetCache_indexCaches; @ObfuscatedName("b") public static byte field631; @ObfuscatedName("c") @@ -136,7 +136,7 @@ public class NetCache { NetCache_responseHeaderBuffer = new Buffer(8); field630 = 0; NetCache_crc = new CRC32(); - NetCache_indexCaches = new IndexCache[256]; + NetCache_indexCaches = new Archive[256]; field631 = 0; NetCache_crcMismatches = 0; NetCache_ioExceptions = 0; diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 03b741230c..f9baebe987 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -12,7 +12,7 @@ public class NetFileRequest extends DualNode { signature = "Lit;" ) @Export("indexCache") - public IndexCache indexCache; + public Archive indexCache; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1487103265 diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index ae8947b0d5..ca8c6ed7c8 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -536,7 +536,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { signature = "(Lir;Lir;Lir;Lhm;I)Z", garbageValue = "-590103687" ) - public static boolean method3537(AbstractIndexCache var0, AbstractIndexCache var1, AbstractIndexCache var2, MidiPcmStream var3) { + public static boolean method3537(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { class1.field1105 = var0; class214.field1127 = var1; class214.field1128 = var2; diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index 47fa02edef..05dc5fc2d7 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -15,12 +15,12 @@ public class ObjectDefinition extends DualNode { signature = "Lir;" ) @Export("ObjectDefinition_indexCache") - static AbstractIndexCache ObjectDefinition_indexCache; + static AbstractArchive ObjectDefinition_indexCache; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache field640; + static AbstractArchive field640; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" @@ -470,7 +470,7 @@ public class ObjectDefinition extends DualNode { } else if (var2 == 82) { this.mapIconId = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); + this.params = AbstractArchive.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -515,7 +515,7 @@ public class ObjectDefinition extends DualNode { if (this.field645 != null) { for (int var4 = 0; var4 < this.field645.length; ++var4) { if (this.field645[var4] == var1) { - return field640.tryLoadRecord(this.field644[var4] & 65535, 0); + return field640.tryLoadFile(this.field644[var4] & 65535, 0); } } @@ -528,7 +528,7 @@ public class ObjectDefinition extends DualNode { boolean var2 = true; for (int var3 = 0; var3 < this.field644.length; ++var3) { - var2 &= field640.tryLoadRecord(this.field644[var3] & 65535, 0); + var2 &= field640.tryLoadFile(this.field644[var3] & 65535, 0); } return var2; @@ -547,7 +547,7 @@ public class ObjectDefinition extends DualNode { boolean var1 = true; for (int var2 = 0; var2 < this.field644.length; ++var2) { - var1 &= field640.tryLoadRecord(this.field644[var2] & 65535, 0); + var1 &= field640.tryLoadFile(this.field644[var2] & 65535, 0); } return var1; @@ -907,7 +907,7 @@ public class ObjectDefinition extends DualNode { if (var1 != null) { return var1; } else { - byte[] var2 = NPCDefinition.NpcDefinition_indexCache.takeRecord(9, var0); + byte[] var2 = NPCDefinition.NpcDefinition_indexCache.takeFile(9, var0); var1 = new NPCDefinition(); var1.id = var0; if (var2 != null) { diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index 1fb50a8cb5..76d0d30733 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -18,7 +18,7 @@ public final class ObjectSound extends Node { signature = "Lit;" ) @Export("indexCache2") - static IndexCache indexCache2; + static Archive indexCache2; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 647270745 diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 0569ab5f5c..10b0bdbfb4 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -119,7 +119,7 @@ public final class Occluder { if (var1 != null) { return var1; } else { - byte[] var2 = VarbitDefinition.VarbitDefinition_indexCache.takeRecord(14, var0); + byte[] var2 = VarbitDefinition.VarbitDefinition_indexCache.takeFile(14, var0); var1 = new VarbitDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); diff --git a/runescape-client/src/main/java/OverlayDefinition.java b/runescape-client/src/main/java/OverlayDefinition.java index 63a376eb61..4a8488a530 100644 --- a/runescape-client/src/main/java/OverlayDefinition.java +++ b/runescape-client/src/main/java/OverlayDefinition.java @@ -11,7 +11,7 @@ public class OverlayDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field663; + public static AbstractArchive field663; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index b4985caf88..43b237d5c7 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -175,7 +175,7 @@ public final class PacketBuffer extends Buffer { garbageValue = "-1562700981" ) @Export("requestNetFile") - static void requestNetFile(IndexCache var0, int var1, int var2, int var3, byte var4, boolean var5) { + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { long var6 = (long)((var1 << 16) + var2); NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); if (var8 == null) { diff --git a/runescape-client/src/main/java/ParamKeyDefinition.java b/runescape-client/src/main/java/ParamKeyDefinition.java index 6e1ae779da..79e24fed2e 100644 --- a/runescape-client/src/main/java/ParamKeyDefinition.java +++ b/runescape-client/src/main/java/ParamKeyDefinition.java @@ -11,7 +11,7 @@ public class ParamKeyDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field679; + public static AbstractArchive field679; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 2845a48a04..52f8e3af95 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -526,7 +526,7 @@ public final class Player extends Actor { ScriptEvent var1 = new ScriptEvent(); var1.widget = var0; var1.args0 = var0.onTargetLeave; - AbstractIndexCache.runScript(var1); + AbstractArchive.runScript(var1); } Client.isSpellSelected = false; diff --git a/runescape-client/src/main/java/RectangleMode.java b/runescape-client/src/main/java/RectangleMode.java index 53928a6045..a47d78b510 100644 --- a/runescape-client/src/main/java/RectangleMode.java +++ b/runescape-client/src/main/java/RectangleMode.java @@ -59,7 +59,7 @@ public enum RectangleMode implements Enumerated { signature = "(Lir;Lir;ZB)V", garbageValue = "1" ) - public static void method6028(AbstractIndexCache var0, AbstractIndexCache var1, boolean var2) { + public static void method6028(AbstractArchive var0, AbstractArchive var1, boolean var2) { ObjectDefinition.ObjectDefinition_indexCache = var0; ObjectDefinition.field640 = var1; ObjectDefinition.ObjectDefinition_isLowDetail = var2; diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 23ce144181..eee9d2ab63 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -73,8 +73,8 @@ public abstract class RouteStrategy { garbageValue = "-602741260" ) @Export("loadSpriteFlat") - static boolean loadSpriteFlat(AbstractIndexCache var0, int var1) { - byte[] var2 = var0.takeRecordFlat(var1); + static boolean loadSpriteFlat(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); if (var2 == null) { return false; } else { diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index e976ebcffa..42cdac2b24 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -36,7 +36,7 @@ public class SecureRandomCallable implements Callable { if (var1 != null) { return var1; } else { - byte[] var2 = VarpDefinition.field943.takeRecord(16, var0); + byte[] var2 = VarpDefinition.field943.takeFile(16, var0); var1 = new VarpDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 378872b26b..a5ab41ae75 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -22,7 +22,7 @@ public class SecureRandomFuture { signature = "Lit;" ) @Export("indexCache5") - static IndexCache indexCache5; + static Archive indexCache5; @ObfuscatedName("jn") @ObfuscatedSignature( signature = "Ldl;" diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 134ea54929..68c330388b 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -12,17 +12,17 @@ public class SequenceDefinition extends DualNode { signature = "Lir;" ) @Export("SequenceDefinition_indexCache") - public static AbstractIndexCache SequenceDefinition_indexCache; + public static AbstractArchive SequenceDefinition_indexCache; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field773; + public static AbstractArchive field773; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field774; + public static AbstractArchive field774; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index 1f17947b6a..eefc146760 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -17,7 +17,7 @@ public class Skeleton extends Node { signature = "Lit;" ) @Export("indexCache1") - static IndexCache indexCache1; + static Archive indexCache1; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -1634889691 diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index a35cc48a35..ab7356b395 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -26,7 +26,7 @@ public class Skills { if (var1 != null) { return var1; } else { - byte[] var2 = ItemDefinition.ItemDefinition_indexCache.takeRecord(10, var0); + byte[] var2 = ItemDefinition.ItemDefinition_indexCache.takeFile(10, var0); var1 = new ItemDefinition(); var1.id = var0; if (var2 != null) { diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index 273e1d1d91..e27628c686 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -18,13 +18,13 @@ public class SoundCache { signature = "Lir;" ) @Export("soundEffectIndex") - AbstractIndexCache soundEffectIndex; + AbstractArchive soundEffectIndex; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) @Export("musicSampleIndex") - AbstractIndexCache musicSampleIndex; + AbstractArchive musicSampleIndex; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lld;" @@ -41,7 +41,7 @@ public class SoundCache { @ObfuscatedSignature( signature = "(Lir;Lir;)V" ) - public SoundCache(AbstractIndexCache var1, AbstractIndexCache var2) { + public SoundCache(AbstractArchive var1, AbstractArchive var2) { this.musicSamples = new NodeHashTable(256); this.rawSounds = new NodeHashTable(256); this.soundEffectIndex = var1; diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index 6226bf1571..a0568f7435 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -126,8 +126,8 @@ public class SoundEffect { signature = "(Lir;II)Lci;" ) @Export("readSoundEffect") - public static SoundEffect readSoundEffect(AbstractIndexCache var0, int var1, int var2) { - byte[] var3 = var0.takeRecord(var1, var2); + public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); return var3 == null ? null : new SoundEffect(new Buffer(var3)); } } diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index e80bd0db1f..aa77ace319 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -50,7 +50,7 @@ public class SoundSystem implements Runnable { if (var1 != null) { return var1; } else { - byte[] var2 = Formatting.indexCache12.takeRecord(var0, 0); + byte[] var2 = Formatting.indexCache12.takeFile(var0, 0); if (var2 == null) { return null; } else { diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index b9d3951b01..1917bb2f86 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -12,13 +12,13 @@ public class SpotAnimationDefinition extends DualNode { signature = "Lir;" ) @Export("SpotAnimationDefinition_indexCache") - public static AbstractIndexCache SpotAnimationDefinition_indexCache; + public static AbstractArchive SpotAnimationDefinition_indexCache; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) @Export("SpotAnimationDefinition_modelIndexCache") - public static AbstractIndexCache SpotAnimationDefinition_modelIndexCache; + public static AbstractArchive SpotAnimationDefinition_modelIndexCache; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/SpriteIds.java b/runescape-client/src/main/java/SpriteIds.java index a21e1d23ec..d1580be415 100644 --- a/runescape-client/src/main/java/SpriteIds.java +++ b/runescape-client/src/main/java/SpriteIds.java @@ -92,8 +92,8 @@ public class SpriteIds { garbageValue = "1764356022" ) @Export("read") - public void read(AbstractIndexCache var1) { - byte[] var2 = var1.takeRecordFlat(class311.field3810.field3809); + public void read(AbstractArchive var1) { + byte[] var2 = var1.takeFileFlat(class311.field3810.field3809); Buffer var3 = new Buffer(var2); while (true) { @@ -127,11 +127,11 @@ public class SpriteIds { signature = "(Lir;Lir;III)Lkk;", garbageValue = "195396240" ) - public static Font method5823(AbstractIndexCache var0, AbstractIndexCache var1, int var2, int var3) { + public static Font method5823(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { if (!SpriteMask.loadSprite(var0, var2, var3)) { return null; } else { - byte[] var4 = var1.takeRecord(var2, var3); + byte[] var4 = var1.takeFile(var2, var3); Font var5; if (var4 == null) { var5 = null; diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index e14649895e..48dbd00210 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -96,8 +96,8 @@ public class SpriteMask extends DualNode { garbageValue = "1" ) @Export("loadSprite") - public static boolean loadSprite(AbstractIndexCache var0, int var1, int var2) { - byte[] var3 = var0.takeRecord(var1, var2); + public static boolean loadSprite(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); if (var3 == null) { return false; } else { diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index 07e4155771..b09dcca747 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -27,21 +27,21 @@ public class Strings { Buffer var1 = new Buffer(var0); int var2 = var1.readUnsignedByte(); int var3 = var1.readInt(); - if (var3 >= 0 && (AbstractIndexCache.field1 == 0 || var3 <= AbstractIndexCache.field1)) { + if (var3 >= 0 && (AbstractArchive.field1 == 0 || var3 <= AbstractArchive.field1)) { if (var2 == 0) { byte[] var6 = new byte[var3]; var1.method46(var6, 0, var3); return var6; } else { int var4 = var1.readInt(); - if (var4 < 0 || AbstractIndexCache.field1 != 0 && var4 > AbstractIndexCache.field1) { + if (var4 < 0 || AbstractArchive.field1 != 0 && var4 > AbstractArchive.field1) { throw new RuntimeException(); } else { byte[] var5 = new byte[var4]; if (var2 == 1) { Bzip2Decompressor.Bzip2Decompressor_decompress(var5, var4, var0, var3, 9); } else { - AbstractIndexCache.gzipDecompressor.decompress(var1, var5); + AbstractArchive.gzipDecompressor.decompress(var1, var5); } return var5; diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index bfbeb96b71..0f8a462be8 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -11,7 +11,7 @@ public class StructDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field885; + public static AbstractArchive field885; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" @@ -58,7 +58,7 @@ public class StructDefinition extends DualNode { @Export("readNext") void readNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); + this.params = AbstractArchive.readStringIntParameters(var1, this.params); } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 8a6694afac..d2c5457236 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -73,7 +73,7 @@ public enum StudioGame implements Enumerated { if (var1 != null) { return var1; } else { - byte[] var2 = UnderlayDefinition.UnderlayDefinition_indexCache.takeRecord(1, var0); + byte[] var2 = UnderlayDefinition.UnderlayDefinition_indexCache.takeFile(1, var0); var1 = new UnderlayDefinition(); if (var2 != null) { var1.read(new Buffer(var2), var0); diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index ce5b8d8384..8c52add844 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -86,10 +86,10 @@ public class Texture extends Node { @ObfuscatedSignature( signature = "(DILir;)Z" ) - boolean method320(double var1, int var3, AbstractIndexCache var4) { + boolean method320(double var1, int var3, AbstractArchive var4) { int var5; for (var5 = 0; var5 < this.records.length; ++var5) { - if (var4.getRecordFlat(this.records[var5]) == null) { + if (var4.getFileFlat(this.records[var5]) == null) { return false; } } diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index b6a22d12a5..b9cbae14c1 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -52,12 +52,12 @@ public class TextureProvider implements TextureLoader { signature = "Lir;" ) @Export("indexCache") - AbstractIndexCache indexCache; + AbstractArchive indexCache; @ObfuscatedSignature( signature = "(Lir;Lir;IDI)V" ) - public TextureProvider(AbstractIndexCache var1, AbstractIndexCache var2, int var3, double var4, int var6) { + public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); this.remaining = 0; this.brightness0 = 1.0D; @@ -72,7 +72,7 @@ public class TextureProvider implements TextureLoader { this.textures = new Texture[var1.method4(0)]; for (int var9 = 0; var9 < var8; ++var9) { - Buffer var10 = new Buffer(var1.takeRecord(0, var7[var9])); + Buffer var10 = new Buffer(var1.takeFile(0, var7[var9])); this.textures[var7[var9]] = new Texture(var10); } diff --git a/runescape-client/src/main/java/UnderlayDefinition.java b/runescape-client/src/main/java/UnderlayDefinition.java index 8ebdfe0da9..43c1a593c9 100644 --- a/runescape-client/src/main/java/UnderlayDefinition.java +++ b/runescape-client/src/main/java/UnderlayDefinition.java @@ -12,7 +12,7 @@ public class UnderlayDefinition extends DualNode { signature = "Lir;" ) @Export("UnderlayDefinition_indexCache") - static AbstractIndexCache UnderlayDefinition_indexCache; + static AbstractArchive UnderlayDefinition_indexCache; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/UnitPriceComparator.java b/runescape-client/src/main/java/UnitPriceComparator.java index d1c09b9fe3..d0d4a05c66 100644 --- a/runescape-client/src/main/java/UnitPriceComparator.java +++ b/runescape-client/src/main/java/UnitPriceComparator.java @@ -45,7 +45,7 @@ final class UnitPriceComparator implements Comparator { signature = "(Lir;B)V", garbageValue = "23" ) - public static void method135(AbstractIndexCache var0) { + public static void method135(AbstractArchive var0) { VarbitDefinition.VarbitDefinition_indexCache = var0; } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index d016050749..93f8e81b87 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -11,7 +11,7 @@ public class UserComparator3 extends AbstractUserComparator { signature = "Lit;" ) @Export("indexCache6") - static IndexCache indexCache6; + static Archive indexCache6; @ObfuscatedName("fl") @ObfuscatedSignature( signature = "Lfm;" diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index 3f2d265505..ba5e343e14 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -12,7 +12,7 @@ public class VarbitDefinition extends DualNode { signature = "Lir;" ) @Export("VarbitDefinition_indexCache") - static AbstractIndexCache VarbitDefinition_indexCache; + static AbstractArchive VarbitDefinition_indexCache; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index 359502ebb5..572b8c0a4d 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -11,7 +11,7 @@ public class VarcInt extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache field942; + static AbstractArchive field942; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index f7a988efaa..a78e68a7f1 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -356,7 +356,7 @@ public class Varcs { signature = "(Lir;I)V", garbageValue = "321265868" ) - public static void method2160(AbstractIndexCache var0) { + public static void method2160(AbstractArchive var0) { OverlayDefinition.field663 = var0; } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index b650c9347c..c688b4fbee 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -11,7 +11,7 @@ public class VarpDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field943; + public static AbstractArchive field943; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 510774535 diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 57745938a0..799664d180 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -28,7 +28,7 @@ public class Varps { signature = "(Lir;I)V", garbageValue = "2111080001" ) - public static void method4393(AbstractIndexCache var0) { + public static void method4393(AbstractArchive var0) { UnderlayDefinition.UnderlayDefinition_indexCache = var0; } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index f29255a2e9..c94e666cfe 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -27,12 +27,12 @@ public class Widget extends Node { signature = "Lir;" ) @Export("Widget_indexCache") - public static AbstractIndexCache Widget_indexCache; + public static AbstractArchive Widget_indexCache; @ObfuscatedName("d") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field955; + public static AbstractArchive field955; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/WidgetGroupParent.java b/runescape-client/src/main/java/WidgetGroupParent.java index 19c90b5d88..ad949b8a8a 100644 --- a/runescape-client/src/main/java/WidgetGroupParent.java +++ b/runescape-client/src/main/java/WidgetGroupParent.java @@ -49,11 +49,11 @@ public class WidgetGroupParent extends Node { return var2; } else { String var3 = String.valueOf(var0); - int var4 = Formatting.indexCache12.getArchiveId(var3); + int var4 = Formatting.indexCache12.getGroupId(var3); if (var4 == -1) { return null; } else { - byte[] var5 = Formatting.indexCache12.takeRecordFlat(var4); + byte[] var5 = Formatting.indexCache12.takeFileFlat(var4); if (var5 != null) { if (var5.length <= 1) { return null; diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 323886684a..a8939dfe2e 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -35,17 +35,17 @@ public class WorldMap { @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache field989; + AbstractArchive field989; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache field990; + AbstractArchive field990; @ObfuscatedName("e") @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache field991; + AbstractArchive field991; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lkk;" @@ -312,7 +312,7 @@ public class WorldMap { garbageValue = "1887817097" ) @Export("init") - public void init(AbstractIndexCache var1, AbstractIndexCache var2, AbstractIndexCache var3, Font var4, HashMap var5, IndexedSprite[] var6) { + public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { this.mapSceneSprites = var6; this.field989 = var1; this.field990 = var2; @@ -323,12 +323,12 @@ public class WorldMap { this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); this.cacheLoader = new WorldMapIndexCacheLoader(var1); - int var7 = this.field989.getArchiveId(WorldMapCacheName.WorldMapCacheName_details.name); + int var7 = this.field989.getGroupId(WorldMapCacheName.WorldMapCacheName_details.name); int[] var8 = this.field989.method3(var7); this.mapAreas = new HashMap(var8.length); for (int var9 = 0; var9 < var8.length; ++var9) { - Buffer var10 = new Buffer(this.field989.takeRecord(var7, var8[var9])); + Buffer var10 = new Buffer(this.field989.takeFile(var7, var8[var9])); WorldMapArea var11 = new WorldMapArea(); var11.read(var10, var8[var9]); this.mapAreas.put(var11.archiveName(), var11); @@ -370,7 +370,7 @@ public class WorldMap { AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); AbstractIndexCache.runScript(var14)) { + for (var12 = var10.iterator(); var12.hasNext(); AbstractArchive.runScript(var14)) { var13 = (AbstractWorldMapIcon)var12.next(); var11.add(var13); var14 = new ScriptEvent(); @@ -392,7 +392,7 @@ public class WorldMap { var15 = new WorldMapEvent(var13.vmethod395(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); var14.setType(16); - AbstractIndexCache.runScript(var14); + AbstractArchive.runScript(var14); } } @@ -1327,7 +1327,7 @@ public class WorldMap { var5.setType(14); } - AbstractIndexCache.runScript(var5); + AbstractArchive.runScript(var5); } @ObfuscatedName("bx") diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 9727a79f03..6fe7e0c410 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -89,7 +89,7 @@ public class WorldMapAreaData extends WorldMapArea { if (var1 != null) { return var1; } else { - byte[] var2 = SequenceDefinition.SequenceDefinition_indexCache.takeRecord(12, var0); + byte[] var2 = SequenceDefinition.SequenceDefinition_indexCache.takeFile(12, var0); var1 = new SequenceDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index ed14d0ff1f..40356c54f5 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -12,7 +12,7 @@ public class WorldMapDecoration { signature = "Lit;" ) @Export("indexCache4") - static IndexCache indexCache4; + static Archive indexCache4; @ObfuscatedName("kw") @ObfuscatedGetter( intValue = -12041645 @@ -96,7 +96,7 @@ public class WorldMapDecoration { ScriptEvent var5 = new ScriptEvent(); var5.widget = var4; var5.args0 = var4.onTargetEnter; - AbstractIndexCache.runScript(var5); + AbstractArchive.runScript(var5); } Client.field157 = var3; diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index fd5ef00171..7eb4d7707b 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -161,17 +161,17 @@ public enum WorldMapDecorationType implements Enumerated { garbageValue = "1" ) public static InvDefinition method4523(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.field427.get((long)var0); + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = class4.field1158.takeRecord(5, var0); + byte[] var2 = class4.field1158.takeFile(5, var0); var1 = new InvDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); } - InvDefinition.field427.put(var1, (long)var0); + InvDefinition.InvDefinition_cached.put(var1, (long)var0); return var1; } } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 62870b4599..4cf0df629b 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -11,7 +11,7 @@ public class WorldMapElement extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1019; + public static AbstractArchive field1019; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java index b1fbbf21e1..4ce75a7560 100644 --- a/runescape-client/src/main/java/WorldMapIcon1.java +++ b/runescape-client/src/main/java/WorldMapIcon1.java @@ -18,7 +18,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "Lit;" ) @Export("indexCache3") - static IndexCache indexCache3; + static Archive indexCache3; @ObfuscatedName("ec") @Export("secureRandom") static SecureRandom secureRandom; diff --git a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java b/runescape-client/src/main/java/WorldMapIndexCacheLoader.java index 7dadbb8aac..891978276e 100644 --- a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java +++ b/runescape-client/src/main/java/WorldMapIndexCacheLoader.java @@ -15,7 +15,7 @@ public class WorldMapIndexCacheLoader { signature = "Lir;" ) @Export("indexCache") - AbstractIndexCache indexCache; + AbstractArchive indexCache; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 624113115 @@ -29,7 +29,7 @@ public class WorldMapIndexCacheLoader { @ObfuscatedSignature( signature = "(Lir;)V" ) - WorldMapIndexCacheLoader(AbstractIndexCache var1) { + WorldMapIndexCacheLoader(AbstractArchive var1) { this.percentLoaded0 = 0; this.isLoaded0 = false; this.indexCache = var1; @@ -59,7 +59,7 @@ public class WorldMapIndexCacheLoader { @Export("load") int load() { if (this.percentLoaded0 < 33) { - if (!this.indexCache.tryLoadRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, this.cacheName)) { + if (!this.indexCache.tryLoadFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, this.cacheName)) { return this.percentLoaded0; } @@ -67,7 +67,7 @@ public class WorldMapIndexCacheLoader { } if (this.percentLoaded0 == 33) { - if (this.indexCache.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName) && !this.indexCache.tryLoadRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName)) { + if (this.indexCache.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName) && !this.indexCache.tryLoadFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName)) { return this.percentLoaded0; } @@ -75,7 +75,7 @@ public class WorldMapIndexCacheLoader { } if (this.percentLoaded0 == 66) { - if (!this.indexCache.tryLoadRecordByNames(this.cacheName, WorldMapCacheName.WorldMapCacheName_labels.name)) { + if (!this.indexCache.tryLoadFileByNames(this.cacheName, WorldMapCacheName.WorldMapCacheName_labels.name)) { return this.percentLoaded0; } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 18cb501ec4..bb5eeeeb11 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -35,7 +35,7 @@ public class WorldMapLabelSize { @ObfuscatedSignature( signature = "Lit;" ) - static IndexCache field1040; + static Archive field1040; @ObfuscatedName("fi") @ObfuscatedGetter( intValue = 1577759565 diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index e15da8096e..b7fc8eccab 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -51,12 +51,12 @@ public final class WorldMapManager { @ObfuscatedSignature( signature = "Lir;" ) - final AbstractIndexCache field1046; + final AbstractArchive field1046; @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lir;" ) - final AbstractIndexCache field1047; + final AbstractArchive field1047; @ObfuscatedName("d") @Export("fonts") final HashMap fonts; @@ -91,7 +91,7 @@ public final class WorldMapManager { @ObfuscatedSignature( signature = "([Llq;Ljava/util/HashMap;Lir;Lir;)V" ) - public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractIndexCache var3, AbstractIndexCache var4) { + public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.isLoaded0 = false; this.loadStarted = false; this.field1045 = new HashMap(); @@ -108,15 +108,15 @@ public final class WorldMapManager { garbageValue = "32" ) @Export("load") - public void load(AbstractIndexCache var1, String var2, boolean var3) { + public void load(AbstractArchive var1, String var2, boolean var3) { if (!this.loadStarted) { this.isLoaded0 = false; this.loadStarted = true; System.nanoTime(); - int var4 = var1.getArchiveId(WorldMapCacheName.WorldMapCacheName_details.name); - int var5 = var1.getRecordId(var4, var2); - Buffer var6 = new Buffer(var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_details.name, var2)); - Buffer var7 = new Buffer(var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, var2)); + int var4 = var1.getGroupId(WorldMapCacheName.WorldMapCacheName_details.name); + int var5 = var1.getFileId(var4, var2); + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.WorldMapCacheName_details.name, var2)); + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, var2)); System.nanoTime(); System.nanoTime(); this.mapAreaData = new WorldMapAreaData(); @@ -165,7 +165,7 @@ public final class WorldMapManager { System.nanoTime(); System.nanoTime(); if (var1.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2)) { - byte[] var18 = var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2); + byte[] var18 = var1.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2); this.overviewSprite = class27.convertJpgToSprite(var18); } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 4d8247b51b..560007ff66 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -252,7 +252,7 @@ public class WorldMapRegion { signature = "(Lir;B)Z", garbageValue = "2" ) - boolean method409(AbstractIndexCache var1) { + boolean method409(AbstractArchive var1) { if (this.field239 != null) { this.field239.method263(var1); if (this.field239.method271()) { @@ -289,7 +289,7 @@ public class WorldMapRegion { signature = "(ILad;[Llq;Lir;Lir;I)V", garbageValue = "518389076" ) - void method455(int var1, class40 var2, IndexedSprite[] var3, AbstractIndexCache var4, AbstractIndexCache var5) { + void method455(int var1, class40 var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { this.field1054 = var1; if ((this.field239 != null || !this.field1052.isEmpty()) && class13.method164(this.x, this.y, var1) == null) { boolean var6 = true; @@ -301,9 +301,9 @@ public class WorldMapRegion { var7 = ((class21)this.field1052.getFirst()).field150; } - var6 &= var5.tryLoadArchive(var7); + var6 &= var5.tryLoadGroup(var7); if (var6) { - byte[] var8 = var5.takeRecordFlat(var7); + byte[] var8 = var5.takeFileFlat(var7); class27 var9 = SecureRandomCallable.method1145(var8); Sprite var10 = new Sprite(this.field1054 * 64, this.field1054 * 64); var10.setRaster(); @@ -449,7 +449,7 @@ public class WorldMapRegion { if (var11 != null) { var12 = var11; } else { - byte[] var13 = OverlayDefinition.field663.takeRecord(4, var7); + byte[] var13 = OverlayDefinition.field663.takeFile(4, var7); var11 = new OverlayDefinition(); if (var13 != null) { var11.read(new Buffer(var13), var7); @@ -554,7 +554,7 @@ public class WorldMapRegion { if (var8 != null) { var9 = var8; } else { - byte[] var10 = OverlayDefinition.field663.takeRecord(4, var6); + byte[] var10 = OverlayDefinition.field663.takeFile(4, var6); var8 = new OverlayDefinition(); if (var10 != null) { var8.read(new Buffer(var10), var6); diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 9b7aae46ca..a0a4f653cc 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -15,7 +15,7 @@ public class WorldMapSection1 implements WorldMapSection { signature = "Lit;" ) @Export("indexCache15") - static IndexCache indexCache15; + static Archive indexCache15; @ObfuscatedName("ey") @ObfuscatedGetter( intValue = -1516124929 @@ -193,7 +193,7 @@ public class WorldMapSection1 implements WorldMapSection { if (var1 != null) { return var1; } else { - byte[] var2 = KitDefinition.KitDefinition_indexCache.takeRecord(3, var0); + byte[] var2 = KitDefinition.KitDefinition_indexCache.takeFile(3, var0); var1 = new KitDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index a3dc383399..99fdb5df3b 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -15,7 +15,7 @@ public class WorldMapSection3 implements WorldMapSection { signature = "Lit;" ) @Export("indexCache8") - static IndexCache indexCache8; + static Archive indexCache8; @ObfuscatedName("go") @ObfuscatedGetter( intValue = -948290091 diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index d1d301d612..701c9fb048 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -9,7 +9,7 @@ final class class1 implements class0 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1105; + public static AbstractArchive field1105; @ObfuscatedName("m") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index 4da7663662..4706aa5295 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -36,8 +36,8 @@ public class class13 { ) @Export("playPcmPlayers") static final void playPcmPlayers() { - if (AbstractIndexCache.pcmPlayer1 != null) { - AbstractIndexCache.pcmPlayer1.run(); + if (AbstractArchive.pcmPlayer1 != null) { + AbstractArchive.pcmPlayer1.run(); } if (WorldMapCacheName.pcmPlayer0 != null) { diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 6d20c53087..3811b9d99d 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -22,7 +22,7 @@ public class class16 { signature = "Lit;" ) @Export("indexCache10") - static IndexCache indexCache10; + static Archive indexCache10; @ObfuscatedName("ga") @ObfuscatedSignature( signature = "[Lln;" diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index 2ae59d52fe..19f4b14541 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -99,7 +99,7 @@ public class class171 { Login.Login_loadingPercent = 10; Client.titleLoadingStage = 30; } else if (Client.titleLoadingStage == 30) { - AbstractIndexCache.indexCache0 = class22.newIndexCache(0, false, true, true); + AbstractArchive.indexCache0 = class22.newIndexCache(0, false, true, true); Skeleton.indexCache1 = class22.newIndexCache(1, false, true, true); ObjectSound.indexCache2 = class22.newIndexCache(2, true, false, true); WorldMapIcon1.indexCache3 = class22.newIndexCache(3, false, true, true); @@ -124,25 +124,25 @@ public class class171 { Client.titleLoadingStage = 40; } else if (Client.titleLoadingStage == 40) { byte var1 = 0; - var0 = var1 + AbstractIndexCache.indexCache0.method131() * 4 / 100; - var0 += Skeleton.indexCache1.method131() * 4 / 100; - var0 += ObjectSound.indexCache2.method131() * 2 / 100; - var0 += WorldMapIcon1.indexCache3.method131() * 2 / 100; - var0 += WorldMapDecoration.indexCache4.method131() * 6 / 100; - var0 += SecureRandomFuture.indexCache5.method131() * 4 / 100; - var0 += UserComparator3.indexCache6.method131() * 2 / 100; - var0 += class40.indexCache7.method131() * 56 / 100; - var0 += WorldMapSection3.indexCache8.method131() * 2 / 100; - var0 += class238.indexCache9.method131() * 2 / 100; - var0 += class16.indexCache10.method131() * 2 / 100; - var0 += Login.indexCache11.method131() * 2 / 100; - var0 += Formatting.indexCache12.method131() * 2 / 100; - var0 += ByteArrayPool.indexCache13.method131() * 2 / 100; - var0 += class2.indexCache14.method131() * 2 / 100; - var0 += WorldMapSection1.indexCache15.method131() * 2 / 100; - var0 += ItemContainer.field434.method131() / 100; - var0 += WorldMapLabelSize.field1040.method131() / 100; - var0 += AbstractByteArrayCopier.field0.method131() / 100; + var0 = var1 + AbstractArchive.indexCache0.percentage() * 4 / 100; + var0 += Skeleton.indexCache1.percentage() * 4 / 100; + var0 += ObjectSound.indexCache2.percentage() * 2 / 100; + var0 += WorldMapIcon1.indexCache3.percentage() * 2 / 100; + var0 += WorldMapDecoration.indexCache4.percentage() * 6 / 100; + var0 += SecureRandomFuture.indexCache5.percentage() * 4 / 100; + var0 += UserComparator3.indexCache6.percentage() * 2 / 100; + var0 += class40.indexCache7.percentage() * 56 / 100; + var0 += WorldMapSection3.indexCache8.percentage() * 2 / 100; + var0 += class238.indexCache9.percentage() * 2 / 100; + var0 += class16.indexCache10.percentage() * 2 / 100; + var0 += Login.indexCache11.percentage() * 2 / 100; + var0 += Formatting.indexCache12.percentage() * 2 / 100; + var0 += ByteArrayPool.indexCache13.percentage() * 2 / 100; + var0 += class2.indexCache14.percentage() * 2 / 100; + var0 += WorldMapSection1.indexCache15.percentage() * 2 / 100; + var0 += ItemContainer.field434.percentage() / 100; + var0 += WorldMapLabelSize.field1040.percentage() / 100; + var0 += AbstractByteArrayCopier.field0.percentage() / 100; var0 += class22.indexCache16.method130() && class22.indexCache16.method2() ? 1 : 0; if (var0 != 100) { if (var0 != 0) { @@ -151,7 +151,7 @@ public class class171 { Login.Login_loadingPercent = 30; } else { - AbstractWorldMapIcon.method625(AbstractIndexCache.indexCache0, "Animations"); + AbstractWorldMapIcon.method625(AbstractArchive.indexCache0, "Animations"); AbstractWorldMapIcon.method625(Skeleton.indexCache1, "Skeletons"); AbstractWorldMapIcon.method625(WorldMapDecoration.indexCache4, "Sound FX"); AbstractWorldMapIcon.method625(SecureRandomFuture.indexCache5, "Maps"); @@ -177,9 +177,9 @@ public class class171 { WorldMapCacheName.pcmPlayer0 = Players.newPcmPlayer(GameShell.taskHandler, 0, 22050); WorldMapCacheName.pcmPlayer0.setStream(var28); NetSocket.method3537(WorldMapSection1.indexCache15, class2.indexCache14, WorldMapDecoration.indexCache4, var28); - AbstractIndexCache.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048); + AbstractArchive.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048); TaskHandler.pcmStreamMixer = new PcmStreamMixer(); - AbstractIndexCache.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer); + AbstractArchive.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer); MilliClock.decimator = new Decimator(22050, class309.PcmPlayer_sampleRate); Login.Login_loadingText = "Prepared sound engine"; Login.Login_loadingPercent = 35; @@ -218,7 +218,7 @@ public class class171 { Client.titleLoadingStage = 70; } } else { - IndexCache var30; + Archive var30; if (Client.titleLoadingStage == 70) { if (!ObjectSound.indexCache2.method2()) { Login.Login_loadingText = "Loading config - " + ObjectSound.indexCache2.loadPercent() + "%"; @@ -226,8 +226,8 @@ public class class171 { } else { Varcs.method2160(ObjectSound.indexCache2); Varps.method4393(ObjectSound.indexCache2); - IndexCache var31 = ObjectSound.indexCache2; - IndexCache var33 = class40.indexCache7; + Archive var31 = ObjectSound.indexCache2; + Archive var33 = class40.indexCache7; KitDefinition.KitDefinition_indexCache = var31; KitDefinition.field456 = var33; KitDefinition.field457 = KitDefinition.KitDefinition_indexCache.method4(3); @@ -235,8 +235,8 @@ public class class171 { IsaacCipher.method4082(ObjectSound.indexCache2, class40.indexCache7); var30 = ObjectSound.indexCache2; StructDefinition.field885 = var30; - IndexCache var5 = ObjectSound.indexCache2; - IndexCache var6 = class40.indexCache7; + Archive var5 = ObjectSound.indexCache2; + Archive var6 = class40.indexCache7; boolean var7 = Client.isMembersWorld; Font var8 = ScriptEvent.fontPlain11; ItemDefinition.ItemDefinition_indexCache = var5; @@ -244,52 +244,52 @@ public class class171 { class30.inMembersWorld = var7; class83.field1167 = ItemDefinition.ItemDefinition_indexCache.method4(10); class204.field1122 = var8; - IndexCache var9 = ObjectSound.indexCache2; - IndexCache var10 = AbstractIndexCache.indexCache0; - IndexCache var11 = Skeleton.indexCache1; + Archive var9 = ObjectSound.indexCache2; + Archive var10 = AbstractArchive.indexCache0; + Archive var11 = Skeleton.indexCache1; SequenceDefinition.SequenceDefinition_indexCache = var9; SequenceDefinition.field773 = var10; SequenceDefinition.field774 = var11; - IndexCache var12 = ObjectSound.indexCache2; - IndexCache var13 = class40.indexCache7; + Archive var12 = ObjectSound.indexCache2; + Archive var13 = class40.indexCache7; SpotAnimationDefinition.SpotAnimationDefinition_indexCache = var12; SpotAnimationDefinition.SpotAnimationDefinition_modelIndexCache = var13; UnitPriceComparator.method135(ObjectSound.indexCache2); - IndexCache var14 = ObjectSound.indexCache2; + Archive var14 = ObjectSound.indexCache2; VarpDefinition.field943 = var14; VarpDefinition.field944 = VarpDefinition.field943.method4(16); - IndexCache var15 = WorldMapIcon1.indexCache3; - IndexCache var16 = class40.indexCache7; - IndexCache var17 = WorldMapSection3.indexCache8; - IndexCache var18 = ByteArrayPool.indexCache13; + Archive var15 = WorldMapIcon1.indexCache3; + Archive var16 = class40.indexCache7; + Archive var17 = WorldMapSection3.indexCache8; + Archive var18 = ByteArrayPool.indexCache13; Widget.Widget_indexCache = var15; BufferedSource.field54 = var16; Widget.field955 = var17; class27.field1143 = var18; Widget.widgets = new Widget[Widget.Widget_indexCache.method5()][]; Widget.loadedWidgetGroups = new boolean[Widget.Widget_indexCache.method5()]; - IndexCache var19 = ObjectSound.indexCache2; + Archive var19 = ObjectSound.indexCache2; class4.field1158 = var19; - IndexCache var20 = ObjectSound.indexCache2; + Archive var20 = ObjectSound.indexCache2; EnumDefinition.EnumDefinition_indexCache = var20; Frames.method3241(ObjectSound.indexCache2); - IndexCache var21 = ObjectSound.indexCache2; + Archive var21 = ObjectSound.indexCache2; ParamKeyDefinition.field679 = var21; class196.varcs = new Varcs(); class60.method1172(ObjectSound.indexCache2, WorldMapSection3.indexCache8, ByteArrayPool.indexCache13); - IndexCache var22 = ObjectSound.indexCache2; - IndexCache var23 = WorldMapSection3.indexCache8; + Archive var22 = ObjectSound.indexCache2; + Archive var23 = WorldMapSection3.indexCache8; HealthBarDefinition.field379 = var22; HealthBarDefinition.field380 = var23; - IndexCache var24 = ObjectSound.indexCache2; - IndexCache var25 = WorldMapSection3.indexCache8; + Archive var24 = ObjectSound.indexCache2; + Archive var25 = WorldMapSection3.indexCache8; WorldMapElement.field1019 = var25; if (var24.method2()) { UserComparator4.WorldMapElement_count = var24.method4(35); Widget.WorldMapElement_cached = new WorldMapElement[UserComparator4.WorldMapElement_count]; for (int var26 = 0; var26 < UserComparator4.WorldMapElement_count; ++var26) { - byte[] var27 = var24.takeRecord(35, var26); + byte[] var27 = var24.takeFile(35, var26); Widget.WorldMapElement_cached[var26] = new WorldMapElement(var26); if (var27 != null) { Widget.WorldMapElement_cached[var26].read(new Buffer(var27)); @@ -487,11 +487,11 @@ public class class171 { Login.Login_loadingPercent = 92; Client.titleLoadingStage = 120; } else if (Client.titleLoadingStage == 120) { - if (!class16.indexCache10.tryLoadRecordByNames("huffman", "")) { + if (!class16.indexCache10.tryLoadFileByNames("huffman", "")) { Login.Login_loadingText = "Loading wordpack - 0%"; Login.Login_loadingPercent = 94; } else { - Huffman var37 = new Huffman(class16.indexCache10.takeRecordByNames("huffman", "")); + Huffman var37 = new Huffman(class16.indexCache10.takeFileByNames("huffman", "")); class303.huffman = var37; Login.Login_loadingText = "Loaded wordpack"; Login.Login_loadingPercent = 94; @@ -514,8 +514,8 @@ public class class171 { } } else if (Client.titleLoadingStage == 140) { Login.Login_loadingPercent = 100; - if (!ItemContainer.field434.tryLoadArchiveByName(WorldMapCacheName.WorldMapCacheName_details.name)) { - Login.Login_loadingText = "Loading world map - " + ItemContainer.field434.archiveLoadPercentByName(WorldMapCacheName.WorldMapCacheName_details.name) / 10 + "%"; + if (!ItemContainer.field434.tryLoadGroupByName(WorldMapCacheName.WorldMapCacheName_details.name)) { + Login.Login_loadingText = "Loading world map - " + ItemContainer.field434.groupLoadPercentByName(WorldMapCacheName.WorldMapCacheName_details.name) / 10 + "%"; } else { if (class60.worldMap0 == null) { class60.worldMap0 = new WorldMap(); @@ -547,7 +547,7 @@ public class class171 { var6.opIndex = var0; var6.targetName = var4; var6.args0 = var5.onOp; - AbstractIndexCache.runScript(var6); + AbstractArchive.runScript(var6); } boolean var11 = true; diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 2fc08b58ab..26be24396c 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -10,7 +10,7 @@ final class class2 implements class0 { signature = "Lit;" ) @Export("indexCache14") - static IndexCache indexCache14; + static Archive indexCache14; @ObfuscatedName("ee") @ObfuscatedGetter( intValue = -753026759 @@ -56,7 +56,7 @@ final class class2 implements class0 { signature = "(Lir;Lir;ZII)V", garbageValue = "-1535318699" ) - static void method27(AbstractIndexCache var0, AbstractIndexCache var1, boolean var2, int var3) { + static void method27(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { if (Login.field465) { if (var3 == 4) { Login.loginIndex = 4; @@ -64,7 +64,7 @@ final class class2 implements class0 { } else { Login.loginIndex = var3; Rasterizer2D.Rasterizer2D_clear(); - byte[] var4 = var0.takeRecordByNames("title.jpg", ""); + byte[] var4 = var0.takeFileByNames("title.jpg", ""); Login.leftTitleSprite = class27.convertJpgToSprite(var4); Fonts.rightTitleSprite = Login.leftTitleSprite.copy(); if ((Client.worldProperties & 536870912) != 0) { @@ -75,8 +75,8 @@ final class class2 implements class0 { Login.titleboxSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebox", ""); IndexCacheLoader.titlebuttonSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebutton", ""); - int var5 = var1.getArchiveId("runes"); - int var6 = var1.getRecordId(var5, ""); + int var5 = var1.getGroupId("runes"); + int var6 = var1.getFileId(var5, ""); IndexedSprite[] var7; if (!SpriteMask.loadSprite(var1, var5, var6)) { var7 = null; @@ -85,8 +85,8 @@ final class class2 implements class0 { } WorldMapEvent.runesSprite = var7; - var6 = var1.getArchiveId("title_mute"); - int var8 = var1.getRecordId(var6, ""); + var6 = var1.getGroupId("title_mute"); + int var8 = var1.getFileId(var6, ""); IndexedSprite[] var9; if (!SpriteMask.loadSprite(var1, var6, var8)) { var9 = null; @@ -134,9 +134,9 @@ final class class2 implements class0 { signature = "(Lir;Ljava/lang/String;Ljava/lang/String;B)[Lln;", garbageValue = "0" ) - public static Sprite[] method20(AbstractIndexCache var0, String var1, String var2) { - int var3 = var0.getArchiveId(var1); - int var4 = var0.getRecordId(var3, var2); + public static Sprite[] method20(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); Sprite[] var5; if (!SpriteMask.loadSprite(var0, var3, var4)) { var5 = null; diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java index 4f769cbdf6..4014951a80 100644 --- a/runescape-client/src/main/java/class204.java +++ b/runescape-client/src/main/java/class204.java @@ -30,9 +30,9 @@ public class class204 { signature = "(Lir;Ljava/lang/String;Ljava/lang/String;IZB)V", garbageValue = "0" ) - public static void method4011(AbstractIndexCache var0, String var1, String var2, int var3, boolean var4) { - int var5 = var0.getArchiveId(var1); - int var6 = var0.getRecordId(var5, var2); + public static void method4011(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { + int var5 = var0.getGroupId(var1); + int var6 = var0.getFileId(var5, var2); Login.method2076(var0, var5, var6, var3, var4); } diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index 41f00afe5f..8fcf3e0641 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -94,9 +94,9 @@ public abstract class class21 { signature = "(Lir;B)V", garbageValue = "-108" ) - void method263(AbstractIndexCache var1) { + void method263(AbstractArchive var1) { if (!this.method271()) { - byte[] var2 = var1.takeRecord(this.field150, this.field152); + byte[] var2 = var1.takeFile(this.field150, this.field152); if (var2 != null) { this.vmethod715(new Buffer(var2)); this.field157 = true; diff --git a/runescape-client/src/main/java/class211.java b/runescape-client/src/main/java/class211.java index f8254ed9d6..c614fe5651 100644 --- a/runescape-client/src/main/java/class211.java +++ b/runescape-client/src/main/java/class211.java @@ -90,7 +90,7 @@ public class class211 { RouteStrategy.Interpreter_intStackSize -= 2; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var9 = ByteArrayPool.indexCache13.takeRecord(var8, 0); + var9 = ByteArrayPool.indexCache13.takeFile(var8, 0); var10 = new Font(var9); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.lineCount(var3, var4); return 1; @@ -99,7 +99,7 @@ public class class211 { RouteStrategy.Interpreter_intStackSize -= 2; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var9 = ByteArrayPool.indexCache13.takeRecord(var8, 0); + var9 = ByteArrayPool.indexCache13.takeFile(var8, 0); var10 = new Font(var9); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.lineWidth(var3, var4); return 1; diff --git a/runescape-client/src/main/java/class214.java b/runescape-client/src/main/java/class214.java index e57819a221..39911f035c 100644 --- a/runescape-client/src/main/java/class214.java +++ b/runescape-client/src/main/java/class214.java @@ -9,12 +9,12 @@ public class class214 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1127; + public static AbstractArchive field1127; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1128; + public static AbstractArchive field1128; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lhm;" @@ -30,7 +30,7 @@ public class class214 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1130; + public static AbstractArchive field1130; @ObfuscatedName("k") static int[] field1131; @ObfuscatedName("ko") diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index d721431b4d..6c68ec13e6 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -22,7 +22,7 @@ public final class class22 { signature = "Lit;" ) @Export("indexCache16") - static IndexCache indexCache16; + static Archive indexCache16; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1976624405 @@ -82,13 +82,13 @@ public final class class22 { garbageValue = "-15" ) @Export("newIndexCache") - static IndexCache newIndexCache(int var0, boolean var1, boolean var2, boolean var3) { + static Archive newIndexCache(int var0, boolean var1, boolean var2, boolean var3) { IndexStore var4 = null; if (class168.dat2File != null) { var4 = new IndexStore(var0, class168.dat2File, IndexStoreAction.idxFiles[var0], 1000000); } - return new IndexCache(var4, Fonts.indexStore255, var0, var1, var2, var3); + return new Archive(var4, Fonts.indexStore255, var0, var1, var2, var3); } @ObfuscatedName("jp") diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java index 20a523668f..db894b0a3c 100644 --- a/runescape-client/src/main/java/class229.java +++ b/runescape-client/src/main/java/class229.java @@ -19,7 +19,7 @@ public class class229 { if (var1 != null) { return var1; } else { - byte[] var2 = ParamKeyDefinition.field679.takeRecord(11, var0); + byte[] var2 = ParamKeyDefinition.field679.takeFile(11, var0); var1 = new ParamKeyDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java index 6fa87ea0aa..16c8acfc8e 100644 --- a/runescape-client/src/main/java/class238.java +++ b/runescape-client/src/main/java/class238.java @@ -9,7 +9,7 @@ public final class class238 { signature = "Lit;" ) @Export("indexCache9") - static IndexCache indexCache9; + static Archive indexCache9; @ObfuscatedName("im") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java index 1bc9f8323c..f9786265b1 100644 --- a/runescape-client/src/main/java/class27.java +++ b/runescape-client/src/main/java/class27.java @@ -13,7 +13,7 @@ public final class class27 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1143; + public static AbstractArchive field1143; @ObfuscatedName("f") final int[] field225; diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java index 0fe6164fd8..2d632c4474 100644 --- a/runescape-client/src/main/java/class30.java +++ b/runescape-client/src/main/java/class30.java @@ -95,7 +95,7 @@ public class class30 { var6 = new ScriptEvent(); var6.widget = var3; var6.args0 = var3.onDialogAbortListener; - AbstractIndexCache.runScript(var6); + AbstractArchive.runScript(var6); } if (var1 == 1 && var3.field974 != null) { @@ -109,7 +109,7 @@ public class class30 { var6 = new ScriptEvent(); var6.widget = var3; var6.args0 = var3.field974; - AbstractIndexCache.runScript(var6); + AbstractArchive.runScript(var6); } } } diff --git a/runescape-client/src/main/java/class322.java b/runescape-client/src/main/java/class322.java index cd12bd2e00..6e9164fb42 100644 --- a/runescape-client/src/main/java/class322.java +++ b/runescape-client/src/main/java/class322.java @@ -17,7 +17,7 @@ public class class322 { garbageValue = "-2000477161" ) @Export("readSprite") - public static Sprite readSprite(AbstractIndexCache var0, int var1, int var2) { + public static Sprite readSprite(AbstractArchive var0, int var1, int var2) { return !SpriteMask.loadSprite(var0, var1, var2) ? null : class258.method4900(); } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 7543a42e7a..d5ef01167d 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -8,7 +8,7 @@ final class class4 implements class0 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1158; + public static AbstractArchive field1158; @ObfuscatedName("m") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index 052402ebef..46263eb734 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -10,7 +10,7 @@ public class class40 { signature = "Lit;" ) @Export("indexCache7") - static IndexCache indexCache7; + static Archive indexCache7; @ObfuscatedName("gs") @Export("regionLandArchives") static byte[][] regionLandArchives; diff --git a/runescape-client/src/main/java/class50.java b/runescape-client/src/main/java/class50.java index 7ffa296a42..12f0681409 100644 --- a/runescape-client/src/main/java/class50.java +++ b/runescape-client/src/main/java/class50.java @@ -31,7 +31,7 @@ public class class50 { if (var1 != null) { return var1; } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_indexCache.takeRecord(13, var0); + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_indexCache.takeFile(13, var0); var1 = new SpotAnimationDefinition(); var1.id = var0; if (var2 != null) { @@ -54,7 +54,7 @@ public class class50 { if (var1 != null) { return var1; } else { - byte[] var2 = ObjectDefinition.ObjectDefinition_indexCache.takeRecord(6, var0); + byte[] var2 = ObjectDefinition.ObjectDefinition_indexCache.takeFile(6, var0); var1 = new ObjectDefinition(); var1.id = var0; if (var2 != null) { @@ -119,8 +119,8 @@ public class class50 { var7 = var6 + (var5 << 8); if (!var9 || var6 != 49 && var6 != 149 && var6 != 147 && var5 != 50 && (var5 != 49 || var6 != 47)) { class308.regions[var8] = var7; - IndexCacheLoader.regionMapArchiveIds[var8] = SecureRandomFuture.indexCache5.getArchiveId("m" + var5 + "_" + var6); - MouseHandler.regionLandArchiveIds[var8] = SecureRandomFuture.indexCache5.getArchiveId("l" + var5 + "_" + var6); + IndexCacheLoader.regionMapArchiveIds[var8] = SecureRandomFuture.indexCache5.getGroupId("m" + var5 + "_" + var6); + MouseHandler.regionLandArchiveIds[var8] = SecureRandomFuture.indexCache5.getGroupId("l" + var5 + "_" + var6); ++var8; } } @@ -185,8 +185,8 @@ public class class50 { class308.regions[var4] = var12; var13 = var12 >> 8 & 255; int var14 = var12 & 255; - IndexCacheLoader.regionMapArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("m" + var13 + "_" + var14); - MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("l" + var13 + "_" + var14); + IndexCacheLoader.regionMapArchiveIds[var4] = SecureRandomFuture.indexCache5.getGroupId("m" + var13 + "_" + var14); + MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.indexCache5.getGroupId("l" + var13 + "_" + var14); ++var4; } } diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index f0e810fb17..19050be122 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -57,7 +57,7 @@ public final class class54 { } long var15 = class203.currentTimeMs(); - if (AbstractIndexCache.method4585() && -1L == Login.field472) { + if (AbstractArchive.method4585() && -1L == Login.field472) { Login.field472 = var15; if (Login.field472 > Login.field471) { Login.field471 = Login.field472; diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java index 1fe5e4fdba..d02a243340 100644 --- a/runescape-client/src/main/java/class60.java +++ b/runescape-client/src/main/java/class60.java @@ -19,7 +19,7 @@ public class class60 { signature = "(Lir;Lir;Lir;I)V", garbageValue = "1583108922" ) - public static void method1172(AbstractIndexCache var0, AbstractIndexCache var1, AbstractIndexCache var2) { + public static void method1172(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { HitSplatDefinition.field382 = var0; HitSplatDefinition.field383 = var1; HitSplatDefinition.field384 = var2; diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java index 89a1da6b66..b6afdbadba 100644 --- a/runescape-client/src/main/java/class83.java +++ b/runescape-client/src/main/java/class83.java @@ -50,7 +50,7 @@ public class class83 { signature = "(Lir;II)Llq;", garbageValue = "1413048059" ) - public static IndexedSprite method2028(AbstractIndexCache var0, int var1) { + public static IndexedSprite method2028(AbstractArchive var0, int var1) { return !RouteStrategy.loadSpriteFlat(var0, var1) ? null : ServerPacket.createIndexedSprite(); }