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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2019-11-28 19:34:22 +01:00
parent 05832f5d6e 0d27667720
commit 594d141d9b
63 changed files with 1570 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ public class DevicePcmPlayer extends PcmPlayer {
)
@Export("init")
protected void init() {
this.format = new AudioFormat((float)Messages.field1274, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false);
this.format = new AudioFormat((float)Messages.PcmPlayer_sampleRate, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false);
this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)];
}

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

@@ -136,7 +136,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
)
public static final void method170(int var0, boolean var1, int var2) {
if (var0 >= 8000 && var0 <= 48000) {
Messages.field1274 = var0;
Messages.PcmPlayer_sampleRate = var0;
PcmPlayer.PcmPlayer_stereo = var1;
RouteStrategy.field2114 = var2;
} else {

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

@@ -174,7 +174,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
class60.pcmPlayer1 = HealthBarUpdate.method1776(GameShell.taskHandler, 1, 2048);
ClientPacket.pcmStreamMixer = new PcmStreamMixer();
class60.pcmPlayer1.setStream(ClientPacket.pcmStreamMixer);
LoginScreenAnimation.decimator = new Decimator(22050, Messages.field1274);
LoginScreenAnimation.decimator = new Decimator(22050, Messages.PcmPlayer_sampleRate);
Login.Login_loadingText = "Prepared sound engine";
Login.Login_loadingPercent = 35;
Client.titleLoadingStage = 50;

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

@@ -78,7 +78,7 @@ public class HealthBarUpdate extends Node {
garbageValue = "148025221"
)
public static final PcmPlayer method1776(TaskHandler var0, int var1, int var2) {
if (Messages.field1274 == 0) {
if (Messages.PcmPlayer_sampleRate == 0) {
throw new IllegalStateException();
} else if (var1 >= 0 && var1 < 2) {
if (var2 < 256) {

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

@@ -138,12 +138,12 @@ public class JagexCache {
int var6 = (var3 - 32 - var5) * var2 / (var4 - var3);
Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field706);
Rasterizer2D.rasterizerDrawVerticalLine(var0, var6 + var1 + 16, var5, Client.field708);
Rasterizer2D.rasterizerDrawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field708);
Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field708);
Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field708);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field708);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field708);
Rasterizer2D.rasterizerDrawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field707);
Rasterizer2D.rasterizerDrawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field707);
Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field707);
Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field707);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field707);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field707);
}

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

@@ -35,7 +35,8 @@ public class Messages {
@ObfuscatedGetter(
intValue = -1088425627
)
public static int field1274;
@Export("PcmPlayer_sampleRate")
public static int PcmPlayer_sampleRate;
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "Lat;"

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

@@ -245,7 +245,7 @@ public class MidiPcmStream extends PcmStream {
@Export("fill")
protected synchronized void fill(int[] var1, int var2, int var3) {
if (this.midiFile.isReady()) {
int var4 = this.midiFile.division * this.field2419 * -727379968 / Messages.field1274;
int var4 = this.midiFile.division * this.field2419 * -727379968 / Messages.PcmPlayer_sampleRate;
do {
long var5 = this.field2431 + (long)var4 * (long)var3;
@@ -294,7 +294,7 @@ public class MidiPcmStream extends PcmStream {
@Export("skip")
protected synchronized void skip(int var1) {
if (this.midiFile.isReady()) {
int var2 = this.midiFile.division * this.field2419 * -727379968 / Messages.field1274;
int var2 = this.midiFile.division * this.field2419 * -727379968 / Messages.PcmPlayer_sampleRate;
do {
long var3 = this.field2431 + (long)var2 * (long)var1;
@@ -519,7 +519,7 @@ public class MidiPcmStream extends PcmStream {
for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
if (var1 < 0 || var2.field2449 == var1) {
if (var2.stream != null) {
var2.stream.method2582(Messages.field1274 / 100);
var2.stream.method2582(Messages.PcmPlayer_sampleRate / 100);
if (var2.stream.method2686()) {
this.patchStream.mixer.addSubStream(var2.stream);
}
@@ -858,7 +858,7 @@ public class MidiPcmStream extends PcmStream {
var2 += (int)(var6 * (double)var4);
}
var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)Messages.field1274 + 0.5D);
var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)Messages.PcmPlayer_sampleRate + 0.5D);
return var4 < 1 ? 1 : var4;
}
@@ -990,7 +990,7 @@ public class MidiPcmStream extends PcmStream {
garbageValue = "178317578"
)
boolean method3802(MusicPatchNode var1, int[] var2, int var3, int var4) {
var1.field2464 = Messages.field1274 / 100;
var1.field2464 = Messages.PcmPlayer_sampleRate / 100;
if (var1.field2459 < 0 || var1.stream != null && !var1.stream.method2585()) {
int var5 = var1.field2455;
if (var5 > 0) {

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

@@ -41,7 +41,7 @@ public class MusicPatchPcmStream extends PcmStream {
)
void method3962(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) {
if ((this.superStream.field2428[var1.field2449] & 4) != 0 && var1.field2459 < 0) {
int var6 = this.superStream.field2433[var1.field2449] / Messages.field1274;
int var6 = this.superStream.field2433[var1.field2449] / Messages.PcmPlayer_sampleRate;
while (true) {
int var7 = (var6 + 1048575 - var1.field2463) / var6;
@@ -54,7 +54,7 @@ public class MusicPatchPcmStream extends PcmStream {
var3 += var7;
var4 -= var7;
var1.field2463 += var7 * var6 - 1048576;
int var8 = Messages.field1274 / 100;
int var8 = Messages.PcmPlayer_sampleRate / 100;
int var9 = 262144 / var6;
if (var9 < var8) {
var8 = var9;
@@ -91,7 +91,7 @@ public class MusicPatchPcmStream extends PcmStream {
)
void method3959(MusicPatchNode var1, int var2) {
if ((this.superStream.field2428[var1.field2449] & 4) != 0 && var1.field2459 < 0) {
int var3 = this.superStream.field2433[var1.field2449] / Messages.field1274;
int var3 = this.superStream.field2433[var1.field2449] / Messages.PcmPlayer_sampleRate;
int var4 = (var3 + 1048575 - var1.field2463) / var3;
var1.field2463 = var3 * var2 + var1.field2463 & 1048575;
if (var4 <= var2) {

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

@@ -263,7 +263,7 @@ public class PcmPlayer {
while (var1 > 5000L + this.timeMs) {
this.skip(256);
this.timeMs += (long)(256000 / Messages.field1274);
this.timeMs += (long)(256000 / Messages.PcmPlayer_sampleRate);
}
} catch (Exception var6) {
this.timeMs = var1;
@@ -359,7 +359,7 @@ public class PcmPlayer {
class300.clearIntArray(var1, 0, var3);
this.field1409 -= var2;
if (this.stream != null && this.field1409 <= 0) {
this.field1409 += Messages.field1274 >> 4;
this.field1409 += Messages.PcmPlayer_sampleRate >> 4;
class1.PcmStream_disable(this.stream);
this.method2452(this.stream, this.stream.vmethod2741());
int var4 = 0;

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

@@ -609,8 +609,8 @@ public class Rasterizer2D extends DualNode {
public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) {
Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4);
Rasterizer2D_drawHorizontalLine(var0, var3 + var1 - 1, var2, var4);
rasterizerDrawVerticalLine(var0, var1, var3, var4);
rasterizerDrawVerticalLine(var0 + var2 - 1, var1, var3, var4);
Rasterizer2D_drawVerticalLine(var0, var1, var3, var4);
Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4);
}
@ObfuscatedName("df")
@@ -679,7 +679,7 @@ public class Rasterizer2D extends DualNode {
@ObfuscatedName("eg")
@Export("Rasterizer2D_drawVerticalLine")
public static void rasterizerDrawVerticalLine(int var0, int var1, int var2, int var3) {
public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) {
if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) {
if (var1 < Rasterizer2D_yClipStart) {
var2 -= Rasterizer2D_yClipStart - var1;
@@ -744,9 +744,9 @@ public class Rasterizer2D extends DualNode {
} else if (var2 == 0) {
if (var3 >= 0) {
rasterizerDrawVerticalLine(var0, var1, var3 + 1, var4);
Rasterizer2D_drawVerticalLine(var0, var1, var3 + 1, var4);
} else {
rasterizerDrawVerticalLine(var0, var3 + var1, -var3 + 1, var4);
Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4);
}
} else {

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

@@ -846,7 +846,7 @@ public class RawPcmStream extends PcmStream {
)
@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)(Messages.field1274 * 100)), var2 << 6) : null;
return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(Messages.PcmPlayer_sampleRate * 100)), var2 << 6) : null;
}
@ObfuscatedName("g")

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

@@ -897,7 +897,7 @@ public class WorldMapRegion {
void method469(int var1, int var2, int var3, int var4) {
var3 %= 4;
if (var3 == 0) {
Rasterizer2D.rasterizerDrawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
}
if (var3 == 1) {
@@ -905,7 +905,7 @@ public class WorldMapRegion {
}
if (var3 == 2) {
Rasterizer2D.rasterizerDrawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
}
if (var3 == 3) {