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

Fix api for upstream merge

Browse Source
This commit is contained in:
Lucas
2019-06-26 22:05:00 +02:00
parent c6855aa648
commit f8ad72c4cd
31 changed files with 135 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runescape-client/src/main/java/Bzip2State.java
View File

@@ -58,7 +58,6 @@ public final class Bzip2State {
@ObfuscatedGetter(
intValue = 1860254567
)
@Export("surfaceOffsetY")
int __n;
@ObfuscatedName("i")
@Export("__i")

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

@@ -296,8 +296,8 @@ public final class Client extends GameShell implements Usernamed {
@Export("indexCacheLoaderIndex")
static int indexCacheLoaderIndex;
@ObfuscatedName("qn")
@Export("unknownSoundValues1")
static int[] unknownSoundValues1;
@Export("queuedSoundEffectLoops")
static int[] queuedSoundEffectLoops;
@ObfuscatedName("qd")
@Export("queuedSoundEffectDelays")
static int[] queuedSoundEffectDelays;
@@ -380,8 +380,8 @@ public final class Client extends GameShell implements Usernamed {
@ObfuscatedGetter(
intValue = -1352723865
)
@Export("__client_qp")
static int __client_qp;
@Export("soundEffectVolume")
static int soundEffectVolume;
@ObfuscatedName("rm")
@Export("__client_rm")
static short __client_rm;
@@ -1602,11 +1602,11 @@ public final class Client extends GameShell implements Usernamed {
__client_qf = 255;
__client_qy = -1;
__client_qq = false;
__client_qp = 127;
soundEffectVolume = 127;
__client_qc = 127;
soundEffectCount = 0;
soundEffectIds = new int[50];
unknownSoundValues1 = new int[50];
queuedSoundEffectLoops = new int[50];
queuedSoundEffectDelays = new int[50];
soundLocations = new int[50];
soundEffects = new SoundEffect[50];
@@ -4803,8 +4803,8 @@ public final class Client extends GameShell implements Usernamed {
SoundEffect var16 = SoundEffect.readSoundEffect(class25.indexCache4, var15.soundEffectId, 0);
if(var16 != null) {
RawSound var17 = var16.toRawSound().resample(MilliClock.decimator);
RawPcmStream var18 = RawPcmStream.method2497(var17, 100, var7);
var18.__x_181(-1);
RawPcmStream var18 = RawPcmStream.createRawPcmStream(var17, 100, var7);
var18.setNumLoops(-1);
TaskHandler.pcmStreamMixer.addSubStream(var18);
var15.stream1 = var18;
}
@@ -4820,8 +4820,8 @@ public final class Client extends GameShell implements Usernamed {
SoundEffect var20 = SoundEffect.readSoundEffect(class25.indexCache4, var15.soundEffectIds[var8], 0);
if(var20 != null) {
RawSound var21 = var20.toRawSound().resample(MilliClock.decimator);
RawPcmStream var19 = RawPcmStream.method2497(var21, 100, var7);
var19.__x_181(0);
RawPcmStream var19 = RawPcmStream.createRawPcmStream(var21, 100, var7);
var19.setNumLoops(0);
TaskHandler.pcmStreamMixer.addSubStream(var19);
var15.stream2 = var19;
var15.__n = var15.__x + (int)(Math.random() * (double)(var15.__d - var15.__x));

1
runescape-client/src/main/java/HitSplatDefinition.java
View File

@@ -53,7 +53,6 @@ public class HitSplatDefinition extends DualNode {
@ObfuscatedGetter(
intValue = -1151968735
)
@Export("surfaceOffsetY")
public int __n;
@ObfuscatedName("i")
@ObfuscatedGetter(

4
runescape-client/src/main/java/Ignored.java
View File

@@ -48,9 +48,9 @@ public class Ignored extends User {
)
@Export("queueSoundEffect")
static void queueSoundEffect(int var0, int var1, int var2) {
if(Client.__client_qp != 0 && var1 != 0 && Client.soundEffectCount < 50) {
if(Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) {
Client.soundEffectIds[Client.soundEffectCount] = var0;
Client.unknownSoundValues1[Client.soundEffectCount] = var1;
Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1;
Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2;
Client.soundEffects[Client.soundEffectCount] = null;
Client.soundLocations[Client.soundEffectCount] = 0;

10
runescape-client/src/main/java/IndexCache.java
View File

@@ -480,23 +480,23 @@ public class IndexCache extends AbstractIndexCache {
if(var4 == 4) {
if(var2 == 0) {
Client.__client_qp = 127;
Client.soundEffectVolume = 127;
}
if(var2 == 1) {
Client.__client_qp = 96;
Client.soundEffectVolume = 96;
}
if(var2 == 2) {
Client.__client_qp = 64;
Client.soundEffectVolume = 64;
}
if(var2 == 3) {
Client.__client_qp = 32;
Client.soundEffectVolume = 32;
}
if(var2 == 4) {
Client.__client_qp = 0;
Client.soundEffectVolume = 0;
}
}

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

@@ -50,7 +50,6 @@ public class MidiPcmStream extends PcmStream {
@Export("__k")
int[] __k;
@ObfuscatedName("n")
@Export("surfaceOffsetY")
int[] __n;
@ObfuscatedName("y")
@Export("__y")
@@ -435,7 +434,7 @@ public class MidiPcmStream extends PcmStream {
}
if(var9.__q[var2] < 0) {
var6.stream.__x_181(-1);
var6.stream.setNumLoops(-1);
}
if(var6.__o >= 0) {

1
runescape-client/src/main/java/MusicPatchNode.java
View File

@@ -89,7 +89,6 @@ public class MusicPatchNode extends Node {
@ObfuscatedGetter(
intValue = 476852577
)
@Export("surfaceOffsetY")
int __n;
@ObfuscatedName("i")
@ObfuscatedGetter(

4
runescape-client/src/main/java/MusicPatchPcmStream.java
View File

@@ -78,7 +78,7 @@ public class MusicPatchPcmStream extends PcmStream {
}
if(var1.patch.__q[var1.__u] < 0) {
var1.stream.__x_181(-1);
var1.stream.setNumLoops(-1);
}
var10.__v_192(var8);
@@ -112,7 +112,7 @@ public class MusicPatchPcmStream extends PcmStream {
}
if(var1.patch.__q[var1.__u] < 0) {
var1.stream.__x_181(-1);
var1.stream.setNumLoops(-1);
}
var2 = var1.__b / var3;

1
runescape-client/src/main/java/ObjectSound.java
View File

@@ -86,7 +86,6 @@ public final class ObjectSound extends Node {
@ObfuscatedGetter(
intValue = -1041508847
)
@Export("surfaceOffsetY")
int __n;
@ObfuscatedName("i")
@ObfuscatedSignature(

1
runescape-client/src/main/java/Occluder.java
View File

@@ -83,7 +83,6 @@ public final class Occluder {
@ObfuscatedGetter(
intValue = -407777817
)
@Export("surfaceOffsetY")
int __n;
@ObfuscatedName("i")
@ObfuscatedGetter(

1
runescape-client/src/main/java/PacketWriter.java
View File

@@ -87,7 +87,6 @@ public class PacketWriter {
@ObfuscatedSignature(
signature = "Lge;"
)
@Export("surfaceOffsetY")
ServerPacket __n;
@ObfuscatedName("i")
@ObfuscatedSignature(

74
runescape-client/src/main/java/RawPcmStream.java
View File

@@ -28,8 +28,8 @@ public class RawPcmStream extends PcmStream {
@Export("__l")
int __l;
@ObfuscatedName("e")
@Export("__e")
int __e;
@Export("numLoops")
int numLoops;
@ObfuscatedName("x")
@Export("start")
int start;
@@ -40,7 +40,6 @@ public class RawPcmStream extends PcmStream {
@Export("__k")
boolean __k;
@ObfuscatedName("n")
@Export("surfaceOffsetY")
int __n;
@ObfuscatedName("i")
@Export("__i")
@@ -122,7 +121,7 @@ public class RawPcmStream extends PcmStream {
int var7 = var4.samples.length << 8;
int var8 = var6 - var5;
if(var8 <= 0) {
this.__e = 0;
this.numLoops = 0;
}
int var9 = var2;
@@ -147,7 +146,7 @@ public class RawPcmStream extends PcmStream {
this.__m = var7 - 1;
}
if(this.__e < 0) {
if(this.numLoops < 0) {
if(this.__k) {
if(this.__f < 0) {
var9 = this.__ap_203(var1, var2, var5, var3, var4.samples[this.start]);
@@ -195,7 +194,7 @@ public class RawPcmStream extends PcmStream {
}
}
} else {
if(this.__e > 0) {
if(this.numLoops > 0) {
if(this.__k) {
label140: {
if(this.__f < 0) {
@@ -206,7 +205,7 @@ public class RawPcmStream extends PcmStream {
this.__m = var5 + var5 - 1 - this.__m;
this.__f = -this.__f;
if(--this.__e == 0) {
if(--this.numLoops == 0) {
break label140;
}
}
@@ -219,7 +218,7 @@ public class RawPcmStream extends PcmStream {
this.__m = var6 + var6 - 1 - this.__m;
this.__f = -this.__f;
if(--this.__e == 0) {
if(--this.numLoops == 0) {
break;
}
@@ -230,7 +229,7 @@ public class RawPcmStream extends PcmStream {
this.__m = var5 + var5 - 1 - this.__m;
this.__f = -this.__f;
} while(--this.__e != 0);
} while(--this.numLoops != 0);
}
} else {
int var10;
@@ -242,14 +241,14 @@ public class RawPcmStream extends PcmStream {
}
var10 = (var6 - 1 - this.__m) / var8;
if(var10 >= this.__e) {
this.__m += var8 * this.__e;
this.__e = 0;
if(var10 >= this.numLoops) {
this.__m += var8 * this.numLoops;
this.numLoops = 0;
break;
}
this.__m += var8 * var10;
this.__e -= var10;
this.numLoops -= var10;
}
} else {
while(true) {
@@ -259,14 +258,14 @@ public class RawPcmStream extends PcmStream {
}
var10 = (this.__m - var5) / var8;
if(var10 >= this.__e) {
this.__m -= var8 * this.__e;
this.__e = 0;
if(var10 >= this.numLoops) {
this.__m -= var8 * this.numLoops;
this.numLoops = 0;
break;
}
this.__m -= var8 * var10;
this.__e -= var10;
this.numLoops -= var10;
}
}
}
@@ -293,9 +292,9 @@ public class RawPcmStream extends PcmStream {
}
@ObfuscatedName("x")
@Export("__x_181")
public synchronized void __x_181(int var1) {
this.__e = var1;
@Export("setNumLoops")
public synchronized void setNumLoops(int var1) {
this.numLoops = var1;
}
@ObfuscatedName("d")
@@ -327,7 +326,7 @@ public class RawPcmStream extends PcmStream {
int var5 = var2.samples.length << 8;
int var6 = var4 - var3;
if(var6 <= 0) {
this.__e = 0;
this.numLoops = 0;
}
if(this.__m < 0) {
@@ -351,7 +350,7 @@ public class RawPcmStream extends PcmStream {
}
this.__m += this.__f * var1;
if(this.__e < 0) {
if(this.numLoops < 0) {
if(!this.__k) {
if(this.__f < 0) {
if(this.__m >= var3) {
@@ -390,7 +389,7 @@ public class RawPcmStream extends PcmStream {
}
} else {
if(this.__e > 0) {
if(this.numLoops > 0) {
if(this.__k) {
label123: {
if(this.__f < 0) {
@@ -400,7 +399,7 @@ public class RawPcmStream extends PcmStream {
this.__m = var3 + var3 - 1 - this.__m;
this.__f = -this.__f;
if(--this.__e == 0) {
if(--this.numLoops == 0) {
break label123;
}
}
@@ -412,7 +411,7 @@ public class RawPcmStream extends PcmStream {
this.__m = var4 + var4 - 1 - this.__m;
this.__f = -this.__f;
if(--this.__e == 0) {
if(--this.numLoops == 0) {
break;
}
@@ -422,7 +421,7 @@ public class RawPcmStream extends PcmStream {
this.__m = var3 + var3 - 1 - this.__m;
this.__f = -this.__f;
} while(--this.__e != 0);
} while(--this.numLoops != 0);
}
} else {
int var7;
@@ -432,28 +431,28 @@ public class RawPcmStream extends PcmStream {
}
var7 = (var4 - 1 - this.__m) / var6;
if(var7 < this.__e) {
if(var7 < this.numLoops) {
this.__m += var6 * var7;
this.__e -= var7;
this.numLoops -= var7;
return;
}
this.__m += var6 * this.__e;
this.__e = 0;
this.__m += var6 * this.numLoops;
this.numLoops = 0;
} else {
if(this.__m < var4) {
return;
}
var7 = (this.__m - var3) / var6;
if(var7 < this.__e) {
if(var7 < this.numLoops) {
this.__m -= var6 * var7;
this.__e -= var7;
this.numLoops -= var7;
return;
}
this.__m -= var6 * this.__e;
this.__e = 0;
this.__m -= var6 * this.numLoops;
this.numLoops = 0;
}
}
}
@@ -779,9 +778,9 @@ public class RawPcmStream extends PcmStream {
int __az_179() {
int var1 = this.__u * 3 >> 6;
var1 = (var1 ^ var1 >> 31) + (var1 >>> 31);
if(this.__e == 0) {
if(this.numLoops == 0) {
var1 -= var1 * this.__m / (((RawSound)super.sound).samples.length << 8);
} else if(this.__e >= 0) {
} else if(this.numLoops >= 0) {
var1 -= var1 * this.start / ((RawSound)super.sound).samples.length;
}
@@ -872,7 +871,8 @@ public class RawPcmStream extends PcmStream {
@ObfuscatedSignature(
signature = "(Lcx;II)Lds;"
)
public static RawPcmStream method2497(RawSound var0, int var1, int var2) {
@Export("createRawPcmStream")
public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) {
return var0.samples != null && var0.samples.length != 0?new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(class309.PcmPlayer_sampleRate * 100)), var2 << 6):null;
}

14
runescape-client/src/main/java/Scene.java
View File

@@ -82,8 +82,8 @@ public class Scene {
@Export("Scene_selectedY")
public static int Scene_selectedY;
@ObfuscatedName("ab")
@Export("__em_ab")
static boolean __em_ab;
@Export("viewportWalking")
static boolean viewportWalking;
@ObfuscatedName("ad")
@Export("Scene_planesCount")
static int Scene_planesCount;
@@ -207,7 +207,7 @@ public class Scene {
Scene_selectedScreenY = 0;
Scene_selectedX = -1;
Scene_selectedY = -1;
__em_ab = false;
viewportWalking = false;
Scene_planesCount = 4;
Scene_planeOccluderCounts = new int[Scene_planesCount];
Scene_planeOccluders = new Occluder[Scene_planesCount][500];
@@ -1066,7 +1066,7 @@ public class Scene {
public void menuOpen(int var1, int var2, int var3, boolean var4) {
if(!method3187() || var4) {
checkClick = true;
__em_ab = var4;
viewportWalking = var4;
Scene_selectedPlane = var1;
Scene_selectedScreenX = var2;
Scene_selectedScreenY = var3;
@@ -1078,7 +1078,7 @@ public class Scene {
@ObfuscatedName("as")
@Export("__as_250")
public void __as_250() {
__em_ab = true;
viewportWalking = true;
}
@ObfuscatedName("az")
@@ -2561,13 +2561,13 @@ public class Scene {
@ObfuscatedName("am")
public static boolean method3187() {
return __em_ab && Scene_selectedX != -1;
return viewportWalking && Scene_selectedX != -1;
}
@ObfuscatedName("an")
public static void method3103() {
Scene_selectedX = -1;
__em_ab = false;
viewportWalking = false;
}
@ObfuscatedName("ax")

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

@@ -124,7 +124,7 @@ public class Script extends DualNode {
int var6 = var4 >> 4 & 7;
int var7 = var4 & 15;
Client.soundEffectIds[Client.soundEffectCount] = var5;
Client.unknownSoundValues1[Client.soundEffectCount] = var6;
Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6;
Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0;
Client.soundEffects[Client.soundEffectCount] = null;
int var8 = (var2 - 64) / 128;

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

@@ -10,13 +10,10 @@ import net.runelite.mapping.ObfuscatedSignature;
@Implements("WorldMapAreaData")
public class WorldMapAreaData extends WorldMapArea {
@ObfuscatedName("n")
@Export("surfaceOffsetY")
HashSet __n;
@ObfuscatedName("i")
@Export("__i")
HashSet __i;
@ObfuscatedName("a")
@Export("__a")
List __a;
@ObfuscatedName("ce")

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

@@ -171,13 +171,13 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
var2 = (var3 - var8) * Client.__client_qc / var3;
} else {
var2 = Client.__client_qp;
var2 = Client.soundEffectVolume;
}
if(var2 > 0) {
RawSound var10 = var9.toRawSound().resample(MilliClock.decimator);
RawPcmStream var11 = RawPcmStream.method2497(var10, 100, var2);
var11.__x_181(Client.unknownSoundValues1[var0] - 1);
RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2);
var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1);
TaskHandler.pcmStreamMixer.addSubStream(var11);
}
@@ -189,7 +189,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
for(int var1 = var0; var1 < Client.soundEffectCount; ++var1) {
Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1];
Client.soundEffects[var1] = Client.soundEffects[var1 + 1];
Client.unknownSoundValues1[var1] = Client.unknownSoundValues1[var1 + 1];
Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1];
Client.queuedSoundEffectDelays[var1] = Client.queuedSoundEffectDelays[var1 + 1];
Client.soundLocations[var1] = Client.soundLocations[var1 + 1];
}

1
runescape-client/src/main/java/WorldMapSection0.java
View File

@@ -92,7 +92,6 @@ public class WorldMapSection0 implements WorldMapSection {
@ObfuscatedGetter(
intValue = -1657956317
)
@Export("surfaceOffsetY")
int __n;
@ObfuscatedName("i")
@ObfuscatedGetter(

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

@@ -208,7 +208,7 @@ public class class16 {
var10 = var7 + 1;
if(Canvas.localPlayer.pathX[0] >= var3 - var10 && Canvas.localPlayer.pathX[0] <= var10 + var3 && Canvas.localPlayer.pathY[0] >= var38 - var10 && Canvas.localPlayer.pathY[0] <= var10 + var38 && Client.__client_qc != 0 && var8 > 0 && Client.soundEffectCount < 50) {
Client.soundEffectIds[Client.soundEffectCount] = var9;
Client.unknownSoundValues1[Client.soundEffectCount] = var8;
Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8;
Client.queuedSoundEffectDelays[Client.soundEffectCount] = var5;
Client.soundEffects[Client.soundEffectCount] = null;
Client.soundLocations[Client.soundEffectCount] = var7 + (var38 << 8) + (var3 << 16);