From 558d3e8d663c2a957908ec2913e6eb25c11eef04 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sun, 7 Jul 2019 08:17:19 +0200 Subject: [PATCH] IndexCacheLoader -> ArchiveLoader, read -> decode --- .../mixins/RSHealthBarDefinitionMixin.java | 2 +- .../java/net/runelite/rs/api/RSClient.java | 6 +- .../net/runelite/rs/api/RSEnumDefinition.java | 4 +- .../src/main/java/AbstractArchive.java | 6 +- .../main/java/AbstractByteArrayCopier.java | 2 +- .../src/main/java/AbstractUserComparator.java | 2 +- .../src/main/java/AbstractWorldMapIcon.java | 2 +- runescape-client/src/main/java/Actor.java | 4 +- runescape-client/src/main/java/Archive.java | 4 +- ...dexCacheLoader.java => ArchiveLoader.java} | 29 +-- .../src/main/java/ByteArrayPool.java | 4 +- runescape-client/src/main/java/Client.java | 72 +++--- .../src/main/java/DynamicObject.java | 12 +- .../src/main/java/EnumDefinition.java | 64 ++--- runescape-client/src/main/java/FontName.java | 24 +- .../src/main/java/Formatting.java | 20 +- runescape-client/src/main/java/GameShell.java | 7 +- .../src/main/java/GrandExchangeOffer.java | 2 +- .../src/main/java/GroundItemPile.java | 6 +- .../src/main/java/GzipDecompressor.java | 2 +- runescape-client/src/main/java/HealthBar.java | 2 +- .../src/main/java/HealthBarDefinition.java | 10 +- .../src/main/java/HitSplatDefinition.java | 10 +- .../src/main/java/IndexStoreAction.java | 4 +- .../src/main/java/Interpreter.java | 4 +- .../src/main/java/InvDefinition.java | 10 +- .../src/main/java/IsaacCipher.java | 2 +- .../src/main/java/ItemDefinition.java | 14 +- .../src/main/java/KitDefinition.java | 14 +- runescape-client/src/main/java/Login.java | 4 +- .../src/main/java/LoginScreenAnimation.java | 2 +- runescape-client/src/main/java/NPC.java | 2 +- .../src/main/java/NPCDefinition.java | 14 +- runescape-client/src/main/java/NetCache.java | 6 +- .../src/main/java/NetFileRequest.java | 4 +- .../src/main/java/ObjectDefinition.java | 18 +- .../src/main/java/ObjectSound.java | 4 +- runescape-client/src/main/java/Occluder.java | 4 +- .../src/main/java/OverlayDefinition.java | 10 +- .../src/main/java/PacketBuffer.java | 2 +- .../src/main/java/ParamKeyDefinition.java | 10 +- .../src/main/java/PlayerAppearance.java | 8 +- .../src/main/java/RectangleMode.java | 2 +- .../src/main/java/SecureRandomCallable.java | 2 +- .../src/main/java/SecureRandomFuture.java | 4 +- .../src/main/java/SequenceDefinition.java | 14 +- runescape-client/src/main/java/Skeleton.java | 4 +- runescape-client/src/main/java/Skills.java | 4 +- .../src/main/java/SoundSystem.java | 2 +- .../main/java/SpotAnimationDefinition.java | 14 +- .../src/main/java/StructDefinition.java | 10 +- .../src/main/java/StudioGame.java | 4 +- .../src/main/java/TextureProvider.java | 10 +- .../src/main/java/UnderlayDefinition.java | 14 +- .../src/main/java/UnitPriceComparator.java | 2 +- .../src/main/java/UserComparator3.java | 4 +- .../src/main/java/VarbitDefinition.java | 14 +- runescape-client/src/main/java/Varcs.java | 6 +- .../src/main/java/VarpDefinition.java | 10 +- 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 | 80 +++---- .../src/main/java/WorldMapArchiveLoader.java | 109 +++++++++ .../src/main/java/WorldMapAreaData.java | 4 +- .../src/main/java/WorldMapDecoration.java | 4 +- .../src/main/java/WorldMapDecorationType.java | 2 +- .../src/main/java/WorldMapElement.java | 10 +- .../src/main/java/WorldMapIcon1.java | 8 +- .../main/java/WorldMapIndexCacheLoader.java | 108 --------- .../src/main/java/WorldMapRegion.java | 4 +- .../src/main/java/WorldMapSection1.java | 8 +- .../src/main/java/WorldMapSection3.java | 4 +- runescape-client/src/main/java/class16.java | 4 +- runescape-client/src/main/java/class171.java | 222 +++++++++--------- runescape-client/src/main/java/class2.java | 8 +- runescape-client/src/main/java/class211.java | 4 +- runescape-client/src/main/java/class22.java | 4 +- runescape-client/src/main/java/class229.java | 2 +- runescape-client/src/main/java/class238.java | 4 +- runescape-client/src/main/java/class3.java | 2 +- runescape-client/src/main/java/class40.java | 4 +- runescape-client/src/main/java/class50.java | 20 +- runescape-client/src/main/java/class54.java | 2 +- runescape-client/src/main/java/class80.java | 2 +- 85 files changed, 592 insertions(+), 589 deletions(-) rename runescape-client/src/main/java/{IndexCacheLoader.java => ArchiveLoader.java} (98%) create mode 100644 runescape-client/src/main/java/WorldMapArchiveLoader.java delete mode 100644 runescape-client/src/main/java/WorldMapIndexCacheLoader.java diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarDefinitionMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarDefinitionMixin.java index f6f31abdf6..383892e7b5 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarDefinitionMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarDefinitionMixin.java @@ -15,7 +15,7 @@ public abstract class RSHealthBarDefinitionMixin implements RSHealthBarDefinitio @Shadow("client") private static RSClient client; - @MethodHook(value = "read", end = true) + @MethodHook(value = "decode", end = true) @Inject public void onRead(RSBuffer buffer) { 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 df17fc3b39..ac5660a71d 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 @@ -441,11 +441,11 @@ public interface RSClient extends RSGameShell, Client @Import("indexedSpritePalette") void setIndexedSpritePalette(int[] indexedSpritePalette); - @Import("indexCache8") + @Import("archive8") @Override RSAbstractArchive getIndexSprites(); - @Import("indexCache12") + @Import("archive12") @Override RSAbstractArchive getIndexScripts(); @@ -1023,7 +1023,7 @@ public interface RSClient extends RSGameShell, Client @Import("pcmStreamMixer") RSPcmStreamMixer getSoundEffectAudioQueue(); - @Import("indexCache4") + @Import("archive4") RSAbstractArchive getIndexCache4(); @Import("decimator") diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java index 0e4206e29a..494cdfb111 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java @@ -13,13 +13,13 @@ public interface RSEnumDefinition extends EnumDefinition, RSDualNode @Override int[] getIntVals(); - @Import("stringVals") + @Import("strVals") @Override String[] getStringVals(); @Import("defaultInt") int getDefaultInt(); - @Import("defaultString") + @Import("defaultStr") String getDefaultString(); } diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index 2d7243c121..aa4a94469a 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -37,8 +37,8 @@ public abstract class AbstractArchive { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache0") - static Archive indexCache0; + @Export("archive0") + static Archive archive0; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1694798923 @@ -750,7 +750,7 @@ public abstract class AbstractArchive { static boolean method4585() { if (Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { while (Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { - IndexCacheLoader var0 = (IndexCacheLoader)Client.indexCacheLoaders.get(Client.indexCacheLoaderIndex); + ArchiveLoader var0 = (ArchiveLoader)Client.indexCacheLoaders.get(Client.indexCacheLoaderIndex); if (!var0.method134()) { return false; } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index b94849ba66..cd7c6c4c6f 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -61,7 +61,7 @@ public abstract class AbstractByteArrayCopier { @Export("unloadWidgetGroup") public static void unloadWidgetGroup(int var0) { if (var0 != -1 && Widget.loadedWidgetGroups[var0]) { - Widget.Widget_indexCache.method7(var0); + Widget.Widget_archive.method7(var0); if (Widget.widgets[var0] != null) { boolean var1 = true; diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 9031a63059..654adba8db 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) { - Archive var1 = UserComparator3.indexCache6; + Archive var1 = UserComparator3.archive6; 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 16874b170e..b23e13f811 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -163,7 +163,7 @@ public abstract class AbstractWorldMapIcon { garbageValue = "-1018878027" ) static void method625(Archive var0, String var1) { - IndexCacheLoader var2 = new IndexCacheLoader(var0, var1); + ArchiveLoader var2 = new ArchiveLoader(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 57b27c3a67..f81a1526e4 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -481,7 +481,7 @@ public abstract class Actor extends Entity { byte[] var9 = HealthBarDefinition.field379.takeFile(33, var1); var7 = new HealthBarDefinition(); if (var9 != null) { - var7.read(new Buffer(var9)); + var7.decode(new Buffer(var9)); } HealthBarDefinition.HealthBarDefinition_cached.put(var7, (long)var1); @@ -543,7 +543,7 @@ public abstract class Actor extends Entity { byte[] var4 = HealthBarDefinition.field379.takeFile(33, var1); var2 = new HealthBarDefinition(); if (var4 != null) { - var2.read(new Buffer(var4)); + var2.decode(new Buffer(var4)); } HealthBarDefinition.HealthBarDefinition_cached.put(var2, (long)var1); diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index fd51f42bab..dca408935e 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -74,7 +74,7 @@ public class Archive extends AbstractArchive { this.loadIndexReference(var8, var9); } else { PacketBuffer.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); - NetCache.NetCache_indexCaches[var7] = this; + NetCache.NetCache_archives[var7] = this; } } @@ -448,7 +448,7 @@ public class Archive extends AbstractArchive { if (var3 != Client.field128) { if (Client.field128 == 0 && Client.field112 != -1) { - Login.method2076(UserComparator3.indexCache6, Client.field112, 0, var3, false); + Login.method2076(UserComparator3.archive6, Client.field112, 0, var3, false); Client.field107 = false; } else if (var3 == 0) { class214.midiPcmStream.clear(); diff --git a/runescape-client/src/main/java/IndexCacheLoader.java b/runescape-client/src/main/java/ArchiveLoader.java similarity index 98% rename from runescape-client/src/main/java/IndexCacheLoader.java rename to runescape-client/src/main/java/ArchiveLoader.java index 00fc3b8ad2..28e4095285 100644 --- a/runescape-client/src/main/java/IndexCacheLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -5,8 +5,9 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("bd") -@Implements("IndexCacheLoader") -public class IndexCacheLoader { +@Implements("ArchiveLoader") +public class ArchiveLoader +{ @ObfuscatedName("pf") @ObfuscatedSignature( signature = "Lko;" @@ -32,8 +33,8 @@ public class IndexCacheLoader { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache") - final Archive indexCache; + @Export("archive") + final Archive archive; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1459455501 @@ -48,9 +49,9 @@ public class IndexCacheLoader { @ObfuscatedSignature( signature = "(Lit;Ljava/lang/String;)V" ) - IndexCacheLoader(Archive var1, String var2) { + ArchiveLoader(Archive var1, String var2) { this.field409 = 0; - this.indexCache = var1; + this.archive = var1; this.field408 = var1.method5(); } @@ -63,7 +64,7 @@ public class IndexCacheLoader { this.field409 = 0; for (int var1 = 0; var1 < this.field408; ++var1) { - if (!this.indexCache.method133(var1) || this.indexCache.method132(var1)) { + if (!this.archive.method133(var1) || this.archive.method132(var1)) { ++this.field409; } } @@ -92,7 +93,7 @@ public class IndexCacheLoader { boolean var20; if (Login.worldSelectOpen) { if (class30.worldSelectBackSprites == null) { - class30.worldSelectBackSprites = class2.method20(WorldMapSection3.indexCache8, "sl_back", ""); + class30.worldSelectBackSprites = class2.method20(WorldMapSection3.archive8, "sl_back", ""); } Archive var11; @@ -100,7 +101,7 @@ public class IndexCacheLoader { int var13; IndexedSprite[] var14; if (Frames.worldSelectFlagSprites == null) { - var11 = WorldMapSection3.indexCache8; + var11 = WorldMapSection3.archive8; var13 = var11.getGroupId("sl_flags"); var12 = var11.getFileId(var13, ""); if (!SpriteMask.loadSprite(var11, var13, var12)) { @@ -113,7 +114,7 @@ public class IndexCacheLoader { } if (AttackOption.worldSelectArrows == null) { - var11 = WorldMapSection3.indexCache8; + var11 = WorldMapSection3.archive8; var13 = var11.getGroupId("sl_arrows"); var12 = var11.getFileId(var13, ""); if (!SpriteMask.loadSprite(var11, var13, var12)) { @@ -126,7 +127,7 @@ public class IndexCacheLoader { } if (UrlRequest.worldSelectStars == null) { - var11 = WorldMapSection3.indexCache8; + var11 = WorldMapSection3.archive8; var13 = var11.getGroupId("sl_stars"); var12 = var11.getFileId(var13, ""); if (!SpriteMask.loadSprite(var11, var13, var12)) { @@ -139,11 +140,11 @@ public class IndexCacheLoader { } if (SecureRandomFuture.worldSelectLeftSprite == null) { - SecureRandomFuture.worldSelectLeftSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "leftarrow", ""); + SecureRandomFuture.worldSelectLeftSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "leftarrow", ""); } if (NetSocket.worldSelectRightSprite == null) { - NetSocket.worldSelectRightSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "rightarrow", ""); + NetSocket.worldSelectRightSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "rightarrow", ""); } Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); @@ -698,7 +699,7 @@ public class IndexCacheLoader { var1.drawCentered("Click to switch", var39 / 2 + var10, var42 / 2 + var34 + 12, 16777215, 0); } } else { - class277.field1144 = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "sl_button", ""); + class277.field1144 = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "sl_button", ""); } } } diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index 794223d4ef..2e8ad5df4a 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -40,8 +40,8 @@ public class ByteArrayPool { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache13") - static Archive indexCache13; + @Export("archive13") + static Archive archive13; @ObfuscatedName("f") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 9ad504ccf6..cd2c02e115 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1272,7 +1272,7 @@ public final class Client extends GameShell implements Usernamed { PlayerAppearance.field726 = class226.field1132; class229.field1137 = class226.field1133; class227.field1136 = class226.field1134; - IndexCacheLoader.field406 = class226.field1135; + ArchiveLoader.field406 = class226.field1135; TriBool.urlRequester = new UrlRequester(); this.setUpKeyboard(); this.setUpMouse(); @@ -1376,8 +1376,8 @@ 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.takeFile(IndexCacheLoader.regionMapArchiveIds[var4], 0); + if (ArchiveLoader.regionMapArchiveIds[var4] != -1 && class40.regionLandArchives[var4] == null) { + class40.regionLandArchives[var4] = SecureRandomFuture.archive5.takeFile(ArchiveLoader.regionMapArchiveIds[var4], 0); if (class40.regionLandArchives[var4] == null) { var3 = false; ++field177; @@ -1385,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.takeFileEncrypted(MouseHandler.regionLandArchiveIds[var4], 0, class190.xteaKeys[var4]); + HealthBarUpdate.regionMapArchives[var4] = SecureRandomFuture.archive5.takeFileEncrypted(MouseHandler.regionLandArchiveIds[var4], 0, class190.xteaKeys[var4]); if (HealthBarUpdate.regionMapArchives[var4] == null) { var3 = false; ++field177; @@ -1847,7 +1847,7 @@ public final class Client extends GameShell implements Usernamed { byte[] var46 = OverlayDefinition.field663.takeFile(4, var42); var43 = new OverlayDefinition(); if (var46 != null) { - var43.read(new Buffer(var46), var42); + var43.decode(new Buffer(var46), var42); } var43.init(); @@ -1884,7 +1884,7 @@ public final class Client extends GameShell implements Usernamed { byte[] var47 = OverlayDefinition.field663.takeFile(4, var67); var68 = new OverlayDefinition(); if (var47 != null) { - var68.read(new Buffer(var47), var67); + var68.decode(new Buffer(var47), var67); } var68.init(); @@ -2181,8 +2181,8 @@ public final class Client extends GameShell implements Usernamed { for (var8 = var21 - 1; var8 <= var56 + 1; ++var8) { for (var9 = var57 - 1; var9 <= var58 + 1; ++var9) { if (var8 < var21 || var8 > var56 || var9 < var57 || var9 > var58) { - SecureRandomFuture.indexCache5.method10("m" + var8 + "_" + var9); - SecureRandomFuture.indexCache5.method10("l" + var8 + "_" + var9); + SecureRandomFuture.archive5.method10("m" + var8 + "_" + var9); + SecureRandomFuture.archive5.method10("l" + var8 + "_" + var9); } } } @@ -2274,10 +2274,10 @@ public final class Client extends GameShell implements Usernamed { if (gameState == 0) { this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); } else if (gameState == 5) { - IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); + ArchiveLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); } else if (gameState != 10 && gameState != 11) { if (gameState == 20) { - IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); + ArchiveLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); } else if (gameState == 25) { if (field181 == 1) { if (field177 > field178) { @@ -2304,7 +2304,7 @@ public final class Client extends GameShell implements Usernamed { PendingSpawn.drawLoadingMessage("Please wait...", false); } } else { - IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); + ArchiveLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); } if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { @@ -2867,7 +2867,7 @@ public final class Client extends GameShell implements Usernamed { Players.NetCache_reference = class22.NetCache_responseArchiveBuffer; for (var12 = 0; var12 < 256; ++var12) { - Archive var22 = NetCache.NetCache_indexCaches[var12]; + Archive var22 = NetCache.NetCache_archives[var12]; if (var22 != null) { Players.NetCache_reference.index = var12 * 8 + 5; var13 = Players.NetCache_reference.readInt(); @@ -2894,7 +2894,7 @@ public final class Client extends GameShell implements Usernamed { NetCache.NetCache_crcMismatches = 0; NetCache.NetCache_ioExceptions = 0; - ModelData0.NetCache_currentResponse.indexCache.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), WorldComparator.field988); + ModelData0.NetCache_currentResponse.archive.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), WorldComparator.field988); } ModelData0.NetCache_currentResponse.remove(); @@ -3321,24 +3321,24 @@ public final class Client extends GameShell implements Usernamed { var8.packetBuffer.method38(var11.array, 0, var11.array.length); var8.packetBuffer.writeByte(clientType); var8.packetBuffer.writeInt(0); - var8.packetBuffer.writeInt(AbstractArchive.indexCache0.hash); - var8.packetBuffer.writeInt(Skeleton.indexCache1.hash); - var8.packetBuffer.writeInt(ObjectSound.indexCache2.hash); - var8.packetBuffer.writeInt(WorldMapIcon1.indexCache3.hash); - var8.packetBuffer.writeInt(WorldMapDecoration.indexCache4.hash); - var8.packetBuffer.writeInt(SecureRandomFuture.indexCache5.hash); - var8.packetBuffer.writeInt(UserComparator3.indexCache6.hash); - var8.packetBuffer.writeInt(class40.indexCache7.hash); - var8.packetBuffer.writeInt(WorldMapSection3.indexCache8.hash); - var8.packetBuffer.writeInt(class238.indexCache9.hash); - var8.packetBuffer.writeInt(class16.indexCache10.hash); - var8.packetBuffer.writeInt(Login.indexCache11.hash); - var8.packetBuffer.writeInt(Formatting.indexCache12.hash); - var8.packetBuffer.writeInt(ByteArrayPool.indexCache13.hash); - var8.packetBuffer.writeInt(class2.indexCache14.hash); - var8.packetBuffer.writeInt(WorldMapSection1.indexCache15.hash); + var8.packetBuffer.writeInt(AbstractArchive.archive0.hash); + var8.packetBuffer.writeInt(Skeleton.archive1.hash); + var8.packetBuffer.writeInt(ObjectSound.archive2.hash); + var8.packetBuffer.writeInt(WorldMapIcon1.archive3.hash); + var8.packetBuffer.writeInt(WorldMapDecoration.archive4.hash); + var8.packetBuffer.writeInt(SecureRandomFuture.archive5.hash); + var8.packetBuffer.writeInt(UserComparator3.archive6.hash); + var8.packetBuffer.writeInt(class40.archive7.hash); + var8.packetBuffer.writeInt(WorldMapSection3.archive8.hash); + var8.packetBuffer.writeInt(class238.archive9.hash); + var8.packetBuffer.writeInt(class16.archive10.hash); + var8.packetBuffer.writeInt(Login.archive11.hash); + var8.packetBuffer.writeInt(Formatting.archive12.hash); + var8.packetBuffer.writeInt(ByteArrayPool.archive13.hash); + var8.packetBuffer.writeInt(class2.archive14.hash); + var8.packetBuffer.writeInt(WorldMapSection1.archive15.hash); var8.packetBuffer.writeInt(0); - var8.packetBuffer.writeInt(class22.indexCache16.hash); + var8.packetBuffer.writeInt(class22.archive16.hash); var8.packetBuffer.writeInt(WorldMapLabelSize.field1040.hash); var8.packetBuffer.writeInt(ItemContainer.field434.hash); var8.packetBuffer.writeInt(AbstractByteArrayCopier.field0.hash); @@ -3481,13 +3481,13 @@ public final class Client extends GameShell implements Usernamed { var2.index = 0; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.index = 0; - IndexCacheLoader.field407 = var2.readUnsignedShort(); + ArchiveLoader.field407 = var2.readUnsignedShort(); loginState = 15; } - if (loginState == 15 && ((AbstractSocket)var1).available() >= IndexCacheLoader.field407) { + if (loginState == 15 && ((AbstractSocket)var1).available() >= ArchiveLoader.field407) { var2.index = 0; - ((AbstractSocket)var1).read(var2.array, 0, IndexCacheLoader.field407); + ((AbstractSocket)var1).read(var2.array, 0, ArchiveLoader.field407); var2.index = 0; String var18 = var2.readStringCp1252NullTerminated(); String var22 = var2.readStringCp1252NullTerminated(); @@ -4430,7 +4430,7 @@ public final class Client extends GameShell implements Usernamed { if (var13.stream1 == null) { if (var13.soundEffectId >= 0) { var14 = null; - var16 = SoundEffect.readSoundEffect(WorldMapDecoration.indexCache4, var13.soundEffectId, 0); + var16 = SoundEffect.readSoundEffect(WorldMapDecoration.archive4, var13.soundEffectId, 0); if (var16 != null) { var17 = var16.toRawSound().resample(MilliClock.decimator); var19 = RawPcmStream.createRawPcmStream(var17, 100, var6); @@ -4447,7 +4447,7 @@ public final class Client extends GameShell implements Usernamed { if (var13.soundEffectIds != null && (var13.field655 -= var4) <= 0) { var7 = (int)(Math.random() * (double)var13.soundEffectIds.length); var14 = null; - var16 = SoundEffect.readSoundEffect(WorldMapDecoration.indexCache4, var13.soundEffectIds[var7], 0); + var16 = SoundEffect.readSoundEffect(WorldMapDecoration.archive4, var13.soundEffectIds[var7], 0); if (var16 != null) { var17 = var16.toRawSound().resample(MilliClock.decimator); var19 = RawPcmStream.createRawPcmStream(var17, 100, var6); @@ -4976,7 +4976,7 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field857 == var1.serverPacket0) { - IndexCacheLoader.field512 = WorldMapElement.method4783(var3.readUnsignedByte()); + ArchiveLoader.field512 = WorldMapElement.method4783(var3.readUnsignedByte()); var1.serverPacket0 = null; return true; } diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index ec577df93e..f6f30e3b2c 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -215,15 +215,15 @@ public class DynamicObject extends Entity { } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { RouteStrategy.Interpreter_intStackSize -= 3; Client.publicChatMode = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; - IndexCacheLoader.field512 = WorldMapElement.method4783(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); - if (IndexCacheLoader.field512 == null) { - IndexCacheLoader.field512 = class310.field3805; + ArchiveLoader.field512 = WorldMapElement.method4783(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + if (ArchiveLoader.field512 == null) { + ArchiveLoader.field512 = class310.field3805; } Client.field138 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; PacketBufferNode var15 = Interpreter.method1915(ClientPacket.field237, Client.packetWriter.isaacCipher); var15.packetBuffer.writeByte(Client.publicChatMode); - var15.packetBuffer.writeByte(IndexCacheLoader.field512.field3804); + var15.packetBuffer.writeByte(ArchiveLoader.field512.field3804); var15.packetBuffer.writeByte(Client.field138); Client.packetWriter.method241(var15); return 1; @@ -288,10 +288,10 @@ public class DynamicObject extends Entity { return 1; } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { - if (IndexCacheLoader.field512 == null) { + if (ArchiveLoader.field512 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = IndexCacheLoader.field512.field3804; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ArchiveLoader.field512.field3804; } return 1; diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index 66bd5d7647..428f82137e 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -11,8 +11,8 @@ public class EnumDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("EnumDefinition_indexCache") - public static AbstractArchive EnumDefinition_indexCache; + @Export("EnumDefinition_archive") + public static AbstractArchive EnumDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" @@ -20,14 +20,14 @@ public class EnumDefinition extends DualNode { @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; @ObfuscatedName("q") - @Export("keyType") - public char keyType; + @Export("inputType") + public char inputType; @ObfuscatedName("w") - @Export("valType") - public char valType; + @Export("outputType") + public char outputType; @ObfuscatedName("o") - @Export("defaultString") - public String defaultString; + @Export("defaultStr") + public String defaultStr; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 1948115527 @@ -38,8 +38,8 @@ public class EnumDefinition extends DualNode { @ObfuscatedGetter( intValue = -12324053 ) - @Export("size0") - public int size0; + @Export("outputCount") + public int outputCount; @ObfuscatedName("l") @Export("keys") public int[] keys; @@ -47,12 +47,12 @@ public class EnumDefinition extends DualNode { @Export("intVals") public int[] intVals; @ObfuscatedName("x") - @Export("stringVals") - public String[] stringVals; + @Export("strVals") + public String[] strVals; EnumDefinition() { - this.defaultString = "null"; - this.size0 = 0; + this.defaultStr = "null"; + this.outputCount = 0; } @ObfuscatedName("f") @@ -60,15 +60,15 @@ public class EnumDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "-230039710" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -77,33 +77,33 @@ public class EnumDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-1255400805" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.keyType = (char)var1.readUnsignedByte(); + this.inputType = (char)var1.readUnsignedByte(); } else if (var2 == 2) { - this.valType = (char)var1.readUnsignedByte(); + this.outputType = (char)var1.readUnsignedByte(); } else if (var2 == 3) { - this.defaultString = var1.readStringCp1252NullTerminated(); + this.defaultStr = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { this.defaultInt = var1.readInt(); } else { int var3; if (var2 == 5) { - this.size0 = var1.readUnsignedShort(); - this.keys = new int[this.size0]; - this.stringVals = new String[this.size0]; + this.outputCount = var1.readUnsignedShort(); + this.keys = new int[this.outputCount]; + this.strVals = new String[this.outputCount]; - for (var3 = 0; var3 < this.size0; ++var3) { + for (var3 = 0; var3 < this.outputCount; ++var3) { this.keys[var3] = var1.readInt(); - this.stringVals[var3] = var1.readStringCp1252NullTerminated(); + this.strVals[var3] = var1.readStringCp1252NullTerminated(); } } else if (var2 == 6) { - this.size0 = var1.readUnsignedShort(); - this.keys = new int[this.size0]; - this.intVals = new int[this.size0]; + this.outputCount = var1.readUnsignedShort(); + this.keys = new int[this.outputCount]; + this.intVals = new int[this.outputCount]; - for (var3 = 0; var3 < this.size0; ++var3) { + for (var3 = 0; var3 < this.outputCount; ++var3) { this.keys[var3] = var1.readInt(); this.intVals[var3] = var1.readInt(); } @@ -119,7 +119,7 @@ public class EnumDefinition extends DualNode { ) @Export("size") public int size() { - return this.size0; + return this.outputCount; } static { diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 3f876c0605..e2eb1e8f48 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -478,18 +478,18 @@ public class FontName { class157.method3382(); ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); Script.Script_cached.clear(); - AbstractArchive.indexCache0.method8(); - Skeleton.indexCache1.method8(); - WorldMapIcon1.indexCache3.method8(); - WorldMapDecoration.indexCache4.method8(); - SecureRandomFuture.indexCache5.method8(); - UserComparator3.indexCache6.method8(); - class40.indexCache7.method8(); - WorldMapSection3.indexCache8.method8(); - class238.indexCache9.method8(); - class16.indexCache10.method8(); - Login.indexCache11.method8(); - Formatting.indexCache12.method8(); + AbstractArchive.archive0.method8(); + Skeleton.archive1.method8(); + WorldMapIcon1.archive3.method8(); + WorldMapDecoration.archive4.method8(); + SecureRandomFuture.archive5.method8(); + UserComparator3.archive6.method8(); + class40.archive7.method8(); + WorldMapSection3.archive8.method8(); + class238.archive9.method8(); + class16.archive10.method8(); + Login.archive11.method8(); + Formatting.archive12.method8(); } @ObfuscatedName("gg") diff --git a/runescape-client/src/main/java/Formatting.java b/runescape-client/src/main/java/Formatting.java index dd3cd2ee5c..54a9d21e40 100644 --- a/runescape-client/src/main/java/Formatting.java +++ b/runescape-client/src/main/java/Formatting.java @@ -13,8 +13,8 @@ public class Formatting { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache12") - static Archive indexCache12; + @Export("archive12") + static Archive archive12; @ObfuscatedName("s") @ObfuscatedSignature( @@ -57,19 +57,19 @@ public class Formatting { var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var9 = Interpreter.getEnum(var3); - if (var9.valType != 's') { + if (var9.outputType != 's') { } - for (var5 = 0; var5 < var9.size0; ++var5) { + for (var5 = 0; var5 < var9.outputCount; ++var5) { if (var4 == var9.keys[var5]) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.stringVals[var5]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.strVals[var5]; var9 = null; break; } } if (var9 != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.defaultString; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.defaultStr; } return 1; @@ -89,11 +89,11 @@ public class Formatting { int var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; EnumDefinition var7 = Interpreter.getEnum(var6); - if (var3 == var7.keyType && var4 == var7.valType) { - for (int var8 = 0; var8 < var7.size0; ++var8) { + if (var3 == var7.inputType && var4 == var7.outputType) { + for (int var8 = 0; var8 < var7.outputCount; ++var8) { if (var5 == var7.keys[var8]) { if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.stringVals[var8]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.strVals[var8]; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.intVals[var8]; } @@ -105,7 +105,7 @@ public class Formatting { if (var7 != null) { if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultString; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultStr; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.defaultInt; } diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 96c8b98a20..f8117a3898 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -718,6 +718,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "1445885427" ) + @Export("packetHandler") protected abstract void packetHandler(); @ObfuscatedName("ab") @@ -1064,14 +1065,14 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene if (var0 != 5 && var0 != 10) { if (var0 == 20) { - class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, true, Client.gameState == 11 ? 4 : 0); + class2.method27(class16.archive10, WorldMapSection3.archive8, true, Client.gameState == 11 ? 4 : 0); } else if (var0 == 11) { - class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, false, 4); + class2.method27(class16.archive10, WorldMapSection3.archive8, false, 4); } else { class80.method2015(); } } else { - class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, true, 0); + class2.method27(class16.archive10, WorldMapSection3.archive8, true, 0); } Client.gameState = var0; diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index de854bdb16..c04163439b 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -143,7 +143,7 @@ public class GrandExchangeOffer { int var0 = 0; for (int var1 = 0; var1 <= Client.indexCacheLoaderIndex; ++var1) { - var0 += ((IndexCacheLoader)Client.indexCacheLoaders.get(var1)).field409; + var0 += ((ArchiveLoader)Client.indexCacheLoaders.get(var1)).field409; } return var0 * 10000 / Client.field140; diff --git a/runescape-client/src/main/java/GroundItemPile.java b/runescape-client/src/main/java/GroundItemPile.java index 095db79c18..6c8c2ea2b5 100644 --- a/runescape-client/src/main/java/GroundItemPile.java +++ b/runescape-client/src/main/java/GroundItemPile.java @@ -71,10 +71,10 @@ public final class GroundItemPile { public static boolean loadWidgetGroup(int var0) { if (Widget.loadedWidgetGroups[var0]) { return true; - } else if (!Widget.Widget_indexCache.tryLoadGroup(var0)) { + } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { return false; } else { - int var1 = Widget.Widget_indexCache.method4(var0); + int var1 = Widget.Widget_archive.method4(var0); if (var1 == 0) { Widget.loadedWidgetGroups[var0] = true; return true; @@ -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.takeFile(var0, var2); + byte[] var3 = Widget.Widget_archive.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 71887acd38..d7a03ede82 100644 --- a/runescape-client/src/main/java/GzipDecompressor.java +++ b/runescape-client/src/main/java/GzipDecompressor.java @@ -63,7 +63,7 @@ public class GzipDecompressor { byte[] var2 = StructDefinition.field885.takeFile(34, var0); var1 = new StructDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } var1.init(); diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index 30b7bcba53..04391a34ef 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -177,7 +177,7 @@ public class HealthBar extends Node { ) static void method1994(int var0, int var1) { if (Client.field128 != 0 && var0 != -1) { - Login.method2076(Login.indexCache11, var0, 0, Client.field128, false); + Login.method2076(Login.archive11, var0, 0, Client.field128, false); Client.field107 = true; } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 1c6a8614da..67f7ab1206 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -112,15 +112,15 @@ public class HealthBarDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "280763431" ) - @Export("read") - public void read(Buffer var1) { + @Export("decode") + public void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -129,8 +129,8 @@ public class HealthBarDefinition extends DualNode { signature = "(Lgr;IB)V", garbageValue = "10" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { var1.readUnsignedShort(); } else if (var2 == 2) { diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index b33ca4df3e..42e62f6a01 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -141,15 +141,15 @@ public class HitSplatDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "1963348982" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -158,8 +158,8 @@ public class HitSplatDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "1789835753" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { this.fontId = var1.method51(); } else if (var2 == 2) { diff --git a/runescape-client/src/main/java/IndexStoreAction.java b/runescape-client/src/main/java/IndexStoreAction.java index f0fdb720c6..cec172fa81 100644 --- a/runescape-client/src/main/java/IndexStoreAction.java +++ b/runescape-client/src/main/java/IndexStoreAction.java @@ -42,8 +42,8 @@ public class IndexStoreAction extends Node { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache") - Archive indexCache; + @Export("archive") + Archive archive; @ObfuscatedName("fn") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index b0cdeff51c..6fe4a6179e 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -105,10 +105,10 @@ public class Interpreter { if (var1 != null) { return var1; } else { - byte[] var2 = EnumDefinition.EnumDefinition_indexCache.takeFile(8, var0); + byte[] var2 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0); var1 = new EnumDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index b5a0acbc9b..51524ccff0 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -29,15 +29,15 @@ public class InvDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "628080573" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -46,8 +46,8 @@ public class InvDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "1763455566" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 2) { this.size = var1.readUnsignedShort(); } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index cef1307128..b41a453923 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -239,7 +239,7 @@ public final class IsaacCipher { garbageValue = "75867683" ) public static void method4082(AbstractArchive var0, AbstractArchive var1) { - NPCDefinition.NpcDefinition_indexCache = var0; + NPCDefinition.NpcDefinition_archive = var0; NPCDefinition.NpcDefinition_modelIndexCache = var1; } diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index e4ff114373..e2ca5be334 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -11,8 +11,8 @@ public class ItemDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("ItemDefinition_indexCache") - public static AbstractArchive ItemDefinition_indexCache; + @Export("ItemDefinition_archive") + public static AbstractArchive ItemDefinition_archive; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Lir;" @@ -339,15 +339,15 @@ public class ItemDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "-781492560" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -356,8 +356,8 @@ public class ItemDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-1975780739" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { this.field435 = var1.readUnsignedShort(); } else if (var2 == 2) { diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 4705d9db1f..b61c3e7fb7 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -11,8 +11,8 @@ public class KitDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("KitDefinition_indexCache") - public static AbstractArchive KitDefinition_indexCache; + @Export("KitDefinition_archive") + public static AbstractArchive KitDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" @@ -68,15 +68,15 @@ public class KitDefinition extends DualNode { signature = "(Lgr;S)V", garbageValue = "22753" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -85,8 +85,8 @@ public class KitDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-1828581673" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { this.bodypartID = var1.readUnsignedByte(); } else { diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index f36bf739c3..3394eeb850 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -139,8 +139,8 @@ public class Login { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache11") - static Archive indexCache11; + @Export("archive11") + static Archive archive11; @ObfuscatedName("m") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 062a7b3b5c..bf939fbb2d 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -619,7 +619,7 @@ public class LoginScreenAnimation { byte[] var2 = HitSplatDefinition.field382.takeFile(32, var0); var1 = new HitSplatDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 0a569b4511..acb5b8050a 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -172,7 +172,7 @@ public final class NPC extends Actor { var3.type = 1; var3.key = (long)var0; var3.archiveDisk = var1; - var3.indexCache = var2; + var3.archive = var2; NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3); diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index d8d600a4a6..4a7f41026f 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -16,8 +16,8 @@ public class NPCDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("NpcDefinition_indexCache") - static AbstractArchive NpcDefinition_indexCache; + @Export("NpcDefinition_archive") + static AbstractArchive NpcDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" @@ -230,15 +230,15 @@ public class NPCDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "-893102766" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -247,8 +247,8 @@ public class NPCDefinition extends DualNode { signature = "(Lgr;IB)V", garbageValue = "-98" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { int var3; int var4; if (var2 == 1) { diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index 5bbfcd0e0f..8373742355 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -96,8 +96,8 @@ public class NetCache { @ObfuscatedSignature( signature = "[Lit;" ) - @Export("NetCache_indexCaches") - public static Archive[] NetCache_indexCaches; + @Export("NetCache_archives") + public static Archive[] NetCache_archives; @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 Archive[256]; + NetCache_archives = 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 f9baebe987..153578f827 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -11,8 +11,8 @@ public class NetFileRequest extends DualNode { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache") - public Archive indexCache; + @Export("archive") + public Archive archive; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1487103265 diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index 05dc5fc2d7..54d1ed474d 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -14,8 +14,8 @@ public class ObjectDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("ObjectDefinition_indexCache") - static AbstractArchive ObjectDefinition_indexCache; + @Export("ObjectDefinition_archive") + static AbstractArchive ObjectDefinition_archive; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" @@ -320,15 +320,15 @@ public class ObjectDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "1210669830" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -337,8 +337,8 @@ public class ObjectDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-2044409717" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { int var3; int var4; if (var2 == 1) { @@ -907,11 +907,11 @@ public class ObjectDefinition extends DualNode { if (var1 != null) { return var1; } else { - byte[] var2 = NPCDefinition.NpcDefinition_indexCache.takeFile(9, var0); + byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0); var1 = new NPCDefinition(); var1.id = var0; if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } var1.init(); diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index 76d0d30733..f9a0dde47d 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -17,8 +17,8 @@ public final class ObjectSound extends Node { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache2") - static Archive indexCache2; + @Export("archive2") + static Archive archive2; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 647270745 diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 10b0bdbfb4..645db55beb 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -119,10 +119,10 @@ public final class Occluder { if (var1 != null) { return var1; } else { - byte[] var2 = VarbitDefinition.VarbitDefinition_indexCache.takeFile(14, var0); + byte[] var2 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); var1 = new VarbitDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } VarbitDefinition.VarbitDefinition_cached.put(var1, (long)var0); diff --git a/runescape-client/src/main/java/OverlayDefinition.java b/runescape-client/src/main/java/OverlayDefinition.java index 4a8488a530..ae466a6f8c 100644 --- a/runescape-client/src/main/java/OverlayDefinition.java +++ b/runescape-client/src/main/java/OverlayDefinition.java @@ -103,15 +103,15 @@ public class OverlayDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-424203051" ) - @Export("read") - public void read(Buffer var1, int var2) { + @Export("decode") + public void decode(Buffer var1, int var2) { while (true) { int var3 = var1.readUnsignedByte(); if (var3 == 0) { return; } - this.readNext(var1, var3, var2); + this.decodeNext(var1, var3, var2); } } @@ -120,8 +120,8 @@ public class OverlayDefinition extends DualNode { signature = "(Lgr;III)V", garbageValue = "2094105763" ) - @Export("readNext") - void readNext(Buffer var1, int var2, int var3) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2, int var3) { if (var2 == 1) { this.rgb = var1.readMedium(); } else if (var2 == 2) { diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index 43b237d5c7..b4717ab040 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -198,7 +198,7 @@ public final class PacketBuffer extends Buffer { } var8 = new NetFileRequest(); - var8.indexCache = var0; + var8.archive = var0; var8.crc = var3; var8.padding = var4; if (var5) { diff --git a/runescape-client/src/main/java/ParamKeyDefinition.java b/runescape-client/src/main/java/ParamKeyDefinition.java index 79e24fed2e..1b721ed1c0 100644 --- a/runescape-client/src/main/java/ParamKeyDefinition.java +++ b/runescape-client/src/main/java/ParamKeyDefinition.java @@ -52,15 +52,15 @@ public class ParamKeyDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "-975533635" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -69,8 +69,8 @@ public class ParamKeyDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "1664350313" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { this.type = class14.method171(var1.readByte()); } else if (var2 == 2) { diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index 59bb5ca93b..46059675b7 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -303,8 +303,8 @@ public class PlayerAppearance { var18.recolor(field726[var12], class229.field1137[var12][this.bodyColors[var12]]); } - if (this.bodyColors[var12] < IndexCacheLoader.field406[var12].length) { - var18.recolor(class227.field1136[var12], IndexCacheLoader.field406[var12][this.bodyColors[var12]]); + if (this.bodyColors[var12] < ArchiveLoader.field406[var12].length) { + var18.recolor(class227.field1136[var12], ArchiveLoader.field406[var12][this.bodyColors[var12]]); } } @@ -387,8 +387,8 @@ public class PlayerAppearance { var8.recolor(field726[var4], class229.field1137[var4][this.bodyColors[var4]]); } - if (this.bodyColors[var4] < IndexCacheLoader.field406[var4].length) { - var8.recolor(class227.field1136[var4], IndexCacheLoader.field406[var4][this.bodyColors[var4]]); + if (this.bodyColors[var4] < ArchiveLoader.field406[var4].length) { + var8.recolor(class227.field1136[var4], ArchiveLoader.field406[var4][this.bodyColors[var4]]); } } diff --git a/runescape-client/src/main/java/RectangleMode.java b/runescape-client/src/main/java/RectangleMode.java index a47d78b510..8ff42d1569 100644 --- a/runescape-client/src/main/java/RectangleMode.java +++ b/runescape-client/src/main/java/RectangleMode.java @@ -60,7 +60,7 @@ public enum RectangleMode implements Enumerated { garbageValue = "1" ) public static void method6028(AbstractArchive var0, AbstractArchive var1, boolean var2) { - ObjectDefinition.ObjectDefinition_indexCache = var0; + ObjectDefinition.ObjectDefinition_archive = var0; ObjectDefinition.field640 = var1; ObjectDefinition.ObjectDefinition_isLowDetail = var2; } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 42cdac2b24..6c7a0c4cd5 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -39,7 +39,7 @@ public class SecureRandomCallable implements Callable { byte[] var2 = VarpDefinition.field943.takeFile(16, var0); var1 = new VarpDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index a5ab41ae75..ee7a481b1e 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -21,8 +21,8 @@ public class SecureRandomFuture { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache5") - static Archive indexCache5; + @Export("archive5") + static Archive archive5; @ObfuscatedName("jn") @ObfuscatedSignature( signature = "Ldl;" diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 68c330388b..1e9f773a7b 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -11,8 +11,8 @@ public class SequenceDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("SequenceDefinition_indexCache") - public static AbstractArchive SequenceDefinition_indexCache; + @Export("SequenceDefinition_archive") + public static AbstractArchive SequenceDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" @@ -110,15 +110,15 @@ public class SequenceDefinition extends DualNode { signature = "(Lgr;S)V", garbageValue = "259" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -127,8 +127,8 @@ public class SequenceDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "154075720" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { int[] var10000; int var3; int var4; diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index eefc146760..b13a804770 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -16,8 +16,8 @@ public class Skeleton extends Node { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache1") - static Archive indexCache1; + @Export("archive1") + static Archive archive1; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -1634889691 diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index ab7356b395..f75dc4b94d 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -26,11 +26,11 @@ public class Skills { if (var1 != null) { return var1; } else { - byte[] var2 = ItemDefinition.ItemDefinition_indexCache.takeFile(10, var0); + byte[] var2 = ItemDefinition.ItemDefinition_archive.takeFile(10, var0); var1 = new ItemDefinition(); var1.id = var0; if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } var1.post(); diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index aa77ace319..201dcdb11a 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.takeFile(var0, 0); + byte[] var2 = Formatting.archive12.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 1917bb2f86..13b1a45b76 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -11,8 +11,8 @@ public class SpotAnimationDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("SpotAnimationDefinition_indexCache") - public static AbstractArchive SpotAnimationDefinition_indexCache; + @Export("SpotAnimationDefinition_archive") + public static AbstractArchive SpotAnimationDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" @@ -104,15 +104,15 @@ public class SpotAnimationDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "906815828" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -121,8 +121,8 @@ public class SpotAnimationDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "2099681848" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { this.archive = var1.readUnsignedShort(); } else if (var2 == 2) { diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index b76149f043..2873f91beb 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -38,15 +38,15 @@ public class StructDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "853330780" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -55,8 +55,8 @@ public class StructDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-2035893488" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 249) { 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 d2c5457236..ed1891e7b1 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -73,10 +73,10 @@ public enum StudioGame implements Enumerated { if (var1 != null) { return var1; } else { - byte[] var2 = UnderlayDefinition.UnderlayDefinition_indexCache.takeFile(1, var0); + byte[] var2 = UnderlayDefinition.UnderlayDefinition_archive.takeFile(1, var0); var1 = new UnderlayDefinition(); if (var2 != null) { - var1.read(new Buffer(var2), var0); + var1.decode(new Buffer(var2), var0); } var1.init(); diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index b9cbae14c1..ce191608a9 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -51,8 +51,8 @@ public class TextureProvider implements TextureLoader { @ObfuscatedSignature( signature = "Lir;" ) - @Export("indexCache") - AbstractArchive indexCache; + @Export("archive") + AbstractArchive archive; @ObfuscatedSignature( signature = "(Lir;Lir;IDI)V" @@ -62,7 +62,7 @@ public class TextureProvider implements TextureLoader { this.remaining = 0; this.brightness0 = 1.0D; this.textureSize = 128; - this.indexCache = var2; + this.archive = var2; this.capacity = var3; this.remaining = this.capacity; this.brightness0 = var4; @@ -96,7 +96,7 @@ public class TextureProvider implements TextureLoader { for (int var7 = 0; var7 < var6.length; ++var7) { int var8 = var6[var7]; - if (this.indexCache.method1(var8)) { + if (this.archive.method1(var8)) { ++var2; } } @@ -132,7 +132,7 @@ public class TextureProvider implements TextureLoader { return var2.pixels; } - boolean var3 = var2.method320(this.brightness0, this.textureSize, this.indexCache); + boolean var3 = var2.method320(this.brightness0, this.textureSize, this.archive); if (var3) { if (this.remaining == 0) { Texture var4 = (Texture)this.deque.removeFirst(); diff --git a/runescape-client/src/main/java/UnderlayDefinition.java b/runescape-client/src/main/java/UnderlayDefinition.java index 43c1a593c9..4cd48e1922 100644 --- a/runescape-client/src/main/java/UnderlayDefinition.java +++ b/runescape-client/src/main/java/UnderlayDefinition.java @@ -11,8 +11,8 @@ public class UnderlayDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("UnderlayDefinition_indexCache") - static AbstractArchive UnderlayDefinition_indexCache; + @Export("UnderlayDefinition_archive") + static AbstractArchive UnderlayDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" @@ -69,15 +69,15 @@ public class UnderlayDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-336010991" ) - @Export("read") - void read(Buffer var1, int var2) { + @Export("decode") + void decode(Buffer var1, int var2) { while (true) { int var3 = var1.readUnsignedByte(); if (var3 == 0) { return; } - this.readNext(var1, var3, var2); + this.decodeNext(var1, var3, var2); } } @@ -86,8 +86,8 @@ public class UnderlayDefinition extends DualNode { signature = "(Lgr;III)V", garbageValue = "137131494" ) - @Export("readNext") - void readNext(Buffer var1, int var2, int var3) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2, int var3) { if (var2 == 1) { this.rgb = var1.readMedium(); } diff --git a/runescape-client/src/main/java/UnitPriceComparator.java b/runescape-client/src/main/java/UnitPriceComparator.java index d0d4a05c66..1ebfa9ecc5 100644 --- a/runescape-client/src/main/java/UnitPriceComparator.java +++ b/runescape-client/src/main/java/UnitPriceComparator.java @@ -46,7 +46,7 @@ final class UnitPriceComparator implements Comparator { garbageValue = "23" ) public static void method135(AbstractArchive var0) { - VarbitDefinition.VarbitDefinition_indexCache = var0; + VarbitDefinition.VarbitDefinition_archive = var0; } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index 93f8e81b87..193ca517ab 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -10,8 +10,8 @@ public class UserComparator3 extends AbstractUserComparator { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache6") - static Archive indexCache6; + @Export("archive6") + static Archive archive6; @ObfuscatedName("fl") @ObfuscatedSignature( signature = "Lfm;" diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index ba5e343e14..0b6544715c 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -11,8 +11,8 @@ public class VarbitDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("VarbitDefinition_indexCache") - static AbstractArchive VarbitDefinition_indexCache; + @Export("VarbitDefinition_archive") + static AbstractArchive VarbitDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" @@ -46,15 +46,15 @@ public class VarbitDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "-1888757206" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -63,8 +63,8 @@ public class VarbitDefinition extends DualNode { signature = "(Lgr;IB)V", garbageValue = "-76" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { this.varp = var1.readUnsignedShort(); this.lowBit = var1.readUnsignedByte(); diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index a78e68a7f1..fbbe1b9c74 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -33,7 +33,7 @@ public class Varcs { Varcs() { this.unwrittenChanges = false; - int var1 = ObjectSound.indexCache2.method4(19); + int var1 = ObjectSound.archive2.method4(19); this.map = new HashMap(); this.intsPersistence = new boolean[var1]; @@ -44,8 +44,8 @@ public class Varcs { } var2 = 0; - if (ObjectSound.indexCache2.method133(15)) { - var2 = ObjectSound.indexCache2.method4(15); + if (ObjectSound.archive2.method133(15)) { + var2 = ObjectSound.archive2.method4(15); } this.strings = new String[var2]; diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index c688b4fbee..93e4af9d40 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -39,15 +39,15 @@ public class VarpDefinition extends DualNode { signature = "(Lgr;B)V", garbageValue = "-41" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -56,8 +56,8 @@ public class VarpDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-1859920822" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 5) { this.type = var1.readUnsignedShort(); } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 799664d180..99b0479857 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -29,7 +29,7 @@ public class Varps { garbageValue = "2111080001" ) public static void method4393(AbstractArchive var0) { - UnderlayDefinition.UnderlayDefinition_indexCache = var0; + UnderlayDefinition.UnderlayDefinition_archive = var0; } @ObfuscatedName("ki") diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index ea9b67341f..9eae4d88ed 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -26,8 +26,8 @@ public class Widget extends Node { @ObfuscatedSignature( signature = "Lir;" ) - @Export("Widget_indexCache") - public static AbstractArchive Widget_indexCache; + @Export("Widget_archive") + public static AbstractArchive Widget_archive; @ObfuscatedName("d") @ObfuscatedSignature( signature = "Lir;" diff --git a/runescape-client/src/main/java/WidgetGroupParent.java b/runescape-client/src/main/java/WidgetGroupParent.java index ad949b8a8a..bfe06d2a39 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.getGroupId(var3); + int var4 = Formatting.archive12.getGroupId(var3); if (var4 == -1) { return null; } else { - byte[] var5 = Formatting.indexCache12.takeFileFlat(var4); + byte[] var5 = Formatting.archive12.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 a8939dfe2e..44dcb1f492 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -74,8 +74,8 @@ public class WorldMap { @ObfuscatedSignature( signature = "Lag;" ) - @Export("currentMapArea0") - WorldMapArea currentMapArea0; + @Export("currentMapArea") + WorldMapArea currentMapArea; @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lag;" @@ -92,7 +92,7 @@ public class WorldMap { signature = "Lls;" ) @Export("cacheLoader") - WorldMapIndexCacheLoader cacheLoader; + WorldMapArchiveLoader cacheLoader; @ObfuscatedName("b") @ObfuscatedGetter( intValue = 1711576969 @@ -322,7 +322,7 @@ public class WorldMap { this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_small, var5.get(fontNameVerdana11)); this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); - this.cacheLoader = new WorldMapIndexCacheLoader(var1); + this.cacheLoader = new WorldMapArchiveLoader(var1); int var7 = this.field989.getGroupId(WorldMapCacheName.WorldMapCacheName_details.name); int[] var8 = this.field989.method3(var7); this.mapAreas = new HashMap(var8.length); @@ -357,7 +357,7 @@ public class WorldMap { ) @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { - if (this.cacheLoader.isLoaded()) { + if (this.cacheLoader.getIsLoaded()) { this.smoothZoom(); this.method363(); if (var3) { @@ -437,10 +437,10 @@ public class WorldMap { @ObfuscatedName("o") void method362(int var1, int var2, boolean var3, long var4) { - if (this.currentMapArea0 != null) { + if (this.currentMapArea != null) { int var6 = (int)((float)this.worldMapX + ((float)(var1 - this.worldMapDisplayX) - (float)this.method377() * this.zoom / 2.0F) / this.zoom); int var7 = (int)((float)this.worldMapY - ((float)(var2 - this.worldMapDisplayY) - (float)this.method378() * this.zoom / 2.0F) / this.zoom); - this.mouseCoord = this.currentMapArea0.coord(var6 + this.currentMapArea0.minX() * 64, var7 + this.currentMapArea0.minY() * 64); + this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.minX() * 64, var7 + this.currentMapArea.minY() * 64); if (this.mouseCoord != null && var3) { int var8; int var9; @@ -631,7 +631,7 @@ public class WorldMap { ) @Export("currentMapAreaId") public int currentMapAreaId() { - return this.currentMapArea0 == null ? -1 : this.currentMapArea0.id(); + return this.currentMapArea == null ? -1 : this.currentMapArea.id(); } @ObfuscatedName("s") @@ -641,7 +641,7 @@ public class WorldMap { ) @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { - return this.currentMapArea0; + return this.currentMapArea; } @ObfuscatedName("t") @@ -651,7 +651,7 @@ public class WorldMap { ) @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { - if (this.currentMapArea0 == null || var1 != this.currentMapArea0) { + if (this.currentMapArea == null || var1 != this.currentMapArea) { this.initializeWorldMap(var1); this.jump(-1, -1, -1); } @@ -665,9 +665,9 @@ public class WorldMap { ) @Export("initializeWorldMap") void initializeWorldMap(WorldMapArea var1) { - this.currentMapArea0 = var1; + this.currentMapArea = var1; this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.field990, this.field991); - this.cacheLoader.reset(this.currentMapArea0.archiveName()); + this.cacheLoader.reset(this.currentMapArea.archiveName()); } @ObfuscatedName("h") @@ -677,11 +677,11 @@ public class WorldMap { ) public void method367(WorldMapArea var1, TileLocation var2, TileLocation var3, boolean var4) { if (var1 != null) { - if (this.currentMapArea0 == null || var1 != this.currentMapArea0) { + if (this.currentMapArea == null || var1 != this.currentMapArea) { this.initializeWorldMap(var1); } - if (!var4 && this.currentMapArea0.containsCoord(var2.plane, var2.x, var2.y)) { + if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { this.jump(var2.plane, var2.x, var2.y); } else { this.jump(var3.plane, var3.x, var3.y); @@ -697,16 +697,16 @@ public class WorldMap { ) @Export("jump") void jump(int var1, int var2, int var3) { - if (this.currentMapArea0 != null) { - int[] var4 = this.currentMapArea0.position(var1, var2, var3); + if (this.currentMapArea != null) { + int[] var4 = this.currentMapArea.position(var1, var2, var3); if (var4 == null) { - var4 = this.currentMapArea0.position(this.currentMapArea0.originPlane(), this.currentMapArea0.originX(), this.currentMapArea0.originY()); + var4 = this.currentMapArea.position(this.currentMapArea.originPlane(), this.currentMapArea.originX(), this.currentMapArea.originY()); } - this.setWorldMapPosition(var4[0] - this.currentMapArea0.minX() * 64, var4[1] - this.currentMapArea0.minY() * 64, true); + this.setWorldMapPosition(var4[0] - this.currentMapArea.minX() * 64, var4[1] - this.currentMapArea.minY() * 64, true); this.worldMapTargetX = -1; this.worldMapTargetY = -1; - this.zoom = this.method370(this.currentMapArea0.zoom()); + this.zoom = this.method370(this.currentMapArea.zoom()); this.zoomTarget = this.zoom; this.field1009 = null; this.iconIterator = null; @@ -726,12 +726,12 @@ public class WorldMap { Rasterizer2D.Rasterizer2D_getClipArray(var6); Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); - int var7 = this.cacheLoader.percentLoaded(); + int var7 = this.cacheLoader.getPercentLoaded(); if (var7 < 100) { this.drawLoading(var1, var2, var3, var4, var7); } else { if (!this.worldMapManager.isLoaded()) { - this.worldMapManager.load(this.field989, this.currentMapArea0.archiveName(), Client.isMembersWorld); + this.worldMapManager.load(this.field989, this.currentMapArea.archiveName(), Client.isMembersWorld); if (!this.worldMapManager.isLoaded()) { return; } @@ -835,9 +835,9 @@ public class WorldMap { ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { - if (this.cacheLoader.isLoaded()) { + if (this.cacheLoader.getIsLoaded()) { if (!this.worldMapManager.isLoaded()) { - this.worldMapManager.load(this.field989, this.currentMapArea0.archiveName(), Client.isMembersWorld); + this.worldMapManager.load(this.field989, this.currentMapArea.archiveName(), Client.isMembersWorld); if (!this.worldMapManager.isLoaded()) { return; } @@ -910,7 +910,7 @@ public class WorldMap { ) @Export("isCacheLoaded") public boolean isCacheLoaded() { - return this.cacheLoader.isLoaded(); + return this.cacheLoader.getIsLoaded(); } @ObfuscatedName("ah") @@ -939,9 +939,9 @@ public class WorldMap { ) @Export("setWorldMapPositionTarget") public void setWorldMapPositionTarget(int var1, int var2) { - if (this.currentMapArea0 != null && this.currentMapArea0.containsPosition(var1, var2)) { - this.worldMapTargetX = var1 - this.currentMapArea0.minX() * 64; - this.worldMapTargetY = var2 - this.currentMapArea0.minY() * 64; + if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { + this.worldMapTargetX = var1 - this.currentMapArea.minX() * 64; + this.worldMapTargetY = var2 - this.currentMapArea.minY() * 64; } } @@ -952,8 +952,8 @@ public class WorldMap { garbageValue = "-2147142500" ) public void method371(int var1, int var2) { - if (this.currentMapArea0 != null) { - this.setWorldMapPosition(var1 - this.currentMapArea0.minX() * 64, var2 - this.currentMapArea0.minY() * 64, true); + if (this.currentMapArea != null) { + this.setWorldMapPosition(var1 - this.currentMapArea.minX() * 64, var2 - this.currentMapArea.minY() * 64, true); this.worldMapTargetX = -1; this.worldMapTargetY = -1; } @@ -966,8 +966,8 @@ public class WorldMap { garbageValue = "-40" ) public void method372(int var1, int var2, int var3) { - if (this.currentMapArea0 != null) { - int[] var4 = this.currentMapArea0.position(var1, var2, var3); + if (this.currentMapArea != null) { + int[] var4 = this.currentMapArea.position(var1, var2, var3); if (var4 != null) { this.setWorldMapPositionTarget(var4[0], var4[1]); } @@ -981,8 +981,8 @@ public class WorldMap { garbageValue = "1808854561" ) public void method373(int var1, int var2, int var3) { - if (this.currentMapArea0 != null) { - int[] var4 = this.currentMapArea0.position(var1, var2, var3); + if (this.currentMapArea != null) { + int[] var4 = this.currentMapArea.position(var1, var2, var3); if (var4 != null) { this.method371(var4[0], var4[1]); } @@ -996,7 +996,7 @@ public class WorldMap { garbageValue = "-659556919" ) public int method374() { - return this.currentMapArea0 == null ? -1 : this.worldMapX + this.currentMapArea0.minX() * 64; + return this.currentMapArea == null ? -1 : this.worldMapX + this.currentMapArea.minX() * 64; } @ObfuscatedName("at") @@ -1005,7 +1005,7 @@ public class WorldMap { garbageValue = "1893257871" ) public int method375() { - return this.currentMapArea0 == null ? -1 : this.worldMapY + this.currentMapArea0.minY() * 64; + return this.currentMapArea == null ? -1 : this.worldMapY + this.currentMapArea.minY() * 64; } @ObfuscatedName("ad") @@ -1014,7 +1014,7 @@ public class WorldMap { garbageValue = "-2005824064" ) public TileLocation method376() { - return this.currentMapArea0 == null ? null : this.currentMapArea0.coord(this.method374(), this.method375()); + return this.currentMapArea == null ? null : this.currentMapArea.coord(this.method374(), this.method375()); } @ObfuscatedName("ap") @@ -1229,7 +1229,7 @@ public class WorldMap { garbageValue = "-73" ) public void method384(int var1, int var2, int var3, int var4, int var5, int var6) { - if (this.cacheLoader.isLoaded()) { + if (this.cacheLoader.getIsLoaded()) { int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); List var9 = this.worldMapManager.method403(this.worldMapX - var7 / 2 - 1, this.worldMapY - var8 / 2 - 1, var7 / 2 + this.worldMapX + 1, var8 / 2 + this.worldMapY + 1, var1, var2, var3, var4, var5, var6); @@ -1264,11 +1264,11 @@ public class WorldMap { garbageValue = "333454230" ) public TileLocation method385(int var1, TileLocation var2) { - if (!this.cacheLoader.isLoaded()) { + if (!this.cacheLoader.getIsLoaded()) { return null; } else if (!this.worldMapManager.isLoaded()) { return null; - } else if (!this.currentMapArea0.containsPosition(var2.x, var2.y)) { + } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { return null; } else { HashMap var3 = this.worldMapManager.buildIcons(); @@ -1337,7 +1337,7 @@ public class WorldMap { ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { - if (!this.cacheLoader.isLoaded()) { + if (!this.cacheLoader.getIsLoaded()) { return null; } else if (!this.worldMapManager.isLoaded()) { return null; diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java new file mode 100644 index 0000000000..3ff6dbd111 --- /dev/null +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -0,0 +1,109 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ls") +@Implements("WorldMapArchiveLoader") +public class WorldMapArchiveLoader +{ + @ObfuscatedName("o") + @Export("cacheName") + String cacheName; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lir;" + ) + @Export("archive") + AbstractArchive archive; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 624113115 + ) + @Export("percentLoaded") + int percentLoaded; + @ObfuscatedName("l") + @Export("isLoaded") + boolean isLoaded; + + @ObfuscatedSignature( + signature = "(Lir;)V" + ) + WorldMapArchiveLoader(AbstractArchive var1) { + this.percentLoaded = 0; + this.isLoaded = false; + this.archive = var1; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1867776989" + ) + @Export("reset") + void reset(String cacheName) { + if (cacheName != null && !cacheName.isEmpty() && cacheName != this.cacheName) { + this.cacheName = cacheName; + this.percentLoaded = 0; + this.isLoaded = false; + this.load(); + } + + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "2019633217" + ) + @Export("load") + int load() { + if (this.percentLoaded < 33) { + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, this.cacheName)) { + return this.percentLoaded; + } + + this.percentLoaded = 33; + } + + if (this.percentLoaded == 33) { + if (this.archive.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName)) { + return this.percentLoaded; + } + + this.percentLoaded = 66; + } + + if (this.percentLoaded == 66) { + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.WorldMapCacheName_labels.name)) { + return this.percentLoaded; + } + + this.percentLoaded = 100; + this.isLoaded = true; + } + + return this.percentLoaded; + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(S)Z", + garbageValue = "-16324" + ) + @Export("getIsLoaded") + boolean getIsLoaded() { + return this.isLoaded; + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "1342963007" + ) + @Export("getPercentLoaded") + int getPercentLoaded() { + return this.percentLoaded; + } +} diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 6fe7e0c410..d7be52abaf 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -89,10 +89,10 @@ public class WorldMapAreaData extends WorldMapArea { if (var1 != null) { return var1; } else { - byte[] var2 = SequenceDefinition.SequenceDefinition_indexCache.takeFile(12, var0); + byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); var1 = new SequenceDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } var1.init(); diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index 40356c54f5..ba3cfb9896 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -11,8 +11,8 @@ public class WorldMapDecoration { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache4") - static Archive indexCache4; + @Export("archive4") + static Archive archive4; @ObfuscatedName("kw") @ObfuscatedGetter( intValue = -12041645 diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index 7eb4d7707b..d85621cd3d 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -168,7 +168,7 @@ public enum WorldMapDecorationType implements Enumerated { byte[] var2 = class4.field1158.takeFile(5, var0); var1 = new InvDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } InvDefinition.InvDefinition_cached.put(var1, (long)var0); diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 4cf0df629b..2f54152343 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -123,15 +123,15 @@ public class WorldMapElement extends DualNode { signature = "(Lgr;B)V", garbageValue = "81" ) - @Export("read") - public void read(Buffer var1) { + @Export("decode") + public void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -140,8 +140,8 @@ public class WorldMapElement extends DualNode { signature = "(Lgr;II)V", garbageValue = "-1197630144" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { this.sprite1 = var1.method51(); } else if (var2 == 2) { diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java index 4ce75a7560..0931561556 100644 --- a/runescape-client/src/main/java/WorldMapIcon1.java +++ b/runescape-client/src/main/java/WorldMapIcon1.java @@ -17,8 +17,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache3") - static Archive indexCache3; + @Export("archive3") + static Archive archive3; @ObfuscatedName("ec") @Export("secureRandom") static SecureRandom secureRandom; @@ -127,7 +127,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { SoundEffect var10 = Client.soundEffects[var0]; if (var10 == null) { Object var2 = null; - var10 = SoundEffect.readSoundEffect(WorldMapDecoration.indexCache4, Client.soundEffectIds[var0], 0); + var10 = SoundEffect.readSoundEffect(WorldMapDecoration.archive4, Client.soundEffectIds[var0], 0); if (var10 == null) { continue; } @@ -202,7 +202,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { if (!var9) { if (Client.field128 != 0 && Client.field112 != -1) { - Login.method2076(UserComparator3.indexCache6, Client.field112, 0, Client.field128, false); + Login.method2076(UserComparator3.archive6, Client.field112, 0, Client.field128, false); } Client.field107 = false; diff --git a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java b/runescape-client/src/main/java/WorldMapIndexCacheLoader.java deleted file mode 100644 index 891978276e..0000000000 --- a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java +++ /dev/null @@ -1,108 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ls") -@Implements("WorldMapIndexCacheLoader") -public class WorldMapIndexCacheLoader { - @ObfuscatedName("o") - @Export("cacheName") - String cacheName; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lir;" - ) - @Export("indexCache") - AbstractArchive indexCache; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 624113115 - ) - @Export("percentLoaded0") - int percentLoaded0; - @ObfuscatedName("l") - @Export("isLoaded0") - boolean isLoaded0; - - @ObfuscatedSignature( - signature = "(Lir;)V" - ) - WorldMapIndexCacheLoader(AbstractArchive var1) { - this.percentLoaded0 = 0; - this.isLoaded0 = false; - this.indexCache = var1; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1867776989" - ) - @Export("reset") - void reset(String var1) { - if (var1 != null && !var1.isEmpty() && var1 != this.cacheName) { - this.cacheName = var1; - this.percentLoaded0 = 0; - this.isLoaded0 = false; - this.load(); - } - - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "2019633217" - ) - @Export("load") - int load() { - if (this.percentLoaded0 < 33) { - if (!this.indexCache.tryLoadFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, this.cacheName)) { - return this.percentLoaded0; - } - - this.percentLoaded0 = 33; - } - - if (this.percentLoaded0 == 33) { - if (this.indexCache.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName) && !this.indexCache.tryLoadFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName)) { - return this.percentLoaded0; - } - - this.percentLoaded0 = 66; - } - - if (this.percentLoaded0 == 66) { - if (!this.indexCache.tryLoadFileByNames(this.cacheName, WorldMapCacheName.WorldMapCacheName_labels.name)) { - return this.percentLoaded0; - } - - this.percentLoaded0 = 100; - this.isLoaded0 = true; - } - - return this.percentLoaded0; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "-16324" - ) - @Export("isLoaded") - boolean isLoaded() { - return this.isLoaded0; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1342963007" - ) - @Export("percentLoaded") - int percentLoaded() { - return this.percentLoaded0; - } -} diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 560007ff66..af00b8f310 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -452,7 +452,7 @@ public class WorldMapRegion { byte[] var13 = OverlayDefinition.field663.takeFile(4, var7); var11 = new OverlayDefinition(); if (var13 != null) { - var11.read(new Buffer(var13), var7); + var11.decode(new Buffer(var13), var7); } var11.init(); @@ -557,7 +557,7 @@ public class WorldMapRegion { byte[] var10 = OverlayDefinition.field663.takeFile(4, var6); var8 = new OverlayDefinition(); if (var10 != null) { - var8.read(new Buffer(var10), var6); + var8.decode(new Buffer(var10), var6); } var8.init(); diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index a0a4f653cc..946af931f3 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -14,8 +14,8 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache15") - static Archive indexCache15; + @Export("archive15") + static Archive archive15; @ObfuscatedName("ey") @ObfuscatedGetter( intValue = -1516124929 @@ -193,10 +193,10 @@ public class WorldMapSection1 implements WorldMapSection { if (var1 != null) { return var1; } else { - byte[] var2 = KitDefinition.KitDefinition_indexCache.takeFile(3, var0); + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); var1 = new KitDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } KitDefinition.KitDefinition_cached.put(var1, (long)var0); diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index 99fdb5df3b..e6e82503ab 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -14,8 +14,8 @@ public class WorldMapSection3 implements WorldMapSection { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache8") - static Archive indexCache8; + @Export("archive8") + static Archive archive8; @ObfuscatedName("go") @ObfuscatedGetter( intValue = -948290091 diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 3811b9d99d..d6b51aa347 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -21,8 +21,8 @@ public class class16 { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache10") - static Archive indexCache10; + @Export("archive10") + static Archive archive10; @ObfuscatedName("ga") @ObfuscatedSignature( signature = "[Lln;" diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index 19f4b14541..9d7b8b34d5 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -99,23 +99,23 @@ public class class171 { Login.Login_loadingPercent = 10; Client.titleLoadingStage = 30; } else if (Client.titleLoadingStage == 30) { - 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); - WorldMapDecoration.indexCache4 = class22.newIndexCache(4, false, true, true); - SecureRandomFuture.indexCache5 = class22.newIndexCache(5, true, true, true); - UserComparator3.indexCache6 = class22.newIndexCache(6, true, true, true); - class40.indexCache7 = class22.newIndexCache(7, false, true, true); - WorldMapSection3.indexCache8 = class22.newIndexCache(8, false, true, true); - class238.indexCache9 = class22.newIndexCache(9, false, true, true); - class16.indexCache10 = class22.newIndexCache(10, false, true, true); - Login.indexCache11 = class22.newIndexCache(11, false, true, true); - Formatting.indexCache12 = class22.newIndexCache(12, false, true, true); - ByteArrayPool.indexCache13 = class22.newIndexCache(13, true, false, true); - class2.indexCache14 = class22.newIndexCache(14, false, true, true); - WorldMapSection1.indexCache15 = class22.newIndexCache(15, false, true, true); - class22.indexCache16 = class22.newIndexCache(17, true, true, true); + AbstractArchive.archive0 = class22.newIndexCache(0, false, true, true); + Skeleton.archive1 = class22.newIndexCache(1, false, true, true); + ObjectSound.archive2 = class22.newIndexCache(2, true, false, true); + WorldMapIcon1.archive3 = class22.newIndexCache(3, false, true, true); + WorldMapDecoration.archive4 = class22.newIndexCache(4, false, true, true); + SecureRandomFuture.archive5 = class22.newIndexCache(5, true, true, true); + UserComparator3.archive6 = class22.newIndexCache(6, true, true, true); + class40.archive7 = class22.newIndexCache(7, false, true, true); + WorldMapSection3.archive8 = class22.newIndexCache(8, false, true, true); + class238.archive9 = class22.newIndexCache(9, false, true, true); + class16.archive10 = class22.newIndexCache(10, false, true, true); + Login.archive11 = class22.newIndexCache(11, false, true, true); + Formatting.archive12 = class22.newIndexCache(12, false, true, true); + ByteArrayPool.archive13 = class22.newIndexCache(13, true, false, true); + class2.archive14 = class22.newIndexCache(14, false, true, true); + WorldMapSection1.archive15 = class22.newIndexCache(15, false, true, true); + class22.archive16 = class22.newIndexCache(17, true, true, true); WorldMapLabelSize.field1040 = class22.newIndexCache(18, false, true, true); ItemContainer.field434 = class22.newIndexCache(19, false, true, true); AbstractByteArrayCopier.field0 = class22.newIndexCache(20, false, true, true); @@ -124,26 +124,26 @@ public class class171 { Client.titleLoadingStage = 40; } else if (Client.titleLoadingStage == 40) { byte var1 = 0; - 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 = var1 + AbstractArchive.archive0.percentage() * 4 / 100; + var0 += Skeleton.archive1.percentage() * 4 / 100; + var0 += ObjectSound.archive2.percentage() * 2 / 100; + var0 += WorldMapIcon1.archive3.percentage() * 2 / 100; + var0 += WorldMapDecoration.archive4.percentage() * 6 / 100; + var0 += SecureRandomFuture.archive5.percentage() * 4 / 100; + var0 += UserComparator3.archive6.percentage() * 2 / 100; + var0 += class40.archive7.percentage() * 56 / 100; + var0 += WorldMapSection3.archive8.percentage() * 2 / 100; + var0 += class238.archive9.percentage() * 2 / 100; + var0 += class16.archive10.percentage() * 2 / 100; + var0 += Login.archive11.percentage() * 2 / 100; + var0 += Formatting.archive12.percentage() * 2 / 100; + var0 += ByteArrayPool.archive13.percentage() * 2 / 100; + var0 += class2.archive14.percentage() * 2 / 100; + var0 += WorldMapSection1.archive15.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; + var0 += class22.archive16.method130() && class22.archive16.method2() ? 1 : 0; if (var0 != 100) { if (var0 != 0) { Login.Login_loadingText = "Checking for updates - " + var0 + "%"; @@ -151,21 +151,21 @@ public class class171 { Login.Login_loadingPercent = 30; } else { - AbstractWorldMapIcon.method625(AbstractArchive.indexCache0, "Animations"); - AbstractWorldMapIcon.method625(Skeleton.indexCache1, "Skeletons"); - AbstractWorldMapIcon.method625(WorldMapDecoration.indexCache4, "Sound FX"); - AbstractWorldMapIcon.method625(SecureRandomFuture.indexCache5, "Maps"); - AbstractWorldMapIcon.method625(UserComparator3.indexCache6, "Music Tracks"); - AbstractWorldMapIcon.method625(class40.indexCache7, "Models"); - AbstractWorldMapIcon.method625(WorldMapSection3.indexCache8, "Sprites"); - AbstractWorldMapIcon.method625(Login.indexCache11, "Music Jingles"); - AbstractWorldMapIcon.method625(class2.indexCache14, "Music Samples"); - AbstractWorldMapIcon.method625(WorldMapSection1.indexCache15, "Music Patches"); + AbstractWorldMapIcon.method625(AbstractArchive.archive0, "Animations"); + AbstractWorldMapIcon.method625(Skeleton.archive1, "Skeletons"); + AbstractWorldMapIcon.method625(WorldMapDecoration.archive4, "Sound FX"); + AbstractWorldMapIcon.method625(SecureRandomFuture.archive5, "Maps"); + AbstractWorldMapIcon.method625(UserComparator3.archive6, "Music Tracks"); + AbstractWorldMapIcon.method625(class40.archive7, "Models"); + AbstractWorldMapIcon.method625(WorldMapSection3.archive8, "Sprites"); + AbstractWorldMapIcon.method625(Login.archive11, "Music Jingles"); + AbstractWorldMapIcon.method625(class2.archive14, "Music Samples"); + AbstractWorldMapIcon.method625(WorldMapSection1.archive15, "Music Patches"); AbstractWorldMapIcon.method625(ItemContainer.field434, "World Map"); AbstractWorldMapIcon.method625(WorldMapLabelSize.field1040, "World Map Geography"); AbstractWorldMapIcon.method625(AbstractByteArrayCopier.field0, "World Map Ground"); class211.spriteIds = new SpriteIds(); - class211.spriteIds.read(class22.indexCache16); + class211.spriteIds.read(class22.archive16); Login.Login_loadingText = "Loaded update list"; Login.Login_loadingPercent = 30; Client.titleLoadingStage = 45; @@ -176,7 +176,7 @@ public class class171 { var28.method174(9, 128); WorldMapCacheName.pcmPlayer0 = Players.newPcmPlayer(GameShell.taskHandler, 0, 22050); WorldMapCacheName.pcmPlayer0.setStream(var28); - NetSocket.method3537(WorldMapSection1.indexCache15, class2.indexCache14, WorldMapDecoration.indexCache4, var28); + NetSocket.method3537(WorldMapSection1.archive15, class2.archive14, WorldMapDecoration.archive4, var28); AbstractArchive.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048); TaskHandler.pcmStreamMixer = new PcmStreamMixer(); AbstractArchive.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer); @@ -184,7 +184,7 @@ public class class171 { Login.Login_loadingText = "Prepared sound engine"; Login.Login_loadingPercent = 35; Client.titleLoadingStage = 50; - WorldMapElement.fonts = new Fonts(WorldMapSection3.indexCache8, ByteArrayPool.indexCache13); + WorldMapElement.fonts = new Fonts(WorldMapSection3.archive8, ByteArrayPool.archive13); } else { int var29; if (Client.titleLoadingStage == 50) { @@ -206,7 +206,7 @@ public class class171 { Client.titleLoadingStage = 60; } } else if (Client.titleLoadingStage == 60) { - var0 = FloorDecoration.method2853(class16.indexCache10, WorldMapSection3.indexCache8); + var0 = FloorDecoration.method2853(class16.archive10, WorldMapSection3.archive8); var29 = class3.method36(); if (var0 < var29) { Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var29 + "%"; @@ -220,69 +220,69 @@ public class class171 { } else { Archive var30; if (Client.titleLoadingStage == 70) { - if (!ObjectSound.indexCache2.method2()) { - Login.Login_loadingText = "Loading config - " + ObjectSound.indexCache2.loadPercent() + "%"; + if (!ObjectSound.archive2.method2()) { + Login.Login_loadingText = "Loading config - " + ObjectSound.archive2.loadPercent() + "%"; Login.Login_loadingPercent = 60; } else { - Varcs.method2160(ObjectSound.indexCache2); - Varps.method4393(ObjectSound.indexCache2); - Archive var31 = ObjectSound.indexCache2; - Archive var33 = class40.indexCache7; - KitDefinition.KitDefinition_indexCache = var31; + Varcs.method2160(ObjectSound.archive2); + Varps.method4393(ObjectSound.archive2); + Archive var31 = ObjectSound.archive2; + Archive var33 = class40.archive7; + KitDefinition.KitDefinition_archive = var31; KitDefinition.field456 = var33; - KitDefinition.field457 = KitDefinition.KitDefinition_indexCache.method4(3); - RectangleMode.method6028(ObjectSound.indexCache2, class40.indexCache7, Client.isLowDetail); - IsaacCipher.method4082(ObjectSound.indexCache2, class40.indexCache7); - var30 = ObjectSound.indexCache2; + KitDefinition.field457 = KitDefinition.KitDefinition_archive.method4(3); + RectangleMode.method6028(ObjectSound.archive2, class40.archive7, Client.isLowDetail); + IsaacCipher.method4082(ObjectSound.archive2, class40.archive7); + var30 = ObjectSound.archive2; StructDefinition.field885 = var30; - Archive var5 = ObjectSound.indexCache2; - Archive var6 = class40.indexCache7; + Archive var5 = ObjectSound.archive2; + Archive var6 = class40.archive7; boolean var7 = Client.isMembersWorld; Font var8 = ScriptEvent.fontPlain11; - ItemDefinition.ItemDefinition_indexCache = var5; + ItemDefinition.ItemDefinition_archive = var5; ItemDefinition.ItemDefinition_modelIndexCache = var6; class30.inMembersWorld = var7; - class83.field1167 = ItemDefinition.ItemDefinition_indexCache.method4(10); + class83.field1167 = ItemDefinition.ItemDefinition_archive.method4(10); class204.field1122 = var8; - Archive var9 = ObjectSound.indexCache2; - Archive var10 = AbstractArchive.indexCache0; - Archive var11 = Skeleton.indexCache1; - SequenceDefinition.SequenceDefinition_indexCache = var9; + Archive var9 = ObjectSound.archive2; + Archive var10 = AbstractArchive.archive0; + Archive var11 = Skeleton.archive1; + SequenceDefinition.SequenceDefinition_archive = var9; SequenceDefinition.field773 = var10; SequenceDefinition.field774 = var11; - Archive var12 = ObjectSound.indexCache2; - Archive var13 = class40.indexCache7; - SpotAnimationDefinition.SpotAnimationDefinition_indexCache = var12; + Archive var12 = ObjectSound.archive2; + Archive var13 = class40.archive7; + SpotAnimationDefinition.SpotAnimationDefinition_archive = var12; SpotAnimationDefinition.SpotAnimationDefinition_modelIndexCache = var13; - UnitPriceComparator.method135(ObjectSound.indexCache2); - Archive var14 = ObjectSound.indexCache2; + UnitPriceComparator.method135(ObjectSound.archive2); + Archive var14 = ObjectSound.archive2; VarpDefinition.field943 = var14; VarpDefinition.field944 = VarpDefinition.field943.method4(16); - Archive var15 = WorldMapIcon1.indexCache3; - Archive var16 = class40.indexCache7; - Archive var17 = WorldMapSection3.indexCache8; - Archive var18 = ByteArrayPool.indexCache13; - Widget.Widget_indexCache = var15; + Archive var15 = WorldMapIcon1.archive3; + Archive var16 = class40.archive7; + Archive var17 = WorldMapSection3.archive8; + Archive var18 = ByteArrayPool.archive13; + Widget.Widget_archive = 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()]; - Archive var19 = ObjectSound.indexCache2; + Widget.widgets = new Widget[Widget.Widget_archive.method5()][]; + Widget.loadedWidgetGroups = new boolean[Widget.Widget_archive.method5()]; + Archive var19 = ObjectSound.archive2; class4.field1158 = var19; - Archive var20 = ObjectSound.indexCache2; - EnumDefinition.EnumDefinition_indexCache = var20; - Frames.method3241(ObjectSound.indexCache2); - Archive var21 = ObjectSound.indexCache2; + Archive var20 = ObjectSound.archive2; + EnumDefinition.EnumDefinition_archive = var20; + Frames.method3241(ObjectSound.archive2); + Archive var21 = ObjectSound.archive2; ParamKeyDefinition.field679 = var21; class196.varcs = new Varcs(); - class60.method1172(ObjectSound.indexCache2, WorldMapSection3.indexCache8, ByteArrayPool.indexCache13); - Archive var22 = ObjectSound.indexCache2; - Archive var23 = WorldMapSection3.indexCache8; + class60.method1172(ObjectSound.archive2, WorldMapSection3.archive8, ByteArrayPool.archive13); + Archive var22 = ObjectSound.archive2; + Archive var23 = WorldMapSection3.archive8; HealthBarDefinition.field379 = var22; HealthBarDefinition.field380 = var23; - Archive var24 = ObjectSound.indexCache2; - Archive var25 = WorldMapSection3.indexCache8; + Archive var24 = ObjectSound.archive2; + Archive var25 = WorldMapSection3.archive8; WorldMapElement.field1019 = var25; if (var24.method2()) { UserComparator4.WorldMapElement_count = var24.method4(35); @@ -292,7 +292,7 @@ public class class171 { byte[] var27 = var24.takeFile(35, var26); Widget.WorldMapElement_cached[var26] = new WorldMapElement(var26); if (var27 != null) { - Widget.WorldMapElement_cached[var26].read(new Buffer(var27)); + Widget.WorldMapElement_cached[var26].decode(new Buffer(var27)); Widget.WorldMapElement_cached[var26].method389(); } } @@ -305,13 +305,13 @@ public class class171 { } else if (Client.titleLoadingStage == 80) { var0 = 0; if (UnitPriceComparator.compass == null) { - UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.indexCache8, class211.spriteIds.field878, 0); + UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field878, 0); } else { ++var0; } if (FaceNormal.field345 == null) { - FaceNormal.field345 = class322.readSprite(WorldMapSection3.indexCache8, class211.spriteIds.field879, 0); + FaceNormal.field345 = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field879, 0); } else { ++var0; } @@ -319,7 +319,7 @@ public class class171 { IndexedSprite[] var32; int var34; if (class192.mapSceneSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.mapScenes; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; @@ -334,7 +334,7 @@ public class class171 { Sprite[] var35; if (class15.headIconPkSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.headIconsPk; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -348,7 +348,7 @@ public class class171 { } if (ClientPreferences.headIconPrayerSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.headIconsPrayer; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -362,7 +362,7 @@ public class class171 { } if (Player.headIconHintSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.headIconsHint; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -376,7 +376,7 @@ public class class171 { } if (class16.mapMarkerSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.mapMarkers; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -390,7 +390,7 @@ public class class171 { } if (KeyHandler.crossSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.crosses; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -404,7 +404,7 @@ public class class171 { } if (class39.mapDotSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.mapDots; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -418,7 +418,7 @@ public class class171 { } if (class32.scrollBarSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.scrollBars; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; @@ -432,7 +432,7 @@ public class class171 { } if (WorldMapSectionType.modIconSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.modIcons; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; @@ -461,11 +461,11 @@ public class class171 { Client.titleLoadingStage = 90; } } else if (Client.titleLoadingStage == 90) { - if (!class238.indexCache9.method2()) { + if (!class238.archive9.method2()) { Login.Login_loadingText = "Loading textures - 0%"; Login.Login_loadingPercent = 90; } else { - SecureRandomFuture.textureProvider = new TextureProvider(class238.indexCache9, WorldMapSection3.indexCache8, 20, 0.8D, Client.isLowDetail ? 64 : 128); + SecureRandomFuture.textureProvider = new TextureProvider(class238.archive9, WorldMapSection3.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); Rasterizer3D.Rasterizer3D_setTextureLoader(SecureRandomFuture.textureProvider); Rasterizer3D.Rasterizer3D_setBrightness(0.8D); Client.titleLoadingStage = 100; @@ -487,25 +487,25 @@ public class class171 { Login.Login_loadingPercent = 92; Client.titleLoadingStage = 120; } else if (Client.titleLoadingStage == 120) { - if (!class16.indexCache10.tryLoadFileByNames("huffman", "")) { + if (!class16.archive10.tryLoadFileByNames("huffman", "")) { Login.Login_loadingText = "Loading wordpack - 0%"; Login.Login_loadingPercent = 94; } else { - Huffman var37 = new Huffman(class16.indexCache10.takeFileByNames("huffman", "")); + Huffman var37 = new Huffman(class16.archive10.takeFileByNames("huffman", "")); class303.huffman = var37; Login.Login_loadingText = "Loaded wordpack"; Login.Login_loadingPercent = 94; Client.titleLoadingStage = 130; } } else if (Client.titleLoadingStage == 130) { - if (!WorldMapIcon1.indexCache3.method2()) { - Login.Login_loadingText = "Loading interfaces - " + WorldMapIcon1.indexCache3.loadPercent() * 4 / 5 + "%"; + if (!WorldMapIcon1.archive3.method2()) { + Login.Login_loadingText = "Loading interfaces - " + WorldMapIcon1.archive3.loadPercent() * 4 / 5 + "%"; Login.Login_loadingPercent = 96; - } else if (!Formatting.indexCache12.method2()) { - Login.Login_loadingText = "Loading interfaces - " + (80 + Formatting.indexCache12.loadPercent() / 6) + "%"; + } else if (!Formatting.archive12.method2()) { + Login.Login_loadingText = "Loading interfaces - " + (80 + Formatting.archive12.loadPercent() / 6) + "%"; Login.Login_loadingPercent = 96; - } else if (!ByteArrayPool.indexCache13.method2()) { - Login.Login_loadingText = "Loading interfaces - " + (96 + ByteArrayPool.indexCache13.loadPercent() / 50) + "%"; + } else if (!ByteArrayPool.archive13.method2()) { + Login.Login_loadingText = "Loading interfaces - " + (96 + ByteArrayPool.archive13.loadPercent() / 50) + "%"; Login.Login_loadingPercent = 96; } else { Login.Login_loadingText = "Loaded interfaces"; diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 26be24396c..988d364e39 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -9,8 +9,8 @@ final class class2 implements class0 { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache14") - static Archive indexCache14; + @Export("archive14") + static Archive archive14; @ObfuscatedName("ee") @ObfuscatedGetter( intValue = -753026759 @@ -74,7 +74,7 @@ final class class2 implements class0 { } Login.titleboxSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebox", ""); - IndexCacheLoader.titlebuttonSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebutton", ""); + ArchiveLoader.titlebuttonSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebutton", ""); int var5 = var1.getGroupId("runes"); int var6 = var1.getFileId(var5, ""); IndexedSprite[] var7; @@ -112,7 +112,7 @@ final class class2 implements class0 { Login.field470 = true; Login.worldSelectOpen = false; if (!ReflectionCheck.clientPreferences.titleMusicDisabled) { - Canvas.method858(2, UserComparator3.indexCache6, "scape main", "", 255, false); + Canvas.method858(2, UserComparator3.archive6, "scape main", "", 255, false); } else { AbstractSocket.method3488(2); } diff --git a/runescape-client/src/main/java/class211.java b/runescape-client/src/main/java/class211.java index c614fe5651..cca70bcd88 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.takeFile(var8, 0); + var9 = ByteArrayPool.archive13.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.takeFile(var8, 0); + var9 = ByteArrayPool.archive13.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/class22.java b/runescape-client/src/main/java/class22.java index 4169842e0d..435fc8e614 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -21,8 +21,8 @@ public final class class22 { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache16") - static Archive indexCache16; + @Export("archive16") + static Archive archive16; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1976624405 diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java index db894b0a3c..e78ec72e7f 100644 --- a/runescape-client/src/main/java/class229.java +++ b/runescape-client/src/main/java/class229.java @@ -22,7 +22,7 @@ public class class229 { byte[] var2 = ParamKeyDefinition.field679.takeFile(11, var0); var1 = new ParamKeyDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } var1.init(); diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java index 16c8acfc8e..8ca962085e 100644 --- a/runescape-client/src/main/java/class238.java +++ b/runescape-client/src/main/java/class238.java @@ -8,8 +8,8 @@ public final class class238 { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache9") - static Archive indexCache9; + @Export("archive9") + static Archive archive9; @ObfuscatedName("im") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 71c2945ebe..85ef654b94 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -107,7 +107,7 @@ public class class3 implements Enumerated { return; } - var1.indexCache.load(var1.archiveDisk, (int)var1.key, var1.data, false); + var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); } } diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index 46263eb734..57733ec6fe 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -9,8 +9,8 @@ public class class40 { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache7") - static Archive indexCache7; + @Export("archive7") + static Archive archive7; @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 12f0681409..e0bee6db6f 100644 --- a/runescape-client/src/main/java/class50.java +++ b/runescape-client/src/main/java/class50.java @@ -31,11 +31,11 @@ public class class50 { if (var1 != null) { return var1; } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_indexCache.takeFile(13, var0); + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); var1 = new SpotAnimationDefinition(); var1.id = var0; if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); @@ -54,11 +54,11 @@ public class class50 { if (var1 != null) { return var1; } else { - byte[] var2 = ObjectDefinition.ObjectDefinition_indexCache.takeFile(6, var0); + byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0); var1 = new ObjectDefinition(); var1.id = var0; if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } var1.init(); @@ -99,7 +99,7 @@ public class class50 { } class308.regions = new int[var8]; - IndexCacheLoader.regionMapArchiveIds = new int[var8]; + ArchiveLoader.regionMapArchiveIds = new int[var8]; MouseHandler.regionLandArchiveIds = new int[var8]; class40.regionLandArchives = new byte[var8][]; HealthBarUpdate.regionMapArchives = new byte[var8][]; @@ -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.getGroupId("m" + var5 + "_" + var6); - MouseHandler.regionLandArchiveIds[var8] = SecureRandomFuture.indexCache5.getGroupId("l" + var5 + "_" + var6); + ArchiveLoader.regionMapArchiveIds[var8] = SecureRandomFuture.archive5.getGroupId("m" + var5 + "_" + var6); + MouseHandler.regionLandArchiveIds[var8] = SecureRandomFuture.archive5.getGroupId("l" + var5 + "_" + var6); ++var8; } } @@ -158,7 +158,7 @@ public class class50 { } class308.regions = new int[var4]; - IndexCacheLoader.regionMapArchiveIds = new int[var4]; + ArchiveLoader.regionMapArchiveIds = new int[var4]; MouseHandler.regionLandArchiveIds = new int[var4]; class40.regionLandArchives = new byte[var4][]; HealthBarUpdate.regionMapArchives = new byte[var4][]; @@ -185,8 +185,8 @@ public class class50 { class308.regions[var4] = var12; var13 = var12 >> 8 & 255; int var14 = var12 & 255; - IndexCacheLoader.regionMapArchiveIds[var4] = SecureRandomFuture.indexCache5.getGroupId("m" + var13 + "_" + var14); - MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.indexCache5.getGroupId("l" + var13 + "_" + var14); + ArchiveLoader.regionMapArchiveIds[var4] = SecureRandomFuture.archive5.getGroupId("m" + var13 + "_" + var14); + MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.archive5.getGroupId("l" + var13 + "_" + var14); ++var4; } } diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index 19050be122..2ce7ee8d41 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -43,7 +43,7 @@ public final class class54 { ReflectionCheck.clientPreferences.titleMusicDisabled = !ReflectionCheck.clientPreferences.titleMusicDisabled; WorldMapSection0.savePreferences(); if (!ReflectionCheck.clientPreferences.titleMusicDisabled) { - class204.method4011(UserComparator3.indexCache6, "scape main", "", 255, false); + class204.method4011(UserComparator3.archive6, "scape main", "", 255, false); } else { class214.midiPcmStream.clear(); class214.field1129 = 1; diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java index c98f5a904b..360e9b06c2 100644 --- a/runescape-client/src/main/java/class80.java +++ b/runescape-client/src/main/java/class80.java @@ -17,7 +17,7 @@ public class class80 { static void method2015() { if (Login.field465) { Login.titleboxSprite = null; - IndexCacheLoader.titlebuttonSprite = null; + ArchiveLoader.titlebuttonSprite = null; WorldMapEvent.runesSprite = null; Login.leftTitleSprite = null; Fonts.rightTitleSprite = null;