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

client: fixed sound export

Browse Source
This commit is contained in:
Justin
2021-12-10 12:40:59 +11:00
parent 57417faf36
commit 74c34114ef
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/kotlin/Dependencies.kt
View File

@@ -27,7 +27,7 @@ object ProjectVersions {
const val launcherVersion = "2.2.0" const val launcherVersion = "2.2.0"
const val rlVersion = "1.8.6" const val rlVersion = "1.8.6"
const val openosrsVersion = "4.16.1" const val openosrsVersion = "4.16.2"
const val rsversion = 202 const val rsversion = 202
const val cacheversion = 165 const val cacheversion = 165

8
runescape-client/src/main/java/Client.java
View File

@@ -3428,7 +3428,7 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens {
var5.packetBuffer.method7407(VertexNormal.archive18.hash); // L: 3049 var5.packetBuffer.method7407(VertexNormal.archive18.hash); // L: 3049
var5.packetBuffer.writeInt(class140.archive5.hash); // L: 3050 var5.packetBuffer.writeInt(class140.archive5.hash); // L: 3050
var5.packetBuffer.writeIntME(class131.archive2.hash); // L: 3051 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.writeIntME(NetSocket.archive9.hash); // L: 3053
var5.packetBuffer.writeInt(class257.archive10.hash); // L: 3054 var5.packetBuffer.writeInt(class257.archive10.hash); // L: 3054
var5.packetBuffer.method7407(HealthBarUpdate.archive20.hash); // L: 3055 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 SoundEffect var32 = soundEffects[var1]; // L: 3885
if (var32 == null) { // L: 3886 if (var32 == null) { // L: 3886
var10000 = null; // L: 3887 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 if (var32 == null) { // L: 3888
continue; continue;
} }
@@ -4752,7 +4752,7 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens {
if (var5.stream1 == null) { // L: 5081 if (var5.stream1 == null) { // L: 5081
if (var5.soundEffectId >= 0) { // L: 5082 if (var5.soundEffectId >= 0) { // L: 5082
var10000 = null; // L: 5083 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 if (var8 != null) { // L: 5084
RawSound var9 = var8.toRawSound().resample(BoundaryObject.decimator); // L: 5085 RawSound var9 = var8.toRawSound().resample(BoundaryObject.decimator); // L: 5085
RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var7); // L: 5086 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 if (var5.soundEffectIds != null && (var5.field789 -= var4) <= 0) { // L: 5095
int var12 = (int)(Math.random() * (double)var5.soundEffectIds.length); // L: 5096 int var12 = (int)(Math.random() * (double)var5.soundEffectIds.length); // L: 5096
var10000 = null; // L: 5097 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 if (var13 != null) { // L: 5098
RawSound var14 = var13.toRawSound().resample(BoundaryObject.decimator); // L: 5099 RawSound var14 = var13.toRawSound().resample(BoundaryObject.decimator); // L: 5099
RawPcmStream var11 = RawPcmStream.createRawPcmStream(var14, 100, var7); // L: 5100 RawPcmStream var11 = RawPcmStream.createRawPcmStream(var14, 100, var7); // L: 5100

3
runescape-client/src/main/java/KeyHandler.java
View File

@@ -91,7 +91,8 @@ public final class KeyHandler implements KeyListener, FocusListener {
@ObfuscatedSignature( @ObfuscatedSignature(
descriptor = "Lkz;" descriptor = "Lkz;"
) )
static Archive field151; @Export("archive4")
static Archive archive4;
static { static {
KeyHandler_instance = new KeyHandler(); // L: 14 KeyHandler_instance = new KeyHandler(); // L: 14

2
runescape-client/src/main/java/UrlRequest.java
View File

@@ -83,7 +83,7 @@ public class UrlRequest {
class115.archive1.clearFiles(); // L: 3632 class115.archive1.clearFiles(); // L: 3632
class9.archive3.clearFiles(); // L: 3633 class9.archive3.clearFiles(); // L: 3633
class19.archive4.clearFiles(); // L: 3634 class19.archive4.clearFiles(); // L: 3634
KeyHandler.field151.clearFiles(); // L: 3635 KeyHandler.archive4.clearFiles(); // L: 3635
class140.archive5.clearFiles(); // L: 3636 class140.archive5.clearFiles(); // L: 3636
WorldMapScaleHandler.archive6.clearFiles(); // L: 3637 WorldMapScaleHandler.archive6.clearFiles(); // L: 3637
class115.archive7.clearFiles(); // L: 3638 class115.archive7.clearFiles(); // L: 3638

8
runescape-client/src/main/java/UserComparator10.java
View File

@@ -72,7 +72,7 @@ public class UserComparator10 extends AbstractUserComparator {
class9.archive3 = VarcInt.newArchive(1, false, true, true); // L: 2189 class9.archive3 = VarcInt.newArchive(1, false, true, true); // L: 2189
class131.archive2 = VarcInt.newArchive(2, true, false, true); // L: 2190 class131.archive2 = VarcInt.newArchive(2, true, false, true); // L: 2190
class19.archive4 = VarcInt.newArchive(3, false, true, true); // L: 2191 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 class140.archive5 = VarcInt.newArchive(5, true, true, true); // L: 2193
WorldMapScaleHandler.archive6 = VarcInt.newArchive(6, true, true, true); // L: 2194 WorldMapScaleHandler.archive6 = VarcInt.newArchive(6, true, true, true); // L: 2194
class115.archive7 = VarcInt.newArchive(7, false, true, true); // L: 2195 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 += class9.archive3.percentage() * 4 / 100; // L: 2216
var18 += class131.archive2.percentage() * 2 / 100; // L: 2217 var18 += class131.archive2.percentage() * 2 / 100; // L: 2217
var18 += class19.archive4.percentage() * 2 / 100; // L: 2218 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 += class140.archive5.percentage() * 4 / 100; // L: 2220
var18 += WorldMapScaleHandler.archive6.percentage() * 2 / 100; // L: 2221 var18 += WorldMapScaleHandler.archive6.percentage() * 2 / 100; // L: 2221
var18 += class115.archive7.percentage() * 56 / 100; // L: 2222 var18 += class115.archive7.percentage() * 56 / 100; // L: 2222
@@ -122,7 +122,7 @@ public class UserComparator10 extends AbstractUserComparator {
} else { } else {
NetFileRequest.method5587(class115.archive1, "Animations"); // L: 2240 NetFileRequest.method5587(class115.archive1, "Animations"); // L: 2240
NetFileRequest.method5587(class9.archive3, "Skeletons"); // L: 2241 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(class140.archive5, "Maps"); // L: 2243
NetFileRequest.method5587(WorldMapScaleHandler.archive6, "Music Tracks"); // L: 2244 NetFileRequest.method5587(WorldMapScaleHandler.archive6, "Music Tracks"); // L: 2244
NetFileRequest.method5587(class115.archive7, "Models"); // L: 2245 NetFileRequest.method5587(class115.archive7, "Models"); // L: 2245
@@ -152,7 +152,7 @@ public class UserComparator10 extends AbstractUserComparator {
JagexCache.pcmPlayer0.setStream(var37); // L: 2271 JagexCache.pcmPlayer0.setStream(var37); // L: 2271
var2 = class133.archive15; // L: 2272 var2 = class133.archive15; // L: 2272
Archive var39 = ChatChannel.archive14; // L: 2273 Archive var39 = ChatChannel.archive14; // L: 2273
Archive var29 = KeyHandler.field151; // L: 2274 Archive var29 = KeyHandler.archive4; // L: 2274
class260.musicPatchesArchive = var2; // L: 2276 class260.musicPatchesArchive = var2; // L: 2276
class331.musicSamplesArchive = var39; // L: 2277 class331.musicSamplesArchive = var39; // L: 2277
class260.soundEffectsArchive = var29; // L: 2278 class260.soundEffectsArchive = var29; // L: 2278