diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index aa4a94469a..2bd08bf4ac 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -748,14 +748,14 @@ public abstract class AbstractArchive { garbageValue = "308670894" ) static boolean method4585() { - if (Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { - while (Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { - ArchiveLoader var0 = (ArchiveLoader)Client.indexCacheLoaders.get(Client.indexCacheLoaderIndex); + if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) { + while (Client.archiveLoaderArchive < Client.archiveLoaders.size()) { + ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoaderArchive); if (!var0.method134()) { return false; } - ++Client.indexCacheLoaderIndex; + ++Client.archiveLoaderArchive; } return true; diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index b23e13f811..69638b9260 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -164,7 +164,7 @@ public abstract class AbstractWorldMapIcon { ) static void method625(Archive var0, String var1) { ArchiveLoader var2 = new ArchiveLoader(var0, var1); - Client.indexCacheLoaders.add(var2); + Client.archiveLoaders.add(var2); Client.field140 += var2.field408; } } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index dca408935e..fc6e29e9d1 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -9,8 +9,8 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Archive") public class Archive extends AbstractArchive { @ObfuscatedName("aj") - @Export("IndexCache_crc") - static CRC32 IndexCache_crc; + @Export("Archive_crc") + static CRC32 Archive_crc; @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lff;" @@ -114,9 +114,9 @@ public class Archive extends AbstractArchive { if (this.archiveDisk != null && this.validGroups != null && this.validGroups[group]) { ArchiveDisk var2 = this.archiveDisk; byte[] var3 = null; - NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - for (IndexStoreAction var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var6 != null; var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) { + NodeDeque var4 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + for (ArchiveDiskAction var6 = (ArchiveDiskAction) ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction) ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { if (var6.key == (long) group && var2 == var6.archiveDisk && var6.type == 0) { var3 = var6.data; break; @@ -179,9 +179,9 @@ public class Archive extends AbstractArchive { int var3 = this.index; ArchiveDisk var4 = this.masterDisk; byte[] var5 = null; - NodeDeque var6 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - for (IndexStoreAction var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var8 != null; var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) { + NodeDeque var6 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + for (ArchiveDiskAction var8 = (ArchiveDiskAction) ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction) ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { if (var8.key == (long)var3 && var4 == var8.archiveDisk && var8.type == 0) { var5 = var8.data; break; @@ -248,9 +248,9 @@ public class Archive extends AbstractArchive { } else if (var3 == null) { PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { - IndexCache_crc.reset(); - IndexCache_crc.update(var3, 0, var3.length); - var5 = (int)IndexCache_crc.getValue(); + Archive_crc.reset(); + Archive_crc.update(var3, 0, var3.length); + var5 = (int)Archive_crc.getValue(); if (var5 != this.indexCrc) { PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { @@ -279,9 +279,9 @@ public class Archive extends AbstractArchive { } if (var3 != null && var3.length > 2) { - IndexCache_crc.reset(); - IndexCache_crc.update(var3, 0, var3.length - 2); - var5 = (int)IndexCache_crc.getValue(); + Archive_crc.reset(); + Archive_crc.update(var3, 0, var3.length - 2); + var5 = (int)Archive_crc.getValue(); int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); if (var5 == super.groupCrcs[var2] && var6 == super.groupVersions[var2]) { this.validGroups[var2] = true; @@ -549,6 +549,6 @@ public class Archive extends AbstractArchive { } static { - IndexCache_crc = new CRC32(); + Archive_crc = new CRC32(); } } diff --git a/runescape-client/src/main/java/IndexStoreAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java similarity index 97% rename from runescape-client/src/main/java/IndexStoreAction.java rename to runescape-client/src/main/java/ArchiveDiskAction.java index cec172fa81..d2470fc62b 100644 --- a/runescape-client/src/main/java/IndexStoreAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ik") -@Implements("IndexStoreAction") -public class IndexStoreAction extends Node { +@Implements("ArchiveDiskAction") +public class ArchiveDiskAction extends Node { @ObfuscatedName("rt") @ObfuscatedGetter( intValue = -1086790653 diff --git a/runescape-client/src/main/java/IndexStoreActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java similarity index 57% rename from runescape-client/src/main/java/IndexStoreActionHandler.java rename to runescape-client/src/main/java/ArchiveDiskActionHandler.java index 7588e57bd5..3e12c3d7da 100644 --- a/runescape-client/src/main/java/IndexStoreActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -5,61 +5,61 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("iv") -@Implements("IndexStoreActionHandler") -public class IndexStoreActionHandler implements Runnable { +@Implements("ArchiveDiskActionHandler") +public class ArchiveDiskActionHandler implements Runnable { @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lje;" ) - @Export("IndexStoreActionHandler_requestQueue") - static NodeDeque IndexStoreActionHandler_requestQueue; + @Export("ArchiveDiskActionHandler_requestQueue") + static NodeDeque ArchiveDiskActionHandler_requestQueue; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lje;" ) - @Export("IndexStoreActionHandler_responseQueue") - static NodeDeque IndexStoreActionHandler_responseQueue; + @Export("ArchiveDiskActionHandler_responseQueue") + static NodeDeque ArchiveDiskActionHandler_responseQueue; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -1282224505 ) static int field412; @ObfuscatedName("w") - @Export("IndexStoreActionHandler_lock") - static Object IndexStoreActionHandler_lock; + @Export("ArchiveDiskActionHandler_lock") + static Object ArchiveDiskActionHandler_lock; @Export("run") @ObfuscatedName("run") public void run() { try { while (true) { - NodeDeque var1 = IndexStoreActionHandler_requestQueue; - IndexStoreAction var2; - synchronized(IndexStoreActionHandler_requestQueue) { - var2 = (IndexStoreAction)IndexStoreActionHandler_requestQueue.last(); + NodeDeque var1 = ArchiveDiskActionHandler_requestQueue; + ArchiveDiskAction var2; + synchronized(ArchiveDiskActionHandler_requestQueue) { + var2 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); } Object var3; if (var2 != null) { if (var2.type == 0) { var2.archiveDisk.write((int)var2.key, var2.data, var2.data.length); - var1 = IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler_requestQueue) { + var1 = ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler_requestQueue) { var2.remove(); } } else if (var2.type == 1) { var2.data = var2.archiveDisk.read((int)var2.key); - var1 = IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler_requestQueue) { - IndexStoreActionHandler_responseQueue.addFirst(var2); + var1 = ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler_responseQueue.addFirst(var2); } } - var3 = IndexStoreActionHandler_lock; - synchronized(IndexStoreActionHandler_lock) { + var3 = ArchiveDiskActionHandler_lock; + synchronized(ArchiveDiskActionHandler_lock) { if (field412 <= 1) { field412 = 0; - IndexStoreActionHandler_lock.notifyAll(); + ArchiveDiskActionHandler_lock.notifyAll(); return; } @@ -67,11 +67,11 @@ public class IndexStoreActionHandler implements Runnable { } } else { class203.method4010(100L); - var3 = IndexStoreActionHandler_lock; - synchronized(IndexStoreActionHandler_lock) { + var3 = ArchiveDiskActionHandler_lock; + synchronized(ArchiveDiskActionHandler_lock) { if (field412 <= 1) { field412 = 0; - IndexStoreActionHandler_lock.notifyAll(); + ArchiveDiskActionHandler_lock.notifyAll(); return; } @@ -100,9 +100,9 @@ public class IndexStoreActionHandler implements Runnable { } static { - IndexStoreActionHandler_requestQueue = new NodeDeque(); - IndexStoreActionHandler_responseQueue = new NodeDeque(); + ArchiveDiskActionHandler_requestQueue = new NodeDeque(); + ArchiveDiskActionHandler_responseQueue = new NodeDeque(); field412 = 0; - IndexStoreActionHandler_lock = new Object(); + ArchiveDiskActionHandler_lock = new Object(); } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index cd2c02e115..7cd196191d 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -253,8 +253,8 @@ public final class Client extends GameShell implements Usernamed { @Export("soundEffectIds") static int[] soundEffectIds; @ObfuscatedName("sy") - @Export("indexCacheLoaders") - static ArrayList indexCacheLoaders; + @Export("archiveLoaders") + static ArrayList archiveLoaders; @ObfuscatedName("sl") @ObfuscatedGetter( intValue = -1605855913 @@ -270,8 +270,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -1546210597 ) - @Export("indexCacheLoaderIndex") - static int indexCacheLoaderIndex; + @Export("archiveLoaderArchive") + static int archiveLoaderArchive; @ObfuscatedName("qn") @Export("queuedSoundEffectLoops") static int[] queuedSoundEffectLoops; @@ -2378,7 +2378,7 @@ public final class Client extends GameShell implements Usernamed { class168.dat2File.close(); for (int var9 = 0; var9 < class168.idxCount; ++var9) { - IndexStoreAction.idxFiles[var9].close(); + ArchiveDiskAction.idxFiles[var9].close(); } class168.idx255File.close(); @@ -2600,10 +2600,10 @@ public final class Client extends GameShell implements Usernamed { Interpreter.method1976(); class168.dat2File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); class168.idx255File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); - IndexStoreAction.idxFiles = new BufferedFile[class168.idxCount]; + ArchiveDiskAction.idxFiles = new BufferedFile[class168.idxCount]; for (int var35 = 0; var35 < class168.idxCount; ++var35) { - IndexStoreAction.idxFiles[var35] = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx" + var35), "rw", 1048576L), 6000, 0); + ArchiveDiskAction.idxFiles[var35] = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx" + var35), "rw", 1048576L), 6000, 0); } } catch (Exception var23) { NPCDefinition.sendStackTrace((String)null, var23); @@ -3899,11 +3899,11 @@ public final class Client extends GameShell implements Usernamed { field137 = 0; while (Decimator.method2490() && field137 < 128) { - if (rights >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && IndexStoreAction.field411 == 66) { + if (rights >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && ArchiveDiskAction.field411 == 66) { String var22 = KeyHandler.method839(); TextureProvider.client.clipboardSetString(var22); } else if (oculusOrbState != 1 || GzipDecompressor.field378 <= 0) { - field145[field137] = IndexStoreAction.field411; + field145[field137] = ArchiveDiskAction.field411; field146[field137] = GzipDecompressor.field378; ++field137; } @@ -4121,7 +4121,7 @@ public final class Client extends GameShell implements Usernamed { var4 = GrandExchangeOffer.field376 * 128 + 64; var9 = KeyHandler.field445 * 128 + 64; - var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - IndexStoreAction.field410; + var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - ArchiveDiskAction.field410; var11 = var4 - WorldMapSection1.cameraX; var12 = var10 - GrandExchangeEvents.cameraY; var13 = var9 - class11.cameraZ; @@ -5428,13 +5428,13 @@ public final class Client extends GameShell implements Usernamed { isCameraLocked = true; GrandExchangeOffer.field376 = var3.readUnsignedByte(); KeyHandler.field445 = var3.readUnsignedByte(); - IndexStoreAction.field410 = var3.readUnsignedShort(); + ArchiveDiskAction.field410 = var3.readUnsignedShort(); VertexNormal.field946 = var3.readUnsignedByte(); class171.field1116 = var3.readUnsignedByte(); if (class171.field1116 >= 100) { var37 = GrandExchangeOffer.field376 * 128 + 64; var6 = KeyHandler.field445 * 128 + 64; - var5 = class32.getTileHeight(var37, var6, SoundSystem.plane) - IndexStoreAction.field410; + var5 = class32.getTileHeight(var37, var6, SoundSystem.plane) - ArchiveDiskAction.field410; var10 = var37 - WorldMapSection1.cameraX; var11 = var5 - GrandExchangeEvents.cameraY; var12 = var6 - class11.cameraZ; @@ -6511,8 +6511,8 @@ public final class Client extends GameShell implements Usernamed { grandExchangeOffers = new GrandExchangeOffer[8]; field159 = new OwnWorldComparator(); field104 = -1; - indexCacheLoaders = new ArrayList(10); - indexCacheLoaderIndex = 0; + archiveLoaders = new ArrayList(10); + archiveLoaderArchive = 0; field140 = 0; field895 = new class65(); field113 = new int[50]; diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 229c6bbeb6..eede8d2877 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -159,7 +159,7 @@ public class Decimator { if (KeyHandler.field453 == KeyHandler.field455) { return false; } else { - IndexStoreAction.field411 = KeyHandler.field450[KeyHandler.field453]; + ArchiveDiskAction.field411 = KeyHandler.field450[KeyHandler.field453]; GzipDecompressor.field378 = KeyHandler.field449[KeyHandler.field453]; KeyHandler.field453 = KeyHandler.field453 + 1 & 127; return true; diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index e2eb1e8f48..66f09c3b9b 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -215,7 +215,7 @@ public class FontName { return 1; } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - IndexStoreActionHandler.method4655(var4); + ArchiveDiskActionHandler.method4655(var4); return 1; } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.rank : 0; diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 809513ef75..7666c5d4de 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -7,8 +7,8 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Frames") public class Frames extends DualNode { @ObfuscatedName("o") - @Export("IndexStoreActionHandler_thread") - static Thread IndexStoreActionHandler_thread; + @Export("ArchiveDiskActionHandler_thread") + static Thread ArchiveDiskActionHandler_thread; @ObfuscatedName("bc") @ObfuscatedSignature( signature = "[Llq;" diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index c04163439b..e88a74d43f 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -139,11 +139,11 @@ public class GrandExchangeOffer { garbageValue = "50" ) static int method101() { - if (Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { + if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) { int var0 = 0; - for (int var1 = 0; var1 <= Client.indexCacheLoaderIndex; ++var1) { - var0 += ((ArchiveLoader)Client.indexCacheLoaders.get(var1)).field409; + for (int var1 = 0; var1 <= Client.archiveLoaderArchive; ++var1) { + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).field409; } return var0 * 10000 / Client.field140; diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index b41a453923..032efe9275 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -240,7 +240,7 @@ public final class IsaacCipher { ) public static void method4082(AbstractArchive var0, AbstractArchive var1) { NPCDefinition.NpcDefinition_archive = var0; - NPCDefinition.NpcDefinition_modelIndexCache = var1; + NPCDefinition.NpcDefinition_modelArchive = var1; } @ObfuscatedName("fl") diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index e2ca5be334..f19226a6d2 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -17,8 +17,8 @@ public class ItemDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("ItemDefinition_modelIndexCache") - public static AbstractArchive ItemDefinition_modelIndexCache; + @Export("ItemDefinition_modelArchive") + public static AbstractArchive ItemDefinition_modelArchive; @ObfuscatedName("x") @ObfuscatedSignature( signature = "Ler;" @@ -590,7 +590,7 @@ public class ItemDefinition extends DualNode { } } - ModelData var4 = ModelData.method2788(ItemDefinition_modelIndexCache, this.field435, 0); + ModelData var4 = ModelData.method2788(ItemDefinition_modelArchive, this.field435, 0); if (var4 == null) { return null; } else { @@ -639,7 +639,7 @@ public class ItemDefinition extends DualNode { if (var5 != null) { return var5; } else { - ModelData var6 = ModelData.method2788(ItemDefinition_modelIndexCache, this.field435, 0); + ModelData var6 = ModelData.method2788(ItemDefinition_modelArchive, this.field435, 0); if (var6 == null) { return null; } else { @@ -710,15 +710,15 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var5 = true; - if (!ItemDefinition_modelIndexCache.tryLoadFile(var2, 0)) { + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var5 = false; } - if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadFile(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var5 = false; } - if (var4 != -1 && !ItemDefinition_modelIndexCache.tryLoadFile(var4, 0)) { + if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { var5 = false; } @@ -744,11 +744,11 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return null; } else { - ModelData var5 = ModelData.method2788(ItemDefinition_modelIndexCache, var2, 0); + ModelData var5 = ModelData.method2788(ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var6 = ModelData.method2788(ItemDefinition_modelIndexCache, var3, 0); + ModelData var6 = ModelData.method2788(ItemDefinition_modelArchive, var3, 0); if (var4 != -1) { - ModelData var7 = ModelData.method2788(ItemDefinition_modelIndexCache, var4, 0); + ModelData var7 = ModelData.method2788(ItemDefinition_modelArchive, var4, 0); ModelData[] var8 = new ModelData[]{var5, var6, var7}; var5 = new ModelData(var8, 3); } else { @@ -799,11 +799,11 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var4 = true; - if (!ItemDefinition_modelIndexCache.tryLoadFile(var2, 0)) { + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var4 = false; } - if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadFile(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var4 = false; } @@ -827,9 +827,9 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return null; } else { - ModelData var4 = ModelData.method2788(ItemDefinition_modelIndexCache, var2, 0); + ModelData var4 = ModelData.method2788(ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var5 = ModelData.method2788(ItemDefinition_modelIndexCache, var3, 0); + ModelData var5 = ModelData.method2788(ItemDefinition_modelArchive, var3, 0); ModelData[] var6 = new ModelData[]{var4, var5}; var4 = new ModelData(var6, 2); } diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index acb5b8050a..5ff51015fb 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -168,26 +168,26 @@ public final class NPC extends Actor { garbageValue = "-51" ) static void method2009(int var0, ArchiveDisk var1, Archive var2) { - IndexStoreAction var3 = new IndexStoreAction(); + ArchiveDiskAction var3 = new ArchiveDiskAction(); var3.type = 1; var3.key = (long)var0; var3.archiveDisk = var1; var3.archive = var2; - NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3); + NodeDeque var4 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); } - Object var5 = IndexStoreActionHandler.IndexStoreActionHandler_lock; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) { - if (IndexStoreActionHandler.field412 == 0) { - Frames.IndexStoreActionHandler_thread = new Thread(new IndexStoreActionHandler()); - Frames.IndexStoreActionHandler_thread.setDaemon(true); - Frames.IndexStoreActionHandler_thread.start(); - Frames.IndexStoreActionHandler_thread.setPriority(5); + Object var5 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field412 == 0) { + Frames.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + Frames.ArchiveDiskActionHandler_thread.setDaemon(true); + Frames.ArchiveDiskActionHandler_thread.start(); + Frames.ArchiveDiskActionHandler_thread.setPriority(5); } - IndexStoreActionHandler.field412 = 600; + ArchiveDiskActionHandler.field412 = 600; } } } diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index 4a7f41026f..7a6ec0a6bd 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -22,8 +22,8 @@ public class NPCDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("NpcDefinition_modelIndexCache") - static AbstractArchive NpcDefinition_modelIndexCache; + @Export("NpcDefinition_modelArchive") + static AbstractArchive NpcDefinition_modelArchive; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Ler;" @@ -383,7 +383,7 @@ public class NPCDefinition extends DualNode { boolean var6 = false; for (int var7 = 0; var7 < this.archives.length; ++var7) { - if (!NpcDefinition_modelIndexCache.tryLoadFile(this.archives[var7], 0)) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.archives[var7], 0)) { var6 = true; } } @@ -396,7 +396,7 @@ public class NPCDefinition extends DualNode { int var8; for (var8 = 0; var8 < this.archives.length; ++var8) { - var12[var8] = ModelData.method2788(NpcDefinition_modelIndexCache, this.archives[var8], 0); + var12[var8] = ModelData.method2788(NpcDefinition_modelArchive, this.archives[var8], 0); } ModelData var9; @@ -457,7 +457,7 @@ public class NPCDefinition extends DualNode { boolean var1 = false; for (int var2 = 0; var2 < this.field636.length; ++var2) { - if (!NpcDefinition_modelIndexCache.tryLoadFile(this.field636[var2], 0)) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.field636[var2], 0)) { var1 = true; } } @@ -468,7 +468,7 @@ public class NPCDefinition extends DualNode { ModelData[] var6 = new ModelData[this.field636.length]; for (int var3 = 0; var3 < this.field636.length; ++var3) { - var6[var3] = ModelData.method2788(NpcDefinition_modelIndexCache, this.field636[var3], 0); + var6[var3] = ModelData.method2788(NpcDefinition_modelArchive, this.field636[var3], 0); } ModelData var7; diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index 64669fbe91..628262c29a 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -52,13 +52,13 @@ public class RunException extends RuntimeException { garbageValue = "-2146928006" ) public static void method3431() { - Object var0 = IndexStoreActionHandler.IndexStoreActionHandler_lock; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) { - if (IndexStoreActionHandler.field412 != 0) { - IndexStoreActionHandler.field412 = 1; + Object var0 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field412 != 0) { + ArchiveDiskActionHandler.field412 = 1; try { - IndexStoreActionHandler.IndexStoreActionHandler_lock.wait(); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); } catch (InterruptedException var4) { } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 13b1a45b76..f2f467aa57 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -17,8 +17,8 @@ public class SpotAnimationDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("SpotAnimationDefinition_modelIndexCache") - public static AbstractArchive SpotAnimationDefinition_modelIndexCache; + @Export("SpotAnimationDefinition_modelArchive") + public static AbstractArchive SpotAnimationDefinition_modelArchive; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Ler;" @@ -172,7 +172,7 @@ public class SpotAnimationDefinition extends DualNode { public final Model getModel(int var1) { Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); if (var2 == null) { - ModelData var3 = ModelData.method2788(SpotAnimationDefinition_modelIndexCache, this.archive, 0); + ModelData var3 = ModelData.method2788(SpotAnimationDefinition_modelArchive, this.archive, 0); if (var3 == null) { return null; } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 9eae4d88ed..7bf87b052d 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -1530,26 +1530,26 @@ public class Widget extends Node { garbageValue = "-1287305716" ) static void method4499(int var0, byte[] var1, ArchiveDisk var2) { - IndexStoreAction var3 = new IndexStoreAction(); + ArchiveDiskAction var3 = new ArchiveDiskAction(); var3.type = 0; var3.key = (long)var0; var3.data = var1; var3.archiveDisk = var2; - NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3); + NodeDeque var4 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); } - Object var5 = IndexStoreActionHandler.IndexStoreActionHandler_lock; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) { - if (IndexStoreActionHandler.field412 == 0) { - Frames.IndexStoreActionHandler_thread = new Thread(new IndexStoreActionHandler()); - Frames.IndexStoreActionHandler_thread.setDaemon(true); - Frames.IndexStoreActionHandler_thread.start(); - Frames.IndexStoreActionHandler_thread.setPriority(5); + Object var5 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field412 == 0) { + Frames.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + Frames.ArchiveDiskActionHandler_thread.setDaemon(true); + Frames.ArchiveDiskActionHandler_thread.start(); + Frames.ArchiveDiskActionHandler_thread.setPriority(5); } - IndexStoreActionHandler.field412 = 600; + ArchiveDiskActionHandler.field412 = 600; } } diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index 9d7b8b34d5..ac8fb28183 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -99,26 +99,26 @@ public class class171 { Login.Login_loadingPercent = 10; Client.titleLoadingStage = 30; } else if (Client.titleLoadingStage == 30) { - 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); + AbstractArchive.archive0 = class22.newArchive(0, false, true, true); + Skeleton.archive1 = class22.newArchive(1, false, true, true); + ObjectSound.archive2 = class22.newArchive(2, true, false, true); + WorldMapIcon1.archive3 = class22.newArchive(3, false, true, true); + WorldMapDecoration.archive4 = class22.newArchive(4, false, true, true); + SecureRandomFuture.archive5 = class22.newArchive(5, true, true, true); + UserComparator3.archive6 = class22.newArchive(6, true, true, true); + class40.archive7 = class22.newArchive(7, false, true, true); + WorldMapSection3.archive8 = class22.newArchive(8, false, true, true); + class238.archive9 = class22.newArchive(9, false, true, true); + class16.archive10 = class22.newArchive(10, false, true, true); + Login.archive11 = class22.newArchive(11, false, true, true); + Formatting.archive12 = class22.newArchive(12, false, true, true); + ByteArrayPool.archive13 = class22.newArchive(13, true, false, true); + class2.archive14 = class22.newArchive(14, false, true, true); + WorldMapSection1.archive15 = class22.newArchive(15, false, true, true); + class22.archive16 = class22.newArchive(17, true, true, true); + WorldMapLabelSize.field1040 = class22.newArchive(18, false, true, true); + ItemContainer.field434 = class22.newArchive(19, false, true, true); + AbstractByteArrayCopier.field0 = class22.newArchive(20, false, true, true); Login.Login_loadingText = "Connecting to update server"; Login.Login_loadingPercent = 20; Client.titleLoadingStage = 40; @@ -240,7 +240,7 @@ public class class171 { boolean var7 = Client.isMembersWorld; Font var8 = ScriptEvent.fontPlain11; ItemDefinition.ItemDefinition_archive = var5; - ItemDefinition.ItemDefinition_modelIndexCache = var6; + ItemDefinition.ItemDefinition_modelArchive = var6; class30.inMembersWorld = var7; class83.field1167 = ItemDefinition.ItemDefinition_archive.method4(10); class204.field1122 = var8; @@ -253,7 +253,7 @@ public class class171 { Archive var12 = ObjectSound.archive2; Archive var13 = class40.archive7; SpotAnimationDefinition.SpotAnimationDefinition_archive = var12; - SpotAnimationDefinition.SpotAnimationDefinition_modelIndexCache = var13; + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var13; UnitPriceComparator.method135(ObjectSound.archive2); Archive var14 = ObjectSound.archive2; VarpDefinition.field943 = var14; diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index 435fc8e614..8be09c4624 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -81,11 +81,11 @@ public final class class22 { signature = "(IZZZB)Lit;", garbageValue = "-15" ) - @Export("newIndexCache") - static Archive newIndexCache(int var0, boolean var1, boolean var2, boolean var3) { + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { ArchiveDisk var4 = null; if (class168.dat2File != null) { - var4 = new ArchiveDisk(var0, class168.dat2File, IndexStoreAction.idxFiles[var0], 1000000); + var4 = new ArchiveDisk(var0, class168.dat2File, ArchiveDiskAction.idxFiles[var0], 1000000); } return new Archive(var4, Fonts.archiveDisk255, var0, var1, var2, var3); diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 85ef654b94..1127161470 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -97,10 +97,10 @@ public class class3 implements Enumerated { ) public static void method41() { while (true) { - NodeDeque var0 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; - IndexStoreAction var1; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - var1 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_responseQueue.removeLast(); + NodeDeque var0 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; + ArchiveDiskAction var1; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + var1 = (ArchiveDiskAction) ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); } if (var1 == null) { diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index 2ce7ee8d41..98eca77335 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -107,7 +107,7 @@ public final class class54 { boolean var8 = false; while (Decimator.method2490()) { - if (IndexStoreAction.field411 == 84) { + if (ArchiveDiskAction.field411 == 84) { var8 = true; } } @@ -253,7 +253,7 @@ public final class class54 { } } - if (IndexStoreAction.field411 == 13) { + if (ArchiveDiskAction.field411 == 13) { Login.loginIndex = 0; Login.Login_username = ""; Login.Login_password = ""; @@ -261,11 +261,11 @@ public final class class54 { Login.otp = ""; Login.field470 = true; } else if (Login.currentLoginField == 0) { - if (IndexStoreAction.field411 == 85 && Login.Login_username.length() > 0) { + if (ArchiveDiskAction.field411 == 85 && Login.Login_username.length() > 0) { Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); } - if (IndexStoreAction.field411 == 84 || IndexStoreAction.field411 == 80) { + if (ArchiveDiskAction.field411 == 84 || ArchiveDiskAction.field411 == 80) { Login.currentLoginField = 1; } @@ -273,15 +273,15 @@ public final class class54 { Login.Login_username = Login.Login_username + GzipDecompressor.field378; } } else if (Login.currentLoginField == 1) { - if (IndexStoreAction.field411 == 85 && Login.Login_password.length() > 0) { + if (ArchiveDiskAction.field411 == 85 && Login.Login_password.length() > 0) { Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); } - if (IndexStoreAction.field411 == 84 || IndexStoreAction.field411 == 80) { + if (ArchiveDiskAction.field411 == 84 || ArchiveDiskAction.field411 == 80) { Login.currentLoginField = 0; } - if (IndexStoreAction.field411 == 84) { + if (ArchiveDiskAction.field411 == 84) { Login.Login_username = Login.Login_username.trim(); if (Login.Login_username.length() == 0) { method1089("", "Please enter your username/email address.", ""); @@ -370,18 +370,18 @@ public final class class54 { } } - if (IndexStoreAction.field411 == 13) { + if (ArchiveDiskAction.field411 == 13) { Login.loginIndex = 0; Login.Login_username = ""; Login.Login_password = ""; class13.otpInt = 0; Login.otp = ""; } else { - if (IndexStoreAction.field411 == 85 && Login.otp.length() > 0) { + if (ArchiveDiskAction.field411 == 85 && Login.otp.length() > 0) { Login.otp = Login.otp.substring(0, Login.otp.length() - 1); } - if (IndexStoreAction.field411 == 84) { + if (ArchiveDiskAction.field411 == 84) { Login.otp.trim(); if (Login.otp.length() != 6) { method1089("", "Please enter a 6-digit PIN.", ""); @@ -432,14 +432,14 @@ public final class class54 { } } - if (IndexStoreAction.field411 == 13) { + if (ArchiveDiskAction.field411 == 13) { MouseHandler.method1084(true); } else { - if (IndexStoreAction.field411 == 85 && Login.Login_username.length() > 0) { + if (ArchiveDiskAction.field411 == 85 && Login.Login_username.length() > 0) { Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); } - if (IndexStoreAction.field411 == 84) { + if (ArchiveDiskAction.field411 == 84) { NPCDefinition.method5162(); return; } @@ -461,7 +461,7 @@ public final class class54 { return; } - } while(IndexStoreAction.field411 != 84 && IndexStoreAction.field411 != 13); + } while(ArchiveDiskAction.field411 != 84 && ArchiveDiskAction.field411 != 13); MouseHandler.method1084(true); } @@ -527,9 +527,9 @@ public final class class54 { } } else { while (Decimator.method2490()) { - if (IndexStoreAction.field411 == 84) { + if (ArchiveDiskAction.field411 == 84) { MouseHandler.method1084(false); - } else if (IndexStoreAction.field411 == 13) { + } else if (ArchiveDiskAction.field411 == 13) { Login.loginIndex = 0; } } @@ -597,16 +597,16 @@ public final class class54 { break; } - if (IndexStoreAction.field411 == 13) { + if (ArchiveDiskAction.field411 == 13) { FontName.closeWorldSelect(); break; } - if (IndexStoreAction.field411 == 96) { + if (ArchiveDiskAction.field411 == 96) { if (Login.worldSelectPage > 0 && SecureRandomFuture.worldSelectLeftSprite != null) { --Login.worldSelectPage; } - } else if (IndexStoreAction.field411 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null) { + } else if (ArchiveDiskAction.field411 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null) { ++Login.worldSelectPage; } } diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index 9d498f0f79..3cfc38e0eb 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -232,7 +232,7 @@ public class class65 extends RouteStrategy { var0.method23(); } - IndexStoreAction.method4553(var0); + ArchiveDiskAction.method4553(var0); ChatChannel.method2225(var0); } }