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

more RSClient refactoring

Browse Source
This commit is contained in:
Lucas
2019-07-08 22:41:26 +02:00
parent 112a2bcba7
commit ad565d3991
80 changed files with 714 additions and 667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runelite-mixins/src/main/java/net/runelite/mixins/ClickboxMixin.java
View File

@@ -40,8 +40,7 @@ public abstract class ClickboxMixin implements RSClient
return;
}
boolean bb = boundingboxCheck(model, _x, _y, _z);
if (!bb)
if (!boundingboxCheck(model, _x, _y, _z))
{
return;
}

8
runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java
View File

@@ -27,13 +27,13 @@ public abstract class RSRasterizer2DMixin implements RSClient
pixels[index] = value & 0x00FFFFFF | outAlpha << 24;
}
@Copy("drawGradientAlpha")
private static void rs$raster2d6(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7)
@Copy("Rasterizer2D_fillRectangleGradientAlpha")
private static void rs$drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7)
{
throw new RuntimeException();
}
@Replace("drawGradientAlpha")
@Replace("Rasterizer2D_fillRectangleGradientAlpha")
private static void rl$drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7)
{
final int width = client.getGraphicsPixelsWidth();
@@ -45,7 +45,7 @@ public abstract class RSRasterizer2DMixin implements RSClient
if (!client.isGpu())
{
rs$raster2d6(var0, var1, var2, var3, var4, var5, var6, var7);
rs$drawGradientAlpha(var0, var1, var2, var3, var4, var5, var6, var7);
return;
}

2
runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
View File

@@ -978,7 +978,7 @@ public interface RSClient extends RSGameShell, Client
@Import("Rasterizer2D_drawVerticalLine")
void rasterizerDrawVerticalLine(int x, int y, int h, int rgb);
@Import("Rasterizer2D_drawGradient")
@Import("Rasterizer2D_fillRectangleGradient")
void rasterizerDrawGradient(int x, int y, int w, int h, int rgbTop, int rgbBottom);
@Import("Rasterizer2D_fillRectangleAlpha")

2
runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapManager.java
View File

@@ -5,7 +5,7 @@ import net.runelite.mapping.Import;
public interface RSWorldMapManager extends WorldMapManager
{
@Import("isLoaded0")
@Import("isLoaded")
@Override
boolean isLoaded();

16
runescape-client/src/main/java/AbstractArchive.java
View File

@@ -97,9 +97,9 @@ public abstract class AbstractArchive {
@Export("shallowFiles")
boolean shallowFiles;
AbstractArchive(boolean var1, boolean var2) {
this.releaseGroups = var1;
this.shallowFiles = var2;
AbstractArchive(boolean releaseGroups, boolean shallowFiles) {
this.releaseGroups = releaseGroups;
this.shallowFiles = shallowFiles;
}
@ObfuscatedName("m")
@@ -446,8 +446,9 @@ public abstract class AbstractArchive {
signature = "(II)I",
garbageValue = "1178362496"
)
public int method4(int var1) {
return this.files[var1].length;
@Export("getGroupFileCount")
public int getGroupFileCount(int group) {
return this.files[group].length;
}
@ObfuscatedName("t")
@@ -455,7 +456,8 @@ public abstract class AbstractArchive {
signature = "(I)I",
garbageValue = "1702434573"
)
public int method5() {
@Export("getGroupCount")
public int getGroupCount() {
return this.files.length;
}
@@ -751,7 +753,7 @@ public abstract class AbstractArchive {
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()) {
if (!var0.isLoaded()) {
return false;
}

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

@@ -13,7 +13,8 @@ public abstract class AbstractByteArrayCopier {
@ObfuscatedSignature(
signature = "Lit;"
)
static Archive field0;
@Export("archive20")
static Archive archive20;
@ObfuscatedName("m")
@ObfuscatedSignature(

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

@@ -169,6 +169,6 @@ public abstract class AbstractWorldMapIcon {
static void method625(Archive var0, String var1) {
ArchiveLoader var2 = new ArchiveLoader(var0, var1);
Client.archiveLoaders.add(var2);
Client.field140 += var2.field408;
Client.field140 += var2.groupCount;
}
}

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

@@ -79,19 +79,19 @@ public class Animation {
}
if ((var9 & 1) != 0) {
field27[var7] = var4.method47();
field27[var7] = var4.readShortSmart();
} else {
field27[var7] = var11;
}
if ((var9 & 2) != 0) {
field28[var7] = var4.method47();
field28[var7] = var4.readShortSmart();
} else {
field28[var7] = var11;
}
if ((var9 & 4) != 0) {
field29[var7] = var4.method47();
field29[var7] = var4.readShortSmart();
} else {
field29[var7] = var11;
}

44
runescape-client/src/main/java/Archive.java
View File

@@ -57,14 +57,14 @@ public class Archive extends AbstractArchive {
@ObfuscatedSignature(
signature = "(Lff;Lff;IZZZ)V"
)
public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) {
super(var4, var5);
public Archive(ArchiveDisk archiveDisk, ArchiveDisk masterDisk, int index, boolean releaseGroups, boolean shallowFiles, boolean var6) {
super(releaseGroups, shallowFiles);
this.field403 = false;
this.field404 = false;
this.field405 = -1;
this.archiveDisk = var1;
this.masterDisk = var2;
this.index = var3;
this.archiveDisk = archiveDisk;
this.masterDisk = masterDisk;
this.index = index;
this.field404 = var6;
int var7 = this.index;
if (Players.NetCache_reference != null) {
@@ -240,26 +240,26 @@ public class Archive extends AbstractArchive {
garbageValue = "-2045340856"
)
@Export("load")
void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
void load(ArchiveDisk var1, int group, byte[] data, boolean var4) {
int var5;
if (var1 == this.masterDisk) {
if (this.field403) {
throw new RuntimeException();
}
if (var3 == null) {
if (data == null) {
PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
} else {
Archive_crc.reset();
Archive_crc.update(var3, 0, var3.length);
Archive_crc.update(data, 0, data.length);
var5 = (int)Archive_crc.getValue();
if (var5 != this.indexCrc) {
PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
} else {
Buffer var6 = new Buffer(Strings.decompressBytes(var3));
Buffer var6 = new Buffer(Strings.decompressBytes(data));
int var7 = var6.readUnsignedByte();
if (var7 != 5 && var7 != 6) {
throw new RuntimeException(var7 + "," + this.index + "," + var2);
throw new RuntimeException(var7 + "," + this.index + "," + group);
}
int var8 = 0;
@@ -270,36 +270,36 @@ public class Archive extends AbstractArchive {
if (var8 != this.indexVersion) {
PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
} else {
this.decodeIndex(var3);
this.decodeIndex(data);
this.loadAllLocal();
}
}
}
} else {
if (!var4 && var2 == this.field405) {
if (!var4 && group == this.field405) {
this.field403 = true;
}
if (var3 != null && var3.length > 2) {
if (data != null && data.length > 2) {
Archive_crc.reset();
Archive_crc.update(var3, 0, var3.length - 2);
Archive_crc.update(data, 0, data.length - 2);
var5 = (int)Archive_crc.getValue();
int var9 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255);
if (var5 == super.groupCrcs[var2] && var9 == super.groupVersions[var2]) {
this.validGroups[var2] = true;
int var9 = ((data[data.length - 2] & 255) << 8) + (data[data.length - 1] & 255);
if (var5 == super.groupCrcs[group] && var9 == super.groupVersions[group]) {
this.validGroups[group] = true;
if (var4) {
super.groups[var2] = Projectile.byteArrayToObject(var3, false);
super.groups[group] = Projectile.byteArrayToObject(data, false);
}
} else {
this.validGroups[var2] = false;
this.validGroups[group] = false;
if (this.field404 || var4) {
PacketBuffer.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
PacketBuffer.requestNetFile(this, this.index, group, super.groupCrcs[group], (byte)2, var4);
}
}
} else {
this.validGroups[var2] = false;
this.validGroups[group] = false;
if (this.field404 || var4) {
PacketBuffer.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
PacketBuffer.requestNetFile(this, this.index, group, super.groupCrcs[group], (byte)2, var4);
}
}
}

29
runescape-client/src/main/java/ArchiveLoader.java
View File

@@ -38,20 +38,22 @@ public class ArchiveLoader {
@ObfuscatedGetter(
intValue = 1459455501
)
final int field408;
@Export("groupCount")
final int groupCount;
@ObfuscatedName("w")
@ObfuscatedGetter(
intValue = 782003089
)
int field409;
@Export("loadedCount")
int loadedCount;
@ObfuscatedSignature(
signature = "(Lit;Ljava/lang/String;)V"
)
ArchiveLoader(Archive var1, String var2) {
this.field409 = 0;
this.archive = var1;
this.field408 = var1.method5();
ArchiveLoader(Archive archive, String name) {
this.loadedCount = 0;
this.archive = archive;
this.groupCount = archive.getGroupCount();
}
@ObfuscatedName("m")
@@ -59,16 +61,17 @@ public class ArchiveLoader {
signature = "(I)Z",
garbageValue = "1352221725"
)
boolean method134() {
this.field409 = 0;
@Export("isLoaded")
boolean isLoaded() {
this.loadedCount = 0;
for (int var1 = 0; var1 < this.field408; ++var1) {
for (int var1 = 0; var1 < this.groupCount; ++var1) {
if (!this.archive.method133(var1) || this.archive.method132(var1)) {
++this.field409;
++this.loadedCount;
}
}
return this.field409 >= this.field408;
return this.loadedCount >= this.groupCount;
}
@ObfuscatedName("x")
@@ -147,8 +150,8 @@ public class ArchiveLoader {
}
Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0);
Rasterizer2D.Rasterizer2D_drawGradient(Login.xPadding, 0, 125, 23, 0xbd9839, 0x8b6608);
Rasterizer2D.Rasterizer2D_drawGradient(Login.xPadding + 125, 0, 640, 23, 0x4f4f4f, 0x292929);
Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 0xbd9839, 0x8b6608);
Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 0x4f4f4f, 0x292929);
var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1);
if (UrlRequest.worldSelectStars != null) {
UrlRequest.worldSelectStars[1].drawAt(Login.xPadding + 140, 1);

34
runescape-client/src/main/java/AudioFilter.java
View File

@@ -8,13 +8,13 @@ public class AudioFilter {
@ObfuscatedName("u")
static float[][] field32;
@ObfuscatedName("g")
static int[][] field33;
static int[][] coefficients;
@ObfuscatedName("l")
static float field34;
@ObfuscatedName("e")
static int field35;
static int forwardMultiplier;
@ObfuscatedName("m")
int[] field36;
int[] pairs;
@ObfuscatedName("q")
int[][][] field37;
@ObfuscatedName("w")
@@ -23,7 +23,7 @@ public class AudioFilter {
int[] field39;
AudioFilter() {
this.field36 = new int[2];
this.pairs = new int[2];
this.field37 = new int[2][2][4];
this.field38 = new int[2][2][4];
this.field39 = new int[2];
@@ -44,16 +44,16 @@ public class AudioFilter {
}
@ObfuscatedName("w")
int method26(int var1, float var2) {
int compute(int var1, float var2) {
float var3;
if (var1 == 0) {
var3 = (float)this.field39[0] + (float)(this.field39[1] - this.field39[0]) * var2;
var3 *= 0.0030517578F;
field34 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
field35 = (int)(field34 * 65536.0F);
forwardMultiplier = (int)(field34 * 65536.0F);
}
if (this.field36[var1] == 0) {
if (this.pairs[var1] == 0) {
return 0;
} else {
var3 = this.method24(var1, 0, var2);
@@ -62,7 +62,7 @@ public class AudioFilter {
float[] var4;
int var5;
for (var5 = 1; var5 < this.field36[var1]; ++var5) {
for (var5 = 1; var5 < this.pairs[var1]; ++var5) {
var3 = this.method24(var1, var5, var2);
float var6 = -2.0F * var3 * (float)Math.cos((double)this.method25(var1, var5, var2));
float var7 = var3 * var3;
@@ -81,17 +81,17 @@ public class AudioFilter {
}
if (var1 == 0) {
for (var5 = 0; var5 < this.field36[0] * 2; ++var5) {
for (var5 = 0; var5 < this.pairs[0] * 2; ++var5) {
var4 = field32[0];
var4[var5] *= field34;
}
}
for (var5 = 0; var5 < this.field36[var1] * 2; ++var5) {
field33[var1][var5] = (int)(field32[var1][var5] * 65536.0F);
for (var5 = 0; var5 < this.pairs[var1] * 2; ++var5) {
coefficients[var1][var5] = (int)(field32[var1][var5] * 65536.0F);
}
return this.field36[var1] * 2;
return this.pairs[var1] * 2;
}
}
@@ -101,8 +101,8 @@ public class AudioFilter {
)
final void method27(Buffer var1, SoundEnvelope var2) {
int var3 = var1.readUnsignedByte();
this.field36[0] = var3 >> 4;
this.field36[1] = var3 & 15;
this.pairs[0] = var3 >> 4;
this.pairs[1] = var3 & 15;
if (var3 != 0) {
this.field39[0] = var1.readUnsignedShort();
this.field39[1] = var1.readUnsignedShort();
@@ -111,14 +111,14 @@ public class AudioFilter {
int var5;
int var6;
for (var5 = 0; var5 < 2; ++var5) {
for (var6 = 0; var6 < this.field36[var5]; ++var6) {
for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
this.field37[var5][0][var6] = var1.readUnsignedShort();
this.field38[var5][0][var6] = var1.readUnsignedShort();
}
}
for (var5 = 0; var5 < 2; ++var5) {
for (var6 = 0; var6 < this.field36[var5]; ++var6) {
for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
if ((var4 & 1 << var5 * 4 << var6) != 0) {
this.field37[var5][1][var6] = var1.readUnsignedShort();
this.field38[var5][1][var6] = var1.readUnsignedShort();
@@ -148,6 +148,6 @@ public class AudioFilter {
static {
field32 = new float[2][8];
field33 = new int[2][8];
coefficients = new int[2][8];
}
}

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

@@ -9,9 +9,11 @@ import net.runelite.mapping.ObfuscatedSignature;
@Implements("Buffer")
public class Buffer extends Node {
@ObfuscatedName("q")
static int[] field45;
@Export("crc32Table")
static int[] crc32Table;
@ObfuscatedName("o")
static long[] field46;
@Export("crc64Table")
static long[] crc64Table;
@ObfuscatedName("m")
@Export("array")
public byte[] array;
@@ -163,7 +165,8 @@ public class Buffer extends Node {
signature = "(Ljava/lang/CharSequence;B)V",
garbageValue = "58"
)
public void method37(CharSequence var1) {
@Export("writeCESU8")
public void writeCESU8(CharSequence var1) {
int var2 = var1.length();
int var3 = 0;
@@ -179,7 +182,7 @@ public class Buffer extends Node {
}
this.array[++this.index - 1] = 0;
this.method42(var3);
this.writeVarInt(var3);
this.index += class16.method190(this.array, this.index, var1);
}
@@ -188,9 +191,10 @@ public class Buffer extends Node {
signature = "([BIII)V",
garbageValue = "-1915344405"
)
public void method38(byte[] var1, int var2, int var3) {
for (int var4 = var2; var4 < var3 + var2; ++var4) {
this.array[++this.index - 1] = var1[var4];
@Export("writeBytes")
public void writeBytes(byte[] bytes, int startIdx, int endIdx) {
for (int var4 = startIdx; var4 < endIdx + startIdx; ++var4) {
this.array[++this.index - 1] = bytes[var4];
}
}
@@ -200,7 +204,8 @@ public class Buffer extends Node {
signature = "(II)V",
garbageValue = "-225163682"
)
public void method39(int var1) {
@Export("writeLengthInt")
public void writeLengthInt(int var1) {
this.array[this.index - var1 - 4] = (byte)(var1 >> 24);
this.array[this.index - var1 - 3] = (byte)(var1 >> 16);
this.array[this.index - var1 - 2] = (byte)(var1 >> 8);
@@ -212,7 +217,8 @@ public class Buffer extends Node {
signature = "(II)V",
garbageValue = "-1298210761"
)
public void method40(int var1) {
@Export("writeLengthShort")
public void writeLengthShort(int var1) {
this.array[this.index - var1 - 2] = (byte)(var1 >> 8);
this.array[this.index - var1 - 1] = (byte)var1;
}
@@ -222,7 +228,8 @@ public class Buffer extends Node {
signature = "(II)V",
garbageValue = "-1839722163"
)
public void method41(int var1) {
@Export("writeLengthByte")
public void writeLengthByte(int var1) {
this.array[this.index - var1 - 1] = (byte)var1;
}
@@ -250,7 +257,8 @@ public class Buffer extends Node {
signature = "(II)V",
garbageValue = "820873705"
)
public void method42(int var1) {
@Export("writeVarInt")
public void writeVarInt(int var1) {
if ((var1 & -128) != 0) {
if ((var1 & -16384) != 0) {
if ((var1 & -2097152) != 0) {
@@ -306,7 +314,8 @@ public class Buffer extends Node {
signature = "(B)I",
garbageValue = "1"
)
public int method44() {
@Export("readShort")
public int readShort() {
this.index += 2;
int var1 = (this.array[this.index - 1] & 255) + ((this.array[this.index - 2] & 255) << 8);
if (var1 > 32767) {
@@ -417,12 +426,13 @@ public class Buffer extends Node {
signature = "(B)Ljava/lang/String;",
garbageValue = "-14"
)
public String method45() {
@Export("readCESU8")
public String readCESU8() {
byte var1 = this.array[++this.index - 1];
if (var1 != 0) {
throw new IllegalStateException("");
} else {
int var2 = this.method52();
int var2 = this.readVarInt();
if (var2 + this.index > this.array.length) {
throw new IllegalStateException("");
} else {
@@ -489,7 +499,8 @@ public class Buffer extends Node {
signature = "([BIIB)V",
garbageValue = "-122"
)
public void method46(byte[] var1, int var2, int var3) {
@Export("readBytes")
public void readBytes(byte[] var1, int var2, int var3) {
for (int var4 = var2; var4 < var3 + var2; ++var4) {
var1[var4] = this.array[++this.index - 1];
}
@@ -501,7 +512,8 @@ public class Buffer extends Node {
signature = "(B)I",
garbageValue = "-24"
)
public int method47() {
@Export("readShortSmart")
public int readShortSmart() {
int var1 = this.array[this.index] & 255;
return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152;
}
@@ -511,7 +523,8 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "1370512869"
)
public int method48() {
@Export("readUShortSmart")
public int readUShortSmart() {
int var1 = this.array[this.index] & 255;
return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768;
}
@@ -525,7 +538,7 @@ public class Buffer extends Node {
int var1 = 0;
int var2;
for (var2 = this.method48(); var2 == 32767; var2 = this.method48()) {
for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) {
var1 += 32767;
}
@@ -561,7 +574,8 @@ public class Buffer extends Node {
signature = "(I)I",
garbageValue = "984135559"
)
public int method52() {
@Export("readVarInt")
public int readVarInt() {
byte var1 = this.array[++this.index - 1];
int var2;
@@ -698,13 +712,13 @@ public class Buffer extends Node {
int var3 = this.index;
this.index = 0;
byte[] var4 = new byte[var3];
this.method46(var4, 0, var3);
this.readBytes(var4, 0, var3);
BigInteger var5 = new BigInteger(var4);
BigInteger var6 = var5.modPow(var1, var2);
byte[] var7 = var6.toByteArray();
this.index = 0;
this.writeShort(var7.length);
this.method38(var7, 0, var7.length);
this.writeBytes(var7, 0, var7.length);
}
@ObfuscatedName("aa")
@@ -712,13 +726,14 @@ public class Buffer extends Node {
signature = "(II)I",
garbageValue = "-484928770"
)
public int method53(int var1) {
@Export("writeCrc")
public int writeCrc(int var1) {
byte[] var2 = this.array;
int var3 = this.index;
int var4 = -1;
for (int var5 = var1; var5 < var3; ++var5) {
var4 = var4 >>> 8 ^ field45[(var4 ^ var2[var5]) & 255];
var4 = var4 >>> 8 ^ crc32Table[(var4 ^ var2[var5]) & 255];
}
var4 = ~var4;
@@ -731,7 +746,8 @@ public class Buffer extends Node {
signature = "(B)Z",
garbageValue = "-11"
)
public boolean method54() {
@Export("checkCrc")
public boolean checkCrc() {
this.index -= 4;
byte[] var1 = this.array;
int var2 = this.index;
@@ -739,7 +755,7 @@ public class Buffer extends Node {
int var4;
for (var4 = 0; var4 < var2; ++var4) {
var3 = var3 >>> 8 ^ field45[(var3 ^ var1[var4]) & 255];
var3 = var3 >>> 8 ^ crc32Table[(var3 ^ var1[var4]) & 255];
}
var3 = ~var3;
@@ -1023,7 +1039,7 @@ public class Buffer extends Node {
}
static {
field45 = new int[256];
crc32Table = new int[256];
int var0;
for (int var1 = 0; var1 < 256; ++var1) {
@@ -1037,10 +1053,10 @@ public class Buffer extends Node {
}
}
field45[var1] = var2;
crc32Table[var1] = var2;
}
field46 = new long[256];
crc64Table = new long[256];
for (var0 = 0; var0 < 256; ++var0) {
long var4 = (long)var0;
@@ -1053,7 +1069,7 @@ public class Buffer extends Node {
}
}
field46[var0] = var4;
crc64Table[var0] = var4;
}
}

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

@@ -74,7 +74,7 @@ public class Calendar {
var6 = Interpreter.Interpreter_calendar.get(5);
int var15 = Interpreter.Interpreter_calendar.get(2);
int var16 = Interpreter.Interpreter_calendar.get(1);
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.field422[var15] + "-" + var16;
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var15] + "-" + var16;
return 1;
} else if (var0 != ScriptOpcodes.TEXT_GENDER) {
if (var0 == ScriptOpcodes.TOSTRING) {

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

@@ -236,7 +236,8 @@ public final class Client extends GameShell implements Usernamed {
@ObfuscatedSignature(
signature = "Lhi;"
)
static PlayerAppearance field119;
@Export("playerAppearance")
static PlayerAppearance playerAppearance;
@ObfuscatedName("qa")
@ObfuscatedGetter(
intValue = -1481002083
@@ -1518,7 +1519,7 @@ public final class Client extends GameShell implements Usernamed {
var10 = 0;
while (true) {
var11 = var26.method48();
var11 = var26.readUShortSmart();
if (var11 == 0) {
break;
}
@@ -2499,9 +2500,9 @@ public final class Client extends GameShell implements Usernamed {
var31 = var15.readStringCp1252NullCircumfixed();
}
} else {
var30 = var15.method45();
var30 = var15.readCESU8();
if (var11 == 1) {
var31 = var15.method45();
var31 = var15.readCESU8();
}
}
@@ -3321,7 +3322,7 @@ public final class Client extends GameShell implements Usernamed {
var8.packetBuffer.writeInt(180);
var8.packetBuffer.writeInt(1);
var8.packetBuffer.writeByte(clientType);
var8.packetBuffer.method38(var6.array, 0, var6.index);
var8.packetBuffer.writeBytes(var6.array, 0, var6.index);
int var10 = var8.packetBuffer.index;
var8.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username);
var8.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0));
@@ -3332,7 +3333,7 @@ public final class Client extends GameShell implements Usernamed {
var8.packetBuffer.writeInt(AbstractArchive.field2);
Buffer var11 = new Buffer(WorldMapLabelSize.platformInfo.size());
WorldMapLabelSize.platformInfo.write(var11);
var8.packetBuffer.method38(var11.array, 0, var11.array.length);
var8.packetBuffer.writeBytes(var11.array, 0, var11.array.length);
var8.packetBuffer.writeByte(clientType);
var8.packetBuffer.writeInt(0);
var8.packetBuffer.writeInt(AbstractArchive.archive0.hash);
@@ -3352,12 +3353,12 @@ public final class Client extends GameShell implements Usernamed {
var8.packetBuffer.writeInt(class2.archive14.hash);
var8.packetBuffer.writeInt(WorldMapSection2.archive15.hash);
var8.packetBuffer.writeInt(0);
var8.packetBuffer.writeInt(WorldMapRectangle.archive16.hash);
var8.packetBuffer.writeInt(WorldMapLabelSize.field1040.hash);
var8.packetBuffer.writeInt(ItemContainer.field434.hash);
var8.packetBuffer.writeInt(AbstractByteArrayCopier.field0.hash);
var8.packetBuffer.writeInt(WorldMapRectangle.archive17.hash);
var8.packetBuffer.writeInt(WorldMapLabelSize.archive18.hash);
var8.packetBuffer.writeInt(ItemContainer.archive19.hash);
var8.packetBuffer.writeInt(AbstractByteArrayCopier.archive20.hash);
var8.packetBuffer.xteaEncrypt(var7, var10, var8.packetBuffer.index);
var8.packetBuffer.method40(var8.packetBuffer.index - var9);
var8.packetBuffer.writeLengthShort(var8.packetBuffer.index - var9);
packetWriter.method241(var8);
packetWriter.method240();
packetWriter.isaacCipher = new IsaacCipher(var7);
@@ -3650,7 +3651,7 @@ public final class Client extends GameShell implements Usernamed {
var6.packetBuffer.writeByte(0);
var7 = var6.packetBuffer.index;
timer.write(var6.packetBuffer);
var6.packetBuffer.method41(var6.packetBuffer.index - var7);
var6.packetBuffer.writeLengthByte(var6.packetBuffer.index - var7);
packetWriter.method241(var6);
timer.method333();
}
@@ -3746,7 +3747,7 @@ public final class Client extends GameShell implements Usernamed {
}
if (var5 != null) {
var5.packetBuffer.method41(var5.packetBuffer.index - var4);
var5.packetBuffer.writeLengthByte(var5.packetBuffer.index - var4);
var12 = var5.packetBuffer.index;
var5.packetBuffer.index = var4;
var5.packetBuffer.writeByte(var10 / var11);
@@ -3815,7 +3816,7 @@ public final class Client extends GameShell implements Usernamed {
var6.packetBuffer.writeMedium((int)var21);
}
var6.packetBuffer.method40(var6.packetBuffer.index - var7);
var6.packetBuffer.writeLengthShort(var6.packetBuffer.index - var7);
packetWriter.method241(var6);
}
@@ -4267,7 +4268,7 @@ public final class Client extends GameShell implements Usernamed {
var5.packetBuffer.writeByte(0);
var4 = var5.packetBuffer.index;
WorldMapLabel.method443(var5.packetBuffer);
var5.packetBuffer.method41(var5.packetBuffer.index - var4);
var5.packetBuffer.writeLengthByte(var5.packetBuffer.index - var4);
packetWriter.method241(var5);
}
}
@@ -4628,7 +4629,7 @@ public final class Client extends GameShell implements Usernamed {
Widget var8;
if (ServerPacket.field850 == var1.serverPacket0) {
var38 = var3.method44();
var38 = var3.readShort();
var6 = var3.method73();
var8 = Huffman.getWidget(var6);
if (var38 != var8.sequenceId || var38 == -1) {
@@ -4969,7 +4970,7 @@ public final class Client extends GameShell implements Usernamed {
String var17;
boolean var18;
if (ServerPacket.field792 == var1.serverPacket0) {
var38 = var3.method48();
var38 = var3.readUShortSmart();
var14 = var3.readUnsignedByte() == 1;
var17 = "";
var18 = false;
@@ -5142,7 +5143,7 @@ public final class Client extends GameShell implements Usernamed {
}
for (; var3.index < var1.serverPacket0Length; WorldMapManager.itemContainerSetItem(var6, var10, var11 - 1, var12)) {
var10 = var3.method48();
var10 = var3.readUShortSmart();
var11 = var3.readUnsignedShort();
var12 = 0;
if (var11 != 0) {
@@ -5502,7 +5503,7 @@ public final class Client extends GameShell implements Usernamed {
if (ServerPacket.field846 == var1.serverPacket0) {
var3.index += 28;
if (var3.method54()) {
if (var3.checkCrc()) {
class234.method4535(var3, var3.index - 28);
}
@@ -5546,7 +5547,7 @@ public final class Client extends GameShell implements Usernamed {
if (ServerPacket.field860 == var1.serverPacket0) {
GrandExchangeOfferAgeComparator.method159();
weight = var3.method44();
weight = var3.readShort();
field124 = cycleCntr;
var1.serverPacket0 = null;
return true;
@@ -6528,7 +6529,7 @@ public final class Client extends GameShell implements Usernamed {
viewportWidth = 0;
viewportHeight = 0;
viewportZoom = 0;
field119 = new PlayerAppearance();
playerAppearance = new PlayerAppearance();
field118 = -1;
field120 = -1;
platformInfoProvider = new DesktopPlatformInfoProvider();

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

@@ -145,10 +145,10 @@ public class ClientParameter {
var2.host = var1.readStringCp1252NullTerminated();
var2.activity = var1.readStringCp1252NullTerminated();
var2.location = var1.readUnsignedByte();
var2.population = var1.method44();
var2.population = var1.readShort();
}
MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2);
MilliClock.sortWorlds(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2);
FriendLoginUpdate.field356 = null;
return true;
}

15
runescape-client/src/main/java/Decimator.java
View File

@@ -172,7 +172,8 @@ public class Decimator {
signature = "(Ldu;IIII)Z",
garbageValue = "555449756"
)
static final boolean method2491(Model var0, int var1, int var2, int var3) {
@Export("boundingBoxCheck")
static final boolean boundingBoxCheck(Model model, int x, int y, int z) {
boolean var4 = ViewportMouse.ViewportMouse_isInViewport;
if (!var4) {
return false;
@@ -219,12 +220,12 @@ public class Decimator {
class248.field1142 = Math.abs(Skeleton.field874);
}
var5 = var0.xMid + var1;
var6 = var2 + var0.yMid;
var7 = var3 + var0.zMid;
var8 = var0.xMidOffset;
var12 = var0.yMidOffset;
var13 = var0.zMidOffset;
var5 = model.xMid + x;
var6 = y + model.yMid;
var7 = z + model.zMid;
var8 = model.xMidOffset;
var12 = model.yMidOffset;
var13 = model.zMidOffset;
var9 = AccessFile.field7 - var5;
var10 = ViewportMouse.field951 - var6;
var11 = ViewportMouse.field952 - var7;

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

@@ -35,7 +35,7 @@ public class DefaultsGroup {
garbageValue = "-2017595575"
)
public static RectangleMode[] method5822() {
return new RectangleMode[]{RectangleMode.field758, RectangleMode.field757, RectangleMode.field759};
return new RectangleMode[]{RectangleMode.GRADIENT_COLOR, RectangleMode.SOLID, RectangleMode.GRADIENT_ALPHA};
}
static {

80
runescape-client/src/main/java/DevicePcmPlayerProvider.java
View File

@@ -150,13 +150,13 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
garbageValue = "-1516599170"
)
@Export("drawInterface")
static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
Rasterizer3D.Rasterizer3D_method1();
static final void drawInterface(Widget[] components, int interfaceID, int xStart, int yStart, int xEnd, int yEnd, int var6, int var7, int var8) {
Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
for (int var9 = 0; var9 < var0.length; ++var9) {
Widget var10 = var0[var9];
if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) {
for (int var9 = 0; var9 < components.length; ++var9) {
Widget var10 = components[var9];
if (var10 != null && (var10.parentId == interfaceID || interfaceID == 0xabcdabcd && var10 == Client.clickedWidget)) {
int var11;
if (var8 == -1) {
Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6;
@@ -170,7 +170,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var10.rootIndex = var11;
var10.cycle = Client.cycle;
if (!var10.isIf3 || !PacketBufferNode.method3673(var10)) {
if (!var10.isIf3 || !PacketBufferNode.isComponentHidden(var10)) {
if (var10.contentType > 0) {
class15.method186(var10);
}
@@ -181,8 +181,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
int var15;
int var16;
if (var10 == Client.clickedWidget) {
if (var1 != -1412584499 && !var10.isScrollBar) {
class279.field1145 = var0;
if (interfaceID != -1412584499 && !var10.isScrollBar) {
class279.field1145 = components;
class54.field1161 = var6;
BuddyRankComparator.field1114 = var7;
continue;
@@ -225,10 +225,10 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
int var21;
int var22;
if (var10.type == 2) {
var15 = var2;
var16 = var3;
var17 = var4;
var18 = var5;
var15 = xStart;
var16 = yStart;
var17 = xEnd;
var18 = yEnd;
} else if (var10.type == 9) {
var22 = var12;
var19 = var13;
@@ -246,17 +246,17 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
++var20;
++var21;
var15 = var22 > var2 ? var22 : var2;
var16 = var19 > var3 ? var19 : var3;
var17 = var20 < var4 ? var20 : var4;
var18 = var21 < var5 ? var21 : var5;
var15 = var22 > xStart ? var22 : xStart;
var16 = var19 > yStart ? var19 : yStart;
var17 = var20 < xEnd ? var20 : xEnd;
var18 = var21 < yEnd ? var21 : yEnd;
} else {
var22 = var12 + var10.width;
var19 = var13 + var10.height;
var15 = var12 > var2 ? var12 : var2;
var16 = var13 > var3 ? var13 : var3;
var17 = var22 < var4 ? var22 : var4;
var18 = var19 < var5 ? var19 : var5;
var15 = var12 > xStart ? var12 : xStart;
var16 = var13 > yStart ? var13 : yStart;
var17 = var22 < xEnd ? var22 : xEnd;
var18 = var19 < yEnd ? var19 : yEnd;
}
if (!var10.isIf3 || var15 < var17 && var16 < var18) {
@@ -284,19 +284,19 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
Client.field217 = var13;
class40.drawEntities(var12, var13, var10.width, var10.height);
Client.field100[var10.rootIndex] = true;
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
continue;
}
if (var10.contentType == 1338) {
MouseRecorder.method1189(var10, var12, var13, var11);
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
continue;
}
if (var10.contentType == 1339) {
WorldMapRectangle.method296(var10, var12, var13, var11);
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
continue;
}
@@ -314,7 +314,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
}
if (var10.type == 0) {
if (!var10.isIf3 && PacketBufferNode.method3673(var10) && var10 != Clock.mousedOverWidgetIf1) {
if (!var10.isIf3 && PacketBufferNode.isComponentHidden(var10) && var10 != Clock.mousedOverWidgetIf1) {
continue;
}
@@ -328,7 +328,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
}
}
drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
drawInterface(components, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
if (var10.children != null) {
drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
}
@@ -338,8 +338,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
Interpreter.drawWidgets(var23.group, var15, var16, var17, var18, var12, var13, var11);
}
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
Rasterizer3D.Rasterizer3D_method1();
Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
}
if (Client.isResizable || Client.field101[var11] || Client.gameDrawingMode > 1) {
@@ -377,7 +377,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
boolean var35 = false;
boolean var46 = false;
var25 = var10.itemIds[var22] - 1;
if (var21 + 32 > var2 && var21 < var4 && var26 + 32 > var3 && var26 < var5 || var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) {
if (var21 + 32 > xStart && var21 < xEnd && var26 + 32 > yStart && var26 < yEnd || var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) {
Sprite var42;
if (Client.isItemSelected == 1 && var22 == HealthBarDefinition.selectedItemSlot && var10.id == ServerPacket.selectedItemWidget) {
var42 = class226.getItemSprite(var25, var10.itemQuantities[var22], 2, 0, 2, false);
@@ -403,8 +403,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
}
var42.method310(var21 + var33, var26 + var24, 128);
if (var1 != -1) {
Widget var47 = var0[var1 & 65535];
if (interfaceID != -1) {
Widget var47 = components[interfaceID & 65535];
int var45;
if (var26 + var24 < Rasterizer2D.Rasterizer2D_yClipStart && var47.scrollY > 0) {
var45 = (Rasterizer2D.Rasterizer2D_yClipStart - var26 - var24) * Client.field183 / 3;
@@ -464,12 +464,12 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
}
if (var10.fill) {
switch(var10.rectangleMode.id) {
switch(var10.rectangleMode.value) {
case 1:
Rasterizer2D.Rasterizer2D_drawGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2);
Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2);
break;
case 2:
Rasterizer2D.drawGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparency & 255), 255 - (var10.field960 & 255));
Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparency & 255), 255 - (var10.field960 & 255));
break;
default:
if (var14 == 0) {
@@ -583,7 +583,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
}
}
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
}
}
}
@@ -613,7 +613,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
}
} else if (var10.modelType == 5) {
if (var10.modelId == 0) {
var43 = Client.field119.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
var43 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
} else {
var43 = Canvas.localPlayer.getModel();
}
@@ -717,12 +717,12 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var33 = var12 + 5;
}
if (var22 + var33 > var4) {
var33 = var4 - var22;
if (var22 + var33 > xEnd) {
var33 = xEnd - var22;
}
if (var24 + var19 > var5) {
var24 = var5 - var19;
if (var24 + var19 > yEnd) {
var24 = yEnd - var19;
}
Rasterizer2D.Rasterizer2D_fillRectangle(var33, var24, var22, var19, 16777120);

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

@@ -421,7 +421,7 @@ public class DynamicObject extends Entity {
var10.packetBuffer.writeByte(var13);
var10.packetBuffer.writeByte(var14);
TextureProvider.method2777(var10.packetBuffer, var3);
var10.packetBuffer.method41(var10.packetBuffer.index - var11);
var10.packetBuffer.writeLengthByte(var10.packetBuffer.index - var11);
Client.packetWriter.method241(var10);
return 1;
} else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) {
@@ -433,7 +433,7 @@ public class DynamicObject extends Entity {
int var9 = var8.packetBuffer.index;
var8.packetBuffer.writeStringCp1252NullTerminated(var3);
TextureProvider.method2777(var8.packetBuffer, var7);
var8.packetBuffer.method40(var8.packetBuffer.index - var9);
var8.packetBuffer.writeLengthShort(var8.packetBuffer.index - var9);
Client.packetWriter.method241(var8);
return 1;
} else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) {

5
runescape-client/src/main/java/Fonts.java
View File

@@ -80,7 +80,8 @@ public class Fonts {
signature = "(I)Lbt;",
garbageValue = "2102006478"
)
static World method5647() {
return World.field987 < World.worldsCount ? ItemContainer.worlds[++World.field987 - 1] : null;
@Export("getNextWorldListWorld")
static World getNextWorldListWorld() {
return World.worldListWorldCount < World.worldsCount ? ItemContainer.worlds[++World.worldListWorldCount - 1] : null;
}
}

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

@@ -28,7 +28,7 @@ public class Frames extends DualNode {
)
public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
NodeDeque var5 = new NodeDeque();
int var6 = var1.method4(var3);
int var6 = var1.getGroupFileCount(var3);
this.frames = new Animation[var6];
int[] var7 = var1.method3(var3);

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

@@ -143,7 +143,7 @@ public class GrandExchangeOffer {
int var0 = 0;
for (int var1 = 0; var1 <= Client.archiveLoaderArchive; ++var1) {
var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).field409;
var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount;
}
return var0 * 10000 / Client.field140;

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

@@ -143,19 +143,19 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
var8 = -1;
var9 = -1;
var10 = -1;
var7 = var0.method48();
var7 = var0.readUShortSmart();
if (var7 == 32767) {
var7 = var0.method48();
var9 = var0.method48();
var8 = var0.method48();
var10 = var0.method48();
var7 = var0.readUShortSmart();
var9 = var0.readUShortSmart();
var8 = var0.readUShortSmart();
var10 = var0.readUShortSmart();
} else if (var7 != 32766) {
var9 = var0.method48();
var9 = var0.readUShortSmart();
} else {
var7 = -1;
}
var11 = var0.method48();
var11 = var0.readUShortSmart();
var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11);
}
}
@@ -163,10 +163,10 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
var6 = var0.method58();
if (var6 > 0) {
for (var7 = 0; var7 < var6; ++var7) {
var8 = var0.method48();
var9 = var0.method48();
var8 = var0.readUShortSmart();
var9 = var0.readUShortSmart();
if (var9 != 32767) {
var10 = var0.method48();
var10 = var0.readUShortSmart();
var11 = var0.readUnsignedByte();
int var12 = var9 > 0 ? var0.method59() : var11;
var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12);

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

@@ -74,7 +74,7 @@ public final class GroundItemPile {
} else if (!Widget.Widget_archive.tryLoadGroup(itf)) {
return false;
} else {
int var1 = Widget.Widget_archive.method4(itf);
int var1 = Widget.Widget_archive.getGroupFileCount(itf);
if (var1 == 0) {
Widget.loadedInterfaces[itf] = true;
return true;

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

@@ -173,19 +173,19 @@ public class HitSplatDefinition extends DualNode {
} else if (var2 == 6) {
this.field391 = var1.method51();
} else if (var2 == 7) {
this.field392 = var1.method44();
this.field392 = var1.readShort();
} else if (var2 == 8) {
this.field395 = var1.readStringCp1252NullCircumfixed();
} else if (var2 == 9) {
this.field387 = var1.readUnsignedShort();
} else if (var2 == 10) {
this.field393 = var1.method44();
this.field393 = var1.readShort();
} else if (var2 == 11) {
this.field394 = 0;
} else if (var2 == 12) {
this.field396 = var1.readUnsignedByte();
} else if (var2 == 13) {
this.field397 = var1.method44();
this.field397 = var1.readShort();
} else if (var2 == 14) {
this.field394 = var1.readUnsignedShort();
} else if (var2 == 17 || var2 == 18) {

173
runescape-client/src/main/java/Instrument.java
View File

@@ -35,42 +35,50 @@ public class Instrument {
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field413;
@Export("pitch")
SoundEnvelope pitch;
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field414;
@Export("volume")
SoundEnvelope volume;
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field415;
@Export("pitchModifier")
SoundEnvelope pitchModifier;
@ObfuscatedName("w")
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field416;
@Export("pitchModifierAmplitude")
SoundEnvelope pitchModifierAmplitude;
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field417;
@Export("volumeMultiplier")
SoundEnvelope volumeMultiplier;
@ObfuscatedName("u")
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field418;
@Export("volumeMultiplierAmplitude")
SoundEnvelope volumeMultiplierAmplitude;
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field419;
@Export("release")
SoundEnvelope release;
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field420;
@Export("attack")
SoundEnvelope attack;
@ObfuscatedName("e")
@Export("oscillatorVolume")
int[] oscillatorVolume;
@@ -96,7 +104,8 @@ public class Instrument {
@ObfuscatedSignature(
signature = "Lde;"
)
SoundEnvelope field421;
@Export("filterEnvelope")
SoundEnvelope filterEnvelope;
@ObfuscatedName("z")
@Export("duration")
int duration;
@@ -122,26 +131,26 @@ public class Instrument {
return Instrument_samples;
} else {
double var3 = (double)var1 / ((double)var2 + 0.0D);
this.field413.reset();
this.field414.reset();
this.pitch.reset();
this.volume.reset();
int var5 = 0;
int var6 = 0;
int var7 = 0;
if (this.field415 != null) {
this.field415.reset();
this.field416.reset();
var5 = (int)((double)(this.field415.end - this.field415.start) * 32.768D / var3);
var6 = (int)((double)this.field415.start * 32.768D / var3);
if (this.pitchModifier != null) {
this.pitchModifier.reset();
this.pitchModifierAmplitude.reset();
var5 = (int)((double)(this.pitchModifier.end - this.pitchModifier.start) * 32.768D / var3);
var6 = (int)((double)this.pitchModifier.start * 32.768D / var3);
}
int var8 = 0;
int var9 = 0;
int var10 = 0;
if (this.field417 != null) {
this.field417.reset();
this.field418.reset();
var8 = (int)((double)(this.field417.end - this.field417.start) * 32.768D / var3);
var9 = (int)((double)this.field417.start * 32.768D / var3);
if (this.volumeMultiplier != null) {
this.volumeMultiplier.reset();
this.volumeMultiplierAmplitude.reset();
var8 = (int)((double)(this.volumeMultiplier.end - this.volumeMultiplier.start) * 32.768D / var3);
var9 = (int)((double)this.volumeMultiplier.start * 32.768D / var3);
}
int var11;
@@ -150,8 +159,8 @@ public class Instrument {
Instrument_phases[var11] = 0;
Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3);
Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100;
Instrument_pitchSteps[var11] = (int)((double)(this.field413.end - this.field413.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3);
Instrument_pitchBaseSteps[var11] = (int)((double)this.field413.start * 32.768D / var3);
Instrument_pitchSteps[var11] = (int)((double)(this.pitch.end - this.pitch.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3);
Instrument_pitchBaseSteps[var11] = (int)((double)this.pitch.start * 32.768D / var3);
}
}
@@ -161,19 +170,19 @@ public class Instrument {
int var15;
int[] var16;
for (var11 = 0; var11 < var1; ++var11) {
var12 = this.field413.doStep(var1);
var13 = this.field414.doStep(var1);
if (this.field415 != null) {
var14 = this.field415.doStep(var1);
var15 = this.field416.doStep(var1);
var12 += this.evaluateWave(var7, var15, this.field415.form) >> 1;
var12 = this.pitch.doStep(var1);
var13 = this.volume.doStep(var1);
if (this.pitchModifier != null) {
var14 = this.pitchModifier.doStep(var1);
var15 = this.pitchModifierAmplitude.doStep(var1);
var12 += this.evaluateWave(var7, var15, this.pitchModifier.form) >> 1;
var7 = var7 + var6 + (var14 * var5 >> 16);
}
if (this.field417 != null) {
var14 = this.field417.doStep(var1);
var15 = this.field418.doStep(var1);
var13 = var13 * ((this.evaluateWave(var10, var15, this.field417.form) >> 1) + 32768) >> 15;
if (this.volumeMultiplier != null) {
var14 = this.volumeMultiplier.doStep(var1);
var15 = this.volumeMultiplierAmplitude.doStep(var1);
var13 = var13 * ((this.evaluateWave(var10, var15, this.volumeMultiplier.form) >> 1) + 32768) >> 15;
var10 = var10 + var9 + (var14 * var8 >> 16);
}
@@ -182,7 +191,7 @@ public class Instrument {
var15 = Instrument_delays[var14] + var11;
if (var15 < var1) {
var16 = Instrument_samples;
var16[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.field413.form);
var16[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.pitch.form);
var16 = Instrument_phases;
var16[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14];
}
@@ -191,20 +200,20 @@ public class Instrument {
}
int var17;
if (this.field419 != null) {
this.field419.reset();
this.field420.reset();
if (this.release != null) {
this.release.reset();
this.attack.reset();
var11 = 0;
boolean var18 = false;
boolean var19 = true;
for (var14 = 0; var14 < var1; ++var14) {
var15 = this.field419.doStep(var1);
var17 = this.field420.doStep(var1);
var15 = this.release.doStep(var1);
var17 = this.attack.doStep(var1);
if (var19) {
var12 = (var15 * (this.field419.end - this.field419.start) >> 8) + this.field419.start;
var12 = (var15 * (this.release.end - this.release.start) >> 8) + this.release.start;
} else {
var12 = (var17 * (this.field419.end - this.field419.start) >> 8) + this.field419.start;
var12 = (var17 * (this.release.end - this.release.start) >> 8) + this.release.start;
}
var11 += 256;
@@ -228,11 +237,11 @@ public class Instrument {
}
}
if (this.filter.field36[0] > 0 || this.filter.field36[1] > 0) {
this.field421.reset();
var11 = this.field421.doStep(var1 + 1);
var12 = this.filter.method26(0, (float)var11 / 65536.0F);
var13 = this.filter.method26(1, (float)var11 / 65536.0F);
if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) {
this.filterEnvelope.reset();
var11 = this.filterEnvelope.doStep(var1 + 1);
var12 = this.filter.compute(0, (float)var11 / 65536.0F);
var13 = this.filter.compute(1, (float)var11 / 65536.0F);
if (var1 >= var12 + var13) {
var14 = 0;
var15 = var13;
@@ -242,18 +251,18 @@ public class Instrument {
int var20;
while (var14 < var15) {
var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16);
var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16);
for (var20 = 0; var20 < var12; ++var20) {
var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.field33[0][var20] >> 16);
var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.coefficients[0][var20] >> 16);
}
for (var20 = 0; var20 < var14; ++var20) {
var17 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.field33[1][var20] >> 16);
var17 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.coefficients[1][var20] >> 16);
}
Instrument_samples[var14] = var17;
var11 = this.field421.doStep(var1 + 1);
var11 = this.filterEnvelope.doStep(var1 + 1);
++var14;
}
@@ -266,18 +275,18 @@ public class Instrument {
int var21;
while (var14 < var15) {
var20 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16);
var20 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16);
for (var21 = 0; var21 < var12; ++var21) {
var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.field33[0][var21] >> 16);
var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.coefficients[0][var21] >> 16);
}
for (var21 = 0; var21 < var13; ++var21) {
var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.field33[1][var21] >> 16);
var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.coefficients[1][var21] >> 16);
}
Instrument_samples[var14] = var20;
var11 = this.field421.doStep(var1 + 1);
var11 = this.filterEnvelope.doStep(var1 + 1);
++var14;
}
@@ -286,22 +295,22 @@ public class Instrument {
var20 = 0;
for (var21 = var14 + var12 - var1; var21 < var12; ++var21) {
var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.field33[0][var21] >> 16);
var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.coefficients[0][var21] >> 16);
}
for (var21 = 0; var21 < var13; ++var21) {
var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.field33[1][var21] >> 16);
var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.coefficients[1][var21] >> 16);
}
Instrument_samples[var14] = var20;
this.field421.doStep(var1 + 1);
this.filterEnvelope.doStep(var1 + 1);
++var14;
}
break;
}
var12 = this.filter.method26(0, (float)var11 / 65536.0F);
var13 = this.filter.method26(1, (float)var11 / 65536.0F);
var12 = this.filter.compute(0, (float)var11 / 65536.0F);
var13 = this.filter.compute(1, (float)var11 / 65536.0F);
var15 += 128;
}
}
@@ -333,55 +342,55 @@ public class Instrument {
)
@Export("decode")
final void decode(Buffer buffer) {
this.field413 = new SoundEnvelope();
this.field413.decode(buffer);
this.field414 = new SoundEnvelope();
this.field414.decode(buffer);
this.pitch = new SoundEnvelope();
this.pitch.decode(buffer);
this.volume = new SoundEnvelope();
this.volume.decode(buffer);
int var2 = buffer.readUnsignedByte();
if (var2 != 0) {
--buffer.index;
this.field415 = new SoundEnvelope();
this.field415.decode(buffer);
this.field416 = new SoundEnvelope();
this.field416.decode(buffer);
this.pitchModifier = new SoundEnvelope();
this.pitchModifier.decode(buffer);
this.pitchModifierAmplitude = new SoundEnvelope();
this.pitchModifierAmplitude.decode(buffer);
}
var2 = buffer.readUnsignedByte();
if (var2 != 0) {
--buffer.index;
this.field417 = new SoundEnvelope();
this.field417.decode(buffer);
this.field418 = new SoundEnvelope();
this.field418.decode(buffer);
this.volumeMultiplier = new SoundEnvelope();
this.volumeMultiplier.decode(buffer);
this.volumeMultiplierAmplitude = new SoundEnvelope();
this.volumeMultiplierAmplitude.decode(buffer);
}
var2 = buffer.readUnsignedByte();
if (var2 != 0) {
--buffer.index;
this.field419 = new SoundEnvelope();
this.field419.decode(buffer);
this.field420 = new SoundEnvelope();
this.field420.decode(buffer);
this.release = new SoundEnvelope();
this.release.decode(buffer);
this.attack = new SoundEnvelope();
this.attack.decode(buffer);
}
for (int var3 = 0; var3 < 10; ++var3) {
int var4 = buffer.method48();
int var4 = buffer.readUShortSmart();
if (var4 == 0) {
break;
}
this.oscillatorVolume[var3] = var4;
this.oscillatorPitch[var3] = buffer.method47();
this.oscillatorDelays[var3] = buffer.method48();
this.oscillatorPitch[var3] = buffer.readShortSmart();
this.oscillatorDelays[var3] = buffer.readUShortSmart();
}
this.delayTime = buffer.method48();
this.delayDecay = buffer.method48();
this.delayTime = buffer.readUShortSmart();
this.delayDecay = buffer.readUShortSmart();
this.duration = buffer.readUnsignedShort();
this.offset = buffer.readUnsignedShort();
this.filter = new AudioFilter();
this.field421 = new SoundEnvelope();
this.filter.method27(buffer, this.field421);
this.filterEnvelope = new SoundEnvelope();
this.filter.method27(buffer, this.filterEnvelope);
}
static {

15
runescape-client/src/main/java/Interpreter.java
View File

@@ -48,7 +48,8 @@ public class Interpreter {
@Export("Interpreter_calendar")
static Calendar Interpreter_calendar;
@ObfuscatedName("z")
static final String[] field422;
@Export("Interpreter_MONTHS")
static final String[] Interpreter_MONTHS;
@ObfuscatedName("s")
static boolean field423;
@ObfuscatedName("t")
@@ -139,7 +140,7 @@ public class Interpreter {
World.sortOption1 = var2;
World.sortOption2 = var3;
MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2);
MilliClock.sortWorlds(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2);
}
@ObfuscatedName("w")
@@ -186,12 +187,12 @@ public class Interpreter {
garbageValue = "-10"
)
@Export("drawWidgets")
static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
if (GroundItemPile.loadInterface(var0)) {
static final void drawWidgets(int interfaceID, int xStart, int yStart, int xEnd, int yEnd, int var5, int var6, int var7) {
if (GroundItemPile.loadInterface(interfaceID)) {
class279.field1145 = null;
DevicePcmPlayerProvider.drawInterface(Widget.interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7);
DevicePcmPlayerProvider.drawInterface(Widget.interfaceComponents[interfaceID], -1, xStart, yStart, xEnd, yEnd, var5, var6, var7);
if (class279.field1145 != null) {
DevicePcmPlayerProvider.drawInterface(class279.field1145, -1412584499, var1, var2, var3, var4, class54.field1161, BuddyRankComparator.field1114, var7);
DevicePcmPlayerProvider.drawInterface(class279.field1145, -1412584499, xStart, yStart, xEnd, yEnd, class54.field1161, BuddyRankComparator.field1114, var7);
class279.field1145 = null;
}
} else if (var7 != -1) {
@@ -212,7 +213,7 @@ public class Interpreter {
Interpreter_frameDepth = 0;
Interpreter_frames = new ScriptFrame[50];
Interpreter_calendar = Calendar.getInstance();
field422 = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
field423 = false;
field424 = false;
field425 = 0;

156
runescape-client/src/main/java/IsaacCipher.java
View File

@@ -1,3 +1,4 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
@@ -10,33 +11,39 @@ public final class IsaacCipher {
@ObfuscatedGetter(
intValue = 1514845493
)
int field428;
@Export("valuesRemaining")
int valuesRemaining;
@ObfuscatedName("o")
int[] field429;
@Export("results")
int[] results;
@ObfuscatedName("u")
int[] field430;
@Export("mm")
int[] mm;
@ObfuscatedName("g")
@ObfuscatedGetter(
intValue = -1670027699
)
int field431;
@Export("aa")
int aa;
@ObfuscatedName("l")
@ObfuscatedGetter(
intValue = -325762649
)
int field432;
@Export("bb")
int bb;
@ObfuscatedName("e")
@ObfuscatedGetter(
intValue = -1951204929
)
int field433;
@Export("cc")
int cc;
public IsaacCipher(int[] var1) {
this.field430 = new int[256];
this.field429 = new int[256];
public IsaacCipher(int[] seed) {
this.mm = new int[256];
this.results = new int[256];
for (int var2 = 0; var2 < var1.length; ++var2) {
this.field429[var2] = var1[var2];
for (int var2 = 0; var2 < seed.length; ++var2) {
this.results[var2] = seed[var2];
}
this.method139();
@@ -47,13 +54,14 @@ public final class IsaacCipher {
signature = "(I)I",
garbageValue = "-7509790"
)
final int method136() {
if (0 == --this.field428 + 1) {
this.method138();
this.field428 = 255;
@Export("nextInt")
final int nextInt() {
if (0 == --this.valuesRemaining + 1) {
this.generateMoreResults();
this.valuesRemaining = 255;
}
return this.field429[this.field428];
return this.results[this.valuesRemaining];
}
@ObfuscatedName("f")
@@ -62,12 +70,12 @@ public final class IsaacCipher {
garbageValue = "-506873526"
)
final int method137() {
if (this.field428 == 0) {
this.method138();
this.field428 = 256;
if (this.valuesRemaining == 0) {
this.generateMoreResults();
this.valuesRemaining = 256;
}
return this.field429[this.field428 - 1];
return this.results[this.valuesRemaining - 1];
}
@ObfuscatedName("q")
@@ -75,27 +83,28 @@ public final class IsaacCipher {
signature = "(B)V",
garbageValue = "124"
)
final void method138() {
this.field432 += ++this.field433;
@Export("generateMoreResults")
final void generateMoreResults() {
this.bb += ++this.cc;
for (int var1 = 0; var1 < 256; ++var1) {
int var2 = this.field430[var1];
int var2 = this.mm[var1];
if ((var1 & 2) == 0) {
if ((var1 & 1) == 0) {
this.field431 ^= this.field431 << 13;
this.aa ^= this.aa << 13;
} else {
this.field431 ^= this.field431 >>> 6;
this.aa ^= this.aa >>> 6;
}
} else if ((var1 & 1) == 0) {
this.field431 ^= this.field431 << 2;
this.aa ^= this.aa << 2;
} else {
this.field431 ^= this.field431 >>> 16;
this.aa ^= this.aa >>> 16;
}
this.field431 += this.field430[128 + var1 & 255];
this.aa += this.mm[128 + var1 & 255];
int var3;
this.field430[var1] = var3 = this.field430[(var2 & 1020) >> 2] + this.field432 + this.field431;
this.field429[var1] = this.field432 = this.field430[(var3 >> 8 & 1020) >> 2] + var2;
this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.bb + this.aa;
this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2;
}
}
@@ -106,14 +115,14 @@ public final class IsaacCipher {
garbageValue = "579890110"
)
final void method139() {
int var1 = -1640531527;
int var2 = -1640531527;
int var3 = -1640531527;
int var4 = -1640531527;
int var5 = -1640531527;
int var6 = -1640531527;
int var7 = -1640531527;
int var8 = -1640531527;
int var1 = 0x9e3779b9;
int var2 = 0x9e3779b9;
int var3 = 0x9e3779b9;
int var4 = 0x9e3779b9;
int var5 = 0x9e3779b9;
int var6 = 0x9e3779b9;
int var7 = 0x9e3779b9;
int var8 = 0x9e3779b9;
int var9;
for (var9 = 0; var9 < 4; ++var9) {
@@ -144,14 +153,14 @@ public final class IsaacCipher {
}
for (var9 = 0; var9 < 256; var9 += 8) {
var8 += this.field429[var9];
var7 += this.field429[var9 + 1];
var6 += this.field429[var9 + 2];
var5 += this.field429[var9 + 3];
var4 += this.field429[var9 + 4];
var3 += this.field429[var9 + 5];
var2 += this.field429[var9 + 6];
var1 += this.field429[var9 + 7];
var8 += this.results[var9];
var7 += this.results[var9 + 1];
var6 += this.results[var9 + 2];
var5 += this.results[var9 + 3];
var4 += this.results[var9 + 4];
var3 += this.results[var9 + 5];
var2 += this.results[var9 + 6];
var1 += this.results[var9 + 7];
var8 ^= var7 << 11;
var5 += var8;
var7 += var6;
@@ -176,25 +185,25 @@ public final class IsaacCipher {
var1 ^= var8 >>> 9;
var6 += var1;
var8 += var7;
this.field430[var9] = var8;
this.field430[var9 + 1] = var7;
this.field430[var9 + 2] = var6;
this.field430[var9 + 3] = var5;
this.field430[var9 + 4] = var4;
this.field430[var9 + 5] = var3;
this.field430[var9 + 6] = var2;
this.field430[var9 + 7] = var1;
this.mm[var9] = var8;
this.mm[var9 + 1] = var7;
this.mm[var9 + 2] = var6;
this.mm[var9 + 3] = var5;
this.mm[var9 + 4] = var4;
this.mm[var9 + 5] = var3;
this.mm[var9 + 6] = var2;
this.mm[var9 + 7] = var1;
}
for (var9 = 0; var9 < 256; var9 += 8) {
var8 += this.field430[var9];
var7 += this.field430[var9 + 1];
var6 += this.field430[var9 + 2];
var5 += this.field430[var9 + 3];
var4 += this.field430[var9 + 4];
var3 += this.field430[var9 + 5];
var2 += this.field430[var9 + 6];
var1 += this.field430[var9 + 7];
var8 += this.mm[var9];
var7 += this.mm[var9 + 1];
var6 += this.mm[var9 + 2];
var5 += this.mm[var9 + 3];
var4 += this.mm[var9 + 4];
var3 += this.mm[var9 + 5];
var2 += this.mm[var9 + 6];
var1 += this.mm[var9 + 7];
var8 ^= var7 << 11;
var5 += var8;
var7 += var6;
@@ -219,18 +228,18 @@ public final class IsaacCipher {
var1 ^= var8 >>> 9;
var6 += var1;
var8 += var7;
this.field430[var9] = var8;
this.field430[var9 + 1] = var7;
this.field430[var9 + 2] = var6;
this.field430[var9 + 3] = var5;
this.field430[var9 + 4] = var4;
this.field430[var9 + 5] = var3;
this.field430[var9 + 6] = var2;
this.field430[var9 + 7] = var1;
this.mm[var9] = var8;
this.mm[var9 + 1] = var7;
this.mm[var9 + 2] = var6;
this.mm[var9 + 3] = var5;
this.mm[var9 + 4] = var4;
this.mm[var9 + 5] = var3;
this.mm[var9 + 6] = var2;
this.mm[var9 + 7] = var1;
}
this.method138();
this.field428 = 256;
this.generateMoreResults();
this.valuesRemaining = 256;
}
@ObfuscatedName("m")
@@ -238,7 +247,8 @@ public final class IsaacCipher {
signature = "(Lir;Lir;I)V",
garbageValue = "75867683"
)
public static void method4082(AbstractArchive var0, AbstractArchive var1) {
@Export("setNpcDefinitionArchives")
public static void setNpcDefinitionArchives(AbstractArchive var0, AbstractArchive var1) {
NPCDefinition.NpcDefinition_archive = var0;
NPCDefinition.NpcDefinition_modelArchive = var1;
}

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

@@ -22,7 +22,8 @@ public class ItemContainer extends Node {
@ObfuscatedSignature(
signature = "Lit;"
)
static Archive field434;
@Export("archive19")
static Archive archive19;
@ObfuscatedName("f")
@Export("ids")
int[] ids;

5
runescape-client/src/main/java/KitDefinition.java
View File

@@ -22,7 +22,8 @@ public class KitDefinition extends DualNode {
@ObfuscatedGetter(
intValue = 235389995
)
public static int field457;
@Export("KitDefinition_totalCount")
public static int KitDefinition_totalCount;
@ObfuscatedName("w")
@ObfuscatedSignature(
signature = "Ler;"
@@ -245,7 +246,7 @@ public class KitDefinition extends DualNode {
public static String method4866(Buffer var0) {
String var1;
try {
int var2 = var0.method48();
int var2 = var0.readUShortSmart();
if (var2 > 32767) {
var2 = 32767;
}

9
runescape-client/src/main/java/LoginPacket.java
View File

@@ -38,7 +38,8 @@ public class LoginPacket implements ClientPacketMarker {
@ObfuscatedSignature(
signature = "[Lgl;"
)
static final LoginPacket[] field478;
@Export("LoginPacket_indexedValues")
static final LoginPacket[] LoginPacket_indexedValues;
@ObfuscatedName("u")
@ObfuscatedGetter(
intValue = 1743806243
@@ -101,11 +102,11 @@ public class LoginPacket implements ClientPacketMarker {
field475 = new LoginPacket(16, -2);
field476 = new LoginPacket(18, -2);
field477 = new LoginPacket(27, 0);
field478 = new LoginPacket[32];
LoginPacket[] var0 = WorldMapIcon2.method300();
LoginPacket_indexedValues = new LoginPacket[32];
LoginPacket[] var0 = WorldMapIcon2.LoginPacket_values();
for (int var1 = 0; var1 < var0.length; ++var1) {
field478[var0[var1].id] = var0[var1];
LoginPacket_indexedValues[var0[var1].id] = var0[var1];
}
}

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

@@ -524,11 +524,11 @@ public class LoginScreenAnimation {
Buffer var9 = new Buffer(var4.index + var5.index + var8.index + 5);
var9.writeByte(2);
var9.writeByte(var4.index);
var9.method38(var4.array, 0, var4.index);
var9.writeBytes(var4.array, 0, var4.index);
var9.writeByte(var5.index);
var9.method38(var5.array, 0, var5.index);
var9.writeBytes(var5.array, 0, var5.index);
var9.writeShort(var8.index);
var9.method38(var8.array, 0, var8.index);
var9.writeBytes(var8.array, 0, var8.index);
byte[] var10 = var9.array;
int var11 = var10.length;
StringBuilder var12 = new StringBuilder();

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

@@ -120,7 +120,7 @@ public class MidiFileReader {
@ObfuscatedName("l")
@Export("readTrackLength")
void readTrackLength(int trackId) {
int var2 = this.buffer.method52();
int var2 = this.buffer.readVarInt();
int[] var3 = this.trackLengths;
var3[trackId] += var2;
}
@@ -148,7 +148,7 @@ public class MidiFileReader {
if (var3 != 240 && var3 != 247) {
return this.method167(trackId, var3);
} else {
int var4 = this.buffer.method52();
int var4 = this.buffer.readVarInt();
if (var3 == 247 && var4 > 0) {
int var5 = this.buffer.array[this.buffer.index] & 255;
if (var5 >= 241 && var5 <= 243 || var5 == 246 || var5 == 248 || var5 >= 250 && var5 <= 252 || var5 == 254) {
@@ -169,7 +169,7 @@ public class MidiFileReader {
int var3;
if (var2 == 255) {
int var8 = this.buffer.readUnsignedByte();
var3 = this.buffer.method52();
var3 = this.buffer.readVarInt();
Buffer var5;
if (var8 == 47) {
var5 = this.buffer;

67
runescape-client/src/main/java/MilliClock.java
View File

@@ -130,14 +130,15 @@ public class MilliClock extends Clock {
signature = "([Lbt;II[I[II)V",
garbageValue = "-1374398116"
)
static void method3400(World[] var0, int var1, int var2, int[] var3, int[] var4) {
if (var1 < var2) {
int var5 = var1 - 1;
int var6 = var2 + 1;
int var7 = (var2 + var1) / 2;
World var8 = var0[var7];
var0[var7] = var0[var1];
var0[var1] = var8;
@Export("sortWorlds")
static void sortWorlds(World[] worlds, int lowestUnsorted, int highestUnsorted, int[] sortOption1, int[] sortOption2) {
if (lowestUnsorted < highestUnsorted) {
int var5 = lowestUnsorted - 1;
int var6 = highestUnsorted + 1;
int var7 = (highestUnsorted + lowestUnsorted) / 2;
World var8 = worlds[var7];
worlds[var7] = worlds[lowestUnsorted];
worlds[lowestUnsorted] = var8;
while (var5 < var6) {
boolean var9 = true;
@@ -149,29 +150,29 @@ public class MilliClock extends Clock {
--var6;
for (var10 = 0; var10 < 4; ++var10) {
if (var3[var10] == 2) {
var11 = var0[var6].index;
if (sortOption1[var10] == 2) {
var11 = worlds[var6].index;
var12 = var8.index;
} else if (var3[var10] == 1) {
var11 = var0[var6].population;
} else if (sortOption1[var10] == 1) {
var11 = worlds[var6].population;
var12 = var8.population;
if (var11 == -1 && var4[var10] == 1) {
if (var11 == -1 && sortOption2[var10] == 1) {
var11 = 2001;
}
if (var12 == -1 && var4[var10] == 1) {
if (var12 == -1 && sortOption2[var10] == 1) {
var12 = 2001;
}
} else if (var3[var10] == 3) {
var11 = var0[var6].isMembersOnly() ? 1 : 0;
} else if (sortOption1[var10] == 3) {
var11 = worlds[var6].isMembersOnly() ? 1 : 0;
var12 = var8.isMembersOnly() ? 1 : 0;
} else {
var11 = var0[var6].id;
var11 = worlds[var6].id;
var12 = var8.id;
}
if (var12 != var11) {
if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) {
if ((sortOption2[var10] != 1 || var11 <= var12) && (sortOption2[var10] != 0 || var11 >= var12)) {
var9 = false;
}
break;
@@ -189,29 +190,29 @@ public class MilliClock extends Clock {
++var5;
for (var10 = 0; var10 < 4; ++var10) {
if (var3[var10] == 2) {
var11 = var0[var5].index;
if (sortOption1[var10] == 2) {
var11 = worlds[var5].index;
var12 = var8.index;
} else if (var3[var10] == 1) {
var11 = var0[var5].population;
} else if (sortOption1[var10] == 1) {
var11 = worlds[var5].population;
var12 = var8.population;
if (var11 == -1 && var4[var10] == 1) {
if (var11 == -1 && sortOption2[var10] == 1) {
var11 = 2001;
}
if (var12 == -1 && var4[var10] == 1) {
if (var12 == -1 && sortOption2[var10] == 1) {
var12 = 2001;
}
} else if (var3[var10] == 3) {
var11 = var0[var5].isMembersOnly() ? 1 : 0;
} else if (sortOption1[var10] == 3) {
var11 = worlds[var5].isMembersOnly() ? 1 : 0;
var12 = var8.isMembersOnly() ? 1 : 0;
} else {
var11 = var0[var5].id;
var11 = worlds[var5].id;
var12 = var8.id;
}
if (var11 != var12) {
if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) {
if ((sortOption2[var10] != 1 || var11 >= var12) && (sortOption2[var10] != 0 || var11 <= var12)) {
var9 = false;
}
break;
@@ -224,14 +225,14 @@ public class MilliClock extends Clock {
} while(var9);
if (var5 < var6) {
World var13 = var0[var5];
var0[var5] = var0[var6];
var0[var6] = var13;
World var13 = worlds[var5];
worlds[var5] = worlds[var6];
worlds[var6] = var13;
}
}
method3400(var0, var1, var6, var3, var4);
method3400(var0, var6 + 1, var2, var3, var4);
sortWorlds(worlds, lowestUnsorted, var6, sortOption1, sortOption2);
sortWorlds(worlds, var6 + 1, highestUnsorted, sortOption1, sortOption2);
}
}

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

@@ -1529,19 +1529,19 @@ public class Model extends Entity {
@ObfuscatedName("cy")
@Export("draw")
void draw(int yaw, int cameraPitchSine, int cameraPitchCosine, int cameraYawSine, int cameraYawCosine, int x, int y, int var8, long tag) {
void draw(int yaw, int cameraPitchSine, int cameraPitchCosine, int cameraYawSine, int cameraYawCosine, int x, int y, int z, long tag) {
field529[0] = -1;
if (this.boundsType != 1) {
this.calculateBoundsCylinder();
}
this.calculateBoundingBox(yaw);
int var11 = cameraYawCosine * var8 - cameraYawSine * x >> 16;
int var11 = cameraYawCosine * z - cameraYawSine * x >> 16;
int var12 = cameraPitchSine * y + cameraPitchCosine * var11 >> 16;
int var13 = cameraPitchCosine * this.xzRadius >> 16;
int var14 = var12 + var13;
if (var14 > 50 && var12 < 3500) {
int var15 = var8 * cameraYawSine + cameraYawCosine * x >> 16;
int var15 = z * cameraYawSine + cameraYawCosine * x >> 16;
int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom;
if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) {
int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom;
@@ -1578,7 +1578,7 @@ public class Model extends Entity {
if (var30 && var29) {
boolean var35 = false;
if (field539) {
var35 = Decimator.method2491(this, x, y, var8);
var35 = Decimator.boundingBoxCheck(this, x, y, z);
} else {
var32 = var12 - var13;
if (var32 <= 50) {
@@ -1639,7 +1639,7 @@ public class Model extends Entity {
var37 += x;
var38 += y;
var39 += var8;
var39 += z;
var40 = var39 * cameraYawSine + cameraYawCosine * var37 >> 16;
var39 = cameraYawCosine * var39 - var37 * cameraYawSine >> 16;
var37 = var40;

36
runescape-client/src/main/java/ModelData.java
View File

@@ -532,17 +532,17 @@ public class ModelData extends Entity {
var50 = var2.readUnsignedByte();
var51 = 0;
if ((var50 & 1) != 0) {
var51 = var3.method47();
var51 = var3.readShortSmart();
}
var52 = 0;
if ((var50 & 2) != 0) {
var52 = var4.method47();
var52 = var4.readShortSmart();
}
var53 = 0;
if ((var50 & 4) != 0) {
var53 = var5.method47();
var53 = var5.readShortSmart();
}
this.verticesX[var49] = var46 + var51;
@@ -602,9 +602,9 @@ public class ModelData extends Entity {
for (var53 = 0; var53 < var10; ++var53) {
var54 = var3.readUnsignedByte();
if (var54 == 1) {
var49 = var2.method47() + var52;
var50 = var2.method47() + var49;
var51 = var2.method47() + var50;
var49 = var2.readShortSmart() + var52;
var50 = var2.readShortSmart() + var49;
var51 = var2.readShortSmart() + var50;
var52 = var51;
this.indices1[var53] = var49;
this.indices2[var53] = var50;
@@ -613,7 +613,7 @@ public class ModelData extends Entity {
if (var54 == 2) {
var50 = var51;
var51 = var2.method47() + var52;
var51 = var2.readShortSmart() + var52;
var52 = var51;
this.indices1[var53] = var49;
this.indices2[var53] = var50;
@@ -622,7 +622,7 @@ public class ModelData extends Entity {
if (var54 == 3) {
var49 = var51;
var51 = var2.method47() + var52;
var51 = var2.readShortSmart() + var52;
var52 = var51;
this.indices1[var53] = var49;
this.indices2[var53] = var50;
@@ -633,7 +633,7 @@ public class ModelData extends Entity {
int var55 = var49;
var49 = var50;
var50 = var55;
var51 = var2.method47() + var52;
var51 = var2.readShortSmart() + var52;
var52 = var51;
this.indices1[var53] = var49;
this.indices2[var53] = var55;
@@ -790,17 +790,17 @@ public class ModelData extends Entity {
var39 = var4.readUnsignedByte();
var40 = 0;
if ((var39 & 1) != 0) {
var40 = var5.method47();
var40 = var5.readShortSmart();
}
var41 = 0;
if ((var39 & 2) != 0) {
var41 = var6.method47();
var41 = var6.readShortSmart();
}
var42 = 0;
if ((var39 & 4) != 0) {
var42 = var7.method47();
var42 = var7.readShortSmart();
}
this.verticesX[var38] = var35 + var40;
@@ -869,9 +869,9 @@ public class ModelData extends Entity {
for (var42 = 0; var42 < var10; ++var42) {
var43 = var5.readUnsignedByte();
if (var43 == 1) {
var38 = var4.method47() + var41;
var39 = var4.method47() + var38;
var40 = var4.method47() + var39;
var38 = var4.readShortSmart() + var41;
var39 = var4.readShortSmart() + var38;
var40 = var4.readShortSmart() + var39;
var41 = var40;
this.indices1[var42] = var38;
this.indices2[var42] = var39;
@@ -880,7 +880,7 @@ public class ModelData extends Entity {
if (var43 == 2) {
var39 = var40;
var40 = var4.method47() + var41;
var40 = var4.readShortSmart() + var41;
var41 = var40;
this.indices1[var42] = var38;
this.indices2[var42] = var39;
@@ -889,7 +889,7 @@ public class ModelData extends Entity {
if (var43 == 3) {
var38 = var40;
var40 = var4.method47() + var41;
var40 = var4.readShortSmart() + var41;
var41 = var40;
this.indices1[var42] = var38;
this.indices2[var42] = var39;
@@ -900,7 +900,7 @@ public class ModelData extends Entity {
var44 = var38;
var38 = var39;
var39 = var44;
var40 = var4.method47() + var41;
var40 = var4.readShortSmart() + var41;
var41 = var40;
this.indices1[var42] = var38;
this.indices2[var42] = var44;

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

@@ -141,8 +141,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
return !mouseEvent.isAltDown() && var2 != 2 ? (!mouseEvent.isMetaDown() && var2 != 3 ? 1 : 2) : 4;
}
@Export("mouseMoved")
@ObfuscatedName("mouseMoved")
public final synchronized void mouseMoved(MouseEvent var1) {
if (MouseHandler_instance != null) {
MouseHandler_idleCycles = 0;
@@ -153,8 +151,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
}
@Export("mousePressed")
@ObfuscatedName("mousePressed")
public final synchronized void mousePressed(MouseEvent var1) {
if (MouseHandler_instance != null) {
MouseHandler_idleCycles = 0;
@@ -173,8 +169,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
}
@Export("mouseReleased")
@ObfuscatedName("mouseReleased")
public final synchronized void mouseReleased(MouseEvent var1) {
if (MouseHandler_instance != null) {
MouseHandler_idleCycles = 0;
@@ -208,19 +202,13 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
}
@Export("mouseDragged")
@ObfuscatedName("mouseDragged")
public final synchronized void mouseDragged(MouseEvent var1) {
this.mouseMoved(var1);
}
@Export("focusGained")
@ObfuscatedName("focusGained")
public final void focusGained(FocusEvent var1) {
}
@Export("focusLost")
@ObfuscatedName("focusLost")
public final synchronized void focusLost(FocusEvent var1) {
if (MouseHandler_instance != null) {
MouseHandler_currentButton0 = 0;
@@ -228,8 +216,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
}
@Export("mouseEntered")
@ObfuscatedName("mouseEntered")
public final synchronized void mouseEntered(MouseEvent var1) {
this.mouseMoved(var1);
}

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

@@ -177,7 +177,7 @@ public class MusicPatch extends Node {
var21 = -1;
}
var23 = var2.method52();
var23 = var2.readVarInt();
}
this.field568[var24] = (short)(this.field568[var24] + ((var23 - 1 & 2) << 14));

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

@@ -122,7 +122,7 @@ public class MusicSample extends Node {
} while(var6 >= 255);
byte[] var7 = new byte[var5];
var2.method46(var7, 0, var5);
var2.readBytes(var7, 0, var5);
this.field620[var4] = var7;
}

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

@@ -82,7 +82,7 @@ public class MusicTrack extends Node {
var14 = var2 + var5 + var6 + var7 + var8 + var9 + var10 + var11 + var12;
for (var15 = 0; var15 < var14; ++var15) {
var1.method52();
var1.readVarInt();
}
var4 += var1.index - var13;
@@ -205,8 +205,8 @@ public class MusicTrack extends Node {
while (true) {
while (true) {
int var63 = var1.method52();
var51.method42(var63);
int var63 = var1.readVarInt();
var51.writeVarInt(var63);
int var64 = var1.array[var29++] & 255;
boolean var65 = var64 != var62;
var62 = var64 & 15;
@@ -217,7 +217,7 @@ public class MusicTrack extends Node {
var51.writeByte(47);
var51.writeByte(0);
var51.method39(var51.index - var61);
var51.writeLengthInt(var51.index - var61);
continue label222;
}

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

@@ -31,9 +31,9 @@ public class NetFileRequest extends DualNode {
static final void method4555(Widget[] var0, int var1) {
for (int var2 = 0; var2 < var0.length; ++var2) {
Widget var3 = var0[var2];
if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !PacketBufferNode.method3673(var3))) {
if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !PacketBufferNode.isComponentHidden(var3))) {
if (var3.type == 0) {
if (!var3.isIf3 && PacketBufferNode.method3673(var3) && var3 != Clock.mousedOverWidgetIf1) {
if (!var3.isIf3 && PacketBufferNode.isComponentHidden(var3) && var3 != Clock.mousedOverWidgetIf1) {
continue;
}

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

@@ -440,11 +440,11 @@ public class ObjectDefinition extends DualNode {
} else if (var2 == 69) {
var1.readUnsignedByte();
} else if (var2 == 70) {
this.offsetX = var1.method44();
this.offsetX = var1.readShort();
} else if (var2 == 71) {
this.offsetHeight = var1.method44();
this.offsetHeight = var1.readShort();
} else if (var2 == 72) {
this.offsetY = var1.method44();
this.offsetY = var1.readShort();
} else if (var2 == 73) {
this.boolean2 = true;
} else if (var2 == 74) {

30
runescape-client/src/main/java/PacketBuffer.java
View File

@@ -19,8 +19,8 @@ public final class PacketBuffer extends Buffer {
@ObfuscatedSignature(
signature = "Lhn;"
)
@Export("isaacCipher0")
IsaacCipher isaacCipher0;
@Export("isaacCipher")
IsaacCipher isaacCipher;
@ObfuscatedName("d")
@ObfuscatedGetter(
intValue = -1048718919
@@ -39,7 +39,7 @@ public final class PacketBuffer extends Buffer {
)
@Export("newIsaacCipher")
public void newIsaacCipher(int[] array) {
this.isaacCipher0 = new IsaacCipher(array);
this.isaacCipher = new IsaacCipher(array);
}
@ObfuscatedName("ih")
@@ -49,7 +49,7 @@ public final class PacketBuffer extends Buffer {
)
@Export("setIsaacCipher")
public void setIsaacCipher(IsaacCipher isaacCipher) {
this.isaacCipher0 = isaacCipher;
this.isaacCipher = isaacCipher;
}
@ObfuscatedName("im")
@@ -59,7 +59,7 @@ public final class PacketBuffer extends Buffer {
)
@Export("writeByteIsaac")
public void writeByteIsaac(int var1) {
super.array[++super.index - 1] = (byte)(var1 + this.isaacCipher0.method136());
super.array[++super.index - 1] = (byte)(var1 + this.isaacCipher.nextInt());
}
@ObfuscatedName("ii")
@@ -69,7 +69,7 @@ public final class PacketBuffer extends Buffer {
)
@Export("readByteIsaac")
public int readByteIsaac() {
return super.array[++super.index - 1] - this.isaacCipher0.method136() & 255;
return super.array[++super.index - 1] - this.isaacCipher.nextInt() & 255;
}
@ObfuscatedName("ig")
@@ -78,7 +78,7 @@ public final class PacketBuffer extends Buffer {
garbageValue = "101"
)
public boolean method236() {
int var1 = super.array[super.index] - this.isaacCipher0.method137() & 255;
int var1 = super.array[super.index] - this.isaacCipher.method137() & 255;
return var1 >= 128;
}
@@ -89,8 +89,8 @@ public final class PacketBuffer extends Buffer {
)
@Export("readSmartByteShortIsaac")
public int readSmartByteShortIsaac() {
int var1 = super.array[++super.index - 1] - this.isaacCipher0.method136() & 255;
return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.index - 1] - this.isaacCipher0.method136() & 255);
int var1 = super.array[++super.index - 1] - this.isaacCipher.nextInt() & 255;
return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.index - 1] - this.isaacCipher.nextInt() & 255);
}
@ObfuscatedName("jb")
@@ -100,7 +100,7 @@ public final class PacketBuffer extends Buffer {
)
public void method237(byte[] var1, int var2, int var3) {
for (int var4 = 0; var4 < var3; ++var4) {
var1[var4 + var2] = (byte)(super.array[++super.index - 1] - this.isaacCipher0.method136());
var1[var4 + var2] = (byte)(super.array[++super.index - 1] - this.isaacCipher.nextInt());
}
}
@@ -175,7 +175,7 @@ public final class PacketBuffer extends Buffer {
garbageValue = "-1562700981"
)
@Export("requestNetFile")
static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) {
static void requestNetFile(Archive archive, int var1, int var2, int var3, byte var4, boolean priority) {
long var6 = (long)((var1 << 16) + var2);
NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6);
if (var8 == null) {
@@ -183,14 +183,14 @@ public final class PacketBuffer extends Buffer {
if (var8 == null) {
var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6);
if (var8 != null) {
if (var5) {
if (priority) {
var8.removeDual();
NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
--NetCache.NetCache_pendingWritesCount;
++NetCache.NetCache_pendingPriorityWritesCount;
}
} else {
if (!var5) {
if (!priority) {
var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6);
if (var8 != null) {
return;
@@ -198,10 +198,10 @@ public final class PacketBuffer extends Buffer {
}
var8 = new NetFileRequest();
var8.archive = var0;
var8.archive = archive;
var8.crc = var3;
var8.padding = var4;
if (var5) {
if (priority) {
NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
++NetCache.NetCache_pendingPriorityWritesCount;
} else {

5
runescape-client/src/main/java/PacketBufferNode.java
View File

@@ -57,8 +57,9 @@ public class PacketBufferNode extends Node {
signature = "(Lho;I)Z",
garbageValue = "-739353556"
)
static boolean method3673(Widget var0) {
return var0.isHidden;
@Export("isComponentHidden")
static boolean isComponentHidden(Widget component) {
return component.isHidden;
}
static {

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

@@ -128,7 +128,7 @@ public class PacketWriter {
break;
}
this.buffer.method38(var1.packetBuffer.array, 0, var1.field671);
this.buffer.writeBytes(var1.packetBuffer.array, 0, var1.field671);
this.field672 -= var1.field671;
var1.remove();
var1.packetBuffer.method36();

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

@@ -287,7 +287,7 @@ public final class Player extends Actor {
this.appearance = new PlayerAppearance();
}
this.appearance.method256(var4, var9, var2 == 1, var3);
this.appearance.update(var4, var9, var2 == 1, var3);
}
@ObfuscatedName("f")

38
runescape-client/src/main/java/PlayerAppearance.java
View File

@@ -10,7 +10,8 @@ public class PlayerAppearance {
@ObfuscatedName("g")
public static short[] field726;
@ObfuscatedName("d")
static final int[] field727;
@Export("equipmentIndices")
static final int[] equipmentIndices;
@ObfuscatedName("k")
@ObfuscatedSignature(
signature = "Ler;"
@@ -48,25 +49,26 @@ public class PlayerAppearance {
signature = "([I[IZII)V",
garbageValue = "727056871"
)
public void method256(int[] var1, int[] var2, boolean var3, int var4) {
if (var1 == null) {
var1 = new int[12];
@Export("update")
public void update(int[] equipment, int[] bodyColors, boolean isFemale, int npcTransformId) {
if (equipment == null) {
equipment = new int[12];
for (int var5 = 0; var5 < 7; ++var5) {
for (int var6 = 0; var6 < KitDefinition.field457; ++var6) {
for (int var6 = 0; var6 < KitDefinition.KitDefinition_totalCount; ++var6) {
KitDefinition var7 = WorldMapSection2.getKitDefinition(var6);
if (var7 != null && !var7.nonSelectable && var5 + (var3 ? 7 : 0) == var7.bodypartID) {
var1[field727[var5]] = var6 + 256;
if (var7 != null && !var7.nonSelectable && var5 + (isFemale ? 7 : 0) == var7.bodypartID) {
equipment[equipmentIndices[var5]] = var6 + 256;
break;
}
}
}
}
this.equipment = var1;
this.bodyColors = var2;
this.isFemale = var3;
this.npcTransformId = var4;
this.equipment = equipment;
this.bodyColors = bodyColors;
this.isFemale = isFemale;
this.npcTransformId = npcTransformId;
this.setHash();
}
@@ -77,7 +79,7 @@ public class PlayerAppearance {
)
public void method257(int var1, boolean var2) {
if (var1 != 1 || !this.isFemale) {
int var3 = this.equipment[field727[var1]];
int var3 = this.equipment[equipmentIndices[var1]];
if (var3 != 0) {
var3 -= 256;
@@ -88,11 +90,11 @@ public class PlayerAppearance {
if (!var2) {
--var3;
if (var3 < 0) {
var3 = KitDefinition.field457 - 1;
var3 = KitDefinition.KitDefinition_totalCount - 1;
}
} else {
++var3;
if (var3 >= KitDefinition.field457) {
if (var3 >= KitDefinition.KitDefinition_totalCount) {
var3 = 0;
}
}
@@ -102,7 +104,7 @@ public class PlayerAppearance {
} while(var4.nonSelectable);
} while(var1 + (this.isFemale ? 7 : 0) != var4.bodypartID);
this.equipment[field727[var1]] = var3 + 256;
this.equipment[equipmentIndices[var1]] = var3 + 256;
this.setHash();
}
}
@@ -143,7 +145,7 @@ public class PlayerAppearance {
)
public void method259(boolean var1) {
if (this.isFemale != var1) {
this.method256((int[])null, this.bodyColors, var1, -1);
this.update((int[])null, this.bodyColors, var1, -1);
}
}
@@ -158,7 +160,7 @@ public class PlayerAppearance {
int var2;
for (var2 = 0; var2 < 7; ++var2) {
int var3 = this.equipment[field727[var2]];
int var3 = this.equipment[equipmentIndices[var2]];
if (var3 == 0) {
var1.writeByte(-1);
} else {
@@ -408,7 +410,7 @@ public class PlayerAppearance {
}
static {
field727 = new int[]{8, 11, 4, 6, 9, 7, 10};
equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10};
PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260);
}
}

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

@@ -411,9 +411,9 @@ public class Rasterizer2D extends DualNode {
}
@Export("Rasterizer2D_drawGradient")
@Export("Rasterizer2D_fillRectangleGradient")
@ObfuscatedName("dw")
public static void Rasterizer2D_drawGradient(int x, int y, int width, int height, int rgbTop, int rgbBot) {
public static void Rasterizer2D_fillRectangleGradient(int x, int y, int width, int height, int rgbTop, int rgbBot) {
if (width > 0 && height > 0) {
int var6 = 0;
int var7 = 65536 / height;
@@ -456,8 +456,8 @@ public class Rasterizer2D extends DualNode {
}
@ObfuscatedName("dv")
@Export("drawGradientAlpha")
public static void drawGradientAlpha(int x, int y, int width, int height, int rgbTop, int rgbBot, int alphaTop, int alphaBot) {
@Export("Rasterizer2D_fillRectangleGradientAlpha")
public static void Rasterizer2D_fillRectangleGradientAlpha(int x, int y, int width, int height, int rgbTop, int rgbBot, int alphaTop, int alphaBot) {
if (width > 0 && height > 0) {
int var8 = 0;
int var9 = 65536 / height;

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

@@ -69,8 +69,8 @@ public class Rasterizer3D extends Rasterizer2D {
public static int[] Rasterizer3D_cosine;
@ObfuscatedName("m")
@Export("Rasterizer3D_method1")
public static final void Rasterizer3D_method1() {
@Export("Rasterizer3D_setClipFromRasterizer2D")
public static final void Rasterizer3D_setClipFromRasterizer2D() {
Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd);
}

28
runescape-client/src/main/java/RectangleMode.java
View File

@@ -11,17 +11,20 @@ public enum RectangleMode implements Enumerated {
@ObfuscatedSignature(
signature = "Llj;"
)
field757(0, 0),
@Export("SOLID")
SOLID(0, 0),
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "Llj;"
)
field758(1, 1),
@Export("GRADIENT_COLOR")
GRADIENT_COLOR(1, 1),
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "Llj;"
)
field759(2, 2);
@Export("GRADIENT_ALPHA")
GRADIENT_ALPHA(2, 2);
@ObfuscatedName("d")
@Export("musicTrackBoolean")
@@ -30,18 +33,18 @@ public enum RectangleMode implements Enumerated {
@ObfuscatedGetter(
intValue = -1391612747
)
@Export("id")
public final int id;
@Export("value")
public final int value;
@ObfuscatedName("o")
@ObfuscatedGetter(
intValue = -1204297807
)
@Export("id2")
final int id2;
@Export("id")
final int id;
private RectangleMode(int var3, int var4) {
this.id = var3;
this.id2 = var4;
this.value = var3;
this.id = var4;
}
@ObfuscatedName("f")
@@ -51,7 +54,7 @@ public enum RectangleMode implements Enumerated {
)
@Export("rsOrdinal")
public int rsOrdinal() {
return this.id2;
return this.id;
}
@ObfuscatedName("m")
@@ -59,9 +62,10 @@ public enum RectangleMode implements Enumerated {
signature = "(Lir;Lir;ZB)V",
garbageValue = "1"
)
public static void method6028(AbstractArchive var0, AbstractArchive var1, boolean var2) {
@Export("setObjectDefinitionArchives")
public static void setObjectDefinitionArchives(AbstractArchive var0, AbstractArchive var1, boolean isLowDetail) {
ObjectDefinition.ObjectDefinition_archive = var0;
ObjectDefinition.field640 = var1;
ObjectDefinition.ObjectDefinition_isLowDetail = var2;
ObjectDefinition.ObjectDefinition_isLowDetail = isLowDetail;
}
}

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

@@ -500,7 +500,7 @@ public class ServerPacket {
int var13 = 0;
while (true) {
int var14 = var10.method48();
int var14 = var10.readUShortSmart();
if (var14 == 0) {
break;
}

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

@@ -123,9 +123,9 @@ public class SoundCache {
)
@Export("getSoundEffect")
public RawSound getSoundEffect(int var1, int[] var2) {
if (this.soundEffectIndex.method5() == 1) {
if (this.soundEffectIndex.getGroupCount() == 1) {
return this.getSoundEffect0(0, var1, var2);
} else if (this.soundEffectIndex.method4(var1) == 1) {
} else if (this.soundEffectIndex.getGroupFileCount(var1) == 1) {
return this.getSoundEffect0(var1, 0, var2);
} else {
throw new RuntimeException();
@@ -139,9 +139,9 @@ public class SoundCache {
)
@Export("getMusicSample")
public RawSound getMusicSample(int var1, int[] var2) {
if (this.musicSampleIndex.method5() == 1) {
if (this.musicSampleIndex.getGroupCount() == 1) {
return this.getMusicSample0(0, var1, var2);
} else if (this.musicSampleIndex.method4(var1) == 1) {
} else if (this.musicSampleIndex.getGroupFileCount(var1) == 1) {
return this.getMusicSample0(var1, 0, var2);
} else {
throw new RuntimeException();

16
runescape-client/src/main/java/Sprite.java
View File

@@ -181,7 +181,8 @@ public final class Sprite extends Rasterizer2D {
}
@ObfuscatedName("l")
public void method307(int var1) {
@Export("outline")
public void outline(int color) {
int[] var2 = new int[this.subWidth * this.subHeight];
int var3 = 0;
@@ -190,13 +191,13 @@ public final class Sprite extends Rasterizer2D {
int var6 = this.pixels[var3];
if (var6 == 0) {
if (var5 > 0 && this.pixels[var3 - 1] != 0) {
var6 = var1;
var6 = color;
} else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) {
var6 = var1;
var6 = color;
} else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) {
var6 = var1;
var6 = color;
} else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) {
var6 = var1;
var6 = color;
}
}
@@ -208,13 +209,14 @@ public final class Sprite extends Rasterizer2D {
}
@ObfuscatedName("e")
public void method308(int var1) {
@Export("shadow")
public void shadow(int color) {
for (int var2 = this.subHeight - 1; var2 > 0; --var2) {
int var3 = var2 * this.subWidth;
for (int var4 = this.subWidth - 1; var4 > 0; --var4) {
if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) {
this.pixels[var4 + var3] = var1;
this.pixels[var4 + var3] = color;
}
}
}

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

@@ -31,7 +31,7 @@ public class Strings {
throw new RuntimeException();
} else if (var2 == 0) {
byte[] var6 = new byte[var3];
var1.method46(var6, 0, var3);
var1.readBytes(var6, 0, var3);
return var6;
} else {
int var4 = var1.readInt();

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

@@ -69,7 +69,7 @@ public class TextureProvider implements TextureLoader {
this.textureSize = var6;
int[] var7 = var1.method3(0);
int var8 = var7.length;
this.textures = new Texture[var1.method4(0)];
this.textures = new Texture[var1.getGroupFileCount(0)];
for (int var9 = 0; var9 < var8; ++var9) {
Buffer var10 = new Buffer(var1.takeFile(0, var7[var9]));
@@ -277,7 +277,7 @@ public class TextureProvider implements TextureLoader {
while (true) {
int var13;
while (!var8) {
var13 = var4.method48();
var13 = var4.readUShortSmart();
if (var13 == 0) {
continue label56;
}
@@ -301,7 +301,7 @@ public class TextureProvider implements TextureLoader {
}
}
var13 = var4.method48();
var13 = var4.readUShortSmart();
if (var13 == 0) {
break;
}

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

@@ -71,7 +71,7 @@ public class UserComparator7 extends AbstractUserComparator {
for (int var12 = 0; var12 < var7; ++var12) {
var11 = var0.readInt();
var10[var12] = new byte[var11];
var0.method46(var10[var12], 0, var11);
var0.readBytes(var10[var12], 0, var11);
}
}

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

@@ -33,7 +33,7 @@ public class Varcs {
Varcs() {
this.unwrittenChanges = false;
int var1 = ObjectSound.archive2.method4(19);
int var1 = ObjectSound.archive2.getGroupFileCount(19);
this.map = new HashMap();
this.intsPersistence = new boolean[var1];
@@ -45,7 +45,7 @@ public class Varcs {
var2 = 0;
if (ObjectSound.archive2.method133(15)) {
var2 = ObjectSound.archive2.method4(15);
var2 = ObjectSound.archive2.getGroupFileCount(15);
}
this.strings = new String[var2];

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

@@ -39,10 +39,10 @@ public class Varps {
)
static void method4400(Buffer var0) {
if (Client.field172 != null) {
var0.method38(Client.field172, 0, Client.field172.length);
var0.writeBytes(Client.field172, 0, Client.field172.length);
} else {
byte[] var1 = AttackOption.method2032();
var0.method38(var1, 0, var1.length);
var0.writeBytes(var1, 0, var1.length);
}
}

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

@@ -112,26 +112,26 @@ public class ViewportMouse {
if (var1 >= 300 && var1 <= 313) {
var2 = (var1 - 300) / 2;
var3 = var1 & 1;
Client.field119.method257(var2, var3 == 1);
Client.playerAppearance.method257(var2, var3 == 1);
}
if (var1 >= 314 && var1 <= 323) {
var2 = (var1 - 314) / 2;
var3 = var1 & 1;
Client.field119.method258(var2, var3 == 1);
Client.playerAppearance.method258(var2, var3 == 1);
}
if (var1 == 324) {
Client.field119.method259(false);
Client.playerAppearance.method259(false);
}
if (var1 == 325) {
Client.field119.method259(true);
Client.playerAppearance.method259(true);
}
if (var1 == 326) {
PacketBufferNode var4 = Interpreter.method1915(ClientPacket.field234, Client.packetWriter.isaacCipher);
Client.field119.method260(var4.packetBuffer);
Client.playerAppearance.method260(var4.packetBuffer);
Client.packetWriter.method241(var4);
return true;
} else {

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

@@ -88,7 +88,7 @@ public final class WallDecoration {
int var2 = -1;
for (int var3 = 0; var3 < var1; ++var3) {
var2 = var2 >>> 8 ^ Buffer.field45[(var2 ^ var0[var3]) & 255];
var2 = var2 >>> 8 ^ Buffer.crc32Table[(var2 ^ var0[var3]) & 255];
}
var2 = ~var2;

30
runescape-client/src/main/java/Widget.java
View File

@@ -724,7 +724,7 @@ public class Widget extends Node {
this.mouseOverColor = 0;
this.mouseOverColor2 = 0;
this.fill = false;
this.rectangleMode = RectangleMode.field757;
this.rectangleMode = RectangleMode.SOLID;
this.transparency = 0;
this.field960 = 0;
this.lineWid = 1;
@@ -801,8 +801,8 @@ public class Widget extends Node {
this.type = buffer.readUnsignedByte();
this.buttonType = buffer.readUnsignedByte();
this.contentType = buffer.readUnsignedShort();
this.rawX = buffer.method44();
this.rawY = buffer.method44();
this.rawX = buffer.readShort();
this.rawY = buffer.readShort();
this.rawWidth = buffer.readUnsignedShort();
this.rawHeight = buffer.readUnsignedShort();
this.transparency = buffer.readUnsignedByte();
@@ -893,8 +893,8 @@ public class Widget extends Node {
for (var8 = 0; var8 < 20; ++var8) {
int var9 = buffer.readUnsignedByte();
if (var9 == 1) {
this.inventoryXOffsets[var8] = buffer.method44();
this.inventoryYOffsets[var8] = buffer.method44();
this.inventoryXOffsets[var8] = buffer.readShort();
this.inventoryYOffsets[var8] = buffer.readShort();
this.inventorySprites[var8] = buffer.readInt();
} else {
this.inventorySprites[var8] = -1;
@@ -987,8 +987,8 @@ public class Widget extends Node {
this.textShadowed = buffer.readUnsignedByte() == 1;
this.color = buffer.readInt();
this.paddingX = buffer.method44();
this.paddingY = buffer.method44();
this.paddingX = buffer.readShort();
this.paddingY = buffer.readShort();
var4 = buffer.readUnsignedByte();
if (var4 == 1) {
this.clickMask |= 1073741824;
@@ -1058,11 +1058,11 @@ public class Widget extends Node {
this.isIf3 = true;
this.type = buffer.readUnsignedByte();
this.contentType = buffer.readUnsignedShort();
this.rawX = buffer.method44();
this.rawY = buffer.method44();
this.rawX = buffer.readShort();
this.rawY = buffer.readShort();
this.rawWidth = buffer.readUnsignedShort();
if (this.type == 9) {
this.rawHeight = buffer.method44();
this.rawHeight = buffer.readShort();
} else {
this.rawHeight = buffer.readUnsignedShort();
}
@@ -1103,8 +1103,8 @@ public class Widget extends Node {
this.modelId = -1;
}
this.modelOffsetX = buffer.method44();
this.modelOffsetY = buffer.method44();
this.modelOffsetX = buffer.readShort();
this.modelOffsetY = buffer.readShort();
this.modelAngleX = buffer.readUnsignedShort();
this.modelAngleY = buffer.readUnsignedShort();
this.modelAngleZ = buffer.readUnsignedShort();
@@ -1293,15 +1293,15 @@ public class Widget extends Node {
}
if (this.outline >= 1) {
var5.method307(1);
var5.outline(1);
}
if (this.outline >= 2) {
var5.method307(16777215);
var5.outline(16777215);
}
if (this.spriteShadow != 0) {
var5.method308(this.spriteShadow);
var5.shadow(this.spriteShadow);
}
widgetSpriteCache.put(var5, var3);

5
runescape-client/src/main/java/World.java
View File

@@ -17,7 +17,8 @@ public class World {
@ObfuscatedGetter(
intValue = 1143875805
)
static int field987;
@Export("worldListWorldCount")
static int worldListWorldCount;
@ObfuscatedName("l")
@Export("sortOption2")
static int[] sortOption2;
@@ -136,7 +137,7 @@ public class World {
static {
worldsCount = 0;
field987 = 0;
worldListWorldCount = 0;
sortOption2 = new int[]{1, 1, 1, 1};
sortOption1 = new int[]{0, 1, 2, 3};
}

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

@@ -177,7 +177,7 @@ public class WorldMapElement extends DualNode {
int var4;
for (var4 = 0; var4 < var3 * 2; ++var4) {
this.field1023[var4] = buffer.method44();
this.field1023[var4] = buffer.readShort();
}
buffer.readInt();
@@ -210,8 +210,8 @@ public class WorldMapElement extends DualNode {
buffer.readUnsignedByte();
buffer.readUnsignedByte();
} else if (opcode == 24) {
buffer.method44();
buffer.method44();
buffer.readShort();
buffer.readShort();
} else if (opcode == 25) {
buffer.method51();
} else if (opcode == 28) {

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

@@ -115,7 +115,8 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
signature = "(I)[Lgl;",
garbageValue = "1026409510"
)
static LoginPacket[] method300() {
@Export("LoginPacket_values")
static LoginPacket[] LoginPacket_values() {
return new LoginPacket[]{LoginPacket.field475, LoginPacket.field476, LoginPacket.field473, LoginPacket.field477, LoginPacket.field474};
}

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

@@ -148,7 +148,7 @@ public class WorldMapLabel {
}
}
var0.method53(var2);
var0.writeCrc(var2);
var1.remove();
}

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

@@ -35,7 +35,8 @@ public class WorldMapLabelSize {
@ObfuscatedSignature(
signature = "Lit;"
)
static Archive field1040;
@Export("archive18")
static Archive archive18;
@ObfuscatedName("fi")
@ObfuscatedGetter(
intValue = 1577759565

32
runescape-client/src/main/java/WorldMapManager.java
View File

@@ -13,8 +13,8 @@ import net.runelite.mapping.ObfuscatedSignature;
@Implements("WorldMapManager")
public final class WorldMapManager {
@ObfuscatedName("m")
@Export("isLoaded0")
boolean isLoaded0;
@Export("loaded")
boolean loaded;
@ObfuscatedName("f")
@Export("loadStarted")
boolean loadStarted;
@@ -92,7 +92,7 @@ public final class WorldMapManager {
signature = "([Llq;Ljava/util/HashMap;Lir;Lir;)V"
)
public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) {
this.isLoaded0 = false;
this.loaded = false;
this.loadStarted = false;
this.field1045 = new HashMap();
this.field1050 = 0;
@@ -108,15 +108,15 @@ public final class WorldMapManager {
garbageValue = "32"
)
@Export("load")
public void load(AbstractArchive indexCache, String cacheName, boolean isMembersWorld) {
public void load(AbstractArchive archive, String cacheName, boolean isMembersWorld) {
if (!this.loadStarted) {
this.isLoaded0 = false;
this.loaded = false;
this.loadStarted = true;
System.nanoTime();
int var4 = indexCache.getGroupId(WorldMapCacheName.WorldMapCacheName_details.name);
int var5 = indexCache.getFileId(var4, cacheName);
Buffer var6 = new Buffer(indexCache.takeFileByNames(WorldMapCacheName.WorldMapCacheName_details.name, cacheName));
Buffer var7 = new Buffer(indexCache.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, cacheName));
int var4 = archive.getGroupId(WorldMapCacheName.WorldMapCacheName_details.name);
int var5 = archive.getFileId(var4, cacheName);
Buffer var6 = new Buffer(archive.takeFileByNames(WorldMapCacheName.WorldMapCacheName_details.name, cacheName));
Buffer var7 = new Buffer(archive.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, cacheName));
System.nanoTime();
System.nanoTime();
this.mapAreaData = new WorldMapAreaData();
@@ -164,15 +164,15 @@ public final class WorldMapManager {
System.nanoTime();
System.nanoTime();
if (indexCache.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, cacheName)) {
byte[] var18 = indexCache.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, cacheName);
if (archive.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, cacheName)) {
byte[] var18 = archive.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, cacheName);
this.overviewSprite = class27.convertJpgToSprite(var18);
}
System.nanoTime();
indexCache.method6();
indexCache.method8();
this.isLoaded0 = true;
archive.method6();
archive.method8();
this.loaded = true;
}
}
@@ -315,7 +315,7 @@ public final class WorldMapManager {
)
public List method403(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
LinkedList var11 = new LinkedList();
if (!this.isLoaded0) {
if (!this.loaded) {
return var11;
} else {
WorldMapRectangle var12 = this.method643(var1, var2, var3, var4);
@@ -386,7 +386,7 @@ public final class WorldMapManager {
)
@Export("isLoaded")
public boolean isLoaded() {
return this.isLoaded0;
return this.loaded;
}
@ObfuscatedName("e")

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

@@ -24,8 +24,8 @@ public final class WorldMapRectangle
@ObfuscatedSignature(
signature = "Lit;"
)
@Export("archive16")
static Archive archive16;
@Export("archive17")
static Archive archive17;
@ObfuscatedName("m")
@ObfuscatedGetter(
intValue = 1976624405
@@ -89,13 +89,13 @@ public final class WorldMapRectangle
garbageValue = "-15"
)
@Export("newArchive")
static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) {
static Archive newArchive(int index, boolean releaseGroups, boolean shallowFiles, boolean var3) {
ArchiveDisk var4 = null;
if (class168.dat2File != null) {
var4 = new ArchiveDisk(var0, class168.dat2File, ArchiveDiskAction.idxFiles[var0], 1000000);
var4 = new ArchiveDisk(index, class168.dat2File, ArchiveDiskAction.idxFiles[index], 1000000);
}
return new Archive(var4, Fonts.masterDisk, var0, var1, var2, var3);
return new Archive(var4, Fonts.masterDisk, index, releaseGroups, shallowFiles, var3);
}
@ObfuscatedName("jp")

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

@@ -298,7 +298,7 @@ public class WorldMapSection2 implements WorldMapSection {
Client.field127 = null;
Client.menuOptionsCount = 0;
Client.isMenuOpen = false;
Client.field119.method256((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1);
Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1);
for (var0 = 0; var0 < 8; ++var0) {
Client.playerMenuActions[var0] = null;

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

@@ -91,8 +91,8 @@ public enum WorldMapSectionType implements Enumerated {
signature = "(IZIZI)V",
garbageValue = "2102950996"
)
@Export("sortWorlds")
static void sortWorlds(int primaryMode, boolean primaryReversed, int secondaryMode, boolean secondaryReversed) {
@Export("sortWorldList")
static void sortWorldList(int primaryMode, boolean primaryReversed, int secondaryMode, boolean secondaryReversed) {
if (ItemContainer.worlds != null) {
class3.doWorldSorting(0, ItemContainer.worlds.length - 1, primaryMode, primaryReversed, secondaryMode, secondaryReversed);
}

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

@@ -16,9 +16,9 @@ public class class14 {
Buffer var3 = new Buffer(500);
var3.writeByte(3);
var3.writeByte(var1 != null ? 1 : 0);
var3.method37(var0.getPath());
var3.writeCESU8(var0.getPath());
if (var1 != null) {
var3.method37("");
var3.writeCESU8("");
}
var2.write(var3.array, 0, var3.index);

40
runescape-client/src/main/java/class15.java
View File

@@ -169,40 +169,40 @@ public class class15 extends class21 {
signature = "(Lho;I)V",
garbageValue = "1585987978"
)
static final void method186(Widget var0) {
int var1 = var0.contentType;
static final void method186(Widget component) {
int var1 = component.contentType;
if (var1 == 324) {
if (Client.field118 == -1) {
Client.field118 = var0.spriteId2;
Client.field120 = var0.spriteId;
Client.field118 = component.spriteId2;
Client.field120 = component.spriteId;
}
if (Client.field119.isFemale) {
var0.spriteId2 = Client.field118;
if (Client.playerAppearance.isFemale) {
component.spriteId2 = Client.field118;
} else {
var0.spriteId2 = Client.field120;
component.spriteId2 = Client.field120;
}
} else if (var1 == 325) {
if (Client.field118 == -1) {
Client.field118 = var0.spriteId2;
Client.field120 = var0.spriteId;
Client.field118 = component.spriteId2;
Client.field120 = component.spriteId;
}
if (Client.field119.isFemale) {
var0.spriteId2 = Client.field120;
if (Client.playerAppearance.isFemale) {
component.spriteId2 = Client.field120;
} else {
var0.spriteId2 = Client.field118;
component.spriteId2 = Client.field118;
}
} else if (var1 == 327) {
var0.modelAngleX = 150;
var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047;
var0.modelType = 5;
var0.modelId = 0;
component.modelAngleX = 150;
component.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047;
component.modelType = 5;
component.modelId = 0;
} else if (var1 == 328) {
var0.modelAngleX = 150;
var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047;
var0.modelType = 5;
var0.modelId = 1;
component.modelAngleX = 150;
component.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047;
component.modelType = 5;
component.modelId = 1;
}
}

46
runescape-client/src/main/java/class171.java
View File

@@ -115,10 +115,10 @@ public class class171 {
ByteArrayPool.archive13 = WorldMapRectangle.newArchive(13, true, false, true);
class2.archive14 = WorldMapRectangle.newArchive(14, false, true, true);
WorldMapSection2.archive15 = WorldMapRectangle.newArchive(15, false, true, true);
WorldMapRectangle.archive16 = WorldMapRectangle.newArchive(17, true, true, true);
WorldMapLabelSize.field1040 = WorldMapRectangle.newArchive(18, false, true, true);
ItemContainer.field434 = WorldMapRectangle.newArchive(19, false, true, true);
AbstractByteArrayCopier.field0 = WorldMapRectangle.newArchive(20, false, true, true);
WorldMapRectangle.archive17 = WorldMapRectangle.newArchive(17, true, true, true);
WorldMapLabelSize.archive18 = WorldMapRectangle.newArchive(18, false, true, true);
ItemContainer.archive19 = WorldMapRectangle.newArchive(19, false, true, true);
AbstractByteArrayCopier.archive20 = WorldMapRectangle.newArchive(20, false, true, true);
Login.Login_loadingText = "Connecting to update server";
Login.Login_loadingPercent = 20;
Client.titleLoadingStage = 40;
@@ -140,10 +140,10 @@ public class class171 {
var0 += ByteArrayPool.archive13.percentage() * 2 / 100;
var0 += class2.archive14.percentage() * 2 / 100;
var0 += WorldMapSection2.archive15.percentage() * 2 / 100;
var0 += ItemContainer.field434.percentage() / 100;
var0 += WorldMapLabelSize.field1040.percentage() / 100;
var0 += AbstractByteArrayCopier.field0.percentage() / 100;
var0 += WorldMapRectangle.archive16.method130() && WorldMapRectangle.archive16.method2() ? 1 : 0;
var0 += ItemContainer.archive19.percentage() / 100;
var0 += WorldMapLabelSize.archive18.percentage() / 100;
var0 += AbstractByteArrayCopier.archive20.percentage() / 100;
var0 += WorldMapRectangle.archive17.method130() && WorldMapRectangle.archive17.method2() ? 1 : 0;
if (var0 != 100) {
if (var0 != 0) {
Login.Login_loadingText = "Checking for updates - " + var0 + "%";
@@ -161,11 +161,11 @@ public class class171 {
AbstractWorldMapIcon.method625(Login.archive11, "Music Jingles");
AbstractWorldMapIcon.method625(class2.archive14, "Music Samples");
AbstractWorldMapIcon.method625(WorldMapSection2.archive15, "Music Patches");
AbstractWorldMapIcon.method625(ItemContainer.field434, "World Map");
AbstractWorldMapIcon.method625(WorldMapLabelSize.field1040, "World Map Geography");
AbstractWorldMapIcon.method625(AbstractByteArrayCopier.field0, "World Map Ground");
AbstractWorldMapIcon.method625(ItemContainer.archive19, "World Map");
AbstractWorldMapIcon.method625(WorldMapLabelSize.archive18, "World Map Geography");
AbstractWorldMapIcon.method625(AbstractByteArrayCopier.archive20, "World Map Ground");
Calendar.spriteIds = new GraphicsDefaults();
Calendar.spriteIds.decode(WorldMapRectangle.archive16);
Calendar.spriteIds.decode(WorldMapRectangle.archive17);
Login.Login_loadingText = "Loaded update list";
Login.Login_loadingPercent = 30;
Client.titleLoadingStage = 45;
@@ -230,9 +230,9 @@ public class class171 {
Archive var33 = class40.archive7;
KitDefinition.KitDefinition_archive = var31;
KitDefinition.field456 = var33;
KitDefinition.field457 = KitDefinition.KitDefinition_archive.method4(3);
RectangleMode.method6028(ObjectSound.archive2, class40.archive7, Client.isLowDetail);
IsaacCipher.method4082(ObjectSound.archive2, class40.archive7);
KitDefinition.KitDefinition_totalCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3);
RectangleMode.setObjectDefinitionArchives(ObjectSound.archive2, class40.archive7, Client.isLowDetail);
IsaacCipher.setNpcDefinitionArchives(ObjectSound.archive2, class40.archive7);
var30 = ObjectSound.archive2;
StructDefinition.StructDefinition_archive = var30;
Archive var5 = ObjectSound.archive2;
@@ -242,7 +242,7 @@ public class class171 {
ItemDefinition.ItemDefinition_archive = var5;
ItemDefinition.ItemDefinition_modelArchive = var6;
class30.inMembersWorld = var7;
class83.field1167 = ItemDefinition.ItemDefinition_archive.method4(10);
class83.field1167 = ItemDefinition.ItemDefinition_archive.getGroupFileCount(10);
class204.field1122 = var8;
Archive var9 = ObjectSound.archive2;
Archive var10 = AbstractArchive.archive0;
@@ -257,7 +257,7 @@ public class class171 {
GrandExchangeOfferUnitPriceComparator.setVarbitDefinitionArchive(ObjectSound.archive2);
Archive var14 = ObjectSound.archive2;
VarpDefinition.field943 = var14;
VarpDefinition.field944 = VarpDefinition.field943.method4(16);
VarpDefinition.field944 = VarpDefinition.field943.getGroupFileCount(16);
Archive var15 = WorldMapIcon1.archive3;
Archive var16 = class40.archive7;
Archive var17 = WorldMapSection1.archive8;
@@ -266,8 +266,8 @@ public class class171 {
BufferedSource.field54 = var16;
Widget.field955 = var17;
class27.field1143 = var18;
Widget.interfaceComponents = new Widget[Widget.Widget_archive.method5()][];
Widget.loadedInterfaces = new boolean[Widget.Widget_archive.method5()];
Widget.interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][];
Widget.loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()];
Archive var19 = ObjectSound.archive2;
class4.InvDefinition_archive = var19;
Archive var20 = ObjectSound.archive2;
@@ -285,7 +285,7 @@ public class class171 {
Archive var25 = WorldMapSection1.archive8;
WorldMapElement.WorldMapElement_archive = var25;
if (var24.method2()) {
UserComparator4.WorldMapElement_count = var24.method4(35);
UserComparator4.WorldMapElement_count = var24.getGroupFileCount(35);
Widget.WorldMapElement_cached = new WorldMapElement[UserComparator4.WorldMapElement_count];
for (int var26 = 0; var26 < UserComparator4.WorldMapElement_count; ++var26) {
@@ -514,12 +514,12 @@ public class class171 {
}
} else if (Client.titleLoadingStage == 140) {
Login.Login_loadingPercent = 100;
if (!ItemContainer.field434.tryLoadGroupByName(WorldMapCacheName.WorldMapCacheName_details.name)) {
Login.Login_loadingText = "Loading world map - " + ItemContainer.field434.groupLoadPercentByName(WorldMapCacheName.WorldMapCacheName_details.name) / 10 + "%";
if (!ItemContainer.archive19.tryLoadGroupByName(WorldMapCacheName.WorldMapCacheName_details.name)) {
Login.Login_loadingText = "Loading world map - " + ItemContainer.archive19.groupLoadPercentByName(WorldMapCacheName.WorldMapCacheName_details.name) / 10 + "%";
} else {
if (class60.worldMap0 == null) {
class60.worldMap0 = new WorldMap();
class60.worldMap0.init(ItemContainer.field434, WorldMapLabelSize.field1040, AbstractByteArrayCopier.field0, class2.fontBold12, Client.fontsMap, class192.mapSceneSprites);
class60.worldMap0.init(ItemContainer.archive19, WorldMapLabelSize.archive18, AbstractByteArrayCopier.archive20, class2.fontBold12, Client.fontsMap, class192.mapSceneSprites);
}
Login.Login_loadingText = "Loaded world map";

7
runescape-client/src/main/java/class190.java
View File

@@ -70,9 +70,10 @@ public class class190 {
signature = "(I)Lbt;",
garbageValue = "-68901151"
)
static World method3672() {
World.field987 = 0;
return Fonts.method5647();
@Export("worldListStart")
static World worldListStart() {
World.worldListWorldCount = 0;
return Fonts.getNextWorldListWorld();
}
@ObfuscatedName("iv")

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

@@ -30,10 +30,10 @@ public class class204 {
signature = "(Lir;Ljava/lang/String;Ljava/lang/String;IZB)V",
garbageValue = "0"
)
public static void method4011(AbstractArchive var0, String var1, String var2, int var3, boolean var4) {
int var5 = var0.getGroupId(var1);
int var6 = var0.getFileId(var5, var2);
Login.method2076(var0, var5, var6, var3, var4);
public static void method4011(AbstractArchive archive, String groupName, String fileName, int var3, boolean var4) {
int var5 = archive.getGroupId(groupName);
int var6 = archive.getFileId(var5, fileName);
Login.method2076(archive, var5, var6, var3, var4);
}
@ObfuscatedName("w")

22
runescape-client/src/main/java/class21.java
View File

@@ -246,19 +246,19 @@ public abstract class class21 {
var8 = -1;
var9 = -1;
var12 = -1;
var11 = var0.method48();
var11 = var0.readUShortSmart();
if (var11 == 32767) {
var11 = var0.method48();
var9 = var0.method48();
var8 = var0.method48();
var12 = var0.method48();
var11 = var0.readUShortSmart();
var9 = var0.readUShortSmart();
var8 = var0.readUShortSmart();
var12 = var0.readUShortSmart();
} else if (var11 != 32766) {
var9 = var0.method48();
var9 = var0.readUShortSmart();
} else {
var11 = -1;
}
var13 = var0.method48();
var13 = var0.readUShortSmart();
var3.addHitSplat(var11, var9, var8, var12, Client.cycle, var13);
}
}
@@ -266,10 +266,10 @@ public abstract class class21 {
var7 = var0.readUnsignedByteNegate();
if (var7 > 0) {
for (var11 = 0; var11 < var7; ++var11) {
var8 = var0.method48();
var9 = var0.method48();
var8 = var0.readUShortSmart();
var9 = var0.readUShortSmart();
if (var9 != 32767) {
var12 = var0.method48();
var12 = var0.readUShortSmart();
var13 = var0.method58();
var10 = var9 > 0 ? var0.readUnsignedByte() : var13;
var3.addHealthBar(var8, Client.cycle, var9, var12, var13, var10);
@@ -382,7 +382,7 @@ public abstract class class21 {
if (!var19 && Client.field208 == 0 && !var3.isHidden) {
Players.field738.index = 0;
var0.method46(Players.field738.array, 0, var8);
var0.readBytes(Players.field738.array, 0, var8);
Players.field738.index = 0;
String var14 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(Players.field738)));
var3.overheadText = var14.trim();

40
runescape-client/src/main/java/class226.java
View File

@@ -19,23 +19,23 @@ public class class226 {
garbageValue = "-76173898"
)
@Export("getItemSprite")
public static final Sprite getItemSprite(int var0, int quantity, int var2, int var3, int var4, boolean var5) {
public static final Sprite getItemSprite(int id, int quantity, int outline, int shadow, int quantityMode, boolean noted) {
if (quantity == -1) {
var4 = 0;
} else if (var4 == 2 && quantity != 1) {
var4 = 1;
quantityMode = 0;
} else if (quantityMode == 2 && quantity != 1) {
quantityMode = 1;
}
long var6 = ((long)quantity << 16) + (long)var0 + ((long)var2 << 38) + ((long)var4 << 40) + ((long)var3 << 42);
long var6 = ((long)quantity << 16) + (long)id + ((long)outline << 38) + ((long)quantityMode << 40) + ((long)shadow << 42);
Sprite var8;
if (!var5) {
if (!noted) {
var8 = (Sprite)ItemDefinition.Sprite_cached.get(var6);
if (var8 != null) {
return var8;
}
}
ItemDefinition var9 = Skills.getItemDefinition(var0);
ItemDefinition var9 = Skills.getItemDefinition(id);
if (quantity > 1 && var9.countobj != null) {
int var10 = -1;
@@ -61,7 +61,7 @@ public class class226 {
return null;
}
} else if (var9.notedId != -1) {
var20 = getItemSprite(var9.unnotedId, quantity, var2, var3, 0, false);
var20 = getItemSprite(var9.unnotedId, quantity, outline, shadow, 0, false);
if (var20 == null) {
return null;
}
@@ -80,7 +80,7 @@ public class class226 {
var8 = new Sprite(36, 32);
Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32);
Rasterizer2D.Rasterizer2D_clear();
Rasterizer3D.Rasterizer3D_method1();
Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
Rasterizer3D.method2989(16, 16);
Rasterizer3D.field741 = false;
if (var9.placeholderTemplate != -1) {
@@ -88,9 +88,9 @@ public class class226 {
}
int var16 = var9.zoom2d;
if (var5) {
if (noted) {
var16 = (int)((double)var16 * 1.5D);
} else if (var2 == 2) {
} else if (outline == 2) {
var16 = (int)((double)var16 * 1.04D);
}
@@ -102,16 +102,16 @@ public class class226 {
var20.drawAt2(0, 0);
}
if (var2 >= 1) {
var8.method307(1);
if (outline >= 1) {
var8.outline(1);
}
if (var2 >= 2) {
var8.method307(16777215);
if (outline >= 2) {
var8.outline(16777215);
}
if (var3 != 0) {
var8.method308(var3);
if (shadow != 0) {
var8.shadow(shadow);
}
Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32);
@@ -119,17 +119,17 @@ public class class226 {
var20.drawAt2(0, 0);
}
if (var4 == 1 || var4 == 2 && var9.isStackable == 1) {
if (quantityMode == 1 || quantityMode == 2 && var9.isStackable == 1) {
class204.field1122.draw(class196.method3735(quantity), 0, 9, 16776960, 1);
}
if (!var5) {
if (!noted) {
ItemDefinition.Sprite_cached.put(var8, var6);
}
Rasterizer2D.Rasterizer2D_replace(var12, var13, var14);
Rasterizer2D.Rasterizer2D_setClipArray(var15);
Rasterizer3D.Rasterizer3D_method1();
Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
Rasterizer3D.field741 = true;
return var8;
}

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

@@ -56,10 +56,10 @@ public final class class238 {
Widget var9 = components[var8];
if (var9 != null && var9.parentId == parentId && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class1.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) {
if (var9.isIf3) {
if (PacketBufferNode.method3673(var9)) {
if (PacketBufferNode.isComponentHidden(var9)) {
continue;
}
} else if (var9.type == 0 && var9 != Clock.mousedOverWidgetIf1 && PacketBufferNode.method3673(var9)) {
} else if (var9.type == 0 && var9 != Clock.mousedOverWidgetIf1 && PacketBufferNode.isComponentHidden(var9)) {
continue;
}

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

@@ -62,7 +62,7 @@ public class class31 {
} else {
World var3;
if (var0 == ScriptOpcodes.WORLDLIST_START) {
var3 = class190.method3672();
var3 = class190.worldListStart();
if (var3 != null) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.id;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.properties;
@@ -81,7 +81,7 @@ public class class31 {
return 1;
} else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) {
var3 = Fonts.method5647();
var3 = Fonts.getNextWorldListWorld();
if (var3 != null) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.id;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.properties;
@@ -137,7 +137,7 @@ public class class31 {
boolean var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
boolean var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3] == 1;
WorldMapSectionType.sortWorlds(var6, var9, var5, var10);
WorldMapSectionType.sortWorldList(var6, var9, var5, var10);
return 1;
} else if (var0 != ScriptOpcodes.GETWORLDINFO) {
if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) {

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

@@ -705,7 +705,7 @@ public class class40 {
var2 = Client.viewportWidth;
var3 = Client.viewportHeight;
Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1);
Rasterizer3D.Rasterizer3D_method1();
Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
int var9;
int var10;
int var11;