diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 5a21af8786..48258f6387 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -27,7 +27,7 @@ object ProjectVersions { const val launcherVersion = "2.2.0" const val rlVersion = "1.8.6" - const val openosrsVersion = "4.16.1" + const val openosrsVersion = "4.16.2" const val rsversion = 202 const val cacheversion = 165 diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 187f3cb59f..c03ae171ea 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -3428,7 +3428,7 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { var5.packetBuffer.method7407(VertexNormal.archive18.hash); // L: 3049 var5.packetBuffer.writeInt(class140.archive5.hash); // L: 3050 var5.packetBuffer.writeIntME(class131.archive2.hash); // L: 3051 - var5.packetBuffer.method7407(KeyHandler.field151.hash); // L: 3052 + var5.packetBuffer.method7407(KeyHandler.archive4.hash); // L: 3052 var5.packetBuffer.writeIntME(NetSocket.archive9.hash); // L: 3053 var5.packetBuffer.writeInt(class257.archive10.hash); // L: 3054 var5.packetBuffer.method7407(HealthBarUpdate.archive20.hash); // L: 3055 @@ -4082,7 +4082,7 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { SoundEffect var32 = soundEffects[var1]; // L: 3885 if (var32 == null) { // L: 3886 var10000 = null; // L: 3887 - var32 = SoundEffect.readSoundEffect(KeyHandler.field151, soundEffectIds[var1], 0); + var32 = SoundEffect.readSoundEffect(KeyHandler.archive4, soundEffectIds[var1], 0); if (var32 == null) { // L: 3888 continue; } @@ -4752,7 +4752,7 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { if (var5.stream1 == null) { // L: 5081 if (var5.soundEffectId >= 0) { // L: 5082 var10000 = null; // L: 5083 - SoundEffect var8 = SoundEffect.readSoundEffect(KeyHandler.field151, var5.soundEffectId, 0); + SoundEffect var8 = SoundEffect.readSoundEffect(KeyHandler.archive4, var5.soundEffectId, 0); if (var8 != null) { // L: 5084 RawSound var9 = var8.toRawSound().resample(BoundaryObject.decimator); // L: 5085 RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var7); // L: 5086 @@ -4769,7 +4769,7 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { if (var5.soundEffectIds != null && (var5.field789 -= var4) <= 0) { // L: 5095 int var12 = (int)(Math.random() * (double)var5.soundEffectIds.length); // L: 5096 var10000 = null; // L: 5097 - SoundEffect var13 = SoundEffect.readSoundEffect(KeyHandler.field151, var5.soundEffectIds[var12], 0); + SoundEffect var13 = SoundEffect.readSoundEffect(KeyHandler.archive4, var5.soundEffectIds[var12], 0); if (var13 != null) { // L: 5098 RawSound var14 = var13.toRawSound().resample(BoundaryObject.decimator); // L: 5099 RawPcmStream var11 = RawPcmStream.createRawPcmStream(var14, 100, var7); // L: 5100 diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index 7e3e751002..8521a042f3 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -91,7 +91,8 @@ public final class KeyHandler implements KeyListener, FocusListener { @ObfuscatedSignature( descriptor = "Lkz;" ) - static Archive field151; + @Export("archive4") + static Archive archive4; static { KeyHandler_instance = new KeyHandler(); // L: 14 diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index 2a7bd8f7db..96c568e232 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -83,7 +83,7 @@ public class UrlRequest { class115.archive1.clearFiles(); // L: 3632 class9.archive3.clearFiles(); // L: 3633 class19.archive4.clearFiles(); // L: 3634 - KeyHandler.field151.clearFiles(); // L: 3635 + KeyHandler.archive4.clearFiles(); // L: 3635 class140.archive5.clearFiles(); // L: 3636 WorldMapScaleHandler.archive6.clearFiles(); // L: 3637 class115.archive7.clearFiles(); // L: 3638 diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index 52b68e6675..b7c30ed595 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -72,7 +72,7 @@ public class UserComparator10 extends AbstractUserComparator { class9.archive3 = VarcInt.newArchive(1, false, true, true); // L: 2189 class131.archive2 = VarcInt.newArchive(2, true, false, true); // L: 2190 class19.archive4 = VarcInt.newArchive(3, false, true, true); // L: 2191 - KeyHandler.field151 = VarcInt.newArchive(4, false, true, true); // L: 2192 + KeyHandler.archive4 = VarcInt.newArchive(4, false, true, true); // L: 2192 class140.archive5 = VarcInt.newArchive(5, true, true, true); // L: 2193 WorldMapScaleHandler.archive6 = VarcInt.newArchive(6, true, true, true); // L: 2194 class115.archive7 = VarcInt.newArchive(7, false, true, true); // L: 2195 @@ -97,7 +97,7 @@ public class UserComparator10 extends AbstractUserComparator { var18 += class9.archive3.percentage() * 4 / 100; // L: 2216 var18 += class131.archive2.percentage() * 2 / 100; // L: 2217 var18 += class19.archive4.percentage() * 2 / 100; // L: 2218 - var18 += KeyHandler.field151.percentage() * 6 / 100; // L: 2219 + var18 += KeyHandler.archive4.percentage() * 6 / 100; // L: 2219 var18 += class140.archive5.percentage() * 4 / 100; // L: 2220 var18 += WorldMapScaleHandler.archive6.percentage() * 2 / 100; // L: 2221 var18 += class115.archive7.percentage() * 56 / 100; // L: 2222 @@ -122,7 +122,7 @@ public class UserComparator10 extends AbstractUserComparator { } else { NetFileRequest.method5587(class115.archive1, "Animations"); // L: 2240 NetFileRequest.method5587(class9.archive3, "Skeletons"); // L: 2241 - NetFileRequest.method5587(KeyHandler.field151, "Sound FX"); // L: 2242 + NetFileRequest.method5587(KeyHandler.archive4, "Sound FX"); // L: 2242 NetFileRequest.method5587(class140.archive5, "Maps"); // L: 2243 NetFileRequest.method5587(WorldMapScaleHandler.archive6, "Music Tracks"); // L: 2244 NetFileRequest.method5587(class115.archive7, "Models"); // L: 2245 @@ -152,7 +152,7 @@ public class UserComparator10 extends AbstractUserComparator { JagexCache.pcmPlayer0.setStream(var37); // L: 2271 var2 = class133.archive15; // L: 2272 Archive var39 = ChatChannel.archive14; // L: 2273 - Archive var29 = KeyHandler.field151; // L: 2274 + Archive var29 = KeyHandler.archive4; // L: 2274 class260.musicPatchesArchive = var2; // L: 2276 class331.musicSamplesArchive = var39; // L: 2277 class260.soundEffectsArchive = var29; // L: 2278