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

rs-client: Cleanup (#1087)

Browse Source 
* rs-client: name SpriteBuffer

* rs-client: (re)name spritebuffer methods

* rs-client/deob: Add missed @Export's, make updatemappings fix this next time

* rs-client: run intellij redundant else inspection

* rs-client: invert some script interpreter if's

* deob: checkstyle fixes

* rs-client: SpriteBuffer_loadSprite -> SpriteBuffer_bufferFile
This commit is contained in:
Lucwousin
2019-07-23 19:43:31 +02:00
committed by GitHub
parent 61b4531a0d
commit 596689a4f7
175 changed files with 9825 additions and 9776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,9 +266,8 @@ public abstract class AbstractArchive {
}
return var5;
} else {
return null;
}
return null;
}
@ObfuscatedName("k")
@@ -281,15 +280,14 @@ public abstract class AbstractArchive {
if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) {
if (this.files[var1][var2] != null) {
return true;
} else if (this.groups[var1] != null) {
return true;
} else {
this.loadGroup(var1);
return this.groups[var1] != null;
}
} else {
return false;
if (this.groups[var1] != null) {
return true;
}
this.loadGroup(var1);
return this.groups[var1] != null;
}
return false;
}
@ObfuscatedName("l")
@@ -300,11 +298,11 @@ public abstract class AbstractArchive {
public boolean method4147(int var1) {
if (this.files.length == 1) {
return this.tryLoadFile(0, var1);
} else if (this.files[var1].length == 1) {
return this.tryLoadFile(var1, 0);
} else {
throw new RuntimeException();
}
if (this.files[var1].length == 1) {
return this.tryLoadFile(var1, 0);
}
throw new RuntimeException();
}
@ObfuscatedName("b")
@@ -316,10 +314,9 @@ public abstract class AbstractArchive {
public boolean tryLoadGroup(int var1) {
if (this.groups[var1] != null) {
return true;
} else {
this.loadGroup(var1);
return this.groups[var1] != null;
}
this.loadGroup(var1);
return this.groups[var1] != null;
}
@ObfuscatedName("i")
@@ -363,11 +360,11 @@ public abstract class AbstractArchive {
public byte[] takeFileFlat(int var1) {
if (this.files.length == 1) {
return this.takeFile(0, var1);
} else if (this.files[var1].length == 1) {
return this.takeFile(var1, 0);
} else {
throw new RuntimeException();
}
if (this.files[var1].length == 1) {
return this.takeFile(var1, 0);
}
throw new RuntimeException();
}
@ObfuscatedName("x")
@@ -391,9 +388,8 @@ public abstract class AbstractArchive {
byte[] var4 = ArchiveDisk.byteArrayFromObject(this.files[var1][var2], false);
return var4;
} else {
return null;
}
return null;
}
@ObfuscatedName("r")
@@ -405,11 +401,11 @@ public abstract class AbstractArchive {
public byte[] getFileFlat(int var1) {
if (this.files.length == 1) {
return this.getFile(0, var1);
} else if (this.files[var1].length == 1) {
return this.getFile(var1, 0);
} else {
throw new RuntimeException();
}
if (this.files[var1].length == 1) {
return this.getFile(var1, 0);
}
throw new RuntimeException();
}
@ObfuscatedName("v")
@@ -503,120 +499,118 @@ public abstract class AbstractArchive {
boolean buildFiles(int var1, int[] var2) {
if (this.groups[var1] == null) {
return false;
} else {
int var3 = this.fileCounts[var1];
int[] var4 = this.fileIds[var1];
Object[] var5 = this.files[var1];
boolean var6 = true;
}
int var3 = this.fileCounts[var1];
int[] var4 = this.fileIds[var1];
Object[] var5 = this.files[var1];
boolean var6 = true;
for (int var7 = 0; var7 < var3; ++var7) {
if (var5[var4[var7]] == null) {
var6 = false;
break;
}
}
if (var6) {
return true;
} else {
byte[] var21;
if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) {
var21 = ArchiveDisk.byteArrayFromObject(this.groups[var1], false);
} else {
var21 = ArchiveDisk.byteArrayFromObject(this.groups[var1], true);
Buffer var8 = new Buffer(var21);
var8.xteaDecrypt(var2, 5, var8.array.length);
}
byte[] var25 = HealthBarUpdate.decompressBytes(var21);
if (this.releaseGroups) {
this.groups[var1] = null;
}
int var10;
if (var3 > 1) {
int var9 = var25.length;
--var9;
var10 = var25[var9] & 255;
var9 -= var10 * var3 * 4;
Buffer var11 = new Buffer(var25);
int[] var12 = new int[var3];
var11.offset = var9;
int var14;
int var15;
for (int var13 = 0; var13 < var10; ++var13) {
var14 = 0;
for (var15 = 0; var15 < var3; ++var15) {
var14 += var11.readInt();
var12[var15] += var14;
}
}
byte[][] var23 = new byte[var3][];
for (var14 = 0; var14 < var3; ++var14) {
var23[var14] = new byte[var12[var14]];
var12[var14] = 0;
}
var11.offset = var9;
var14 = 0;
int var17;
for (var15 = 0; var15 < var10; ++var15) {
int var16 = 0;
for (var17 = 0; var17 < var3; ++var17) {
var16 += var11.readInt();
System.arraycopy(var25, var14, var23[var17], var12[var17], var16);
var12[var17] += var16;
var14 += var16;
}
}
for (var15 = 0; var15 < var3; ++var15) {
if (!this.shallowFiles) {
var17 = var4[var15];
byte[] var19 = var23[var15];
Object var18;
if (var19 == null) {
var18 = null;
} else if (var19.length > 136) {
DirectByteArrayCopier var20 = new DirectByteArrayCopier();
var20.set(var19);
var18 = var20;
} else {
var18 = var19;
}
var5[var17] = var18;
} else {
var5[var4[var15]] = var23[var15];
}
}
} else if (!this.shallowFiles) {
var10 = var4[0];
Object var26;
if (var25 == null) {
var26 = null;
} else if (var25.length > 136) {
DirectByteArrayCopier var27 = new DirectByteArrayCopier();
var27.set(var25);
var26 = var27;
} else {
var26 = var25;
}
var5[var10] = var26;
} else {
var5[var4[0]] = var25;
}
return true;
for (int var7 = 0; var7 < var3; ++var7) {
if (var5[var4[var7]] == null) {
var6 = false;
break;
}
}
if (var6) {
return true;
}
byte[] var21;
if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) {
var21 = ArchiveDisk.byteArrayFromObject(this.groups[var1], false);
} else {
var21 = ArchiveDisk.byteArrayFromObject(this.groups[var1], true);
Buffer var8 = new Buffer(var21);
var8.xteaDecrypt(var2, 5, var8.array.length);
}
byte[] var25 = HealthBarUpdate.decompressBytes(var21);
if (this.releaseGroups) {
this.groups[var1] = null;
}
int var10;
if (var3 > 1) {
int var9 = var25.length;
--var9;
var10 = var25[var9] & 255;
var9 -= var10 * var3 * 4;
Buffer var11 = new Buffer(var25);
int[] var12 = new int[var3];
var11.offset = var9;
int var14;
int var15;
for (int var13 = 0; var13 < var10; ++var13) {
var14 = 0;
for (var15 = 0; var15 < var3; ++var15) {
var14 += var11.readInt();
var12[var15] += var14;
}
}
byte[][] var23 = new byte[var3][];
for (var14 = 0; var14 < var3; ++var14) {
var23[var14] = new byte[var12[var14]];
var12[var14] = 0;
}
var11.offset = var9;
var14 = 0;
int var17;
for (var15 = 0; var15 < var10; ++var15) {
int var16 = 0;
for (var17 = 0; var17 < var3; ++var17) {
var16 += var11.readInt();
System.arraycopy(var25, var14, var23[var17], var12[var17], var16);
var12[var17] += var16;
var14 += var16;
}
}
for (var15 = 0; var15 < var3; ++var15) {
if (!this.shallowFiles) {
var17 = var4[var15];
byte[] var19 = var23[var15];
Object var18;
if (var19 == null) {
var18 = null;
} else if (var19.length > 136) {
DirectByteArrayCopier var20 = new DirectByteArrayCopier();
var20.set(var19);
var18 = var20;
} else {
var18 = var19;
}
var5[var17] = var18;
} else {
var5[var4[var15]] = var23[var15];
}
}
} else if (!this.shallowFiles) {
var10 = var4[0];
Object var26;
if (var25 == null) {
var26 = null;
} else if (var25.length > 136) {
DirectByteArrayCopier var27 = new DirectByteArrayCopier();
var27.set(var25);
var26 = var27;
} else {
var26 = var25;
}
var5[var10] = var26;
} else {
var5[var4[0]] = var25;
}
return true;
}
@ObfuscatedName("z")
@@ -653,10 +647,9 @@ public abstract class AbstractArchive {
int var3 = this.groupNameHashTable.get(GrandExchangeOfferAgeComparator.hashString(var1));
if (var3 < 0) {
return false;
} else {
int var4 = this.fileNameHashTables[var3].get(GrandExchangeOfferAgeComparator.hashString(var2));
return var4 >= 0;
}
int var4 = this.fileNameHashTables[var3].get(GrandExchangeOfferAgeComparator.hashString(var2));
return var4 >= 0;
}
@ObfuscatedName("as")
@@ -744,15 +737,16 @@ public abstract class AbstractArchive {
HealthBarUpdate.Interpreter_intStackSize -= 3;
class81.queueSoundEffect(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize], Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]);
return 1;
} else if (var0 == ScriptOpcodes.SOUND_SONG) {
}
if (var0 == ScriptOpcodes.SOUND_SONG) {
GrandExchangeOfferTotalQuantityComparator.method93(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
return 1;
} else if (var0 == ScriptOpcodes.SOUND_JINGLE) {
}
if (var0 == ScriptOpcodes.SOUND_JINGLE) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
WorldMapLabelSize.method188(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize], Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
return 1;
} else {
return 2;
}
return 2;
}
}

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

@@ -22,6 +22,7 @@ public abstract class AbstractByteArrayCopier {
signature = "([BI)V",
garbageValue = "594076777"
)
@Export("set")
public abstract void set(byte[] var1);
@ObfuscatedName("l")

351
runescape-client/src/main/java/AbstractFont.java
View File

@@ -219,55 +219,54 @@ public abstract class AbstractFont extends Rasterizer2D {
public int stringWidth(String var1) {
if (var1 == null) {
return 0;
} else {
int var2 = -1;
int var3 = -1;
int var4 = 0;
}
int var2 = -1;
int var3 = -1;
int var4 = 0;
for (int var5 = 0; var5 < var1.length(); ++var5) {
char var6 = var1.charAt(var5);
if (var6 == '<') {
var2 = var5;
} else {
if (var6 == '>' && var2 != -1) {
String var7 = var1.substring(var2 + 1, var5);
var2 = -1;
if (var7.equals("lt")) {
var6 = '<';
} else {
if (!var7.equals("gt")) {
if (var7.startsWith("img=")) {
try {
int var8 = class3.parseInt(var7.substring(4));
var4 += AbstractFont_modIconSprites[var8].width;
var3 = -1;
} catch (Exception var10) {
}
for (int var5 = 0; var5 < var1.length(); ++var5) {
char var6 = var1.charAt(var5);
if (var6 == '<') {
var2 = var5;
} else {
if (var6 == '>' && var2 != -1) {
String var7 = var1.substring(var2 + 1, var5);
var2 = -1;
if (var7.equals("lt")) {
var6 = '<';
} else {
if (!var7.equals("gt")) {
if (var7.startsWith("img=")) {
try {
int var8 = class3.parseInt(var7.substring(4));
var4 += AbstractFont_modIconSprites[var8].width;
var3 = -1;
} catch (Exception var10) {
}
continue;
}
var6 = '>';
}
}
if (var6 == 160) {
var6 = ' ';
}
if (var2 == -1) {
var4 += this.advances[(char)(ItemDefinition.charToByteCp1252(var6) & 255)];
if (this.kerning != null && var3 != -1) {
var4 += this.kerning[var6 + (var3 << 8)];
continue;
}
var3 = var6;
var6 = '>';
}
}
}
return var4;
if (var6 == 160) {
var6 = ' ';
}
if (var2 == -1) {
var4 += this.advances[(char)(ItemDefinition.charToByteCp1252(var6) & 255)];
if (this.kerning != null && var3 != -1) {
var4 += this.kerning[var6 + (var3 << 8)];
}
var3 = var6;
}
}
}
return var4;
}
@ObfuscatedName("v")
@@ -275,104 +274,103 @@ public abstract class AbstractFont extends Rasterizer2D {
public int breakLines(String var1, int[] var2, String[] var3) {
if (var1 == null) {
return 0;
} else {
int var4 = 0;
int var5 = 0;
StringBuilder var6 = new StringBuilder(100);
int var7 = -1;
int var8 = 0;
byte var9 = 0;
int var10 = -1;
char var11 = 0;
int var12 = 0;
int var13 = var1.length();
}
int var4 = 0;
int var5 = 0;
StringBuilder var6 = new StringBuilder(100);
int var7 = -1;
int var8 = 0;
byte var9 = 0;
int var10 = -1;
char var11 = 0;
int var12 = 0;
int var13 = var1.length();
for (int var14 = 0; var14 < var13; ++var14) {
char var15 = var1.charAt(var14);
if (var15 == '<') {
var10 = var14;
} else {
if (var15 == '>' && var10 != -1) {
String var16 = var1.substring(var10 + 1, var14);
var10 = -1;
var6.append('<');
var6.append(var16);
var6.append('>');
if (var16.equals("br")) {
var3[var12] = var6.toString().substring(var5, var6.length());
++var12;
var5 = var6.length();
var4 = 0;
var7 = -1;
var11 = 0;
} else if (var16.equals("lt")) {
var4 += this.charWidth('<');
if (this.kerning != null && var11 != -1) {
var4 += this.kerning[(var11 << '\b') + 60];
}
var11 = '<';
} else if (var16.equals("gt")) {
var4 += this.charWidth('>');
if (this.kerning != null && var11 != -1) {
var4 += this.kerning[(var11 << '\b') + 62];
}
var11 = '>';
} else if (var16.startsWith("img=")) {
try {
int var17 = class3.parseInt(var16.substring(4));
var4 += AbstractFont_modIconSprites[var17].width;
var11 = 0;
} catch (Exception var20) {
}
for (int var14 = 0; var14 < var13; ++var14) {
char var15 = var1.charAt(var14);
if (var15 == '<') {
var10 = var14;
} else {
if (var15 == '>' && var10 != -1) {
String var16 = var1.substring(var10 + 1, var14);
var10 = -1;
var6.append('<');
var6.append(var16);
var6.append('>');
if (var16.equals("br")) {
var3[var12] = var6.toString().substring(var5, var6.length());
++var12;
var5 = var6.length();
var4 = 0;
var7 = -1;
var11 = 0;
} else if (var16.equals("lt")) {
var4 += this.charWidth('<');
if (this.kerning != null && var11 != -1) {
var4 += this.kerning[(var11 << '\b') + 60];
}
var15 = 0;
var11 = '<';
} else if (var16.equals("gt")) {
var4 += this.charWidth('>');
if (this.kerning != null && var11 != -1) {
var4 += this.kerning[(var11 << '\b') + 62];
}
var11 = '>';
} else if (var16.startsWith("img=")) {
try {
int var17 = class3.parseInt(var16.substring(4));
var4 += AbstractFont_modIconSprites[var17].width;
var11 = 0;
} catch (Exception var20) {
}
}
if (var10 == -1) {
if (var15 != 0) {
var6.append(var15);
var4 += this.charWidth(var15);
if (this.kerning != null && var11 != -1) {
var4 += this.kerning[var15 + (var11 << '\b')];
}
var15 = 0;
}
var11 = var15;
if (var10 == -1) {
if (var15 != 0) {
var6.append(var15);
var4 += this.charWidth(var15);
if (this.kerning != null && var11 != -1) {
var4 += this.kerning[var15 + (var11 << '\b')];
}
if (var15 == ' ') {
var7 = var6.length();
var8 = var4;
var9 = 1;
}
var11 = var15;
}
if (var2 != null && var4 > var2[var12 < var2.length ? var12 : var2.length - 1] && var7 >= 0) {
var3[var12] = var6.toString().substring(var5, var7 - var9);
++var12;
var5 = var7;
var7 = -1;
var4 -= var8;
var11 = 0;
}
if (var15 == ' ') {
var7 = var6.length();
var8 = var4;
var9 = 1;
}
if (var15 == '-') {
var7 = var6.length();
var8 = var4;
var9 = 0;
}
if (var2 != null && var4 > var2[var12 < var2.length ? var12 : var2.length - 1] && var7 >= 0) {
var3[var12] = var6.toString().substring(var5, var7 - var9);
++var12;
var5 = var7;
var7 = -1;
var4 -= var8;
var11 = 0;
}
if (var15 == '-') {
var7 = var6.length();
var8 = var4;
var9 = 0;
}
}
}
String var19 = var6.toString();
if (var19.length() > var5) {
var3[var12++] = var19.substring(var5, var19.length());
}
return var12;
}
String var19 = var6.toString();
if (var19.length() > var5) {
var3[var12++] = var19.substring(var5, var19.length());
}
return var12;
}
@ObfuscatedName("y")
@@ -439,60 +437,59 @@ public abstract class AbstractFont extends Rasterizer2D {
public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
if (var1 == null) {
return 0;
} else {
this.reset(var6, var7);
if (var10 == 0) {
var10 = this.ascent;
}
int[] var11 = new int[]{var4};
if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) {
var11 = null;
}
int var12 = this.breakLines(var1, var11, AbstractFont_lines);
if (var9 == 3 && var12 == 1) {
var9 = 1;
}
int var13;
int var14;
if (var9 == 0) {
var13 = var3 + this.maxAscent;
} else if (var9 == 1) {
var13 = var3 + (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / 2 + this.maxAscent;
} else if (var9 == 2) {
var13 = var3 + var5 - this.maxDescent - var10 * (var12 - 1);
} else {
var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1);
if (var14 < 0) {
var14 = 0;
}
var13 = var3 + var14 + this.maxAscent;
var10 += var14;
}
for (var14 = 0; var14 < var12; ++var14) {
if (var8 == 0) {
this.draw0(AbstractFont_lines[var14], var2, var13);
} else if (var8 == 1) {
this.draw0(AbstractFont_lines[var14], var2 + (var4 - this.stringWidth(AbstractFont_lines[var14])) / 2, var13);
} else if (var8 == 2) {
this.draw0(AbstractFont_lines[var14], var2 + var4 - this.stringWidth(AbstractFont_lines[var14]), var13);
} else if (var14 == var12 - 1) {
this.draw0(AbstractFont_lines[var14], var2, var13);
} else {
this.calculateLineJustification(AbstractFont_lines[var14], var4);
this.draw0(AbstractFont_lines[var14], var2, var13);
AbstractFont_justificationTotal = 0;
}
var13 += var10;
}
return var12;
}
this.reset(var6, var7);
if (var10 == 0) {
var10 = this.ascent;
}
int[] var11 = new int[]{var4};
if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) {
var11 = null;
}
int var12 = this.breakLines(var1, var11, AbstractFont_lines);
if (var9 == 3 && var12 == 1) {
var9 = 1;
}
int var13;
int var14;
if (var9 == 0) {
var13 = var3 + this.maxAscent;
} else if (var9 == 1) {
var13 = var3 + (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / 2 + this.maxAscent;
} else if (var9 == 2) {
var13 = var3 + var5 - this.maxDescent - var10 * (var12 - 1);
} else {
var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1);
if (var14 < 0) {
var14 = 0;
}
var13 = var3 + var14 + this.maxAscent;
var10 += var14;
}
for (var14 = 0; var14 < var12; ++var14) {
if (var8 == 0) {
this.draw0(AbstractFont_lines[var14], var2, var13);
} else if (var8 == 1) {
this.draw0(AbstractFont_lines[var14], var2 + (var4 - this.stringWidth(AbstractFont_lines[var14])) / 2, var13);
} else if (var8 == 2) {
this.draw0(AbstractFont_lines[var14], var2 + var4 - this.stringWidth(AbstractFont_lines[var14]), var13);
} else if (var14 == var12 - 1) {
this.draw0(AbstractFont_lines[var14], var2, var13);
} else {
this.calculateLineJustification(AbstractFont_lines[var14], var4);
this.draw0(AbstractFont_lines[var14], var2, var13);
AbstractFont_justificationTotal = 0;
}
var13 += var10;
}
return var12;
}
@ObfuscatedName("al")

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

@@ -247,9 +247,8 @@ public abstract class AbstractWorldMapData {
ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
if (var2 == null) {
return -1;
} else {
return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1;
}
return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1;
}
@ObfuscatedName("gj")

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

@@ -81,9 +81,8 @@ public abstract class AbstractWorldMapIcon {
boolean fitsScreen(int var1, int var2) {
if (this.elementFitsScreen(var1, var2)) {
return true;
} else {
return this.labelFitsScreen(var1, var2);
}
return this.labelFitsScreen(var1, var2);
}
@ObfuscatedName("d")
@@ -105,47 +104,46 @@ public abstract class AbstractWorldMapIcon {
boolean elementFitsScreen(int var1, int var2) {
if (!this.hasValidElement()) {
return false;
} else {
WorldMapElement var3 = class222.getWorldMapElement(this.getElement());
int var4 = this.getSubWidth();
int var5 = this.getSubHeight();
switch(var3.horizontalAlignment.value) {
case 0:
if (var1 <= this.screenX - var4 || var1 > this.screenX) {
return false;
}
break;
case 1:
if (var1 >= this.screenX && var1 < var4 + this.screenX) {
break;
}
return false;
case 2:
if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) {
return false;
}
}
switch(var3.verticalAlignment.value) {
case 0:
if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) {
return false;
}
break;
case 1:
if (var2 <= this.screenY - var5 || var2 > this.screenY) {
return false;
}
break;
case 2:
if (var2 < this.screenY || var2 >= var5 + this.screenY) {
return false;
}
}
return true;
}
WorldMapElement var3 = class222.getWorldMapElement(this.getElement());
int var4 = this.getSubWidth();
int var5 = this.getSubHeight();
switch(var3.horizontalAlignment.value) {
case 0:
if (var1 <= this.screenX - var4 || var1 > this.screenX) {
return false;
}
break;
case 1:
if (var1 >= this.screenX && var1 < var4 + this.screenX) {
break;
}
return false;
case 2:
if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) {
return false;
}
}
switch(var3.verticalAlignment.value) {
case 0:
if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) {
return false;
}
break;
case 1:
if (var2 <= this.screenY - var5 || var2 > this.screenY) {
return false;
}
break;
case 2:
if (var2 < this.screenY || var2 >= var5 + this.screenY) {
return false;
}
}
return true;
}
@ObfuscatedName("z")
@@ -158,11 +156,11 @@ public abstract class AbstractWorldMapIcon {
WorldMapLabel var3 = this.getLabel();
if (var3 == null) {
return false;
} else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) {
return var2 >= this.screenY && var2 <= this.screenY + var3.height;
} else {
return false;
}
if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) {
return var2 >= this.screenY && var2 <= this.screenY + var3.height;
}
return false;
}
@ObfuscatedName("r")

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

@@ -67,10 +67,9 @@ public final class AccessFile {
this.file.seek(this.maxSize);
this.file.write(1);
throw new EOFException();
} else {
this.file.write(var1, var2, var3);
this.offset += (long)var3;
}
this.file.write(var1, var2, var3);
this.offset += (long)var3;
}
@ObfuscatedName("e")

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

@@ -113,20 +113,19 @@ public class Animation {
if (var1.length != var4.offset) {
throw new RuntimeException();
} else {
this.transformCount = var7;
this.transformSkeletonLabels = new int[var7];
this.transformXs = new int[var7];
this.transformYs = new int[var7];
this.transformZs = new int[var7];
for (var8 = 0; var8 < var7; ++var8) {
this.transformSkeletonLabels[var8] = field1638[var8];
this.transformXs[var8] = field1639[var8];
this.transformYs[var8] = field1636[var8];
this.transformZs[var8] = field1635[var8];
}
}
this.transformCount = var7;
this.transformSkeletonLabels = new int[var7];
this.transformXs = new int[var7];
this.transformYs = new int[var7];
this.transformZs = new int[var7];
for (var8 = 0; var8 < var7; ++var8) {
this.transformSkeletonLabels[var8] = field1638[var8];
this.transformXs[var8] = field1639[var8];
this.transformYs[var8] = field1636[var8];
this.transformZs[var8] = field1635[var8];
}
}
}

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

@@ -102,9 +102,8 @@ public class Archive extends AbstractArchive {
int groupLoadPercent(int var1) {
if (super.groups[var1] != null) {
return 100;
} else {
return this.validGroups[var1] ? 100 : Huffman.method3948(this.index, var1);
}
return this.validGroups[var1] ? 100 : Huffman.method3948(this.index, var1);
}
@ObfuscatedName("v")
@@ -140,16 +139,16 @@ public class Archive extends AbstractArchive {
public int percentage() {
if (this.field3155) {
return 100;
} else if (super.groups != null) {
return 99;
} else {
int var1 = Huffman.method3948(255, this.index);
if (var1 >= 100) {
var1 = 99;
}
return var1;
}
if (super.groups != null) {
return 99;
}
int var1 = Huffman.method3948(255, this.index);
if (var1 >= 100) {
var1 = 99;
}
return var1;
}
@ObfuscatedName("dt")
@@ -396,10 +395,9 @@ public class Archive extends AbstractArchive {
if (var1 == 0) {
return 100;
} else {
var3 = var2 * 100 / var1;
return var3;
}
var3 = var2 * 100 / var1;
return var3;
}
@ObfuscatedName("q")

150
runescape-client/src/main/java/ArchiveDisk.java
View File

@@ -67,81 +67,80 @@ public final class ArchiveDisk {
if (this.idxFile.length() < (long)(var1 * 6 + 6)) {
var10000 = null;
return (byte[])var10000;
} else {
this.idxFile.seek((long)(var1 * 6));
this.idxFile.read(ArchiveDisk_buffer, 0, 6);
int var3 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8);
int var4 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8);
if (var3 < 0 || var3 > this.maxEntrySize) {
}
this.idxFile.seek((long)(var1 * 6));
this.idxFile.read(ArchiveDisk_buffer, 0, 6);
int var3 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8);
int var4 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8);
if (var3 < 0 || var3 > this.maxEntrySize) {
var10000 = null;
return (byte[])var10000;
}
if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) {
var10000 = null;
return (byte[])var10000;
}
byte[] var5 = new byte[var3];
int var6 = 0;
for (int var7 = 0; var6 < var3; ++var7) {
if (var4 == 0) {
var10000 = null;
return (byte[])var10000;
} else if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) {
var10000 = null;
return (byte[])var10000;
} else {
byte[] var5 = new byte[var3];
int var6 = 0;
}
for (int var7 = 0; var6 < var3; ++var7) {
if (var4 == 0) {
var10000 = null;
return (byte[])var10000;
}
this.datFile.seek(520L * (long)var4);
int var8 = var3 - var6;
int var9;
int var10;
int var11;
int var12;
byte var13;
if (var1 > 65535) {
if (var8 > 510) {
var8 = 510;
}
var13 = 10;
this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13);
var9 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8);
var10 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8);
var11 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16);
var12 = ArchiveDisk_buffer[9] & 255;
} else {
if (var8 > 512) {
var8 = 512;
}
var13 = 8;
this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8);
var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8);
var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8);
var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255);
var12 = ArchiveDisk_buffer[7] & 255;
}
if (var9 != var1 || var7 != var10 || var12 != this.archive) {
var10000 = null;
return (byte[])var10000;
}
if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) {
var10000 = null;
return (byte[])var10000;
}
int var14 = var8 + var13;
for (int var15 = var13; var15 < var14; ++var15) {
var5[var6++] = ArchiveDisk_buffer[var15];
}
var4 = var11;
this.datFile.seek(520L * (long)var4);
int var8 = var3 - var6;
int var9;
int var10;
int var11;
int var12;
byte var13;
if (var1 > 65535) {
if (var8 > 510) {
var8 = 510;
}
byte[] var20 = var5;
return var20;
var13 = 10;
this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13);
var9 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8);
var10 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8);
var11 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16);
var12 = ArchiveDisk_buffer[9] & 255;
} else {
if (var8 > 512) {
var8 = 512;
}
var13 = 8;
this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8);
var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8);
var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8);
var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255);
var12 = ArchiveDisk_buffer[7] & 255;
}
if (var9 != var1 || var7 != var10 || var12 != this.archive) {
var10000 = null;
return (byte[])var10000;
}
if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) {
var10000 = null;
return (byte[])var10000;
}
int var14 = var8 + var13;
for (int var15 = var13; var15 < var14; ++var15) {
var5[var6++] = ArchiveDisk_buffer[var15];
}
var4 = var11;
}
byte[] var20 = var5;
return var20;
} catch (IOException var18) {
return null;
}
@@ -163,9 +162,8 @@ public final class ArchiveDisk {
}
return var5;
} else {
throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3);
}
throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3);
}
}
@@ -343,21 +341,21 @@ public final class ArchiveDisk {
public static byte[] byteArrayFromObject(Object var0, boolean var1) {
if (var0 == null) {
return null;
} else if (var0 instanceof byte[]) {
}
if (var0 instanceof byte[]) {
byte[] var6 = (byte[])((byte[])var0);
if (var1) {
int var4 = var6.length;
byte[] var5 = new byte[var4];
System.arraycopy(var6, 0, var5, 0, var4);
return var5;
} else {
return var6;
}
} else if (var0 instanceof AbstractByteArrayCopier) {
return var6;
}
if (var0 instanceof AbstractByteArrayCopier) {
AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0;
return var2.get();
} else {
throw new IllegalArgumentException();
}
throw new IllegalArgumentException();
}
}

17
runescape-client/src/main/java/ArchiveDiskAction.java
View File

@@ -42,15 +42,14 @@ public class ArchiveDiskAction extends Node {
KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0);
if (var1 != null) {
return var1;
} else {
byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0);
var1 = new KitDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2));
}
KitDefinition.KitDefinition_cached.put(var1, (long)var0);
return var1;
}
byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0);
var1 = new KitDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2));
}
KitDefinition.KitDefinition_cached.put(var1, (long)var0);
return var1;
}
}

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

@@ -99,7 +99,8 @@ public class ArchiveDiskActionHandler implements Runnable {
public static final PcmPlayer method4256(TaskHandler var0, int var1, int var2) {
if (CollisionMap.PcmPlayer_sampleRate == 0) {
throw new IllegalStateException();
} else if (var1 >= 0 && var1 < 2) {
}
if (var1 >= 0 && var1 < 2) {
if (var2 < 256) {
var2 = 256;
}
@@ -133,8 +134,7 @@ public class ArchiveDiskActionHandler implements Runnable {
} catch (Throwable var4) {
return new PcmPlayer();
}
} else {
throw new IllegalArgumentException();
}
throw new IllegalArgumentException();
}
}

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

@@ -91,19 +91,18 @@ public class ArchiveLoader {
if (var0 == ScriptOpcodes.CC_CALLONRESIZE) {
if (Interpreter.field1106 >= 10) {
throw new RuntimeException();
} else if (var3.onResize == null) {
return 0;
} else {
ScriptEvent var4 = new ScriptEvent();
var4.widget = var3;
var4.args = var3.onResize;
var4.field583 = Interpreter.field1106 + 1;
Client.scriptEvents.addFirst(var4);
return 1;
}
} else {
return 2;
if (var3.onResize == null) {
return 0;
}
ScriptEvent var4 = new ScriptEvent();
var4.widget = var3;
var4.args = var3.onResize;
var4.field583 = Interpreter.field1106 + 1;
Client.scriptEvents.addFirst(var4);
return 1;
}
return 2;
}
@ObfuscatedName("jk")

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

@@ -65,44 +65,43 @@ public class AudioFilter {
if (this.pairs[var1] == 0) {
return 0;
} else {
var3 = this.method2668(var1, 0, var2);
field1488[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2683(var1, 0, var2));
field1488[var1][1] = var3 * var3;
float[] var10000;
int var4;
for (var4 = 1; var4 < this.pairs[var1]; ++var4) {
var3 = this.method2668(var1, var4, var2);
float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2683(var1, var4, var2));
float var6 = var3 * var3;
field1488[var1][var4 * 2 + 1] = field1488[var1][var4 * 2 - 1] * var6;
field1488[var1][var4 * 2] = field1488[var1][var4 * 2 - 1] * var5 + field1488[var1][var4 * 2 - 2] * var6;
for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) {
var10000 = field1488[var1];
var10000[var7] += field1488[var1][var7 - 1] * var5 + field1488[var1][var7 - 2] * var6;
}
var10000 = field1488[var1];
var10000[1] += field1488[var1][0] * var5 + var6;
var10000 = field1488[var1];
var10000[0] += var5;
}
if (var1 == 0) {
for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) {
var10000 = field1488[0];
var10000[var4] *= field1491;
}
}
for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) {
coefficients[var1][var4] = (int)(field1488[var1][var4] * 65536.0F);
}
return this.pairs[var1] * 2;
}
var3 = this.method2668(var1, 0, var2);
field1488[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2683(var1, 0, var2));
field1488[var1][1] = var3 * var3;
float[] var10000;
int var4;
for (var4 = 1; var4 < this.pairs[var1]; ++var4) {
var3 = this.method2668(var1, var4, var2);
float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2683(var1, var4, var2));
float var6 = var3 * var3;
field1488[var1][var4 * 2 + 1] = field1488[var1][var4 * 2 - 1] * var6;
field1488[var1][var4 * 2] = field1488[var1][var4 * 2 - 1] * var5 + field1488[var1][var4 * 2 - 2] * var6;
for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) {
var10000 = field1488[var1];
var10000[var7] += field1488[var1][var7 - 1] * var5 + field1488[var1][var7 - 2] * var6;
}
var10000 = field1488[var1];
var10000[1] += field1488[var1][0] * var5 + var6;
var10000 = field1488[var1];
var10000[0] += var5;
}
if (var1 == 0) {
for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) {
var10000 = field1488[0];
var10000[var4] *= field1491;
}
}
for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) {
coefficients[var1][var4] = (int)(field1488[var1][var4] * 65536.0F);
}
return this.pairs[var1] * 2;
}
@ObfuscatedName("k")

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

@@ -103,12 +103,11 @@ public final class BoundaryObject {
if (!var4) {
return null;
} else {
try {
return new Frames(var0, var1, var2, var3);
} catch (Exception var11) {
return null;
}
}
try {
return new Frames(var0, var1, var2, var3);
} catch (Exception var11) {
return null;
}
}
@@ -122,15 +121,14 @@ public final class BoundaryObject {
EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0);
if (var1 != null) {
return var1;
} else {
byte[] var2 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0);
var1 = new EnumDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2));
}
EnumDefinition.EnumDefinition_cached.put(var1, (long)var0);
return var1;
}
byte[] var2 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0);
var1 = new EnumDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2));
}
EnumDefinition.EnumDefinition_cached.put(var1, (long)var0);
return var1;
}
}

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

@@ -91,8 +91,7 @@ public class Buddy extends User {
}
return var0 * 10000 / Client.field927;
} else {
return 10000;
}
return 10000;
}
}

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

@@ -31,9 +31,8 @@ public class BuddyRankComparator extends AbstractUserComparator {
int compareBuddy(Buddy var1, Buddy var2) {
if (var2.rank != var1.rank) {
return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank;
} else {
return this.compareUser(var1, var2);
}
return this.compareUser(var1, var2);
}
public int compare(Object var1, Object var2) {

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

@@ -173,10 +173,9 @@ public class Buffer extends Node {
int var2 = var1.indexOf(0);
if (var2 >= 0) {
throw new IllegalArgumentException("");
} else {
this.offset += WorldMapSection0.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset);
this.array[++this.offset - 1] = 0;
}
this.offset += WorldMapSection0.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset);
this.array[++this.offset - 1] = 0;
}
@ObfuscatedName("bg")
@@ -189,11 +188,10 @@ public class Buffer extends Node {
int var2 = var1.indexOf(0);
if (var2 >= 0) {
throw new IllegalArgumentException("");
} else {
this.array[++this.offset - 1] = 0;
this.offset += WorldMapSection0.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset);
this.array[++this.offset - 1] = 0;
}
this.array[++this.offset - 1] = 0;
this.offset += WorldMapSection0.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset);
this.array[++this.offset - 1] = 0;
}
@ObfuscatedName("bh")
@@ -244,12 +242,11 @@ public class Buffer extends Node {
public void writeLengthInt(int var1) {
if (var1 < 0) {
throw new IllegalArgumentException();
} else {
this.array[this.offset - var1 - 4] = (byte)(var1 >> 24);
this.array[this.offset - var1 - 3] = (byte)(var1 >> 16);
this.array[this.offset - var1 - 2] = (byte)(var1 >> 8);
this.array[this.offset - var1 - 1] = (byte)var1;
}
this.array[this.offset - var1 - 4] = (byte)(var1 >> 24);
this.array[this.offset - var1 - 3] = (byte)(var1 >> 16);
this.array[this.offset - var1 - 2] = (byte)(var1 >> 8);
this.array[this.offset - var1 - 1] = (byte)var1;
}
@ObfuscatedName("bc")
@@ -424,9 +421,8 @@ public class Buffer extends Node {
if (this.array[this.offset] == 0) {
++this.offset;
return null;
} else {
return this.readStringCp1252NullTerminated();
}
return this.readStringCp1252NullTerminated();
}
@ObfuscatedName("br")
@@ -455,15 +451,14 @@ public class Buffer extends Node {
byte var1 = this.array[++this.offset - 1];
if (var1 != 0) {
throw new IllegalStateException("");
} else {
int var2 = this.offset;
while (this.array[++this.offset - 1] != 0) {
}
int var3 = this.offset - var2 - 1;
return var3 == 0 ? "" : FriendSystem.decodeStringCp1252(this.array, var2, var3);
}
int var2 = this.offset;
while (this.array[++this.offset - 1] != 0) {
}
int var3 = this.offset - var2 - 1;
return var3 == 0 ? "" : FriendSystem.decodeStringCp1252(this.array, var2, var3);
}
@ObfuscatedName("bf")
@@ -476,16 +471,14 @@ public class Buffer extends Node {
byte var1 = this.array[++this.offset - 1];
if (var1 != 0) {
throw new IllegalStateException("");
} else {
int var2 = this.readVarInt();
if (var2 + this.offset > this.array.length) {
throw new IllegalStateException("");
} else {
String var3 = ClientPreferences.method1755(this.array, this.offset, var2);
this.offset += var2;
return var3;
}
}
int var2 = this.readVarInt();
if (var2 + this.offset > this.array.length) {
throw new IllegalStateException("");
}
String var3 = ClientPreferences.method1755(this.array, this.offset, var2);
this.offset += var2;
return var3;
}
@ObfuscatedName("bv")
@@ -557,10 +550,9 @@ public class Buffer extends Node {
public int method5511() {
if (this.array[this.offset] < 0) {
return this.readInt() & Integer.MAX_VALUE;
} else {
int var1 = this.readUnsignedShort();
return var1 == 32767 ? -1 : var1;
}
int var1 = this.readUnsignedShort();
return var1 == 32767 ? -1 : var1;
}
@ObfuscatedName("cl")

27
runescape-client/src/main/java/BufferedFile.java
View File

@@ -100,9 +100,8 @@ public class BufferedFile {
public void seek(long var1) throws IOException {
if (var1 < 0L) {
throw new IOException("");
} else {
this.offset = var1;
}
this.offset = var1;
}
@ObfuscatedName("e")
@@ -392,18 +391,18 @@ public class BufferedFile {
ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
if (var2 == null) {
return 0;
} else if (var1 == -1) {
return 0;
} else {
int var3 = 0;
for (int var4 = 0; var4 < var2.quantities.length; ++var4) {
if (var2.ids[var4] == var1) {
var3 += var2.quantities[var4];
}
}
return var3;
}
if (var1 == -1) {
return 0;
}
int var3 = 0;
for (int var4 = 0; var4 < var2.quantities.length; ++var4) {
if (var2.ids[var4] == var1) {
var3 += var2.quantities[var4];
}
}
return var3;
}
}

45
runescape-client/src/main/java/BufferedSink.java
View File

@@ -74,9 +74,8 @@ public class BufferedSink implements Runnable {
}
return true;
} else {
return false;
}
return false;
}
@ObfuscatedName("w")
@@ -90,29 +89,27 @@ public class BufferedSink implements Runnable {
synchronized(this) {
if (this.exception != null) {
throw new IOException(this.exception.toString());
} else {
int var5;
if (this.position <= this.limit) {
var5 = this.capacity - this.limit + this.position - 1;
} else {
var5 = this.position - this.limit - 1;
}
if (var5 < var3) {
throw new IOException("");
} else {
if (var3 + this.limit <= this.capacity) {
System.arraycopy(var1, var2, this.buffer, this.limit, var3);
} else {
int var6 = this.capacity - this.limit;
System.arraycopy(var1, var2, this.buffer, this.limit, var6);
System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6);
}
this.limit = (var3 + this.limit) % this.capacity;
this.notifyAll();
}
}
int var5;
if (this.position <= this.limit) {
var5 = this.capacity - this.limit + this.position - 1;
} else {
var5 = this.position - this.limit - 1;
}
if (var5 < var3) {
throw new IOException("");
}
if (var3 + this.limit <= this.capacity) {
System.arraycopy(var1, var2, this.buffer, this.limit, var3);
} else {
int var6 = this.capacity - this.limit;
System.arraycopy(var1, var2, this.buffer, this.limit, var6);
System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6);
}
this.limit = (var3 + this.limit) % this.capacity;
this.notifyAll();
}
} else {
throw new IOException();

77
runescape-client/src/main/java/BufferedSource.java
View File

@@ -61,7 +61,8 @@ public class BufferedSource implements Runnable {
boolean isAvailable(int var1) throws IOException {
if (var1 == 0) {
return true;
} else if (var1 > 0 && var1 < this.capacity) {
}
if (var1 > 0 && var1 < this.capacity) {
synchronized(this) {
int var3;
if (this.position <= this.limit) {
@@ -73,17 +74,14 @@ public class BufferedSource implements Runnable {
if (var3 < var1) {
if (this.exception != null) {
throw new IOException(this.exception.toString());
} else {
this.notifyAll();
return false;
}
} else {
return true;
this.notifyAll();
return false;
}
return true;
}
} else {
throw new IOException();
}
throw new IOException();
}
@ObfuscatedName("w")
@@ -103,10 +101,9 @@ public class BufferedSource implements Runnable {
if (var2 <= 0 && this.exception != null) {
throw new IOException(this.exception.toString());
} else {
this.notifyAll();
return var2;
}
this.notifyAll();
return var2;
}
}
@@ -121,15 +118,13 @@ public class BufferedSource implements Runnable {
if (this.limit == this.position) {
if (this.exception != null) {
throw new IOException(this.exception.toString());
} else {
return -1;
}
} else {
int var2 = this.buffer[this.position] & 255;
this.position = (this.position + 1) % this.capacity;
this.notifyAll();
return var2;
return -1;
}
int var2 = this.buffer[this.position] & 255;
this.position = (this.position + 1) % this.capacity;
this.notifyAll();
return var2;
}
}
@@ -155,23 +150,21 @@ public class BufferedSource implements Runnable {
if (var3 == 0 && this.exception != null) {
throw new IOException(this.exception.toString());
} else {
if (var3 + this.position <= this.capacity) {
System.arraycopy(this.buffer, this.position, var1, var2, var3);
} else {
int var6 = this.capacity - this.position;
System.arraycopy(this.buffer, this.position, var1, var2, var6);
System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6);
}
this.position = (var3 + this.position) % this.capacity;
this.notifyAll();
return var3;
}
if (var3 + this.position <= this.capacity) {
System.arraycopy(this.buffer, this.position, var1, var2, var3);
} else {
int var6 = this.capacity - this.position;
System.arraycopy(this.buffer, this.position, var1, var2, var6);
System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6);
}
this.position = (var3 + this.position) % this.capacity;
this.notifyAll();
return var3;
}
} else {
throw new IOException();
}
throw new IOException();
}
@ObfuscatedName("k")
@@ -262,25 +255,25 @@ public class BufferedSource implements Runnable {
GrandExchangeOfferWorldComparator.leftTitleSprite = BuddyRankComparator.convertJpgToSprite(var4);
NPC.rightTitleSprite = GrandExchangeOfferWorldComparator.leftTitleSprite.mirrorHorizontally();
if ((Client.worldProperties & 536870912) != 0) {
GroundItem.logoSprite = class215.loadIndexedSpriteByName(var1, "logo_deadman_mode", "");
GroundItem.logoSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", "");
} else {
GroundItem.logoSprite = class215.loadIndexedSpriteByName(var1, "logo", "");
GroundItem.logoSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "logo", "");
}
Login.titleboxSprite = class215.loadIndexedSpriteByName(var1, "titlebox", "");
VarpDefinition.titlebuttonSprite = class215.loadIndexedSpriteByName(var1, "titlebutton", "");
Login.titleboxSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", "");
VarpDefinition.titlebuttonSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", "");
int var6 = var1.getGroupId("runes");
int var7 = var1.getFileId(var6, "");
IndexedSprite[] var5 = class289.method5281(var1, var6, var7);
IndexedSprite[] var5 = class289.SpriteBuffer_getIndexedSpriteArray(var1, var6, var7);
Login.runesSprite = var5;
var7 = var1.getGroupId("title_mute");
int var8 = var1.getFileId(var7, "");
IndexedSprite[] var9 = class289.method5281(var1, var7, var8);
IndexedSprite[] var9 = class289.SpriteBuffer_getIndexedSpriteArray(var1, var7, var8);
Login.title_muteSprite = var9;
Login.options_buttons_0Sprite = class215.loadIndexedSpriteByName(var1, "options_radio_buttons,0", "");
Message.field606 = class215.loadIndexedSpriteByName(var1, "options_radio_buttons,4", "");
Decimator.options_buttons_2Sprite = class215.loadIndexedSpriteByName(var1, "options_radio_buttons,2", "");
Login.field1185 = class215.loadIndexedSpriteByName(var1, "options_radio_buttons,6", "");
Login.options_buttons_0Sprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", "");
Message.field606 = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", "");
Decimator.options_buttons_2Sprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", "");
Login.field1185 = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", "");
class237.field3191 = Login.options_buttons_0Sprite.subWidth;
WorldMapDecoration.field212 = Login.options_buttons_0Sprite.subHeight;
Ignored.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite);

37
runescape-client/src/main/java/ChatChannel.java
View File

@@ -234,28 +234,27 @@ public class ChatChannel {
static final boolean runCs1(Widget var0) {
if (var0.cs1Comparisons == null) {
return false;
} else {
for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) {
int var2 = Varps.method3969(var0, var1);
int var3 = var0.cs1ComparisonValues[var1];
if (var0.cs1Comparisons[var1] == 2) {
if (var2 >= var3) {
return false;
}
} else if (var0.cs1Comparisons[var1] == 3) {
if (var2 <= var3) {
return false;
}
} else if (var0.cs1Comparisons[var1] == 4) {
if (var2 == var3) {
return false;
}
} else if (var2 != var3) {
}
for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) {
int var2 = Varps.method3969(var0, var1);
int var3 = var0.cs1ComparisonValues[var1];
if (var0.cs1Comparisons[var1] == 2) {
if (var2 >= var3) {
return false;
}
} else if (var0.cs1Comparisons[var1] == 3) {
if (var2 <= var3) {
return false;
}
} else if (var0.cs1Comparisons[var1] == 4) {
if (var2 == var3) {
return false;
}
} else if (var2 != var3) {
return false;
}
return true;
}
return true;
}
}

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

File diff suppressed because it is too large Load Diff

499
runescape-client/src/main/java/ClientPreferences.java
View File

@@ -229,7 +229,8 @@ public class ClientPreferences {
if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.publicChatMode;
return 1;
} else if (var0 == ScriptOpcodes.CHAT_SETFILTER) {
}
if (var0 == ScriptOpcodes.CHAT_SETFILTER) {
HealthBarUpdate.Interpreter_intStackSize -= 3;
Client.publicChatMode = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
class226.field3072 = NetSocket.method3530(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
@@ -244,256 +245,264 @@ public class ClientPreferences {
var18.packetBuffer.writeByte(Client.field872);
Client.packetWriter.method2219(var18);
return 1;
} else {
String var3;
int var4;
if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) {
var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
HealthBarUpdate.Interpreter_intStackSize -= 2;
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
int var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
PacketBufferNode var6 = Archive.method4265(ClientPacket.field2205, Client.packetWriter.isaacCipher);
var6.packetBuffer.writeByte(Huffman.stringCp1252NullTerminatedByteSize(var3) + 2);
var6.packetBuffer.writeStringCp1252NullTerminated(var3);
var6.packetBuffer.writeByte(var4 - 1);
var6.packetBuffer.writeByte(var5);
Client.packetWriter.method2219(var6);
return 1;
}
String var3;
int var4;
if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) {
var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
HealthBarUpdate.Interpreter_intStackSize -= 2;
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
int var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
PacketBufferNode var6 = Archive.method4265(ClientPacket.field2205, Client.packetWriter.isaacCipher);
var6.packetBuffer.writeByte(Huffman.stringCp1252NullTerminatedByteSize(var3) + 2);
var6.packetBuffer.writeStringCp1252NullTerminated(var3);
var6.packetBuffer.writeByte(var4 - 1);
var6.packetBuffer.writeByte(var5);
Client.packetWriter.method2219(var6);
return 1;
}
int var10;
if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var10 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
Message var15 = GroundItem.method2049(var10, var4);
if (var15 != null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.count;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.cycle;
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : "";
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : "";
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : "";
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0);
} else {
int var10;
if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var10 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
Message var15 = GroundItem.method2049(var10, var4);
if (var15 != null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.count;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.cycle;
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : "";
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : "";
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : "";
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0);
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
}
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
}
return 1;
} else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) {
var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Message var16 = WorldMapIcon_1.method297(var10);
if (var16 != null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.type;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.cycle;
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : "";
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : "";
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : "";
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0);
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
}
return 1;
}
if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) {
var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Message var16 = WorldMapIcon_1.method297(var10);
if (var16 != null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.type;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.cycle;
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : "";
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : "";
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : "";
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0);
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
}
return 1;
} else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) {
if (class226.field3072 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class226.field3072.field3815;
}
return 1;
}
if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) {
if (class226.field3072 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class226.field3072.field3815;
}
return 1;
} else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) {
var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
String var14 = var3.toLowerCase();
byte var17 = 0;
if (var14.startsWith("yellow:")) {
var17 = 0;
var3 = var3.substring("yellow:".length());
} else if (var14.startsWith("red:")) {
var17 = 1;
var3 = var3.substring("red:".length());
} else if (var14.startsWith("green:")) {
var17 = 2;
var3 = var3.substring("green:".length());
} else if (var14.startsWith("cyan:")) {
var17 = 3;
var3 = var3.substring("cyan:".length());
} else if (var14.startsWith("purple:")) {
var17 = 4;
var3 = var3.substring("purple:".length());
} else if (var14.startsWith("white:")) {
var17 = 5;
var3 = var3.substring("white:".length());
} else if (var14.startsWith("flash1:")) {
var17 = 6;
var3 = var3.substring("flash1:".length());
} else if (var14.startsWith("flash2:")) {
var17 = 7;
var3 = var3.substring("flash2:".length());
} else if (var14.startsWith("flash3:")) {
var17 = 8;
var3 = var3.substring("flash3:".length());
} else if (var14.startsWith("glow1:")) {
var17 = 9;
var3 = var3.substring("glow1:".length());
} else if (var14.startsWith("glow2:")) {
var17 = 10;
var3 = var3.substring("glow2:".length());
} else if (var14.startsWith("glow3:")) {
var17 = 11;
var3 = var3.substring("glow3:".length());
} else if (ScriptFrame.field528 != class190.field2348) {
if (var14.startsWith("yellow:")) {
var17 = 0;
var3 = var3.substring("yellow:".length());
} else if (var14.startsWith("red:")) {
var17 = 1;
var3 = var3.substring("red:".length());
} else if (var14.startsWith("green:")) {
var17 = 2;
var3 = var3.substring("green:".length());
} else if (var14.startsWith("cyan:")) {
var17 = 3;
var3 = var3.substring("cyan:".length());
} else if (var14.startsWith("purple:")) {
var17 = 4;
var3 = var3.substring("purple:".length());
} else if (var14.startsWith("white:")) {
var17 = 5;
var3 = var3.substring("white:".length());
} else if (var14.startsWith("flash1:")) {
var17 = 6;
var3 = var3.substring("flash1:".length());
} else if (var14.startsWith("flash2:")) {
var17 = 7;
var3 = var3.substring("flash2:".length());
} else if (var14.startsWith("flash3:")) {
var17 = 8;
var3 = var3.substring("flash3:".length());
} else if (var14.startsWith("glow1:")) {
var17 = 9;
var3 = var3.substring("glow1:".length());
} else if (var14.startsWith("glow2:")) {
var17 = 10;
var3 = var3.substring("glow2:".length());
} else if (var14.startsWith("glow3:")) {
var17 = 11;
var3 = var3.substring("glow3:".length());
}
}
var14 = var3.toLowerCase();
byte var7 = 0;
if (var14.startsWith("wave:")) {
var7 = 1;
var3 = var3.substring("wave:".length());
} else if (var14.startsWith("wave2:")) {
var7 = 2;
var3 = var3.substring("wave2:".length());
} else if (var14.startsWith("shake:")) {
var7 = 3;
var3 = var3.substring("shake:".length());
} else if (var14.startsWith("scroll:")) {
var7 = 4;
var3 = var3.substring("scroll:".length());
} else if (var14.startsWith("slide:")) {
var7 = 5;
var3 = var3.substring("slide:".length());
} else if (class190.field2348 != ScriptFrame.field528) {
if (var14.startsWith("wave:")) {
var7 = 1;
var3 = var3.substring("wave:".length());
} else if (var14.startsWith("wave2:")) {
var7 = 2;
var3 = var3.substring("wave2:".length());
} else if (var14.startsWith("shake:")) {
var7 = 3;
var3 = var3.substring("shake:".length());
} else if (var14.startsWith("scroll:")) {
var7 = 4;
var3 = var3.substring("scroll:".length());
} else if (var14.startsWith("slide:")) {
var7 = 5;
var3 = var3.substring("slide:".length());
}
}
PacketBufferNode var8 = Archive.method4265(ClientPacket.field2258, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeByte(0);
int var9 = var8.packetBuffer.offset;
var8.packetBuffer.writeByte(var4);
var8.packetBuffer.writeByte(var17);
var8.packetBuffer.writeByte(var7);
Skeleton.method3063(var8.packetBuffer, var3);
var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9);
Client.packetWriter.method2219(var8);
return 1;
} else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) {
Skills.Interpreter_stringStackSize -= 2;
var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize];
String var12 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1];
PacketBufferNode var11 = Archive.method4265(ClientPacket.field2228, Client.packetWriter.isaacCipher);
var11.packetBuffer.writeShort(0);
int var13 = var11.packetBuffer.offset;
var11.packetBuffer.writeStringCp1252NullTerminated(var3);
Skeleton.method3063(var11.packetBuffer, var12);
var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13);
Client.packetWriter.method2219(var11);
return 1;
} else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) {
if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.field872;
return 1;
} else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) {
var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = LoginScreenAnimation.method1744(var10);
return 1;
} else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) {
var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = MusicPatchNode2.method3686(var10);
return 1;
} else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) {
var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class192.method3669(var10);
return 1;
} else if (var0 == ScriptOpcodes.DOCHEAT) {
var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
UserComparator1.doCheat(var3);
return 1;
} else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) {
Client.field762 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize].toLowerCase().trim();
return 1;
} else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = Client.field762;
return 1;
} else if (var0 == 5023) {
var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
System.out.println(var3);
return 1;
} else {
return 2;
}
} else {
if (Client.localPlayer != null && Client.localPlayer.username != null) {
var3 = Client.localPlayer.username.getName();
} else {
var3 = "";
}
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3;
return 1;
return 1;
}
if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) {
var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
String var14 = var3.toLowerCase();
byte var17 = 0;
if (var14.startsWith("yellow:")) {
var17 = 0;
var3 = var3.substring("yellow:".length());
} else if (var14.startsWith("red:")) {
var17 = 1;
var3 = var3.substring("red:".length());
} else if (var14.startsWith("green:")) {
var17 = 2;
var3 = var3.substring("green:".length());
} else if (var14.startsWith("cyan:")) {
var17 = 3;
var3 = var3.substring("cyan:".length());
} else if (var14.startsWith("purple:")) {
var17 = 4;
var3 = var3.substring("purple:".length());
} else if (var14.startsWith("white:")) {
var17 = 5;
var3 = var3.substring("white:".length());
} else if (var14.startsWith("flash1:")) {
var17 = 6;
var3 = var3.substring("flash1:".length());
} else if (var14.startsWith("flash2:")) {
var17 = 7;
var3 = var3.substring("flash2:".length());
} else if (var14.startsWith("flash3:")) {
var17 = 8;
var3 = var3.substring("flash3:".length());
} else if (var14.startsWith("glow1:")) {
var17 = 9;
var3 = var3.substring("glow1:".length());
} else if (var14.startsWith("glow2:")) {
var17 = 10;
var3 = var3.substring("glow2:".length());
} else if (var14.startsWith("glow3:")) {
var17 = 11;
var3 = var3.substring("glow3:".length());
} else if (ScriptFrame.field528 != class190.field2348) {
if (var14.startsWith("yellow:")) {
var17 = 0;
var3 = var3.substring("yellow:".length());
} else if (var14.startsWith("red:")) {
var17 = 1;
var3 = var3.substring("red:".length());
} else if (var14.startsWith("green:")) {
var17 = 2;
var3 = var3.substring("green:".length());
} else if (var14.startsWith("cyan:")) {
var17 = 3;
var3 = var3.substring("cyan:".length());
} else if (var14.startsWith("purple:")) {
var17 = 4;
var3 = var3.substring("purple:".length());
} else if (var14.startsWith("white:")) {
var17 = 5;
var3 = var3.substring("white:".length());
} else if (var14.startsWith("flash1:")) {
var17 = 6;
var3 = var3.substring("flash1:".length());
} else if (var14.startsWith("flash2:")) {
var17 = 7;
var3 = var3.substring("flash2:".length());
} else if (var14.startsWith("flash3:")) {
var17 = 8;
var3 = var3.substring("flash3:".length());
} else if (var14.startsWith("glow1:")) {
var17 = 9;
var3 = var3.substring("glow1:".length());
} else if (var14.startsWith("glow2:")) {
var17 = 10;
var3 = var3.substring("glow2:".length());
} else if (var14.startsWith("glow3:")) {
var17 = 11;
var3 = var3.substring("glow3:".length());
}
}
var14 = var3.toLowerCase();
byte var7 = 0;
if (var14.startsWith("wave:")) {
var7 = 1;
var3 = var3.substring("wave:".length());
} else if (var14.startsWith("wave2:")) {
var7 = 2;
var3 = var3.substring("wave2:".length());
} else if (var14.startsWith("shake:")) {
var7 = 3;
var3 = var3.substring("shake:".length());
} else if (var14.startsWith("scroll:")) {
var7 = 4;
var3 = var3.substring("scroll:".length());
} else if (var14.startsWith("slide:")) {
var7 = 5;
var3 = var3.substring("slide:".length());
} else if (class190.field2348 != ScriptFrame.field528) {
if (var14.startsWith("wave:")) {
var7 = 1;
var3 = var3.substring("wave:".length());
} else if (var14.startsWith("wave2:")) {
var7 = 2;
var3 = var3.substring("wave2:".length());
} else if (var14.startsWith("shake:")) {
var7 = 3;
var3 = var3.substring("shake:".length());
} else if (var14.startsWith("scroll:")) {
var7 = 4;
var3 = var3.substring("scroll:".length());
} else if (var14.startsWith("slide:")) {
var7 = 5;
var3 = var3.substring("slide:".length());
}
}
PacketBufferNode var8 = Archive.method4265(ClientPacket.field2258, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeByte(0);
int var9 = var8.packetBuffer.offset;
var8.packetBuffer.writeByte(var4);
var8.packetBuffer.writeByte(var17);
var8.packetBuffer.writeByte(var7);
Skeleton.method3063(var8.packetBuffer, var3);
var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9);
Client.packetWriter.method2219(var8);
return 1;
}
if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) {
Skills.Interpreter_stringStackSize -= 2;
var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize];
String var12 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1];
PacketBufferNode var11 = Archive.method4265(ClientPacket.field2228, Client.packetWriter.isaacCipher);
var11.packetBuffer.writeShort(0);
int var13 = var11.packetBuffer.offset;
var11.packetBuffer.writeStringCp1252NullTerminated(var3);
Skeleton.method3063(var11.packetBuffer, var12);
var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13);
Client.packetWriter.method2219(var11);
return 1;
}
if (var0 == ScriptOpcodes.CHAT_PLAYERNAME) {
if (Client.localPlayer != null && Client.localPlayer.username != null) {
var3 = Client.localPlayer.username.getName();
} else {
var3 = "";
}
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3;
return 1;
}
if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.field872;
return 1;
}
if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) {
var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = LoginScreenAnimation.method1744(var10);
return 1;
}
if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) {
var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = MusicPatchNode2.method3686(var10);
return 1;
}
if (var0 == ScriptOpcodes.CHAT_GETPREVUID) {
var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class192.method3669(var10);
return 1;
}
if (var0 == ScriptOpcodes.DOCHEAT) {
var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
UserComparator1.doCheat(var3);
return 1;
}
if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) {
Client.field762 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize].toLowerCase().trim();
return 1;
}
if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = Client.field762;
return 1;
}
if (var0 == 5023) {
var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
System.out.println(var3);
return 1;
}
return 2;
}
}

11
runescape-client/src/main/java/Coord.java
View File

@@ -77,11 +77,11 @@ public class Coord {
boolean equalsCoord(Coord var1) {
if (this.plane != var1.plane) {
return false;
} else if (this.x != var1.x) {
return false;
} else {
return this.y == var1.y;
}
if (this.x != var1.x) {
return false;
}
return this.y == var1.y;
}
@ObfuscatedName("e")
@@ -101,9 +101,8 @@ public class Coord {
public boolean equals(Object var1) {
if (this == var1) {
return true;
} else {
return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1);
}
return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1);
}
public String toString() {

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

@@ -148,7 +148,8 @@ public class Decimator {
static final int method2517(int var0, int var1) {
if (var0 == -2) {
return 12345678;
} else if (var0 == -1) {
}
if (var0 == -1) {
if (var1 < 2) {
var1 = 2;
} else if (var1 > 126) {
@@ -156,16 +157,15 @@ public class Decimator {
}
return var1;
} else {
var1 = (var0 & 127) * var1 / 128;
if (var1 < 2) {
var1 = 2;
} else if (var1 > 126) {
var1 = 126;
}
return (var0 & 65408) + var1;
}
var1 = (var0 & 127) * var1 / 128;
if (var1 < 2) {
var1 = 2;
} else if (var1 > 126) {
var1 = 126;
}
return (var0 & 65408) + var1;
}
@ObfuscatedName("ge")

81
runescape-client/src/main/java/DemotingHashTable.java
View File

@@ -48,29 +48,27 @@ public final class DemotingHashTable {
Wrapper var3 = (Wrapper)this.hashTable.get(var1);
if (var3 == null) {
return null;
} else {
Object var4 = var3.get();
if (var4 == null) {
var3.remove();
var3.removeDual();
this.remaining += var3.size;
return null;
} else {
if (var3.isSoft()) {
DirectWrapper var5 = new DirectWrapper(var4, var3.size);
this.hashTable.put(var5, var3.key);
this.queue.add(var5);
var5.keyDual = 0L;
var3.remove();
var3.removeDual();
} else {
this.queue.add(var3);
var3.keyDual = 0L;
}
return var4;
}
}
Object var4 = var3.get();
if (var4 == null) {
var3.remove();
var3.removeDual();
this.remaining += var3.size;
return null;
}
if (var3.isSoft()) {
DirectWrapper var5 = new DirectWrapper(var4, var3.size);
this.hashTable.put(var5, var3.key);
this.queue.add(var5);
var5.keyDual = 0L;
var3.remove();
var3.removeDual();
} else {
this.queue.add(var3);
var3.keyDual = 0L;
}
return var4;
}
@ObfuscatedName("w")
@@ -99,30 +97,29 @@ public final class DemotingHashTable {
public void put(Object var1, long var2, int var4) {
if (var4 > this.capacity) {
throw new IllegalStateException();
} else {
this.remove(var2);
this.remaining -= var4;
}
this.remove(var2);
this.remaining -= var4;
while (this.remaining < 0) {
Wrapper var5 = (Wrapper)this.queue.removeLast();
if (var5 == null) {
throw new RuntimeException("");
}
if (!var5.isSoft()) {
}
this.removeWrapper(var5);
if (this.field1966 != null) {
this.field1966.method3338(var5.get());
}
while (this.remaining < 0) {
Wrapper var5 = (Wrapper)this.queue.removeLast();
if (var5 == null) {
throw new RuntimeException("");
}
DirectWrapper var6 = new DirectWrapper(var1, var4);
this.hashTable.put(var6, var2);
this.queue.add(var6);
var6.keyDual = 0L;
if (!var5.isSoft()) {
}
this.removeWrapper(var5);
if (this.field1966 != null) {
this.field1966.method3338(var5.get());
}
}
DirectWrapper var6 = new DirectWrapper(var1, var4);
this.hashTable.put(var6, var2);
this.queue.add(var6);
var6.keyDual = 0L;
}
@ObfuscatedName("k")

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

@@ -136,27 +136,26 @@ public class DynamicObject extends Entity {
if (var12 == null) {
return null;
} else {
int var2;
int var3;
if (this.orientation != 1 && this.orientation != 3) {
var2 = var12.sizeX;
var3 = var12.sizeY;
} else {
var2 = var12.sizeY;
var3 = var12.sizeX;
}
int var4 = (var2 >> 1) + this.x;
int var5 = (var2 + 1 >> 1) + this.x;
int var6 = (var3 >> 1) + this.y;
int var7 = (var3 + 1 >> 1) + this.y;
int[][] var8 = Tiles.Tiles_heights[this.plane];
int var9 = var8[var4][var6] + var8[var5][var6] + var8[var4][var7] + var8[var5][var7] >> 2;
int var10 = (this.x << 7) + (var2 << 6);
int var11 = (this.y << 7) + (var3 << 6);
return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame);
}
int var2;
int var3;
if (this.orientation != 1 && this.orientation != 3) {
var2 = var12.sizeX;
var3 = var12.sizeY;
} else {
var2 = var12.sizeY;
var3 = var12.sizeX;
}
int var4 = (var2 >> 1) + this.x;
int var5 = (var2 + 1 >> 1) + this.x;
int var6 = (var3 >> 1) + this.y;
int var7 = (var3 + 1 >> 1) + this.y;
int[][] var8 = Tiles.Tiles_heights[this.plane];
int var9 = var8[var4][var6] + var8[var5][var6] + var8[var4][var7] + var8[var5][var7] >> 2;
int var10 = (this.x << 7) + (var2 << 6);
int var11 = (this.y << 7) + (var3 << 6);
return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame);
}
@ObfuscatedName("w")
@@ -261,31 +260,35 @@ public class DynamicObject extends Entity {
}
return var4 - var5;
} else if (var2 == 2) {
}
if (var2 == 2) {
return var0.location - var1.location;
} else if (var2 == 3) {
}
if (var2 == 3) {
if (var0.activity.equals("-")) {
if (var1.activity.equals("-")) {
return 0;
} else {
return var3 ? -1 : 1;
}
} else if (var1.activity.equals("-")) {
return var3 ? 1 : -1;
} else {
return var0.activity.compareTo(var1.activity);
return var3 ? -1 : 1;
}
} else if (var2 == 4) {
return var0.method1698() ? (var1.method1698() ? 0 : 1) : (var1.method1698() ? -1 : 0);
} else if (var2 == 5) {
return var0.method1682() ? (var1.method1682() ? 0 : 1) : (var1.method1682() ? -1 : 0);
} else if (var2 == 6) {
return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0);
} else if (var2 == 7) {
return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0);
} else {
return var0.id - var1.id;
if (var1.activity.equals("-")) {
return var3 ? 1 : -1;
}
return var0.activity.compareTo(var1.activity);
}
if (var2 == 4) {
return var0.method1698() ? (var1.method1698() ? 0 : 1) : (var1.method1698() ? -1 : 0);
}
if (var2 == 5) {
return var0.method1682() ? (var1.method1682() ? 0 : 1) : (var1.method1682() ? -1 : 0);
}
if (var2 == 6) {
return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0);
}
if (var2 == 7) {
return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0);
}
return var0.id - var1.id;
}
@ObfuscatedName("b")

58
runescape-client/src/main/java/EnumDefinition.java
View File

@@ -171,33 +171,39 @@ public class EnumDefinition extends DualNode {
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4 + var3;
return 1;
} else if (var0 == ScriptOpcodes.SUB) {
}
if (var0 == ScriptOpcodes.SUB) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 - var4;
return 1;
} else if (var0 == ScriptOpcodes.MULTIPLY) {
}
if (var0 == ScriptOpcodes.MULTIPLY) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 * var4;
return 1;
} else if (var0 == ScriptOpcodes.DIV) {
}
if (var0 == ScriptOpcodes.DIV) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 / var4;
return 1;
} else if (var0 == ScriptOpcodes.RANDOM) {
}
if (var0 == ScriptOpcodes.RANDOM) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3);
return 1;
} else if (var0 == ScriptOpcodes.RANDOMINC) {
}
if (var0 == ScriptOpcodes.RANDOMINC) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1));
return 1;
} else if (var0 == ScriptOpcodes.INTERPOLATE) {
}
if (var0 == ScriptOpcodes.INTERPOLATE) {
HealthBarUpdate.Interpreter_intStackSize -= 5;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
@@ -206,37 +212,43 @@ public class EnumDefinition extends DualNode {
int var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 4];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5);
return 1;
} else if (var0 == ScriptOpcodes.ADDPERCENT) {
}
if (var0 == ScriptOpcodes.ADDPERCENT) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100;
return 1;
} else if (var0 == ScriptOpcodes.SETBIT) {
}
if (var0 == ScriptOpcodes.SETBIT) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 | 1 << var4;
return 1;
} else if (var0 == ScriptOpcodes.CLEARBIT) {
}
if (var0 == ScriptOpcodes.CLEARBIT) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4);
return 1;
} else if (var0 == ScriptOpcodes.TESTBIT) {
}
if (var0 == ScriptOpcodes.TESTBIT) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0;
return 1;
} else if (var0 == ScriptOpcodes.MOD) {
}
if (var0 == ScriptOpcodes.MOD) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 % var4;
return 1;
} else if (var0 == ScriptOpcodes.POW) {
}
if (var0 == ScriptOpcodes.POW) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
@@ -247,15 +259,16 @@ public class EnumDefinition extends DualNode {
}
return 1;
} else if (var0 == ScriptOpcodes.INVPOW) {
}
if (var0 == ScriptOpcodes.INVPOW) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
if (var3 == 0) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
return 1;
} else {
switch(var4) {
}
switch(var4) {
case 0:
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Integer.MAX_VALUE;
break;
@@ -275,29 +288,30 @@ public class EnumDefinition extends DualNode {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4);
}
return 1;
}
} else if (var0 == ScriptOpcodes.AND) {
return 1;
}
if (var0 == ScriptOpcodes.AND) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 & var4;
return 1;
} else if (var0 == ScriptOpcodes.OR) {
}
if (var0 == ScriptOpcodes.OR) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 | var4;
return 1;
} else if (var0 == ScriptOpcodes.SCALE) {
}
if (var0 == ScriptOpcodes.SCALE) {
HealthBarUpdate.Interpreter_intStackSize -= 3;
long var9 = (long)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
long var11 = (long)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
long var13 = (long)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11);
return 1;
} else {
return 2;
}
return 2;
}
}

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

@@ -1,3 +1,4 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@@ -10,5 +11,6 @@ public interface Enumerated {
signature = "(I)I",
garbageValue = "320353268"
)
@Export("rsOrdinal")
int rsOrdinal();
}

25
runescape-client/src/main/java/FloorUnderlayDefinition.java
View File

@@ -186,19 +186,8 @@ public class FloorUnderlayDefinition extends DualNode {
if (var0 == ScriptOpcodes.IF_GETTARGETMASK) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = HealthBar.method1957(class268.getWidgetClickMask(var3));
return 1;
} else if (var0 != ScriptOpcodes.IF_GETOP) {
if (var0 == ScriptOpcodes.IF_GETOPBASE) {
if (var3.dataText == null) {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
} else {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.dataText;
}
return 1;
} else {
return 2;
}
} else {
}
if (var0 == ScriptOpcodes.IF_GETOP) {
int var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
--var4;
if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) {
@@ -209,5 +198,15 @@ public class FloorUnderlayDefinition extends DualNode {
return 1;
}
if (var0 == ScriptOpcodes.IF_GETOPBASE) {
if (var3.dataText == null) {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
} else {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.dataText;
}
return 1;
}
return 2;
}
}

216
runescape-client/src/main/java/FontName.java
View File

@@ -80,111 +80,116 @@ public class FontName {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = WorldMapArea.getItemDefinition(var3).name;
return 1;
} else {
int var4;
ItemDefinition var5;
if (var0 == ScriptOpcodes.OC_OP) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
var5 = WorldMapArea.getItemDefinition(var3);
if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1];
} else {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
}
return 1;
} else if (var0 == ScriptOpcodes.OC_IOP) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
var5 = WorldMapArea.getItemDefinition(var3);
if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1];
} else {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
}
return 1;
} else if (var0 == ScriptOpcodes.OC_COST) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.getItemDefinition(var3).price;
return 1;
} else if (var0 == ScriptOpcodes.OC_STACKABLE) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.getItemDefinition(var3).isStackable == 1 ? 1 : 0;
return 1;
} else {
ItemDefinition var6;
if (var0 == ScriptOpcodes.OC_CERT) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = WorldMapArea.getItemDefinition(var3);
if (var6.noteTemplate == -1 && var6.note >= 0) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.note;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3;
}
return 1;
} else if (var0 == ScriptOpcodes.OC_UNCERT) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = WorldMapArea.getItemDefinition(var3);
if (var6.noteTemplate >= 0 && var6.note >= 0) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.note;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3;
}
return 1;
} else if (var0 == ScriptOpcodes.OC_MEMBERS) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.getItemDefinition(var3).isMembersOnly ? 1 : 0;
return 1;
} else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = WorldMapArea.getItemDefinition(var3);
if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.placeholder;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3;
}
return 1;
} else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = WorldMapArea.getItemDefinition(var3);
if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.placeholder;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3;
}
return 1;
} else if (var0 == ScriptOpcodes.OC_FIND) {
String var7 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
WorldMapDecoration.findItemDefinitions(var7, var4 == 1);
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = FloorOverlayDefinition.foundItemIdCount;
return 1;
} else if (var0 != ScriptOpcodes.OC_FINDNEXT) {
if (var0 == ScriptOpcodes.OC_FINDRESET) {
class32.foundItemIndex = 0;
return 1;
} else {
return 2;
}
} else {
if (WorldMapData_1.foundItemIds != null && class32.foundItemIndex < FloorOverlayDefinition.foundItemIdCount) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapData_1.foundItemIds[++class32.foundItemIndex - 1] & '\uffff';
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
}
return 1;
}
}
}
int var4;
ItemDefinition var5;
if (var0 == ScriptOpcodes.OC_OP) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
var5 = WorldMapArea.getItemDefinition(var3);
if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1];
} else {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
}
return 1;
}
if (var0 == ScriptOpcodes.OC_IOP) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
var5 = WorldMapArea.getItemDefinition(var3);
if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1];
} else {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
}
return 1;
}
if (var0 == ScriptOpcodes.OC_COST) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.getItemDefinition(var3).price;
return 1;
}
if (var0 == ScriptOpcodes.OC_STACKABLE) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.getItemDefinition(var3).isStackable == 1 ? 1 : 0;
return 1;
}
ItemDefinition var6;
if (var0 == ScriptOpcodes.OC_CERT) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = WorldMapArea.getItemDefinition(var3);
if (var6.noteTemplate == -1 && var6.note >= 0) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.note;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3;
}
return 1;
}
if (var0 == ScriptOpcodes.OC_UNCERT) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = WorldMapArea.getItemDefinition(var3);
if (var6.noteTemplate >= 0 && var6.note >= 0) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.note;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3;
}
return 1;
}
if (var0 == ScriptOpcodes.OC_MEMBERS) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.getItemDefinition(var3).isMembersOnly ? 1 : 0;
return 1;
}
if (var0 == ScriptOpcodes.OC_PLACEHOLDER) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = WorldMapArea.getItemDefinition(var3);
if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.placeholder;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3;
}
return 1;
}
if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = WorldMapArea.getItemDefinition(var3);
if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.placeholder;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3;
}
return 1;
}
if (var0 == ScriptOpcodes.OC_FIND) {
String var7 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
WorldMapDecoration.findItemDefinitions(var7, var4 == 1);
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = FloorOverlayDefinition.foundItemIdCount;
return 1;
}
if (var0 == ScriptOpcodes.OC_FINDNEXT) {
if (WorldMapData_1.foundItemIds != null && class32.foundItemIndex < FloorOverlayDefinition.foundItemIdCount) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapData_1.foundItemIds[++class32.foundItemIndex - 1] & '\uffff';
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
}
return 1;
}
if (var0 == ScriptOpcodes.OC_FINDRESET) {
class32.foundItemIndex = 0;
return 1;
}
return 2;
}
@ObfuscatedName("ii")
@@ -826,8 +831,7 @@ public class FontName {
static String method5318(Widget var0) {
if (HealthBar.method1957(class268.getWidgetClickMask(var0)) == 0) {
return null;
} else {
return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null;
}
return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null;
}
}

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

@@ -49,7 +49,7 @@ public class Fonts {
if (this.map.containsKey(var5)) {
var2.put(var5, this.map.get(var5));
} else {
Font var6 = class287.method5258(this.spritesArchive, this.fontsArchive, var5.name, "");
Font var6 = class287.SpriteBuffer_getFontByName(this.spritesArchive, this.fontsArchive, var5.name, "");
if (var6 != null) {
this.map.put(var5, var6);
var2.put(var5, var6);

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

@@ -181,71 +181,73 @@ public class Frames extends DualNode {
boolean var4 = ViewportMouse.ViewportMouse_isInViewport;
if (!var4) {
return false;
} else {
int var5;
int var6;
int var7;
int var8;
int var11;
int var12;
int var13;
int var16;
int var17;
if (!ViewportMouse.ViewportMouse_false0) {
var5 = Scene.Scene_cameraPitchSine;
var6 = Scene.Scene_cameraPitchCosine;
var7 = Scene.Scene_cameraYawSine;
var8 = Scene.Scene_cameraYawCosine;
byte var9 = 50;
short var10 = 3500;
var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var9 / Rasterizer3D.Rasterizer3D_zoom;
var12 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var9 / Rasterizer3D.Rasterizer3D_zoom;
var13 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var10 / Rasterizer3D.Rasterizer3D_zoom;
int var14 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var10 / Rasterizer3D.Rasterizer3D_zoom;
int var15 = Rasterizer3D.rot1(var12, var9, var6, var5);
var16 = Rasterizer3D.rot2(var12, var9, var6, var5);
var12 = var15;
var15 = Rasterizer3D.rot1(var14, var10, var6, var5);
var17 = Rasterizer3D.rot2(var14, var10, var6, var5);
var14 = var15;
var15 = Rasterizer3D.rot3(var11, var16, var8, var7);
var16 = Rasterizer3D.rot4(var11, var16, var8, var7);
var11 = var15;
var15 = Rasterizer3D.rot3(var13, var17, var8, var7);
var17 = Rasterizer3D.rot4(var13, var17, var8, var7);
ModelData0.field1871 = (var11 + var15) / 2;
ViewportMouse.field1745 = (var12 + var14) / 2;
ViewportMouse.field1746 = (var16 + var17) / 2;
GroundItem.field1242 = (var15 - var11) / 2;
GrandExchangeEvent.field48 = (var14 - var12) / 2;
Canvas.field422 = (var17 - var16) / 2;
ScriptFrame.field527 = Math.abs(GroundItem.field1242);
ViewportMouse.field1741 = Math.abs(GrandExchangeEvent.field48);
MenuAction.field1160 = Math.abs(Canvas.field422);
}
var5 = var0.xMid + var1;
var6 = var2 + var0.yMid;
var7 = var3 + var0.zMid;
var8 = var0.xMidOffset;
var16 = var0.yMidOffset;
var17 = var0.zMidOffset;
var11 = ModelData0.field1871 - var5;
var12 = ViewportMouse.field1745 - var6;
var13 = ViewportMouse.field1746 - var7;
if (Math.abs(var11) > var8 + ScriptFrame.field527) {
return false;
} else if (Math.abs(var12) > var16 + ViewportMouse.field1741) {
return false;
} else if (Math.abs(var13) > var17 + MenuAction.field1160) {
return false;
} else if (Math.abs(var13 * GrandExchangeEvent.field48 - var12 * Canvas.field422) > var17 * ViewportMouse.field1741 + var16 * MenuAction.field1160) {
return false;
} else if (Math.abs(var11 * Canvas.field422 - var13 * GroundItem.field1242) > var8 * MenuAction.field1160 + var17 * ScriptFrame.field527) {
return false;
} else {
return Math.abs(var12 * GroundItem.field1242 - var11 * GrandExchangeEvent.field48) <= var16 * ScriptFrame.field527 + var8 * ViewportMouse.field1741;
}
}
int var5;
int var6;
int var7;
int var8;
int var11;
int var12;
int var13;
int var16;
int var17;
if (!ViewportMouse.ViewportMouse_false0) {
var5 = Scene.Scene_cameraPitchSine;
var6 = Scene.Scene_cameraPitchCosine;
var7 = Scene.Scene_cameraYawSine;
var8 = Scene.Scene_cameraYawCosine;
byte var9 = 50;
short var10 = 3500;
var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var9 / Rasterizer3D.Rasterizer3D_zoom;
var12 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var9 / Rasterizer3D.Rasterizer3D_zoom;
var13 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var10 / Rasterizer3D.Rasterizer3D_zoom;
int var14 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var10 / Rasterizer3D.Rasterizer3D_zoom;
int var15 = Rasterizer3D.rot1(var12, var9, var6, var5);
var16 = Rasterizer3D.rot2(var12, var9, var6, var5);
var12 = var15;
var15 = Rasterizer3D.rot1(var14, var10, var6, var5);
var17 = Rasterizer3D.rot2(var14, var10, var6, var5);
var14 = var15;
var15 = Rasterizer3D.rot3(var11, var16, var8, var7);
var16 = Rasterizer3D.rot4(var11, var16, var8, var7);
var11 = var15;
var15 = Rasterizer3D.rot3(var13, var17, var8, var7);
var17 = Rasterizer3D.rot4(var13, var17, var8, var7);
ModelData0.field1871 = (var11 + var15) / 2;
ViewportMouse.field1745 = (var12 + var14) / 2;
ViewportMouse.field1746 = (var16 + var17) / 2;
GroundItem.field1242 = (var15 - var11) / 2;
GrandExchangeEvent.field48 = (var14 - var12) / 2;
Canvas.field422 = (var17 - var16) / 2;
ScriptFrame.field527 = Math.abs(GroundItem.field1242);
ViewportMouse.field1741 = Math.abs(GrandExchangeEvent.field48);
MenuAction.field1160 = Math.abs(Canvas.field422);
}
var5 = var0.xMid + var1;
var6 = var2 + var0.yMid;
var7 = var3 + var0.zMid;
var8 = var0.xMidOffset;
var16 = var0.yMidOffset;
var17 = var0.zMidOffset;
var11 = ModelData0.field1871 - var5;
var12 = ViewportMouse.field1745 - var6;
var13 = ViewportMouse.field1746 - var7;
if (Math.abs(var11) > var8 + ScriptFrame.field527) {
return false;
}
if (Math.abs(var12) > var16 + ViewportMouse.field1741) {
return false;
}
if (Math.abs(var13) > var17 + MenuAction.field1160) {
return false;
}
if (Math.abs(var13 * GrandExchangeEvent.field48 - var12 * Canvas.field422) > var17 * ViewportMouse.field1741 + var16 * MenuAction.field1160) {
return false;
}
if (Math.abs(var11 * Canvas.field422 - var13 * GroundItem.field1242) > var8 * MenuAction.field1160 + var17 * ScriptFrame.field527) {
return false;
}
return Math.abs(var12 * GroundItem.field1242 - var11 * GrandExchangeEvent.field48) <= var16 * ScriptFrame.field527 + var8 * ViewportMouse.field1741;
}
}

47
runescape-client/src/main/java/Friend.java
View File

@@ -23,23 +23,29 @@ public class Friend extends Buddy {
int compareToFriend(Friend var1) {
if (super.world == Client.worldId && Client.worldId != var1.world) {
return -1;
} else if (Client.worldId == var1.world && super.world != Client.worldId) {
return 1;
} else if (super.world != 0 && var1.world == 0) {
return -1;
} else if (var1.world != 0 && super.world == 0) {
return 1;
} else if (this.field3650 && !var1.field3650) {
return -1;
} else if (!this.field3650 && var1.field3650) {
return 1;
} else if (this.field3651 && !var1.field3651) {
return -1;
} else if (!this.field3651 && var1.field3651) {
return 1;
} else {
return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2;
}
if (Client.worldId == var1.world && super.world != Client.worldId) {
return 1;
}
if (super.world != 0 && var1.world == 0) {
return -1;
}
if (var1.world != 0 && super.world == 0) {
return 1;
}
if (this.field3650 && !var1.field3650) {
return -1;
}
if (!this.field3650 && var1.field3650) {
return 1;
}
if (this.field3651 && !var1.field3651) {
return -1;
}
if (!this.field3651 && var1.field3651) {
return 1;
}
return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2;
}
@ObfuscatedName("ax")
@@ -61,15 +67,14 @@ public class Friend extends Buddy {
signature = "(Lhp;IIB)Z",
garbageValue = "-3"
)
@Export("doesSpriteExist")
public static boolean doesSpriteExist(AbstractArchive var0, int var1, int var2) {
@Export("SpriteBuffer_bufferFile")
public static boolean SpriteBuffer_bufferFile(AbstractArchive var0, int var1, int var2) {
byte[] var3 = var0.takeFile(var1, var2);
if (var3 == null) {
return false;
} else {
class185.SpriteBuffer_decode(var3);
return true;
}
class185.SpriteBuffer_decode(var3);
return true;
}
@ObfuscatedName("fv")

260
runescape-client/src/main/java/FriendSystem.java
View File

@@ -122,11 +122,11 @@ public class FriendSystem {
final boolean isFriended(Username var1, boolean var2) {
if (var1 == null) {
return false;
} else if (var1.equals(Client.localPlayer.username)) {
return true;
} else {
return this.friendsList.isFriended(var1, var2);
}
if (var1.equals(Client.localPlayer.username)) {
return true;
}
return this.friendsList.isFriended(var1, var2);
}
@ObfuscatedName("b")
@@ -138,9 +138,8 @@ public class FriendSystem {
final boolean isIgnored(Username var1) {
if (var1 == null) {
return false;
} else {
return this.ignoreList.contains(var1);
}
return this.ignoreList.contains(var1);
}
@ObfuscatedName("i")
@@ -357,138 +356,153 @@ public class FriendSystem {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type();
return 1;
} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) {
}
if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id;
return 1;
} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) {
}
if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice;
return 1;
} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) {
}
if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity;
return 1;
} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) {
}
if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity;
return 1;
} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) {
}
if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice;
return 1;
} else {
int var12;
if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var12 = Client.grandExchangeOffers[var3].status();
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0;
return 1;
} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var12 = Client.grandExchangeOffers[var3].status();
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0;
return 1;
} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var12 = Client.grandExchangeOffers[var3].status();
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0;
return 1;
} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var12 = Client.grandExchangeOffers[var3].status();
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0;
return 1;
} else {
boolean var13;
if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) {
var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
if (PendingSpawn.grandExchangeEvents != null) {
PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13);
}
return 1;
} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) {
var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
if (PendingSpawn.grandExchangeEvents != null) {
PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13);
}
return 1;
} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var13 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] == 1;
boolean var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1;
if (PendingSpawn.grandExchangeEvents != null) {
Client.GrandExchangeEvents_worldComparator.filterWorlds = var4;
PendingSpawn.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13);
}
return 1;
} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) {
var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
if (PendingSpawn.grandExchangeEvents != null) {
PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13);
}
return 1;
} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) {
var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
if (PendingSpawn.grandExchangeEvents != null) {
PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13);
}
return 1;
} else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = PendingSpawn.grandExchangeEvents == null ? 0 : PendingSpawn.grandExchangeEvents.events.size();
return 1;
} else {
GrandExchangeEvent var11;
if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.world;
return 1;
} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getOfferName();
return 1;
} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName();
return 1;
} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
long var5 = DirectByteArrayCopier.currentTimeMs() - Buddy.field3632 - var11.age;
int var7 = (int)(var5 / 3600000L);
int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L);
int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L);
String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10;
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var10;
return 1;
} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity;
return 1;
} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice;
return 1;
} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id;
return 1;
} else {
return 2;
}
}
}
}
int var12;
if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var12 = Client.grandExchangeOffers[var3].status();
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0;
return 1;
}
if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var12 = Client.grandExchangeOffers[var3].status();
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0;
return 1;
}
if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var12 = Client.grandExchangeOffers[var3].status();
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0;
return 1;
}
if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var12 = Client.grandExchangeOffers[var3].status();
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0;
return 1;
}
boolean var13;
if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) {
var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
if (PendingSpawn.grandExchangeEvents != null) {
PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13);
}
return 1;
}
if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) {
var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
if (PendingSpawn.grandExchangeEvents != null) {
PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13);
}
return 1;
}
if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var13 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] == 1;
boolean var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1;
if (PendingSpawn.grandExchangeEvents != null) {
Client.GrandExchangeEvents_worldComparator.filterWorlds = var4;
PendingSpawn.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13);
}
return 1;
}
if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) {
var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
if (PendingSpawn.grandExchangeEvents != null) {
PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13);
}
return 1;
}
if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) {
var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
if (PendingSpawn.grandExchangeEvents != null) {
PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13);
}
return 1;
}
if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = PendingSpawn.grandExchangeEvents == null ? 0 : PendingSpawn.grandExchangeEvents.events.size();
return 1;
}
GrandExchangeEvent var11;
if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.world;
return 1;
}
if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getOfferName();
return 1;
}
if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName();
return 1;
}
if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
long var5 = DirectByteArrayCopier.currentTimeMs() - Buddy.field3632 - var11.age;
int var7 = (int)(var5 / 3600000L);
int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L);
int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L);
String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10;
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var10;
return 1;
}
if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity;
return 1;
}
if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice;
return 1;
}
if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id;
return 1;
}
return 2;
}
}

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

@@ -65,9 +65,8 @@ public class FriendsList extends UserList {
Friend var3 = (Friend)this.getByUsername(var1);
if (var3 == null) {
return false;
} else {
return !var2 || var3.world != 0;
}
return !var2 || var3.world != 0;
}
@ObfuscatedName("c")

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

@@ -101,8 +101,8 @@ public final class GameObject {
signature = "(Lhp;Lhp;III)Lke;",
garbageValue = "-1252480817"
)
@Export("loadFont")
public static Font loadFont(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
return !Friend.doesSpriteExist(var0, var2, var3) ? null : WallDecoration.getWorldMapSprite(var1.takeFile(var2, var3));
@Export("SpriteBuffer_getFont")
public static Font SpriteBuffer_getFont(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
return !Friend.SpriteBuffer_bufferFile(var0, var2, var3) ? null : WallDecoration.SpriteBuffer_createFont(var1.takeFile(var2, var3));
}
}

47
runescape-client/src/main/java/GameShell.java
View File

@@ -557,24 +557,20 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) {
if (var1.endsWith("127.0.0.1")) {
return true;
} else {
while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') {
var1 = var1.substring(0, var1.length() - 1);
}
if (var1.endsWith("192.168.1.")) {
return true;
} else {
this.error("invalidhost");
return false;
}
}
} else {
return true;
while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') {
var1 = var1.substring(0, var1.length() - 1);
}
if (var1.endsWith("192.168.1.")) {
return true;
}
this.error("invalidhost");
return false;
}
} else {
return true;
}
return true;
}
@ObfuscatedName("j")
@@ -713,6 +709,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
signature = "(B)V",
garbageValue = "-3"
)
@Export("doCycle")
protected abstract void doCycle();
@ObfuscatedName("ag")
@@ -720,6 +717,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
signature = "(ZB)V",
garbageValue = "-5"
)
@Export("draw")
protected abstract void draw(boolean var1);
@ObfuscatedName("ar")
@@ -992,17 +990,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0);
if (var1 != null) {
return var1;
} else {
byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0);
var1 = new NPCDefinition();
var1.id = var0;
if (var2 != null) {
var1.decode(new Buffer(var2));
}
var1.postDecode();
NPCDefinition.NpcDefinition_cached.put(var1, (long)var0);
return var1;
}
byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0);
var1 = new NPCDefinition();
var1.id = var0;
if (var2 != null) {
var1.decode(new Buffer(var2));
}
var1.postDecode();
NPCDefinition.NpcDefinition_cached.put(var1, (long)var0);
return var1;
}
}

19
runescape-client/src/main/java/GrandExchangeEvent.java
View File

@@ -95,17 +95,16 @@ public class GrandExchangeEvent {
SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0);
if (var1 != null) {
return var1;
} else {
byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0);
var1 = new SequenceDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2));
}
var1.postDecode();
SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0);
return var1;
}
byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0);
var1 = new SequenceDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2));
}
var1.postDecode();
SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0);
return var1;
}
@ObfuscatedName("jj")

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

@@ -207,348 +207,373 @@ public class GrandExchangeOffer {
int var5 = class1.baseY * 64 + (Client.localPlayer.y >> 7);
WorldMapID.getWorldMap().method6309(var3, var9, var5, true);
return 1;
} else {
WorldMapArea var11;
if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
String var16 = "";
var11 = WorldMapID.getWorldMap().getMapArea(var3);
if (var11 != null) {
var16 = var11.getExternalName();
}
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16;
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
WorldMapID.getWorldMap().setCurrentMapAreaId(var3);
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getZoomLevel();
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
WorldMapID.getWorldMap().setZoomPercentage(var3);
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isCacheLoaded() ? 1 : 0;
return 1;
} else {
Coord var15;
if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) {
var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
WorldMapID.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y);
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) {
var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
WorldMapID.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y);
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) {
var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
WorldMapID.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y);
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) {
var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
WorldMapID.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y);
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayX();
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayY();
return 1;
} else {
WorldMapArea var13;
if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var13 = WorldMapID.getWorldMap().getMapArea(var3);
if (var13 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getOrigin().packed();
}
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var13 = WorldMapID.getWorldMap().getMapArea(var3);
if (var13 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64;
}
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var13 = WorldMapID.getWorldMap().getMapArea(var3);
if (var13 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1;
}
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var13 = WorldMapID.getWorldMap().getMapArea(var3);
if (var13 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getZoom();
}
return 1;
} else if (var0 == 6615) {
var15 = WorldMapID.getWorldMap().getDisplayCoord();
if (var15 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.x;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.y;
}
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().currentMapAreaId();
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) {
var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
var13 = WorldMapID.getWorldMap().getCurrentMapArea();
if (var13 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
return 1;
} else {
int[] var14 = var13.position(var15.plane, var15.x, var15.y);
if (var14 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14[0];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14[1];
}
return 1;
}
} else {
Coord var7;
if (var0 == 6618) {
var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
var13 = WorldMapID.getWorldMap().getCurrentMapArea();
if (var13 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
return 1;
} else {
var7 = var13.coord(var15.x, var15.y);
if (var7 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var7.packed();
}
return 1;
}
} else {
Coord var12;
if (var0 == 6619) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
ObjectSound.method1824(var3, var12, false);
return 1;
} else if (var0 == 6620) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
ObjectSound.method1824(var3, var12, true);
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
var11 = WorldMapID.getWorldMap().getMapArea(var3);
if (var11 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
return 1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0;
return 1;
}
} else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayWith();
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayHeight();
return 1;
} else if (var0 == 6623) {
var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
var13 = WorldMapID.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y);
if (var13 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getId();
}
return 1;
} else if (var0 == 6624) {
WorldMapID.getWorldMap().method6337(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
return 1;
} else if (var0 == 6625) {
WorldMapID.getWorldMap().method6338();
return 1;
} else if (var0 == 6626) {
WorldMapID.getWorldMap().method6339(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
return 1;
} else if (var0 == 6627) {
WorldMapID.getWorldMap().method6340();
return 1;
} else {
boolean var10;
if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) {
var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
WorldMapID.getWorldMap().setPerpetualFlash(var10);
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
WorldMapID.getWorldMap().flashElement(var3);
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
WorldMapID.getWorldMap().flashCategory(var3);
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) {
WorldMapID.getWorldMap().stopCurrentFlashes();
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) {
var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
WorldMapID.getWorldMap().setElementsDisabled(var10);
return 1;
} else {
boolean var4;
if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1;
WorldMapID.getWorldMap().disableElement(var3, var4);
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1;
WorldMapID.getWorldMap().setCategoryDisabled(var3, var4);
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getElementsDisabled() ? 1 : 0;
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isElementDisabled(var3) ? 1 : 0;
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isCategoryDisabled(var3) ? 1 : 0;
return 1;
} else if (var0 == 6638) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
var7 = WorldMapID.getWorldMap().method6352(var3, var12);
if (var7 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var7.packed();
}
return 1;
} else {
AbstractWorldMapIcon var8;
if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) {
var8 = WorldMapID.getWorldMap().iconStart();
if (var8 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.getElement();
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.coord2.packed();
}
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) {
var8 = WorldMapID.getWorldMap().iconNext();
if (var8 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.getElement();
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.coord2.packed();
}
return 1;
} else {
WorldMapElement var6;
if (var0 == ScriptOpcodes.MEC_TEXT) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = class222.getWorldMapElement(var3);
if (var6.name == null) {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
} else {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var6.name;
}
return 1;
} else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = class222.getWorldMapElement(var3);
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.textSize;
return 1;
} else if (var0 == ScriptOpcodes.MEC_CATEGORY) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = class222.getWorldMapElement(var3);
if (var6 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.category;
}
return 1;
} else if (var0 == ScriptOpcodes.MEC_SPRITE) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = class222.getWorldMapElement(var3);
if (var6 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.sprite1;
}
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.mapElement;
return 1;
} else if (var0 == 6698) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.coord1.packed();
return 1;
} else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.coord2.packed();
return 1;
} else {
return 2;
}
}
}
}
}
}
}
}
}
}
WorldMapArea var11;
if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
String var16 = "";
var11 = WorldMapID.getWorldMap().getMapArea(var3);
if (var11 != null) {
var16 = var11.getExternalName();
}
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16;
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
WorldMapID.getWorldMap().setCurrentMapAreaId(var3);
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getZoomLevel();
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
WorldMapID.getWorldMap().setZoomPercentage(var3);
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isCacheLoaded() ? 1 : 0;
return 1;
}
Coord var15;
if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) {
var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
WorldMapID.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y);
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) {
var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
WorldMapID.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y);
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) {
var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
WorldMapID.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y);
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) {
var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
WorldMapID.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y);
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayX();
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayY();
return 1;
}
WorldMapArea var13;
if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var13 = WorldMapID.getWorldMap().getMapArea(var3);
if (var13 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getOrigin().packed();
}
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var13 = WorldMapID.getWorldMap().getMapArea(var3);
if (var13 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64;
}
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var13 = WorldMapID.getWorldMap().getMapArea(var3);
if (var13 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1;
}
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var13 = WorldMapID.getWorldMap().getMapArea(var3);
if (var13 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getZoom();
}
return 1;
}
if (var0 == 6615) {
var15 = WorldMapID.getWorldMap().getDisplayCoord();
if (var15 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.x;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.y;
}
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().currentMapAreaId();
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) {
var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
var13 = WorldMapID.getWorldMap().getCurrentMapArea();
if (var13 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
return 1;
}
int[] var14 = var13.position(var15.plane, var15.x, var15.y);
if (var14 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14[0];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14[1];
}
return 1;
}
Coord var7;
if (var0 == 6618) {
var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
var13 = WorldMapID.getWorldMap().getCurrentMapArea();
if (var13 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
return 1;
}
var7 = var13.coord(var15.x, var15.y);
if (var7 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var7.packed();
}
return 1;
}
Coord var12;
if (var0 == 6619) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
ObjectSound.method1824(var3, var12, false);
return 1;
}
if (var0 == 6620) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
ObjectSound.method1824(var3, var12, true);
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
var11 = WorldMapID.getWorldMap().getMapArea(var3);
if (var11 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
return 1;
}
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0;
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayWith();
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayHeight();
return 1;
}
if (var0 == 6623) {
var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
var13 = WorldMapID.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y);
if (var13 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getId();
}
return 1;
}
if (var0 == 6624) {
WorldMapID.getWorldMap().method6337(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
return 1;
}
if (var0 == 6625) {
WorldMapID.getWorldMap().method6338();
return 1;
}
if (var0 == 6626) {
WorldMapID.getWorldMap().method6339(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
return 1;
}
if (var0 == 6627) {
WorldMapID.getWorldMap().method6340();
return 1;
}
boolean var10;
if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) {
var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
WorldMapID.getWorldMap().setPerpetualFlash(var10);
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
WorldMapID.getWorldMap().flashElement(var3);
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
WorldMapID.getWorldMap().flashCategory(var3);
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) {
WorldMapID.getWorldMap().stopCurrentFlashes();
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) {
var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
WorldMapID.getWorldMap().setElementsDisabled(var10);
return 1;
}
boolean var4;
if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1;
WorldMapID.getWorldMap().disableElement(var3, var4);
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1;
WorldMapID.getWorldMap().setCategoryDisabled(var3, var4);
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getElementsDisabled() ? 1 : 0;
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isElementDisabled(var3) ? 1 : 0;
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isCategoryDisabled(var3) ? 1 : 0;
return 1;
}
if (var0 == 6638) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
var7 = WorldMapID.getWorldMap().method6352(var3, var12);
if (var7 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var7.packed();
}
return 1;
}
AbstractWorldMapIcon var8;
if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) {
var8 = WorldMapID.getWorldMap().iconStart();
if (var8 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.getElement();
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.coord2.packed();
}
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) {
var8 = WorldMapID.getWorldMap().iconNext();
if (var8 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.getElement();
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.coord2.packed();
}
return 1;
}
WorldMapElement var6;
if (var0 == ScriptOpcodes.MEC_TEXT) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = class222.getWorldMapElement(var3);
if (var6.name == null) {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
} else {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var6.name;
}
return 1;
}
if (var0 == ScriptOpcodes.MEC_TEXTSIZE) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = class222.getWorldMapElement(var3);
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.textSize;
return 1;
}
if (var0 == ScriptOpcodes.MEC_CATEGORY) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = class222.getWorldMapElement(var3);
if (var6 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.category;
}
return 1;
}
if (var0 == ScriptOpcodes.MEC_SPRITE) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = class222.getWorldMapElement(var3);
if (var6 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.sprite1;
}
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.mapElement;
return 1;
}
if (var0 == 6698) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.coord1.packed();
return 1;
}
if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.coord2.packed();
return 1;
}
return 2;
}
@ObfuscatedName("fk")

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

@@ -116,24 +116,28 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
if (var0 == ScriptOpcodes.CC_GETX) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.x;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETY) {
}
if (var0 == ScriptOpcodes.CC_GETY) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.y;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETWIDTH) {
}
if (var0 == ScriptOpcodes.CC_GETWIDTH) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.width;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETHEIGHT) {
}
if (var0 == ScriptOpcodes.CC_GETHEIGHT) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.height;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETHIDE) {
}
if (var0 == ScriptOpcodes.CC_GETHIDE) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETLAYER) {
}
if (var0 == ScriptOpcodes.CC_GETLAYER) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.parentId;
return 1;
} else {
return 2;
}
return 2;
}
@ObfuscatedName("hb")
@@ -175,37 +179,35 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
if (var1 == 205) {
Client.field700 = 250;
return true;
} else {
int var2;
int var3;
if (var1 >= 300 && var1 <= 313) {
var2 = (var1 - 300) / 2;
var3 = var1 & 1;
Client.playerAppearance.method3992(var2, var3 == 1);
}
if (var1 >= 314 && var1 <= 323) {
var2 = (var1 - 314) / 2;
var3 = var1 & 1;
Client.playerAppearance.method3993(var2, var3 == 1);
}
if (var1 == 324) {
Client.playerAppearance.method4006(false);
}
if (var1 == 325) {
Client.playerAppearance.method4006(true);
}
if (var1 == 326) {
PacketBufferNode var4 = Archive.method4265(ClientPacket.field2215, Client.packetWriter.isaacCipher);
Client.playerAppearance.method3995(var4.packetBuffer);
Client.packetWriter.method2219(var4);
return true;
} else {
return false;
}
}
int var2;
int var3;
if (var1 >= 300 && var1 <= 313) {
var2 = (var1 - 300) / 2;
var3 = var1 & 1;
Client.playerAppearance.method3992(var2, var3 == 1);
}
if (var1 >= 314 && var1 <= 323) {
var2 = (var1 - 314) / 2;
var3 = var1 & 1;
Client.playerAppearance.method3993(var2, var3 == 1);
}
if (var1 == 324) {
Client.playerAppearance.method4006(false);
}
if (var1 == 325) {
Client.playerAppearance.method4006(true);
}
if (var1 == 326) {
PacketBufferNode var4 = Archive.method4265(ClientPacket.field2215, Client.packetWriter.isaacCipher);
Client.playerAppearance.method3995(var4.packetBuffer);
Client.packetWriter.method2219(var4);
return true;
}
return false;
}
}

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

@@ -31,19 +31,18 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
if (var2.world == var1.world) {
return 0;
} else {
if (this.filterWorlds) {
if (Client.worldId == var1.world) {
return -1;
}
if (var2.world == Client.worldId) {
return 1;
}
}
if (this.filterWorlds) {
if (Client.worldId == var1.world) {
return -1;
}
return var1.world < var2.world ? -1 : 1;
if (var2.world == Client.worldId) {
return 1;
}
}
return var1.world < var2.world ? -1 : 1;
}
public boolean equals(Object var1) {

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

@@ -95,10 +95,9 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
static String method54(IterableNodeHashTable var0, int var1, String var2) {
if (var0 == null) {
return var2;
} else {
ObjectNode var3 = (ObjectNode)var0.get((long)var1);
return var3 == null ? var2 : (String)var3.obj;
}
ObjectNode var3 = (ObjectNode)var0.get((long)var1);
return var3 == null ? var2 : (String)var3.obj;
}
@ObfuscatedName("w")
@@ -110,16 +109,15 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0);
if (var1 != null) {
return var1;
} else {
byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0);
var1 = new VarpDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2));
}
VarpDefinition.VarpDefinition_cached.put(var1, (long)var0);
return var1;
}
byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0);
var1 = new VarpDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2));
}
VarpDefinition.VarpDefinition_cached.put(var1, (long)var0);
return var1;
}
@ObfuscatedName("w")
@@ -129,7 +127,7 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
)
@Export("openURL")
public static void openURL(String var0, boolean var1, boolean var2) {
class326.method6243(var0, var1, "openjs", var2);
SpriteBuffer.method6243(var0, var1, "openjs", var2);
}
@ObfuscatedName("gn")

25
runescape-client/src/main/java/GraphicsObject.java
View File

@@ -225,12 +225,10 @@ public final class GraphicsObject extends Entity {
var3.onStockTransmit = var8;
} else if (var0 == 1426) {
var3.field2681 = var8;
} else {
if (var0 != ScriptOpcodes.CC_SETONRESIZE) {
return 2;
}
} else if (var0 == ScriptOpcodes.CC_SETONRESIZE) {
var3.onResize = var8;
} else {
return 2;
}
var3.hasListener = true;
@@ -245,16 +243,15 @@ public final class GraphicsObject extends Entity {
static final int method1948(int var0, int var1) {
if (var0 == -1) {
return 12345678;
} else {
var1 = (var0 & 127) * var1 / 128;
if (var1 < 2) {
var1 = 2;
} else if (var1 > 126) {
var1 = 126;
}
return (var0 & 65408) + var1;
}
var1 = (var0 & 127) * var1 / 128;
if (var1 < 2) {
var1 = 2;
} else if (var1 > 126) {
var1 = 126;
}
return (var0 & 65408) + var1;
}
@ObfuscatedName("az")

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

@@ -85,13 +85,11 @@ public class HealthBar extends Node {
if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) {
return var2;
} else {
var2.remove();
return null;
}
} else {
var2.remove();
return null;
}
return null;
}
@ObfuscatedName("e")

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

@@ -167,19 +167,17 @@ public class HealthBarDefinition extends DualNode {
public Sprite getFrontSprite() {
if (this.frontSpriteID < 0) {
return null;
} else {
Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID);
if (var1 != null) {
return var1;
} else {
var1 = class65.loadSprite(HealthBarDefinition_spritesArchive, this.frontSpriteID, 0);
if (var1 != null) {
HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID);
}
return var1;
}
}
Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID);
if (var1 != null) {
return var1;
}
var1 = class65.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.frontSpriteID, 0);
if (var1 != null) {
HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID);
}
return var1;
}
@ObfuscatedName("k")
@@ -191,18 +189,16 @@ public class HealthBarDefinition extends DualNode {
public Sprite getBackSprite() {
if (this.backSpriteID < 0) {
return null;
} else {
Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID);
if (var1 != null) {
return var1;
} else {
var1 = class65.loadSprite(HealthBarDefinition_spritesArchive, this.backSpriteID, 0);
if (var1 != null) {
HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID);
}
return var1;
}
}
Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID);
if (var1 != null) {
return var1;
}
var1 = class65.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.backSpriteID, 0);
if (var1 != null) {
HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID);
}
return var1;
}
}

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

@@ -89,13 +89,12 @@ public class HealthBarUpdate extends Node {
static boolean method1676(String var0) {
if (var0 == null) {
return false;
} else {
try {
new URL(var0);
return true;
} catch (MalformedURLException var2) {
return false;
}
}
try {
new URL(var0);
return true;
} catch (MalformedURLException var2) {
return false;
}
}
@@ -210,25 +209,24 @@ public class HealthBarUpdate extends Node {
int var3 = var1.readInt();
if (var3 < 0 || AbstractArchive.field3143 != 0 && var3 > AbstractArchive.field3143) {
throw new RuntimeException();
} else if (var2 == 0) {
}
if (var2 == 0) {
byte[] var4 = new byte[var3];
var1.readBytes(var4, 0, var3);
return var4;
} else {
int var6 = var1.readInt();
if (var6 < 0 || AbstractArchive.field3143 != 0 && var6 > AbstractArchive.field3143) {
throw new RuntimeException();
} else {
byte[] var5 = new byte[var6];
if (var2 == 1) {
BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9);
} else {
AbstractArchive.gzipDecompressor.decompress(var1, var5);
}
return var5;
}
}
int var6 = var1.readInt();
if (var6 < 0 || AbstractArchive.field3143 != 0 && var6 > AbstractArchive.field3143) {
throw new RuntimeException();
}
byte[] var5 = new byte[var6];
if (var2 == 1) {
BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9);
} else {
AbstractArchive.gzipDecompressor.decompress(var1, var5);
}
return var5;
}
@ObfuscatedName("fd")

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

@@ -285,19 +285,17 @@ public class HitSplatDefinition extends DualNode {
public Sprite method4551() {
if (this.field3334 < 0) {
return null;
} else {
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3334);
if (var1 != null) {
return var1;
} else {
var1 = class65.loadSprite(HitSplatDefinition_spritesArchive, this.field3334, 0);
if (var1 != null) {
HitSplatDefinition_cachedSprites.put(var1, (long)this.field3334);
}
return var1;
}
}
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3334);
if (var1 != null) {
return var1;
}
var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3334, 0);
if (var1 != null) {
HitSplatDefinition_cachedSprites.put(var1, (long)this.field3334);
}
return var1;
}
@ObfuscatedName("b")
@@ -308,19 +306,17 @@ public class HitSplatDefinition extends DualNode {
public Sprite method4557() {
if (this.field3336 < 0) {
return null;
} else {
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3336);
if (var1 != null) {
return var1;
} else {
var1 = class65.loadSprite(HitSplatDefinition_spritesArchive, this.field3336, 0);
if (var1 != null) {
HitSplatDefinition_cachedSprites.put(var1, (long)this.field3336);
}
return var1;
}
}
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3336);
if (var1 != null) {
return var1;
}
var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3336, 0);
if (var1 != null) {
HitSplatDefinition_cachedSprites.put(var1, (long)this.field3336);
}
return var1;
}
@ObfuscatedName("i")
@@ -331,19 +327,17 @@ public class HitSplatDefinition extends DualNode {
public Sprite method4558() {
if (this.field3337 < 0) {
return null;
} else {
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3337);
if (var1 != null) {
return var1;
} else {
var1 = class65.loadSprite(HitSplatDefinition_spritesArchive, this.field3337, 0);
if (var1 != null) {
HitSplatDefinition_cachedSprites.put(var1, (long)this.field3337);
}
return var1;
}
}
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3337);
if (var1 != null) {
return var1;
}
var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3337, 0);
if (var1 != null) {
HitSplatDefinition_cachedSprites.put(var1, (long)this.field3337);
}
return var1;
}
@ObfuscatedName("c")
@@ -354,19 +348,17 @@ public class HitSplatDefinition extends DualNode {
public Sprite method4583() {
if (this.field3338 < 0) {
return null;
} else {
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3338);
if (var1 != null) {
return var1;
} else {
var1 = class65.loadSprite(HitSplatDefinition_spritesArchive, this.field3338, 0);
if (var1 != null) {
HitSplatDefinition_cachedSprites.put(var1, (long)this.field3338);
}
return var1;
}
}
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3338);
if (var1 != null) {
return var1;
}
var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3338, 0);
if (var1 != null) {
HitSplatDefinition_cachedSprites.put(var1, (long)this.field3338);
}
return var1;
}
@ObfuscatedName("u")
@@ -378,28 +370,26 @@ public class HitSplatDefinition extends DualNode {
public Font getFont() {
if (this.fontId == -1) {
return null;
} else {
Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId);
if (var1 != null) {
return var1;
} else {
AbstractArchive var3 = HitSplatDefinition_spritesArchive;
AbstractArchive var4 = HitSplatDefinition_fontsArchive;
int var5 = this.fontId;
Font var2;
if (!Friend.doesSpriteExist(var3, var5, 0)) {
var2 = null;
} else {
var2 = WallDecoration.getWorldMapSprite(var4.takeFile(var5, 0));
}
if (var2 != null) {
HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId);
}
return var2;
}
}
Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId);
if (var1 != null) {
return var1;
}
AbstractArchive var3 = HitSplatDefinition_spritesArchive;
AbstractArchive var4 = HitSplatDefinition_fontsArchive;
int var5 = this.fontId;
Font var2;
if (!Friend.SpriteBuffer_bufferFile(var3, var5, 0)) {
var2 = null;
} else {
var2 = WallDecoration.SpriteBuffer_createFont(var4.takeFile(var5, 0));
}
if (var2 != null) {
HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId);
}
return var2;
}
@ObfuscatedName("q")

257
runescape-client/src/main/java/Huffman.java
View File

@@ -159,139 +159,138 @@ public class Huffman {
int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) {
if (var5 == 0) {
return 0;
} else {
int var6 = 0;
var5 += var4;
int var7 = var2;
}
int var6 = 0;
var5 += var4;
int var7 = var2;
while (true) {
byte var8 = var1[var7];
if (var8 < 0) {
var6 = this.keys[var6];
} else {
++var6;
}
int var9;
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
}
var6 = 0;
}
if ((var8 & 64) != 0) {
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
}
var6 = 0;
}
if ((var8 & 32) != 0) {
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
}
var6 = 0;
}
if ((var8 & 16) != 0) {
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
}
var6 = 0;
}
if ((var8 & 8) != 0) {
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
}
var6 = 0;
}
if ((var8 & 4) != 0) {
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
}
var6 = 0;
}
if ((var8 & 2) != 0) {
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
}
var6 = 0;
}
if ((var8 & 1) != 0) {
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
}
var6 = 0;
}
++var7;
while (true) {
byte var8 = var1[var7];
if (var8 < 0) {
var6 = this.keys[var6];
} else {
++var6;
}
return var7 + 1 - var2;
int var9;
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
}
var6 = 0;
}
if ((var8 & 64) != 0) {
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
}
var6 = 0;
}
if ((var8 & 32) != 0) {
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
}
var6 = 0;
}
if ((var8 & 16) != 0) {
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
}
var6 = 0;
}
if ((var8 & 8) != 0) {
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
}
var6 = 0;
}
if ((var8 & 4) != 0) {
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
}
var6 = 0;
}
if ((var8 & 2) != 0) {
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
}
var6 = 0;
}
if ((var8 & 1) != 0) {
var6 = this.keys[var6];
} else {
++var6;
}
if ((var9 = this.keys[var6]) < 0) {
var3[var4++] = (byte)(~var9);
if (var4 >= var5) {
break;
}
var6 = 0;
}
++var7;
}
return var7 + 1 - var2;
}
@ObfuscatedName("k")

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

@@ -62,10 +62,10 @@ public class Ignored extends User {
public static boolean isCharPrintable(char var0) {
if (var0 >= ' ' && var0 <= '~') {
return true;
} else if (var0 >= 160 && var0 <= 255) {
return true;
} else {
return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376;
}
if (var0 >= 160 && var0 <= 255) {
return true;
}
return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376;
}
}

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

@@ -152,155 +152,172 @@ public class Instrument {
class301.clearIntArray(Instrument_samples, 0, var1);
if (var2 < 10) {
return Instrument_samples;
} else {
double var3 = (double)var1 / ((double)var2 + 0.0D);
this.pitch.reset();
this.volume.reset();
int var5 = 0;
int var6 = 0;
int var7 = 0;
}
double var3 = (double)var1 / ((double)var2 + 0.0D);
this.pitch.reset();
this.volume.reset();
int var5 = 0;
int var6 = 0;
int var7 = 0;
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.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;
for (var11 = 0; var11 < 5; ++var11) {
if (this.oscillatorVolume[var11] != 0) {
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.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);
}
}
int var12;
int var13;
int var14;
int var15;
int[] var10000;
for (var11 = 0; var11 < var1; ++var11) {
var12 = this.pitch.doStep(var1);
var13 = this.volume.doStep(var1);
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);
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);
}
int var8 = 0;
int var9 = 0;
int var10 = 0;
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);
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);
}
int var11;
for (var11 = 0; var11 < 5; ++var11) {
if (this.oscillatorVolume[var11] != 0) {
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.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);
}
}
int var12;
int var13;
int var14;
int var15;
int[] var10000;
for (var11 = 0; var11 < var1; ++var11) {
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.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);
}
for (var14 = 0; var14 < 5; ++var14) {
if (this.oscillatorVolume[var14] != 0) {
var15 = Instrument_delays[var14] + var11;
if (var15 < var1) {
var10000 = Instrument_samples;
var10000[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.pitch.form);
var10000 = Instrument_phases;
var10000[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14];
}
for (var14 = 0; var14 < 5; ++var14) {
if (this.oscillatorVolume[var14] != 0) {
var15 = Instrument_delays[var14] + var11;
if (var15 < var1) {
var10000 = Instrument_samples;
var10000[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.pitch.form);
var10000 = Instrument_phases;
var10000[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14];
}
}
}
}
int var16;
if (this.release != null) {
this.release.reset();
this.attack.reset();
var11 = 0;
boolean var19 = false;
boolean var20 = true;
int var16;
if (this.release != null) {
this.release.reset();
this.attack.reset();
var11 = 0;
boolean var19 = false;
boolean var20 = true;
for (var14 = 0; var14 < var1; ++var14) {
var15 = this.release.doStep(var1);
var16 = this.attack.doStep(var1);
if (var20) {
var12 = (var15 * (this.release.end - this.release.start) >> 8) + this.release.start;
} else {
var12 = (var16 * (this.release.end - this.release.start) >> 8) + this.release.start;
}
for (var14 = 0; var14 < var1; ++var14) {
var15 = this.release.doStep(var1);
var16 = this.attack.doStep(var1);
if (var20) {
var12 = (var15 * (this.release.end - this.release.start) >> 8) + this.release.start;
} else {
var12 = (var16 * (this.release.end - this.release.start) >> 8) + this.release.start;
}
var11 += 256;
if (var11 >= var12) {
var11 = 0;
var20 = !var20;
}
var11 += 256;
if (var11 >= var12) {
var11 = 0;
var20 = !var20;
}
if (var20) {
Instrument_samples[var14] = 0;
}
if (var20) {
Instrument_samples[var14] = 0;
}
}
}
if (this.delayTime > 0 && this.delayDecay > 0) {
var11 = (int)((double)this.delayTime * var3);
if (this.delayTime > 0 && this.delayDecay > 0) {
var11 = (int)((double)this.delayTime * var3);
for (var12 = var11; var12 < var1; ++var12) {
var10000 = Instrument_samples;
var10000[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100;
}
for (var12 = var11; var12 < var1; ++var12) {
var10000 = Instrument_samples;
var10000[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100;
}
}
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;
if (var13 > var1 - var12) {
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;
if (var13 > var1 - var12) {
var15 = var1 - var12;
}
int var17;
while (var14 < var15) {
var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16);
for (var17 = 0; var17 < var12; ++var17) {
var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var17] * (long)AudioFilter.coefficients[0][var17] >> 16);
}
for (var17 = 0; var17 < var14; ++var17) {
var16 -= (int)((long)Instrument_samples[var14 - 1 - var17] * (long)AudioFilter.coefficients[1][var17] >> 16);
}
Instrument_samples[var14] = var16;
var11 = this.filterEnvelope.doStep(var1 + 1);
++var14;
}
var15 = 128;
while (true) {
if (var15 > var1 - var12) {
var15 = var1 - var12;
}
int var17;
int var18;
while (var14 < var15) {
var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16);
var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16);
for (var17 = 0; var17 < var12; ++var17) {
var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var17] * (long)AudioFilter.coefficients[0][var17] >> 16);
for (var18 = 0; var18 < var12; ++var18) {
var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16);
}
for (var17 = 0; var17 < var14; ++var17) {
var16 -= (int)((long)Instrument_samples[var14 - 1 - var17] * (long)AudioFilter.coefficients[1][var17] >> 16);
for (var18 = 0; var18 < var13; ++var18) {
var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16);
}
Instrument_samples[var14] = var16;
Instrument_samples[var14] = var17;
var11 = this.filterEnvelope.doStep(var1 + 1);
++var14;
}
var15 = 128;
if (var14 >= var1 - var12) {
while (var14 < var1) {
var17 = 0;
while (true) {
if (var15 > var1 - var12) {
var15 = var1 - var12;
}
int var18;
while (var14 < var15) {
var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16);
for (var18 = 0; var18 < var12; ++var18) {
for (var18 = var14 + var12 - var1; var18 < var12; ++var18) {
var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16);
}
@@ -309,48 +326,30 @@ public class Instrument {
}
Instrument_samples[var14] = var17;
var11 = this.filterEnvelope.doStep(var1 + 1);
this.filterEnvelope.doStep(var1 + 1);
++var14;
}
if (var14 >= var1 - var12) {
while (var14 < var1) {
var17 = 0;
for (var18 = var14 + var12 - var1; var18 < var12; ++var18) {
var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16);
}
for (var18 = 0; var18 < var13; ++var18) {
var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16);
}
Instrument_samples[var14] = var17;
this.filterEnvelope.doStep(var1 + 1);
++var14;
}
break;
}
var12 = this.filter.compute(0, (float)var11 / 65536.0F);
var13 = this.filter.compute(1, (float)var11 / 65536.0F);
var15 += 128;
break;
}
var12 = this.filter.compute(0, (float)var11 / 65536.0F);
var13 = this.filter.compute(1, (float)var11 / 65536.0F);
var15 += 128;
}
}
for (var11 = 0; var11 < var1; ++var11) {
if (Instrument_samples[var11] < -32768) {
Instrument_samples[var11] = -32768;
}
if (Instrument_samples[var11] > 32767) {
Instrument_samples[var11] = 32767;
}
}
return Instrument_samples;
}
for (var11 = 0; var11 < var1; ++var11) {
if (Instrument_samples[var11] < -32768) {
Instrument_samples[var11] = -32768;
}
if (Instrument_samples[var11] > 32767) {
Instrument_samples[var11] = 32767;
}
}
return Instrument_samples;
}
@ObfuscatedName("w")
@@ -358,13 +357,14 @@ public class Instrument {
final int evaluateWave(int var1, int var2, int var3) {
if (var3 == 1) {
return (var1 & 32767) < 16384 ? var2 : -var2;
} else if (var3 == 2) {
return Instrument_sine[var1 & 32767] * var2 >> 14;
} else if (var3 == 3) {
return (var2 * (var1 & 32767) >> 14) - var2;
} else {
return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0;
}
if (var3 == 2) {
return Instrument_sine[var1 & 32767] * var2 >> 14;
}
if (var3 == 3) {
return (var2 * (var1 & 32767) >> 14) - var2;
}
return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0;
}
@ObfuscatedName("e")

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

@@ -102,14 +102,13 @@ public class Interpreter {
static final boolean method1936(int var0) {
if (var0 < 0) {
return false;
} else {
int var1 = Client.menuOpcodes[var0];
if (var1 >= 2000) {
var1 -= 2000;
}
return var1 == 1007;
}
int var1 = Client.menuOpcodes[var0];
if (var1 >= 2000) {
var1 -= 2000;
}
return var1 == 1007;
}
@ObfuscatedName("jo")

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

@@ -42,17 +42,16 @@ public class ItemContainer extends Node {
FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0);
if (var1 != null) {
return var1;
} else {
byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0);
var1 = new FloorUnderlayDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2), var0);
}
var1.postDecode();
FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0);
return var1;
}
byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0);
var1 = new FloorUnderlayDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2), var0);
}
var1.postDecode();
FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0);
return var1;
}
@ObfuscatedName("ac")

253
runescape-client/src/main/java/ItemDefinition.java
View File

@@ -611,25 +611,24 @@ public class ItemDefinition extends DualNode {
ModelData var4 = ModelData.method2769(ItemDefinition_modelArchive, this.model, 0);
if (var4 == null) {
return null;
} else {
if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) {
var4.method2786(this.resizeX, this.resizeY, this.resizeZ);
}
if (this.recolorFrom != null) {
for (var3 = 0; var3 < this.recolorFrom.length; ++var3) {
var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]);
}
}
if (this.retextureFrom != null) {
for (var3 = 0; var3 < this.retextureFrom.length; ++var3) {
var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]);
}
}
return var4;
}
if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) {
var4.method2786(this.resizeX, this.resizeY, this.resizeZ);
}
if (this.recolorFrom != null) {
for (var3 = 0; var3 < this.recolorFrom.length; ++var3) {
var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]);
}
}
if (this.retextureFrom != null) {
for (var3 = 0; var3 < this.retextureFrom.length; ++var3) {
var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]);
}
}
return var4;
}
@ObfuscatedName("c")
@@ -656,34 +655,32 @@ public class ItemDefinition extends DualNode {
Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id);
if (var5 != null) {
return var5;
} else {
ModelData var6 = ModelData.method2769(ItemDefinition_modelArchive, this.model, 0);
if (var6 == null) {
return null;
} else {
if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) {
var6.method2786(this.resizeX, this.resizeY, this.resizeZ);
}
}
ModelData var6 = ModelData.method2769(ItemDefinition_modelArchive, this.model, 0);
if (var6 == null) {
return null;
}
if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) {
var6.method2786(this.resizeX, this.resizeY, this.resizeZ);
}
int var4;
if (this.recolorFrom != null) {
for (var4 = 0; var4 < this.recolorFrom.length; ++var4) {
var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]);
}
}
if (this.retextureFrom != null) {
for (var4 = 0; var4 < this.retextureFrom.length; ++var4) {
var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]);
}
}
var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50);
var5.isSingleTile = true;
ItemDefinition_cachedModels.put(var5, (long)this.id);
return var5;
int var4;
if (this.recolorFrom != null) {
for (var4 = 0; var4 < this.recolorFrom.length; ++var4) {
var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]);
}
}
if (this.retextureFrom != null) {
for (var4 = 0; var4 < this.retextureFrom.length; ++var4) {
var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]);
}
}
var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50);
var5.isSingleTile = true;
ItemDefinition_cachedModels.put(var5, (long)this.id);
return var5;
}
@ObfuscatedName("u")
@@ -727,22 +724,21 @@ public class ItemDefinition extends DualNode {
if (var2 == -1) {
return true;
} else {
boolean var5 = true;
if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) {
var5 = false;
}
if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) {
var5 = false;
}
if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) {
var5 = false;
}
return var5;
}
boolean var5 = true;
if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) {
var5 = false;
}
if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) {
var5 = false;
}
if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) {
var5 = false;
}
return var5;
}
@ObfuscatedName("v")
@@ -762,43 +758,42 @@ public class ItemDefinition extends DualNode {
if (var2 == -1) {
return null;
} else {
ModelData var5 = ModelData.method2769(ItemDefinition_modelArchive, var2, 0);
if (var3 != -1) {
ModelData var6 = ModelData.method2769(ItemDefinition_modelArchive, var3, 0);
if (var4 != -1) {
ModelData var7 = ModelData.method2769(ItemDefinition_modelArchive, var4, 0);
ModelData[] var8 = new ModelData[]{var5, var6, var7};
var5 = new ModelData(var8, 3);
} else {
ModelData[] var10 = new ModelData[]{var5, var6};
var5 = new ModelData(var10, 2);
}
}
if (!var1 && this.maleOffset != 0) {
var5.method2782(0, this.maleOffset, 0);
}
if (var1 && this.femaleOffset != 0) {
var5.method2782(0, this.femaleOffset, 0);
}
int var9;
if (this.recolorFrom != null) {
for (var9 = 0; var9 < this.recolorFrom.length; ++var9) {
var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]);
}
}
if (this.retextureFrom != null) {
for (var9 = 0; var9 < this.retextureFrom.length; ++var9) {
var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]);
}
}
return var5;
}
ModelData var5 = ModelData.method2769(ItemDefinition_modelArchive, var2, 0);
if (var3 != -1) {
ModelData var6 = ModelData.method2769(ItemDefinition_modelArchive, var3, 0);
if (var4 != -1) {
ModelData var7 = ModelData.method2769(ItemDefinition_modelArchive, var4, 0);
ModelData[] var8 = new ModelData[]{var5, var6, var7};
var5 = new ModelData(var8, 3);
} else {
ModelData[] var10 = new ModelData[]{var5, var6};
var5 = new ModelData(var10, 2);
}
}
if (!var1 && this.maleOffset != 0) {
var5.method2782(0, this.maleOffset, 0);
}
if (var1 && this.femaleOffset != 0) {
var5.method2782(0, this.femaleOffset, 0);
}
int var9;
if (this.recolorFrom != null) {
for (var9 = 0; var9 < this.recolorFrom.length; ++var9) {
var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]);
}
}
if (this.retextureFrom != null) {
for (var9 = 0; var9 < this.retextureFrom.length; ++var9) {
var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]);
}
}
return var5;
}
@ObfuscatedName("y")
@@ -816,18 +811,17 @@ public class ItemDefinition extends DualNode {
if (var2 == -1) {
return true;
} else {
boolean var4 = true;
if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) {
var4 = false;
}
if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) {
var4 = false;
}
return var4;
}
boolean var4 = true;
if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) {
var4 = false;
}
if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) {
var4 = false;
}
return var4;
}
@ObfuscatedName("g")
@@ -845,29 +839,28 @@ public class ItemDefinition extends DualNode {
if (var2 == -1) {
return null;
} else {
ModelData var4 = ModelData.method2769(ItemDefinition_modelArchive, var2, 0);
if (var3 != -1) {
ModelData var5 = ModelData.method2769(ItemDefinition_modelArchive, var3, 0);
ModelData[] var6 = new ModelData[]{var4, var5};
var4 = new ModelData(var6, 2);
}
int var7;
if (this.recolorFrom != null) {
for (var7 = 0; var7 < this.recolorFrom.length; ++var7) {
var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]);
}
}
if (this.retextureFrom != null) {
for (var7 = 0; var7 < this.retextureFrom.length; ++var7) {
var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]);
}
}
return var4;
}
ModelData var4 = ModelData.method2769(ItemDefinition_modelArchive, var2, 0);
if (var3 != -1) {
ModelData var5 = ModelData.method2769(ItemDefinition_modelArchive, var3, 0);
ModelData[] var6 = new ModelData[]{var4, var5};
var4 = new ModelData(var6, 2);
}
int var7;
if (this.recolorFrom != null) {
for (var7 = 0; var7 < this.recolorFrom.length; ++var7) {
var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]);
}
}
if (this.retextureFrom != null) {
for (var7 = 0; var7 < this.retextureFrom.length; ++var7) {
var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]);
}
}
return var4;
}
@ObfuscatedName("a")
@@ -913,12 +906,10 @@ public class ItemDefinition extends DualNode {
if (this.shiftClickIndex != -1 && this.inventoryActions != null) {
if (this.shiftClickIndex >= 0) {
return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex : -1;
} else {
return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1;
}
} else {
return -1;
return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1;
}
return -1;
}
@ObfuscatedName("q")

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

@@ -60,10 +60,9 @@ public class IterableDualNodeQueue implements Iterable {
DualNode var1 = this.sentinel.previousDual;
if (var1 == this.sentinel) {
return null;
} else {
var1.removeDual();
return var1;
}
var1.removeDual();
return var1;
}
@ObfuscatedName("k")
@@ -91,10 +90,9 @@ public class IterableDualNodeQueue implements Iterable {
if (var2 == this.sentinel) {
this.head = null;
return null;
} else {
this.head = var2.previousDual;
return var2;
}
this.head = var2.previousDual;
return var2;
}
@ObfuscatedName("b")
@@ -107,10 +105,9 @@ public class IterableDualNodeQueue implements Iterable {
if (var1 == this.sentinel) {
this.head = null;
return null;
} else {
this.head = var1.previousDual;
return var1;
}
this.head = var1.previousDual;
return var1;
}
public Iterator iterator() {

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

@@ -56,9 +56,8 @@ public class IterableDualNodeQueueIterator implements Iterator {
public void remove() {
if (this.last == null) {
throw new IllegalStateException();
} else {
this.last.removeDual();
this.last = null;
}
this.last.removeDual();
this.last = null;
}
}

12
runescape-client/src/main/java/IterableNodeDeque.java
View File

@@ -91,10 +91,9 @@ public class IterableNodeDeque implements Iterable, Collection {
if (var2 == this.sentinel) {
this.field3538 = null;
return null;
} else {
this.field3538 = var2.previous;
return var2;
}
this.field3538 = var2.previous;
return var2;
}
@ObfuscatedName("b")
@@ -107,10 +106,9 @@ public class IterableNodeDeque implements Iterable, Collection {
if (var1 == this.sentinel) {
this.field3538 = null;
return null;
} else {
this.field3538 = var1.previous;
return var1;
}
this.field3538 = var1.previous;
return var1;
}
@ObfuscatedName("i")
@@ -125,7 +123,7 @@ public class IterableNodeDeque implements Iterable, Collection {
}
@ObfuscatedName("c")
@Export("isEmpty")
@Export("rsIsEmpty")
public boolean rsIsEmpty() {
return this.sentinel.previous == this.sentinel;
}

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

@@ -53,10 +53,9 @@ public class IterableNodeDequeDescendingIterator implements Iterator {
public void remove() {
if (this.last == null) {
throw new IllegalStateException();
} else {
this.last.remove();
this.last = null;
}
this.last.remove();
this.last = null;
}
public Object next() {

21
runescape-client/src/main/java/IterableNodeHashTable.java
View File

@@ -122,20 +122,19 @@ public final class IterableNodeHashTable implements Iterable {
Node var1;
if (this.index > 0 && this.buckets[this.index - 1] != this.current) {
var1 = this.current;
this.current = var1.previous;
return var1;
} else {
do {
if (this.index >= this.size) {
return null;
}
var1 = this.buckets[this.index++].previous;
} while(var1 == this.buckets[this.index - 1]);
this.current = var1.previous;
return var1;
}
do {
if (this.index >= this.size) {
return null;
}
var1 = this.buckets[this.index++].previous;
} while(var1 == this.buckets[this.index - 1]);
this.current = var1.previous;
return var1;
}
public Iterator iterator() {

45
runescape-client/src/main/java/IterableNodeHashTableIterator.java
View File

@@ -49,48 +49,45 @@ public class IterableNodeHashTableIterator implements Iterator {
public boolean hasNext() {
if (this.hashTable.buckets[this.index - 1] != this.head) {
return true;
} else {
while (this.index < this.hashTable.size) {
if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) {
this.head = this.hashTable.buckets[this.index - 1].previous;
return true;
}
this.head = this.hashTable.buckets[this.index - 1];
}
while (this.index < this.hashTable.size) {
if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) {
this.head = this.hashTable.buckets[this.index - 1].previous;
return true;
}
return false;
this.head = this.hashTable.buckets[this.index - 1];
}
return false;
}
public Object next() {
Node var1;
if (this.hashTable.buckets[this.index - 1] != this.head) {
var1 = this.head;
this.head = var1.previous;
this.last = var1;
return var1;
} else {
do {
if (this.index >= this.hashTable.size) {
return null;
}
var1 = this.hashTable.buckets[this.index++].previous;
} while(var1 == this.hashTable.buckets[this.index - 1]);
this.head = var1.previous;
this.last = var1;
return var1;
}
do {
if (this.index >= this.hashTable.size) {
return null;
}
var1 = this.hashTable.buckets[this.index++].previous;
} while(var1 == this.hashTable.buckets[this.index - 1]);
this.head = var1.previous;
this.last = var1;
return var1;
}
public void remove() {
if (this.last == null) {
throw new IllegalStateException();
} else {
this.last.remove();
this.last = null;
}
this.last.remove();
this.last = null;
}
}

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

@@ -135,17 +135,16 @@ public class KitDefinition extends DualNode {
public boolean ready() {
if (this.models2 == null) {
return true;
} else {
boolean var1 = true;
for (int var2 = 0; var2 < this.models2.length; ++var2) {
if (!class288.KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) {
var1 = false;
}
}
return var1;
}
boolean var1 = true;
for (int var2 = 0; var2 < this.models2.length; ++var2) {
if (!class288.KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) {
var1 = false;
}
}
return var1;
}
@ObfuscatedName("l")
@@ -157,35 +156,34 @@ public class KitDefinition extends DualNode {
public ModelData getModelData() {
if (this.models2 == null) {
return null;
} else {
ModelData[] var1 = new ModelData[this.models2.length];
for (int var2 = 0; var2 < this.models2.length; ++var2) {
var1[var2] = ModelData.method2769(class288.KitDefinition_modelsArchive, this.models2[var2], 0);
}
ModelData var4;
if (var1.length == 1) {
var4 = var1[0];
} else {
var4 = new ModelData(var1, var1.length);
}
int var3;
if (this.recolorFrom != null) {
for (var3 = 0; var3 < this.recolorFrom.length; ++var3) {
var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]);
}
}
if (this.retextureFrom != null) {
for (var3 = 0; var3 < this.retextureFrom.length; ++var3) {
var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]);
}
}
return var4;
}
ModelData[] var1 = new ModelData[this.models2.length];
for (int var2 = 0; var2 < this.models2.length; ++var2) {
var1[var2] = ModelData.method2769(class288.KitDefinition_modelsArchive, this.models2[var2], 0);
}
ModelData var4;
if (var1.length == 1) {
var4 = var1[0];
} else {
var4 = new ModelData(var1, var1.length);
}
int var3;
if (this.recolorFrom != null) {
for (var3 = 0; var3 < this.recolorFrom.length; ++var3) {
var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]);
}
}
if (this.retextureFrom != null) {
for (var3 = 0; var3 < this.retextureFrom.length; ++var3) {
var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]);
}
}
return var4;
}
@ObfuscatedName("b")

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

@@ -51,10 +51,9 @@ public class LinkDeque {
if (var1 == this.sentinel) {
this.current = null;
return null;
} else {
this.current = var1.previous;
return var1;
}
this.current = var1.previous;
return var1;
}
@ObfuscatedName("e")
@@ -67,9 +66,8 @@ public class LinkDeque {
if (var1 == this.sentinel) {
this.current = null;
return null;
} else {
this.current = var1.previous;
return var1;
}
this.current = var1.previous;
return var1;
}
}

64
runescape-client/src/main/java/MenuAction.java
View File

@@ -152,17 +152,16 @@ public class MenuAction {
var17 = var3 - var4;
if (var17 != 0) {
return var17;
} else {
for (int var19 = 0; var19 < var16; ++var19) {
var20 = var0.charAt(var19);
char var13 = var1.charAt(var19);
if (var13 != var20) {
return WorldMapArea.method387(var20, var2) - WorldMapArea.method387(var13, var2);
}
}
return 0;
}
for (int var19 = 0; var19 < var16; ++var19) {
var20 = var0.charAt(var19);
char var13 = var1.charAt(var19);
if (var13 != var20) {
return WorldMapArea.method387(var20, var2) - WorldMapArea.method387(var13, var2);
}
}
return 0;
}
@ObfuscatedName("q")
@@ -185,50 +184,63 @@ public class MenuAction {
if (var0 == ScriptOpcodes.CC_GETSCROLLX) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollX;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETSCROLLY) {
}
if (var0 == ScriptOpcodes.CC_GETSCROLLY) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollY;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETTEXT) {
}
if (var0 == ScriptOpcodes.CC_GETTEXT) {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.text;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) {
}
if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollWidth;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) {
}
if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollHeight;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) {
}
if (var0 == ScriptOpcodes.CC_GETMODELZOOM) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelZoom;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) {
}
if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleX;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) {
}
if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleZ;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) {
}
if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleY;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) {
}
if (var0 == ScriptOpcodes.CC_GETTRANSTOP) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.transparencyTop;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) {
}
if (var0 == ScriptOpcodes.CC_GETTRANSBOT) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.transparencyBot;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETCOLOUR) {
}
if (var0 == ScriptOpcodes.CC_GETCOLOUR) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.color;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) {
}
if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.color2;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETFILLMODE) {
}
if (var0 == ScriptOpcodes.CC_GETFILLMODE) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal();
return 1;
} else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) {
}
if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0;
return 1;
} else {
return 2;
}
return 2;
}
}

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

@@ -151,21 +151,20 @@ public class MidiFileReader {
if (var5 != 240 && var5 != 247) {
return this.method3840(var1, var5);
} else {
int var3 = this.buffer.readVarInt();
if (var5 == 247 && var3 > 0) {
int var4 = this.buffer.array[this.buffer.offset] & 255;
if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) {
++this.buffer.offset;
this.field2464[var1] = var4;
return this.method3840(var1, var4);
}
}
Buffer var10000 = this.buffer;
var10000.offset += var3;
return 0;
}
int var3 = this.buffer.readVarInt();
if (var5 == 247 && var3 > 0) {
int var4 = this.buffer.array[this.buffer.offset] & 255;
if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) {
++this.buffer.offset;
this.field2464[var1] = var4;
return this.method3840(var1, var4);
}
}
Buffer var10000 = this.buffer;
var10000.offset += var3;
return 0;
}
@ObfuscatedName("x")
@@ -179,7 +178,8 @@ public class MidiFileReader {
var10000 = this.buffer;
var10000.offset += var4;
return 1;
} else if (var7 == 81) {
}
if (var7 == 81) {
int var5 = this.buffer.readMedium();
var4 -= 3;
int var6 = this.trackLengths[var1];
@@ -188,24 +188,22 @@ public class MidiFileReader {
var10000 = this.buffer;
var10000.offset += var4;
return 2;
} else {
var10000 = this.buffer;
var10000.offset += var4;
return 3;
}
} else {
byte var3 = field2468[var2 - 128];
var4 = var2;
if (var3 >= 1) {
var4 = var2 | this.buffer.readUnsignedByte() << 8;
}
if (var3 >= 2) {
var4 |= this.buffer.readUnsignedByte() << 16;
}
return var4;
var10000 = this.buffer;
var10000.offset += var4;
return 3;
}
byte var3 = field2468[var2 - 128];
var4 = var2;
if (var3 >= 1) {
var4 = var2 | this.buffer.readUnsignedByte() << 8;
}
if (var3 >= 2) {
var4 |= this.buffer.readUnsignedByte() << 16;
}
return var4;
}
@ObfuscatedName("r")

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

@@ -221,6 +221,7 @@ public class MidiPcmStream extends PcmStream {
@ObfuscatedSignature(
signature = "()Ldx;"
)
@Export("firstSubStream")
protected synchronized PcmStream firstSubStream() {
return this.patchStream;
}
@@ -229,6 +230,7 @@ public class MidiPcmStream extends PcmStream {
@ObfuscatedSignature(
signature = "()Ldx;"
)
@Export("nextSubStream")
protected synchronized PcmStream nextSubStream() {
return null;
}
@@ -976,9 +978,8 @@ public class MidiPcmStream extends PcmStream {
}
return true;
} else {
return false;
}
return false;
}
@ObfuscatedName("bp")
@@ -1066,19 +1067,17 @@ public class MidiPcmStream extends PcmStream {
}
return true;
} else {
var1.stream.method2536(var1.field2455, this.method3731(var1), this.method3732(var1));
return false;
}
} else {
var1.method3826();
var1.remove();
if (var1.field2438 > 0 && var1 == this.field2428[var1.field2440][var1.field2438]) {
this.field2428[var1.field2440][var1.field2438] = null;
}
return true;
var1.stream.method2536(var1.field2455, this.method3731(var1), this.method3732(var1));
return false;
}
var1.method3826();
var1.remove();
if (var1.field2438 > 0 && var1 == this.field2428[var1.field2440][var1.field2438]) {
this.field2428[var1.field2440][var1.field2438] = null;
}
return true;
}
@ObfuscatedName("w")

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

@@ -126,8 +126,7 @@ public class MilliClock extends Clock {
static int method3468(int var0, int var1, int var2) {
if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) {
return 0;
} else {
return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0;
}
return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0;
}
}

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

@@ -381,84 +381,82 @@ public class Model extends Entity {
var10 = var10 + 127 >> 7;
if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) {
return this;
} else {
Model var11;
if (var5) {
var11 = new Model();
var11.verticesCount = this.verticesCount;
var11.indicesCount = this.indicesCount;
var11.field1691 = this.field1691;
var11.verticesX = this.verticesX;
var11.verticesZ = this.verticesZ;
var11.indices1 = this.indices1;
var11.indices2 = this.indices2;
var11.indices3 = this.indices3;
var11.faceColors1 = this.faceColors1;
var11.faceColors2 = this.faceColors2;
var11.faceColors3 = this.faceColors3;
var11.faceRenderPriorities = this.faceRenderPriorities;
var11.faceAlphas = this.faceAlphas;
var11.field1688 = this.field1688;
var11.faceTextures = this.faceTextures;
var11.field1690 = this.field1690;
var11.field1692 = this.field1692;
var11.field1693 = this.field1693;
var11.field1694 = this.field1694;
var11.vertexLabels = this.vertexLabels;
var11.faceLabelsAlpha = this.faceLabelsAlpha;
var11.isSingleTile = this.isSingleTile;
var11.verticesY = new int[var11.verticesCount];
} else {
var11 = this;
}
int var12;
int var13;
int var14;
int var15;
int var16;
int var17;
int var18;
int var19;
int var20;
int var21;
if (var6 == 0) {
for (var12 = 0; var12 < var11.verticesCount; ++var12) {
var13 = var2 + this.verticesX[var12];
var14 = var4 + this.verticesZ[var12];
var15 = var13 & 127;
var16 = var14 & 127;
var17 = var13 >> 7;
var18 = var14 >> 7;
var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7;
var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7;
var21 = var19 * (128 - var16) + var20 * var16 >> 7;
var11.verticesY[var12] = var21 + this.verticesY[var12] - var3;
}
} else {
for (var12 = 0; var12 < var11.verticesCount; ++var12) {
var13 = (-this.verticesY[var12] << 16) / super.height;
if (var13 < var6) {
var14 = var2 + this.verticesX[var12];
var15 = var4 + this.verticesZ[var12];
var16 = var14 & 127;
var17 = var15 & 127;
var18 = var14 >> 7;
var19 = var15 >> 7;
var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7;
var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7;
int var22 = var20 * (128 - var17) + var21 * var17 >> 7;
var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12];
}
}
}
var11.resetBounds();
return var11;
}
} else {
return this;
Model var11;
if (var5) {
var11 = new Model();
var11.verticesCount = this.verticesCount;
var11.indicesCount = this.indicesCount;
var11.field1691 = this.field1691;
var11.verticesX = this.verticesX;
var11.verticesZ = this.verticesZ;
var11.indices1 = this.indices1;
var11.indices2 = this.indices2;
var11.indices3 = this.indices3;
var11.faceColors1 = this.faceColors1;
var11.faceColors2 = this.faceColors2;
var11.faceColors3 = this.faceColors3;
var11.faceRenderPriorities = this.faceRenderPriorities;
var11.faceAlphas = this.faceAlphas;
var11.field1688 = this.field1688;
var11.faceTextures = this.faceTextures;
var11.field1690 = this.field1690;
var11.field1692 = this.field1692;
var11.field1693 = this.field1693;
var11.field1694 = this.field1694;
var11.vertexLabels = this.vertexLabels;
var11.faceLabelsAlpha = this.faceLabelsAlpha;
var11.isSingleTile = this.isSingleTile;
var11.verticesY = new int[var11.verticesCount];
} else {
var11 = this;
}
int var12;
int var13;
int var14;
int var15;
int var16;
int var17;
int var18;
int var19;
int var20;
int var21;
if (var6 == 0) {
for (var12 = 0; var12 < var11.verticesCount; ++var12) {
var13 = var2 + this.verticesX[var12];
var14 = var4 + this.verticesZ[var12];
var15 = var13 & 127;
var16 = var14 & 127;
var17 = var13 >> 7;
var18 = var14 >> 7;
var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7;
var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7;
var21 = var19 * (128 - var16) + var20 * var16 >> 7;
var11.verticesY[var12] = var21 + this.verticesY[var12] - var3;
}
} else {
for (var12 = 0; var12 < var11.verticesCount; ++var12) {
var13 = (-this.verticesY[var12] << 16) / super.height;
if (var13 < var6) {
var14 = var2 + this.verticesX[var12];
var15 = var4 + this.verticesZ[var12];
var16 = var14 & 127;
var17 = var15 & 127;
var18 = var14 >> 7;
var19 = var15 >> 7;
var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7;
var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7;
int var22 = var20 * (128 - var17) + var21 * var17 >> 7;
var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12];
}
}
}
var11.resetBounds();
return var11;
}
return this;
}
@ObfuscatedName("w")

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

@@ -1046,81 +1046,79 @@ public class ModelData extends Entity {
var10 = var10 + 127 >> 7;
if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) {
return this;
}
ModelData var11 = new ModelData();
var11.verticesCount = this.verticesCount;
var11.faceCount = this.faceCount;
var11.field1555 = this.field1555;
var11.verticesX = this.verticesX;
var11.verticesZ = this.verticesZ;
var11.indices1 = this.indices1;
var11.indices2 = this.indices2;
var11.indices3 = this.indices3;
var11.field1557 = this.field1557;
var11.field1559 = this.field1559;
var11.faceAlphas = this.faceAlphas;
var11.textureCoords = this.textureCoords;
var11.faceColors = this.faceColors;
var11.faceTextures = this.faceTextures;
var11.field1563 = this.field1563;
var11.textureRenderTypes = this.textureRenderTypes;
var11.texTriangleX = this.texTriangleX;
var11.texTriangleY = this.texTriangleY;
var11.texTriangleZ = this.texTriangleZ;
var11.field1569 = this.field1569;
var11.field1553 = this.field1553;
var11.vertexLabels = this.vertexLabels;
var11.faceLabelsAlpha = this.faceLabelsAlpha;
var11.field1580 = this.field1580;
var11.field1577 = this.field1577;
var11.verticesY = new int[var11.verticesCount];
int var12;
int var13;
int var14;
int var15;
int var16;
int var17;
int var18;
int var19;
int var20;
int var21;
if (var6 == 0) {
for (var12 = 0; var12 < var11.verticesCount; ++var12) {
var13 = var2 + this.verticesX[var12];
var14 = var4 + this.verticesZ[var12];
var15 = var13 & 127;
var16 = var14 & 127;
var17 = var13 >> 7;
var18 = var14 >> 7;
var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7;
var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7;
var21 = var19 * (128 - var16) + var20 * var16 >> 7;
var11.verticesY[var12] = var21 + this.verticesY[var12] - var3;
}
} else {
ModelData var11 = new ModelData();
var11.verticesCount = this.verticesCount;
var11.faceCount = this.faceCount;
var11.field1555 = this.field1555;
var11.verticesX = this.verticesX;
var11.verticesZ = this.verticesZ;
var11.indices1 = this.indices1;
var11.indices2 = this.indices2;
var11.indices3 = this.indices3;
var11.field1557 = this.field1557;
var11.field1559 = this.field1559;
var11.faceAlphas = this.faceAlphas;
var11.textureCoords = this.textureCoords;
var11.faceColors = this.faceColors;
var11.faceTextures = this.faceTextures;
var11.field1563 = this.field1563;
var11.textureRenderTypes = this.textureRenderTypes;
var11.texTriangleX = this.texTriangleX;
var11.texTriangleY = this.texTriangleY;
var11.texTriangleZ = this.texTriangleZ;
var11.field1569 = this.field1569;
var11.field1553 = this.field1553;
var11.vertexLabels = this.vertexLabels;
var11.faceLabelsAlpha = this.faceLabelsAlpha;
var11.field1580 = this.field1580;
var11.field1577 = this.field1577;
var11.verticesY = new int[var11.verticesCount];
int var12;
int var13;
int var14;
int var15;
int var16;
int var17;
int var18;
int var19;
int var20;
int var21;
if (var6 == 0) {
for (var12 = 0; var12 < var11.verticesCount; ++var12) {
var13 = var2 + this.verticesX[var12];
var14 = var4 + this.verticesZ[var12];
var15 = var13 & 127;
for (var12 = 0; var12 < var11.verticesCount; ++var12) {
var13 = (-this.verticesY[var12] << 16) / super.height;
if (var13 < var6) {
var14 = var2 + this.verticesX[var12];
var15 = var4 + this.verticesZ[var12];
var16 = var14 & 127;
var17 = var13 >> 7;
var17 = var15 & 127;
var18 = var14 >> 7;
var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7;
var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7;
var21 = var19 * (128 - var16) + var20 * var16 >> 7;
var11.verticesY[var12] = var21 + this.verticesY[var12] - var3;
}
} else {
for (var12 = 0; var12 < var11.verticesCount; ++var12) {
var13 = (-this.verticesY[var12] << 16) / super.height;
if (var13 < var6) {
var14 = var2 + this.verticesX[var12];
var15 = var4 + this.verticesZ[var12];
var16 = var14 & 127;
var17 = var15 & 127;
var18 = var14 >> 7;
var19 = var15 >> 7;
var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7;
var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7;
int var22 = var20 * (128 - var17) + var21 * var17 >> 7;
var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12];
}
var19 = var15 >> 7;
var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7;
var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7;
int var22 = var20 * (128 - var17) + var21 * var17 >> 7;
var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12];
}
}
var11.invalidate();
return var11;
}
} else {
return this;
var11.invalidate();
return var11;
}
return this;
}
@ObfuscatedName("b")

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

@@ -88,7 +88,8 @@ public class ModelData0 {
}
return 1;
} else if (var0 == ScriptOpcodes.CC_SETSIZE) {
}
if (var0 == ScriptOpcodes.CC_SETSIZE) {
HealthBarUpdate.Interpreter_intStackSize -= 4;
var4.rawWidth = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4.rawHeight = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
@@ -101,7 +102,8 @@ public class ModelData0 {
}
return 1;
} else if (var0 == ScriptOpcodes.CC_SETHIDE) {
}
if (var0 == ScriptOpcodes.CC_SETHIDE) {
boolean var5 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
if (var5 != var4.isHidden) {
var4.isHidden = var5;
@@ -109,14 +111,15 @@ public class ModelData0 {
}
return 1;
} else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) {
}
if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) {
var4.noClickThrough = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
return 1;
} else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) {
}
if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) {
var4.noScrollThrough = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
return 1;
} else {
return 2;
}
return 2;
}
}

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

@@ -161,9 +161,8 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
int var2 = var1.getButton();
if (!var1.isAltDown() && var2 != 2) {
return !var1.isMetaDown() && var2 != 3 ? 1 : 2;
} else {
return 4;
}
return 4;
}
public final synchronized void mouseMoved(MouseEvent var1) {
@@ -258,9 +257,8 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
if (var1 == 1) {
return var0 * var2;
} else {
return var2;
}
return var2;
}
@ObfuscatedName("e")
@@ -299,105 +297,101 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
var0.exportIndex();
if (var1 != 0) {
throw new RuntimeException();
} else {
var0.importIndex();
}
var0.importIndex();
for (var2 = 0; var2 < Players.Players_count; ++var2) {
var3 = Players.Players_indices[var2];
if ((Players.field1252[var3] & 1) != 0) {
if (var1 > 0) {
--var1;
for (var2 = 0; var2 < Players.Players_count; ++var2) {
var3 = Players.Players_indices[var2];
if ((Players.field1252[var3] & 1) != 0) {
if (var1 > 0) {
--var1;
var10000 = Players.field1252;
var10000[var3] = (byte)(var10000[var3] | 2);
} else {
var4 = var0.readBits(1);
if (var4 == 0) {
var1 = World.method1686(var0);
var10000 = Players.field1252;
var10000[var3] = (byte)(var10000[var3] | 2);
} else {
var4 = var0.readBits(1);
if (var4 == 0) {
var1 = World.method1686(var0);
var10000 = Players.field1252;
var10000[var3] = (byte)(var10000[var3] | 2);
} else {
WorldMapIcon_0.method210(var0, var3);
}
}
}
}
var0.exportIndex();
if (var1 != 0) {
throw new RuntimeException();
} else {
var0.importIndex();
for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) {
var3 = Players.Players_emptyIndices[var2];
if ((Players.field1252[var3] & 1) != 0) {
if (var1 > 0) {
--var1;
var10000 = Players.field1252;
var10000[var3] = (byte)(var10000[var3] | 2);
} else {
var4 = var0.readBits(1);
if (var4 == 0) {
var1 = World.method1686(var0);
var10000 = Players.field1252;
var10000[var3] = (byte)(var10000[var3] | 2);
} else if (class226.updateExternalPlayer(var0, var3)) {
var10000 = Players.field1252;
var10000[var3] = (byte)(var10000[var3] | 2);
}
}
}
}
var0.exportIndex();
if (var1 != 0) {
throw new RuntimeException();
} else {
var0.importIndex();
for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) {
var3 = Players.Players_emptyIndices[var2];
if ((Players.field1252[var3] & 1) == 0) {
if (var1 > 0) {
--var1;
var10000 = Players.field1252;
var10000[var3] = (byte)(var10000[var3] | 2);
} else {
var4 = var0.readBits(1);
if (var4 == 0) {
var1 = World.method1686(var0);
var10000 = Players.field1252;
var10000[var3] = (byte)(var10000[var3] | 2);
} else if (class226.updateExternalPlayer(var0, var3)) {
var10000 = Players.field1252;
var10000[var3] = (byte)(var10000[var3] | 2);
}
}
}
}
var0.exportIndex();
if (var1 != 0) {
throw new RuntimeException();
} else {
Players.Players_count = 0;
Players.Players_emptyIdxCount = 0;
for (var2 = 1; var2 < 2048; ++var2) {
var10000 = Players.field1252;
var10000[var2] = (byte)(var10000[var2] >> 1);
Player var5 = Client.players[var2];
if (var5 != null) {
Players.Players_indices[++Players.Players_count - 1] = var2;
} else {
Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2;
}
}
WorldMapIcon_0.method210(var0, var3);
}
}
}
}
var0.exportIndex();
if (var1 != 0) {
throw new RuntimeException();
}
var0.importIndex();
for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) {
var3 = Players.Players_emptyIndices[var2];
if ((Players.field1252[var3] & 1) != 0) {
if (var1 > 0) {
--var1;
var10000 = Players.field1252;
var10000[var3] = (byte)(var10000[var3] | 2);
} else {
var4 = var0.readBits(1);
if (var4 == 0) {
var1 = World.method1686(var0);
var10000 = Players.field1252;
var10000[var3] = (byte)(var10000[var3] | 2);
} else if (class226.updateExternalPlayer(var0, var3)) {
var10000 = Players.field1252;
var10000[var3] = (byte)(var10000[var3] | 2);
}
}
}
}
var0.exportIndex();
if (var1 != 0) {
throw new RuntimeException();
}
var0.importIndex();
for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) {
var3 = Players.Players_emptyIndices[var2];
if ((Players.field1252[var3] & 1) == 0) {
if (var1 > 0) {
--var1;
var10000 = Players.field1252;
var10000[var3] = (byte)(var10000[var3] | 2);
} else {
var4 = var0.readBits(1);
if (var4 == 0) {
var1 = World.method1686(var0);
var10000 = Players.field1252;
var10000[var3] = (byte)(var10000[var3] | 2);
} else if (class226.updateExternalPlayer(var0, var3)) {
var10000 = Players.field1252;
var10000[var3] = (byte)(var10000[var3] | 2);
}
}
}
}
var0.exportIndex();
if (var1 != 0) {
throw new RuntimeException();
}
Players.Players_count = 0;
Players.Players_emptyIdxCount = 0;
for (var2 = 1; var2 < 2048; ++var2) {
var10000 = Players.field1252;
var10000[var2] = (byte)(var10000[var2] >> 1);
Player var5 = Client.players[var2];
if (var5 != null) {
Players.Players_indices[++Players.Players_count - 1] = var2;
} else {
Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2;
}
}
}
@ObfuscatedName("v")

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

@@ -536,17 +536,16 @@ public class MusicPatch extends Node {
SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0);
if (var1 != null) {
return var1;
} else {
byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0);
var1 = new SpotAnimationDefinition();
var1.id = var0;
if (var2 != null) {
var1.decode(new Buffer(var2));
}
SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0);
return var1;
}
byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0);
var1 = new SpotAnimationDefinition();
var1.id = var0;
if (var2 != null) {
var1.decode(new Buffer(var2));
}
SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0);
return var1;
}
@ObfuscatedName("e")

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

@@ -65,8 +65,7 @@ public class MusicPatchNode2 {
Message var1 = (Message)Messages.Messages_hashTable.get((long)var0);
if (var1 == null) {
return -1;
} else {
return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count;
}
return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count;
}
}

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

@@ -128,9 +128,8 @@ public class MusicPatchPcmStream extends PcmStream {
MusicPatchNode var1 = (MusicPatchNode)this.queue.last();
if (var1 == null) {
return null;
} else {
return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream());
}
return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream());
}
@ObfuscatedName("b")

222
runescape-client/src/main/java/NPC.java
View File

@@ -134,31 +134,29 @@ public final class NPC extends Actor {
protected final Model getModel() {
if (this.definition == null) {
return null;
} else {
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GrandExchangeEvent.getSequenceDefinition(super.sequence) : null;
SequenceDefinition var2 = super.movementSequence != -1 && (super.readySequence != super.movementSequence || var1 == null) ? GrandExchangeEvent.getSequenceDefinition(super.movementSequence) : null;
Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
if (var3 == null) {
return null;
} else {
var3.calculateBoundsCylinder();
super.defaultHeight = var3.height;
if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
Model var4 = MusicPatch.getSpotAnimationDefinition(super.spotAnimation).getModel(super.spotAnimationFrame);
if (var4 != null) {
var4.offsetBy(0, -super.heightOffset, 0);
Model[] var5 = new Model[]{var3, var4};
var3 = new Model(var5, 2);
}
}
if (this.definition.size == 1) {
var3.isSingleTile = true;
}
return var3;
}
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GrandExchangeEvent.getSequenceDefinition(super.sequence) : null;
SequenceDefinition var2 = super.movementSequence != -1 && (super.readySequence != super.movementSequence || var1 == null) ? GrandExchangeEvent.getSequenceDefinition(super.movementSequence) : null;
Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
if (var3 == null) {
return null;
}
var3.calculateBoundsCylinder();
super.defaultHeight = var3.height;
if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
Model var4 = MusicPatch.getSpotAnimationDefinition(super.spotAnimation).getModel(super.spotAnimationFrame);
if (var4 != null) {
var4.offsetBy(0, -super.heightOffset, 0);
Model[] var5 = new Model[]{var3, var4};
var3 = new Model(var5, 2);
}
}
if (this.definition.size == 1) {
var3.isSingleTile = true;
}
return var3;
}
@ObfuscatedName("v")
@@ -179,78 +177,112 @@ public final class NPC extends Actor {
static int method1977(int var0, Script var1, boolean var2) {
if (var0 < 1000) {
return Skeleton.method3064(var0, var1, var2);
} else if (var0 < 1100) {
return ModelData0.method3250(var0, var1, var2);
} else if (var0 < 1200) {
return class83.method1994(var0, var1, var2);
} else if (var0 < 1300) {
return WorldMapDecoration.method324(var0, var1, var2);
} else if (var0 < 1400) {
return UserComparator9.method3389(var0, var1, var2);
} else if (var0 < 1500) {
return GraphicsObject.method1943(var0, var1, var2);
} else if (var0 < 1600) {
return GrandExchangeOfferAgeComparator.method147(var0, var1, var2);
} else if (var0 < 1700) {
return MenuAction.method1992(var0, var1, var2);
} else if (var0 < 1800) {
return class169.method3501(var0, var1, var2);
} else if (var0 < 1900) {
return StudioGame.method4137(var0, var1, var2);
} else if (var0 < 2000) {
return ArchiveLoader.method1100(var0, var1, var2);
} else if (var0 < 2100) {
return ModelData0.method3250(var0, var1, var2);
} else if (var0 < 2200) {
return class83.method1994(var0, var1, var2);
} else if (var0 < 2300) {
return WorldMapDecoration.method324(var0, var1, var2);
} else if (var0 < 2400) {
return UserComparator9.method3389(var0, var1, var2);
} else if (var0 < 2500) {
return GraphicsObject.method1943(var0, var1, var2);
} else if (var0 < 2600) {
return ScriptEvent.method1127(var0, var1, var2);
} else if (var0 < 2700) {
return TextureProvider.method2743(var0, var1, var2);
} else if (var0 < 2800) {
return UrlRequester.method3306(var0, var1, var2);
} else if (var0 < 2900) {
return FloorUnderlayDefinition.method4433(var0, var1, var2);
} else if (var0 < 3000) {
return ArchiveLoader.method1100(var0, var1, var2);
} else if (var0 < 3200) {
return class30.method536(var0, var1, var2);
} else if (var0 < 3300) {
return AbstractArchive.method4172(var0, var1, var2);
} else if (var0 < 3400) {
return WorldMapID.method540(var0, var1, var2);
} else if (var0 < 3500) {
return class65.method1175(var0, var1, var2);
} else if (var0 < 3700) {
return class30.method535(var0, var1, var2);
} else if (var0 < 4000) {
return FriendSystem.method1817(var0, var1, var2);
} else if (var0 < 4100) {
return EnumDefinition.method4532(var0, var1, var2);
} else if (var0 < 4200) {
return class208.method3941(var0, var1, var2);
} else if (var0 < 4300) {
return FontName.method5316(var0, var1, var2);
} else if (var0 < 5100) {
return ClientPreferences.method1753(var0, var1, var2);
} else if (var0 < 5400) {
return UserComparator6.method3436(var0, var1, var2);
} else if (var0 < 5600) {
return WorldMapSectionType.method239(var0, var1, var2);
} else if (var0 < 5700) {
return WorldMapData_1.method696(var0, var1, var2);
} else if (var0 < 6300) {
return WorldMapSectionType.method242(var0, var1, var2);
} else if (var0 < 6600) {
return class197.method3703(var0, var1, var2);
} else {
return var0 < 6700 ? GrandExchangeOffer.method114(var0, var1, var2) : 2;
}
if (var0 < 1100) {
return ModelData0.method3250(var0, var1, var2);
}
if (var0 < 1200) {
return class83.method1994(var0, var1, var2);
}
if (var0 < 1300) {
return WorldMapDecoration.method324(var0, var1, var2);
}
if (var0 < 1400) {
return UserComparator9.method3389(var0, var1, var2);
}
if (var0 < 1500) {
return GraphicsObject.method1943(var0, var1, var2);
}
if (var0 < 1600) {
return GrandExchangeOfferAgeComparator.method147(var0, var1, var2);
}
if (var0 < 1700) {
return MenuAction.method1992(var0, var1, var2);
}
if (var0 < 1800) {
return class169.method3501(var0, var1, var2);
}
if (var0 < 1900) {
return StudioGame.method4137(var0, var1, var2);
}
if (var0 < 2000) {
return ArchiveLoader.method1100(var0, var1, var2);
}
if (var0 < 2100) {
return ModelData0.method3250(var0, var1, var2);
}
if (var0 < 2200) {
return class83.method1994(var0, var1, var2);
}
if (var0 < 2300) {
return WorldMapDecoration.method324(var0, var1, var2);
}
if (var0 < 2400) {
return UserComparator9.method3389(var0, var1, var2);
}
if (var0 < 2500) {
return GraphicsObject.method1943(var0, var1, var2);
}
if (var0 < 2600) {
return ScriptEvent.method1127(var0, var1, var2);
}
if (var0 < 2700) {
return TextureProvider.method2743(var0, var1, var2);
}
if (var0 < 2800) {
return UrlRequester.method3306(var0, var1, var2);
}
if (var0 < 2900) {
return FloorUnderlayDefinition.method4433(var0, var1, var2);
}
if (var0 < 3000) {
return ArchiveLoader.method1100(var0, var1, var2);
}
if (var0 < 3200) {
return class30.method536(var0, var1, var2);
}
if (var0 < 3300) {
return AbstractArchive.method4172(var0, var1, var2);
}
if (var0 < 3400) {
return WorldMapID.method540(var0, var1, var2);
}
if (var0 < 3500) {
return class65.method1175(var0, var1, var2);
}
if (var0 < 3700) {
return class30.method535(var0, var1, var2);
}
if (var0 < 4000) {
return FriendSystem.method1817(var0, var1, var2);
}
if (var0 < 4100) {
return EnumDefinition.method4532(var0, var1, var2);
}
if (var0 < 4200) {
return class208.method3941(var0, var1, var2);
}
if (var0 < 4300) {
return FontName.method5316(var0, var1, var2);
}
if (var0 < 5100) {
return ClientPreferences.method1753(var0, var1, var2);
}
if (var0 < 5400) {
return UserComparator6.method3436(var0, var1, var2);
}
if (var0 < 5600) {
return WorldMapSectionType.method239(var0, var1, var2);
}
if (var0 < 5700) {
return WorldMapData_1.method696(var0, var1, var2);
}
if (var0 < 6300) {
return WorldMapSectionType.method242(var0, var1, var2);
}
if (var0 < 6600) {
return class197.method3703(var0, var1, var2);
}
return var0 < 6700 ? GrandExchangeOffer.method114(var0, var1, var2) : 2;
}
}

222
runescape-client/src/main/java/NPCDefinition.java
View File

@@ -389,68 +389,67 @@ public class NPCDefinition extends DualNode {
if (this.transforms != null) {
NPCDefinition var12 = this.transform();
return var12 == null ? null : var12.getModel(var1, var2, var3, var4);
} else {
Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id);
if (var5 == null) {
boolean var6 = false;
for (int var7 = 0; var7 < this.models.length; ++var7) {
if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) {
var6 = true;
}
}
if (var6) {
return null;
}
ModelData[] var8 = new ModelData[this.models.length];
int var9;
for (var9 = 0; var9 < this.models.length; ++var9) {
var8[var9] = ModelData.method2769(NpcDefinition_modelArchive, this.models[var9], 0);
}
ModelData var11;
if (var8.length == 1) {
var11 = var8[0];
} else {
var11 = new ModelData(var8, var8.length);
}
if (this.recolorFrom != null) {
for (var9 = 0; var9 < this.recolorFrom.length; ++var9) {
var11.recolor(this.recolorFrom[var9], this.recolorTo[var9]);
}
}
if (this.retextureFrom != null) {
for (var9 = 0; var9 < this.retextureFrom.length; ++var9) {
var11.retexture(this.retextureFrom[var9], this.retextureTo[var9]);
}
}
var5 = var11.toModel(this.field3489 + 64, this.field3477 + 850, -30, -50, -30);
NpcDefinition_cachedModels.put(var5, (long)this.id);
}
Model var10;
if (var1 != null && var3 != null) {
var10 = var1.applyTransformations(var5, var2, var3, var4);
} else if (var1 != null) {
var10 = var1.transformActorModel(var5, var2);
} else if (var3 != null) {
var10 = var3.transformActorModel(var5, var4);
} else {
var10 = var5.toSharedSequenceModel(true);
}
if (this.widthScale != 128 || this.heightScale != 128) {
var10.scale(this.widthScale, this.heightScale, this.widthScale);
}
return var10;
}
Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id);
if (var5 == null) {
boolean var6 = false;
for (int var7 = 0; var7 < this.models.length; ++var7) {
if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) {
var6 = true;
}
}
if (var6) {
return null;
}
ModelData[] var8 = new ModelData[this.models.length];
int var9;
for (var9 = 0; var9 < this.models.length; ++var9) {
var8[var9] = ModelData.method2769(NpcDefinition_modelArchive, this.models[var9], 0);
}
ModelData var11;
if (var8.length == 1) {
var11 = var8[0];
} else {
var11 = new ModelData(var8, var8.length);
}
if (this.recolorFrom != null) {
for (var9 = 0; var9 < this.recolorFrom.length; ++var9) {
var11.recolor(this.recolorFrom[var9], this.recolorTo[var9]);
}
}
if (this.retextureFrom != null) {
for (var9 = 0; var9 < this.retextureFrom.length; ++var9) {
var11.retexture(this.retextureFrom[var9], this.retextureTo[var9]);
}
}
var5 = var11.toModel(this.field3489 + 64, this.field3477 + 850, -30, -50, -30);
NpcDefinition_cachedModels.put(var5, (long)this.id);
}
Model var10;
if (var1 != null && var3 != null) {
var10 = var1.applyTransformations(var5, var2, var3, var4);
} else if (var1 != null) {
var10 = var1.transformActorModel(var5, var2);
} else if (var3 != null) {
var10 = var3.transformActorModel(var5, var4);
} else {
var10 = var5.toSharedSequenceModel(true);
}
if (this.widthScale != 128 || this.heightScale != 128) {
var10.scale(this.widthScale, this.heightScale, this.widthScale);
}
return var10;
}
@ObfuscatedName("b")
@@ -463,49 +462,48 @@ public class NPCDefinition extends DualNode {
if (this.transforms != null) {
NPCDefinition var1 = this.transform();
return var1 == null ? null : var1.getModelData();
} else if (this.field3463 == null) {
}
if (this.field3463 == null) {
return null;
} else {
boolean var5 = false;
}
boolean var5 = false;
for (int var2 = 0; var2 < this.field3463.length; ++var2) {
if (!NpcDefinition_modelArchive.tryLoadFile(this.field3463[var2], 0)) {
var5 = true;
}
}
if (var5) {
return null;
} else {
ModelData[] var6 = new ModelData[this.field3463.length];
for (int var3 = 0; var3 < this.field3463.length; ++var3) {
var6[var3] = ModelData.method2769(NpcDefinition_modelArchive, this.field3463[var3], 0);
}
ModelData var7;
if (var6.length == 1) {
var7 = var6[0];
} else {
var7 = new ModelData(var6, var6.length);
}
int var4;
if (this.recolorFrom != null) {
for (var4 = 0; var4 < this.recolorFrom.length; ++var4) {
var7.recolor(this.recolorFrom[var4], this.recolorTo[var4]);
}
}
if (this.retextureFrom != null) {
for (var4 = 0; var4 < this.retextureFrom.length; ++var4) {
var7.retexture(this.retextureFrom[var4], this.retextureTo[var4]);
}
}
return var7;
for (int var2 = 0; var2 < this.field3463.length; ++var2) {
if (!NpcDefinition_modelArchive.tryLoadFile(this.field3463[var2], 0)) {
var5 = true;
}
}
if (var5) {
return null;
}
ModelData[] var6 = new ModelData[this.field3463.length];
for (int var3 = 0; var3 < this.field3463.length; ++var3) {
var6[var3] = ModelData.method2769(NpcDefinition_modelArchive, this.field3463[var3], 0);
}
ModelData var7;
if (var6.length == 1) {
var7 = var6[0];
} else {
var7 = new ModelData(var6, var6.length);
}
int var4;
if (this.recolorFrom != null) {
for (var4 = 0; var4 < this.recolorFrom.length; ++var4) {
var7.recolor(this.recolorFrom[var4], this.recolorTo[var4]);
}
}
if (this.retextureFrom != null) {
for (var4 = 0; var4 < this.retextureFrom.length; ++var4) {
var7.retexture(this.retextureFrom[var4], this.retextureTo[var4]);
}
}
return var7;
}
@ObfuscatedName("i")
@@ -541,20 +539,18 @@ public class NPCDefinition extends DualNode {
public boolean transformIsVisible() {
if (this.transforms == null) {
return true;
} else {
int var1 = -1;
if (this.transformVarbit != -1) {
var1 = GrandExchangeOfferOwnWorldComparator.getVarbit(this.transformVarbit);
} else if (this.transformVarp != -1) {
var1 = Varps.Varps_main[this.transformVarp];
}
if (var1 >= 0 && var1 < this.transforms.length) {
return this.transforms[var1] != -1;
} else {
return this.transforms[this.transforms.length - 1] != -1;
}
}
int var1 = -1;
if (this.transformVarbit != -1) {
var1 = GrandExchangeOfferOwnWorldComparator.getVarbit(this.transformVarbit);
} else if (this.transformVarp != -1) {
var1 = Varps.Varps_main[this.transformVarp];
}
if (var1 >= 0 && var1 < this.transforms.length) {
return this.transforms[var1] != -1;
}
return this.transforms[this.transforms.length - 1] != -1;
}
@ObfuscatedName("u")

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

@@ -146,9 +146,8 @@ public final class NetSocket extends AbstractSocket implements Runnable {
public boolean isAvailable(int var1) throws IOException {
if (this.isClosed) {
return false;
} else {
return this.inputStream.available() >= var1;
}
return this.inputStream.available() >= var1;
}
@ObfuscatedName("k")
@@ -160,20 +159,19 @@ public final class NetSocket extends AbstractSocket implements Runnable {
public int read(byte[] var1, int var2, int var3) throws IOException {
if (this.isClosed) {
return 0;
} else {
int var4;
int var5;
for (var4 = var3; var3 > 0; var3 -= var5) {
var5 = this.inputStream.read(var1, var2, var3);
if (var5 <= 0) {
throw new EOFException();
}
var2 += var5;
}
int var4;
int var5;
for (var4 = var3; var3 > 0; var3 -= var5) {
var5 = this.inputStream.read(var1, var2, var3);
if (var5 <= 0) {
throw new EOFException();
}
return var4;
var2 += var5;
}
return var4;
}
@ObfuscatedName("l")
@@ -187,26 +185,25 @@ public final class NetSocket extends AbstractSocket implements Runnable {
if (this.exceptionWriting) {
this.exceptionWriting = false;
throw new IOException();
} else {
if (this.outBuffer == null) {
this.outBuffer = new byte[this.bufferLength];
}
if (this.outBuffer == null) {
this.outBuffer = new byte[this.bufferLength];
}
synchronized(this) {
for (int var5 = 0; var5 < var3; ++var5) {
this.outBuffer[this.outOffset] = var1[var5 + var2];
this.outOffset = (this.outOffset + 1) % this.bufferLength;
if ((this.outLength + this.maxPacketLength) % this.bufferLength == this.outOffset) {
throw new IOException();
}
}
synchronized(this) {
for (int var5 = 0; var5 < var3; ++var5) {
this.outBuffer[this.outOffset] = var1[var5 + var2];
this.outOffset = (this.outOffset + 1) % this.bufferLength;
if ((this.outLength + this.maxPacketLength) % this.bufferLength == this.outOffset) {
throw new IOException();
}
}
if (this.task == null) {
this.task = this.taskHandler.newThreadTask(this, 3);
}
this.notifyAll();
if (this.task == null) {
this.task = this.taskHandler.newThreadTask(this, 3);
}
this.notifyAll();
}
}
}
@@ -358,16 +355,15 @@ public final class NetSocket extends AbstractSocket implements Runnable {
InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0);
if (var1 != null) {
return var1;
} else {
byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0);
var1 = new InvDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2));
}
InvDefinition.InvDefinition_cached.put(var1, (long)var0);
return var1;
}
byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0);
var1 = new InvDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2));
}
InvDefinition.InvDefinition_cached.put(var1, (long)var0);
return var1;
}
@ObfuscatedName("p")

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

@@ -80,10 +80,9 @@ public class NodeDeque {
Node var1 = this.sentinel.previous;
if (var1 == this.sentinel) {
return null;
} else {
var1.remove();
return var1;
}
var1.remove();
return var1;
}
@ObfuscatedName("l")
@@ -95,10 +94,9 @@ public class NodeDeque {
Node var1 = this.sentinel.next;
if (var1 == this.sentinel) {
return null;
} else {
var1.remove();
return var1;
}
var1.remove();
return var1;
}
@ObfuscatedName("b")
@@ -111,10 +109,9 @@ public class NodeDeque {
if (var1 == this.sentinel) {
this.current = null;
return null;
} else {
this.current = var1.previous;
return var1;
}
this.current = var1.previous;
return var1;
}
@ObfuscatedName("i")
@@ -127,10 +124,9 @@ public class NodeDeque {
if (var1 == this.sentinel) {
this.current = null;
return null;
} else {
this.current = var1.next;
return var1;
}
this.current = var1.next;
return var1;
}
@ObfuscatedName("c")
@@ -143,10 +139,9 @@ public class NodeDeque {
if (var1 == this.sentinel) {
this.current = null;
return null;
} else {
this.current = var1.previous;
return var1;
}
this.current = var1.previous;
return var1;
}
@ObfuscatedName("u")
@@ -159,10 +154,9 @@ public class NodeDeque {
if (var1 == this.sentinel) {
this.current = null;
return null;
} else {
this.current = var1.next;
return var1;
}
this.current = var1.next;
return var1;
}
@ObfuscatedName("p")

21
runescape-client/src/main/java/NodeHashTable.java
View File

@@ -101,19 +101,18 @@ public final class NodeHashTable {
Node var1;
if (this.index > 0 && this.buckets[this.index - 1] != this.current) {
var1 = this.current;
this.current = var1.previous;
return var1;
} else {
do {
if (this.index >= this.size) {
return null;
}
var1 = this.buckets[this.index++].previous;
} while(var1 == this.buckets[this.index - 1]);
this.current = var1.previous;
return var1;
}
do {
if (this.index >= this.size) {
return null;
}
var1 = this.buckets[this.index++].previous;
} while(var1 == this.buckets[this.index - 1]);
this.current = var1.previous;
return var1;
}
}

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

@@ -532,19 +532,20 @@ public class ObjectDefinition extends DualNode {
}
return true;
} else if (this.field3362 == null) {
return true;
} else if (var1 != 10) {
return true;
} else {
boolean var2 = true;
for (int var3 = 0; var3 < this.field3362.length; ++var3) {
var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.field3362[var3] & 65535, 0);
}
return var2;
}
if (this.field3362 == null) {
return true;
}
if (var1 != 10) {
return true;
}
boolean var2 = true;
for (int var3 = 0; var3 < this.field3362.length; ++var3) {
var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.field3362[var3] & 65535, 0);
}
return var2;
}
@ObfuscatedName("l")
@@ -555,15 +556,14 @@ public class ObjectDefinition extends DualNode {
public final boolean method4608() {
if (this.field3362 == null) {
return true;
} else {
boolean var1 = true;
for (int var2 = 0; var2 < this.field3362.length; ++var2) {
var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.field3362[var2] & 65535, 0);
}
return var1;
}
boolean var1 = true;
for (int var2 = 0; var2 < this.field3362.length; ++var2) {
var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.field3362[var2] & 65535, 0);
}
return var1;
}
@ObfuscatedName("b")
@@ -671,20 +671,19 @@ public class ObjectDefinition extends DualNode {
}
if (var7 == null && this.clipType * 256 == -1) {
return var11;
} else {
if (var7 != null) {
var11 = var7.transformObjectModel(var11, var8, var2);
} else {
var11 = var11.toSharedSequenceModel(true);
}
if (this.clipType * 256 >= 0) {
var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType * 256);
}
return var11;
}
if (var7 != null) {
var11 = var7.transformObjectModel(var11, var8, var2);
} else {
var11 = var11.toSharedSequenceModel(true);
}
if (this.clipType * 256 >= 0) {
var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType * 256);
}
return var11;
}
@ObfuscatedName("u")
@@ -893,17 +892,16 @@ public class ObjectDefinition extends DualNode {
public boolean method4598() {
if (this.transforms == null) {
return this.ambientSoundId != -1 || this.field3367 != null;
} else {
for (int var1 = 0; var1 < this.transforms.length; ++var1) {
if (this.transforms[var1] != -1) {
ObjectDefinition var2 = ViewportMouse.getObjectDefinition(this.transforms[var1]);
if (var2.ambientSoundId != -1 || var2.field3367 != null) {
return true;
}
}
for (int var1 = 0; var1 < this.transforms.length; ++var1) {
if (this.transforms[var1] != -1) {
ObjectDefinition var2 = ViewportMouse.getObjectDefinition(this.transforms[var1]);
if (var2.ambientSoundId != -1 || var2.field3367 != null) {
return true;
}
}
return false;
}
return false;
}
}

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

@@ -140,11 +140,10 @@ public final class ObjectSound extends Node {
Script var5 = class49.getWorldMapScript(var3, var0);
if (var5 != null) {
return var5;
} else {
int var4 = GraphicsDefaults.getWorldMapScriptIdCategory(var2, var0);
var5 = class49.getWorldMapScript(var4, var0);
return var5 != null ? var5 : null;
}
int var4 = GraphicsDefaults.getWorldMapScriptIdCategory(var2, var0);
var5 = class49.getWorldMapScript(var4, var0);
return var5 != null ? var5 : null;
}
@ObfuscatedName("ai")

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

@@ -169,22 +169,21 @@ public class PacketBuffer extends Buffer {
signature = "(Lhp;III)Llx;",
garbageValue = "-1232611828"
)
@Export("loadIndexedSprite")
static IndexedSprite loadIndexedSprite(AbstractArchive var0, int var1, int var2) {
if (!Friend.doesSpriteExist(var0, var1, var2)) {
@Export("SpriteBuffer_getIndexedSprite")
static IndexedSprite SpriteBuffer_getIndexedSprite(AbstractArchive var0, int var1, int var2) {
if (!Friend.SpriteBuffer_bufferFile(var0, var1, var2)) {
return null;
} else {
IndexedSprite var4 = new IndexedSprite();
var4.width = class326.SpriteBuffer_spriteWidth;
var4.height = class326.SpriteBuffer_spriteHeight;
var4.xOffset = Varps.SpriteBuffer_xOffsets[0];
var4.yOffset = class326.SpriteBuffer_yOffsets[0];
var4.subWidth = class326.SpriteBuffer_spriteWidths[0];
var4.subHeight = class216.SpriteBuffer_spriteHeights[0];
var4.palette = Frames.SpriteBuffer_spritePalette;
var4.pixels = class326.SpriteBuffer_pixels[0];
class16.method174();
return var4;
}
IndexedSprite var4 = new IndexedSprite();
var4.width = SpriteBuffer.SpriteBuffer_spriteWidth;
var4.height = SpriteBuffer.SpriteBuffer_spriteHeight;
var4.xOffset = Varps.SpriteBuffer_xOffsets[0];
var4.yOffset = SpriteBuffer.SpriteBuffer_yOffsets[0];
var4.subWidth = SpriteBuffer.SpriteBuffer_spriteWidths[0];
var4.subHeight = class216.SpriteBuffer_spriteHeights[0];
var4.palette = Frames.SpriteBuffer_spritePalette;
var4.pixels = SpriteBuffer.SpriteBuffer_pixels[0];
class16.SpriteBuffer_clear();
return var4;
}
}

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

@@ -153,13 +153,14 @@ public class PacketBufferNode extends Node {
if (var0 == 338) {
return 'O';
} else if (var0 == 339) {
return 'o';
} else if (var0 == 376) {
return 'Y';
} else {
return var0;
}
if (var0 == 339) {
return 'o';
}
if (var0 == 376) {
return 'Y';
}
return var0;
}
@ObfuscatedName("gi")

19
runescape-client/src/main/java/ParamDefinition.java
View File

@@ -130,16 +130,15 @@ public class ParamDefinition extends DualNode {
StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0);
if (var1 != null) {
return var1;
} else {
byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0);
var1 = new StructDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2));
}
var1.postDecode();
StructDefinition.StructDefinition_cached.put(var1, (long)var0);
return var1;
}
byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0);
var1 = new StructDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2));
}
var1.postDecode();
StructDefinition.StructDefinition_cached.put(var1, (long)var0);
return var1;
}
}

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

@@ -111,6 +111,7 @@ public class PcmPlayer {
signature = "(I)V",
garbageValue = "-1518489339"
)
@Export("init")
protected void init() throws Exception {
}
@@ -119,6 +120,7 @@ public class PcmPlayer {
signature = "(IB)V",
garbageValue = "2"
)
@Export("open")
protected void open(int var1) throws Exception {
}
@@ -133,6 +135,7 @@ public class PcmPlayer {
}
@ObfuscatedName("p")
@Export("write")
protected void write() throws Exception {
}

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

@@ -93,6 +93,7 @@ public class PcmStreamMixer extends PcmStream {
@ObfuscatedSignature(
signature = "()Ldx;"
)
@Export("firstSubStream")
protected PcmStream firstSubStream() {
return (PcmStream)this.subStreams.last();
}
@@ -101,6 +102,7 @@ public class PcmStreamMixer extends PcmStream {
@ObfuscatedSignature(
signature = "()Ldx;"
)
@Export("nextSubStream")
protected PcmStream nextSubStream() {
return (PcmStream)this.subStreams.previous();
}

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

@@ -374,66 +374,64 @@ public final class Player extends Actor {
protected final Model getModel() {
if (this.appearance == null) {
return null;
} else {
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GrandExchangeEvent.getSequenceDefinition(super.sequence) : null;
SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.movementSequence != super.readySequence || var1 == null) ? GrandExchangeEvent.getSequenceDefinition(super.movementSequence) : null;
Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
if (var3 == null) {
return null;
} else {
var3.calculateBoundsCylinder();
super.defaultHeight = var3.height;
Model var4;
Model[] var5;
if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
var4 = MusicPatch.getSpotAnimationDefinition(super.spotAnimation).getModel(super.spotAnimationFrame);
if (var4 != null) {
var4.offsetBy(0, -super.heightOffset, 0);
var5 = new Model[]{var3, var4};
var3 = new Model(var5, 2);
}
}
if (!this.isUnanimated && this.model0 != null) {
if (Client.cycle >= this.animationCycleEnd) {
this.model0 = null;
}
if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) {
var4 = this.model0;
var4.offsetBy(this.field633 * 4096 - super.x, this.tileHeight2 - this.tileHeight, this.field620 * 4096 - super.y);
if (super.orientation == 512) {
var4.rotateY90Ccw();
var4.rotateY90Ccw();
var4.rotateY90Ccw();
} else if (super.orientation == 1024) {
var4.rotateY90Ccw();
var4.rotateY90Ccw();
} else if (super.orientation == 1536) {
var4.rotateY90Ccw();
}
var5 = new Model[]{var3, var4};
var3 = new Model(var5, 2);
if (super.orientation == 512) {
var4.rotateY90Ccw();
} else if (super.orientation == 1024) {
var4.rotateY90Ccw();
var4.rotateY90Ccw();
} else if (super.orientation == 1536) {
var4.rotateY90Ccw();
var4.rotateY90Ccw();
var4.rotateY90Ccw();
}
var4.offsetBy(super.x - this.field633 * 4096, this.tileHeight - this.tileHeight2, super.y - this.field620 * 4096);
}
}
var3.isSingleTile = true;
return var3;
}
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GrandExchangeEvent.getSequenceDefinition(super.sequence) : null;
SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.movementSequence != super.readySequence || var1 == null) ? GrandExchangeEvent.getSequenceDefinition(super.movementSequence) : null;
Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
if (var3 == null) {
return null;
}
var3.calculateBoundsCylinder();
super.defaultHeight = var3.height;
Model var4;
Model[] var5;
if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
var4 = MusicPatch.getSpotAnimationDefinition(super.spotAnimation).getModel(super.spotAnimationFrame);
if (var4 != null) {
var4.offsetBy(0, -super.heightOffset, 0);
var5 = new Model[]{var3, var4};
var3 = new Model(var5, 2);
}
}
if (!this.isUnanimated && this.model0 != null) {
if (Client.cycle >= this.animationCycleEnd) {
this.model0 = null;
}
if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) {
var4 = this.model0;
var4.offsetBy(this.field633 * 4096 - super.x, this.tileHeight2 - this.tileHeight, this.field620 * 4096 - super.y);
if (super.orientation == 512) {
var4.rotateY90Ccw();
var4.rotateY90Ccw();
var4.rotateY90Ccw();
} else if (super.orientation == 1024) {
var4.rotateY90Ccw();
var4.rotateY90Ccw();
} else if (super.orientation == 1536) {
var4.rotateY90Ccw();
}
var5 = new Model[]{var3, var4};
var3 = new Model(var5, 2);
if (super.orientation == 512) {
var4.rotateY90Ccw();
} else if (super.orientation == 1024) {
var4.rotateY90Ccw();
var4.rotateY90Ccw();
} else if (super.orientation == 1536) {
var4.rotateY90Ccw();
var4.rotateY90Ccw();
var4.rotateY90Ccw();
}
var4.offsetBy(super.x - this.field633 * 4096, this.tileHeight - this.tileHeight2, super.y - this.field620 * 4096);
}
}
var3.isSingleTile = true;
return var3;
}
@ObfuscatedName("u")
@@ -521,38 +519,41 @@ public final class Player extends Actor {
try {
if (!class51.field434.startsWith("win")) {
throw new Exception();
} else if (!var0.startsWith("http://") && !var0.startsWith("https://")) {
throw new Exception();
} else {
String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*";
for (int var4 = 0; var4 < var0.length(); ++var4) {
if (var11.indexOf(var0.charAt(var4)) == -1) {
throw new Exception();
}
}
Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\"");
return true;
}
if (!var0.startsWith("http://") && !var0.startsWith("https://")) {
throw new Exception();
}
String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*";
for (int var4 = 0; var4 < var0.length(); ++var4) {
if (var11.indexOf(var0.charAt(var4)) == -1) {
throw new Exception();
}
}
Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\"");
return true;
} catch (Throwable var5) {
return false;
}
} else if (var1 == 1) {
}
if (var1 == 1) {
try {
Object var10 = class47.method806(class51.applet, var2, new Object[]{(new URL(class51.applet.getCodeBase(), var0)).toString()});
return var10 != null;
} catch (Throwable var6) {
return false;
}
} else if (var1 == 2) {
}
if (var1 == 2) {
try {
class51.applet.getAppletContext().showDocument(new URL(class51.applet.getCodeBase(), var0), "_blank");
return true;
} catch (Exception var7) {
return false;
}
} else if (var1 == 3) {
}
if (var1 == 3) {
try {
Applet var3 = class51.applet;
JSObject.getWindow(var3).call("loggedout", (Object[])null);
@@ -565,9 +566,8 @@ public final class Player extends Actor {
} catch (Exception var8) {
return false;
}
} else {
throw new IllegalArgumentException();
}
throw new IllegalArgumentException();
}
@ObfuscatedName("ff")

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

@@ -238,109 +238,107 @@ public class PlayerAppearance {
public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
if (this.npcTransformId != -1) {
return GameShell.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4);
} else {
long var5 = this.field2539;
int[] var7 = this.equipment;
if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) {
var7 = new int[12];
}
long var5 = this.field2539;
int[] var7 = this.equipment;
if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) {
var7 = new int[12];
for (int var15 = 0; var15 < 12; ++var15) {
var7[var15] = this.equipment[var15];
for (int var15 = 0; var15 < 12; ++var15) {
var7[var15] = this.equipment[var15];
}
if (var1.shield >= 0) {
var5 += (long)(var1.shield - this.equipment[5] << 40);
var7[5] = var1.shield;
}
if (var1.weapon >= 0) {
var5 += (long)(var1.weapon - this.equipment[3] << 48);
var7[3] = var1.weapon;
}
}
Model var8 = (Model)PlayerAppearance_cachedModels.get(var5);
if (var8 == null) {
boolean var9 = false;
int var11;
for (int var10 = 0; var10 < 12; ++var10) {
var11 = var7[var10];
if (var11 >= 256 && var11 < 512 && !ArchiveDiskAction.getKitDefinition(var11 - 256).ready()) {
var9 = true;
}
if (var1.shield >= 0) {
var5 += (long)(var1.shield - this.equipment[5] << 40);
var7[5] = var1.shield;
}
if (var1.weapon >= 0) {
var5 += (long)(var1.weapon - this.equipment[3] << 48);
var7[3] = var1.weapon;
if (var11 >= 512 && !WorldMapArea.getItemDefinition(var11 - 512).method4646(this.isFemale)) {
var9 = true;
}
}
Model var8 = (Model)PlayerAppearance_cachedModels.get(var5);
if (var8 == null) {
boolean var9 = false;
int var11;
for (int var10 = 0; var10 < 12; ++var10) {
var11 = var7[var10];
if (var11 >= 256 && var11 < 512 && !ArchiveDiskAction.getKitDefinition(var11 - 256).ready()) {
var9 = true;
}
if (var11 >= 512 && !WorldMapArea.getItemDefinition(var11 - 512).method4646(this.isFemale)) {
var9 = true;
}
}
if (var9) {
if (-1L != this.field2537) {
var8 = (Model)PlayerAppearance_cachedModels.get(this.field2537);
}
if (var8 == null) {
return null;
}
if (var9) {
if (-1L != this.field2537) {
var8 = (Model)PlayerAppearance_cachedModels.get(this.field2537);
}
if (var8 == null) {
ModelData[] var16 = new ModelData[12];
var11 = 0;
int var13;
for (int var12 = 0; var12 < 12; ++var12) {
var13 = var7[var12];
ModelData var14;
if (var13 >= 256 && var13 < 512) {
var14 = ArchiveDiskAction.getKitDefinition(var13 - 256).getModelData();
if (var14 != null) {
var16[var11++] = var14;
}
}
if (var13 >= 512) {
var14 = WorldMapArea.getItemDefinition(var13 - 512).method4694(this.isFemale);
if (var14 != null) {
var16[var11++] = var14;
}
}
}
ModelData var17 = new ModelData(var16, var11);
for (var13 = 0; var13 < 5; ++var13) {
if (this.bodyColors[var13] < class247.field3291[var13].length) {
var17.recolor(ModelData0.field1870[var13], class247.field3291[var13][this.bodyColors[var13]]);
}
if (this.bodyColors[var13] < Message.field604[var13].length) {
var17.recolor(WorldMapCacheName.field309[var13], Message.field604[var13][this.bodyColors[var13]]);
}
}
var8 = var17.toModel(64, 850, -30, -50, -30);
PlayerAppearance_cachedModels.put(var8, var5);
this.field2537 = var5;
return null;
}
}
if (var1 == null && var3 == null) {
return var8;
} else {
Model var18;
if (var1 != null && var3 != null) {
var18 = var1.applyTransformations(var8, var2, var3, var4);
} else if (var1 != null) {
var18 = var1.transformActorModel(var8, var2);
} else {
var18 = var3.transformActorModel(var8, var4);
if (var8 == null) {
ModelData[] var16 = new ModelData[12];
var11 = 0;
int var13;
for (int var12 = 0; var12 < 12; ++var12) {
var13 = var7[var12];
ModelData var14;
if (var13 >= 256 && var13 < 512) {
var14 = ArchiveDiskAction.getKitDefinition(var13 - 256).getModelData();
if (var14 != null) {
var16[var11++] = var14;
}
}
if (var13 >= 512) {
var14 = WorldMapArea.getItemDefinition(var13 - 512).method4694(this.isFemale);
if (var14 != null) {
var16[var11++] = var14;
}
}
}
return var18;
ModelData var17 = new ModelData(var16, var11);
for (var13 = 0; var13 < 5; ++var13) {
if (this.bodyColors[var13] < class247.field3291[var13].length) {
var17.recolor(ModelData0.field1870[var13], class247.field3291[var13][this.bodyColors[var13]]);
}
if (this.bodyColors[var13] < Message.field604[var13].length) {
var17.recolor(WorldMapCacheName.field309[var13], Message.field604[var13][this.bodyColors[var13]]);
}
}
var8 = var17.toModel(64, 850, -30, -50, -30);
PlayerAppearance_cachedModels.put(var8, var5);
this.field2537 = var5;
}
}
if (var1 == null && var3 == null) {
return var8;
}
Model var18;
if (var1 != null && var3 != null) {
var18 = var1.applyTransformations(var8, var2, var3, var4);
} else if (var1 != null) {
var18 = var1.transformActorModel(var8, var2);
} else {
var18 = var3.transformActorModel(var8, var4);
}
return var18;
}
@ObfuscatedName("i")
@@ -352,61 +350,59 @@ public class PlayerAppearance {
ModelData getModelData() {
if (this.npcTransformId != -1) {
return GameShell.getNpcDefinition(this.npcTransformId).getModelData();
} else {
boolean var1 = false;
}
boolean var1 = false;
int var3;
for (int var2 = 0; var2 < 12; ++var2) {
var3 = this.equipment[var2];
if (var3 >= 256 && var3 < 512 && !ArchiveDiskAction.getKitDefinition(var3 - 256).method4445()) {
var1 = true;
}
if (var3 >= 512 && !WorldMapArea.getItemDefinition(var3 - 512).method4683(this.isFemale)) {
var1 = true;
}
int var3;
for (int var2 = 0; var2 < 12; ++var2) {
var3 = this.equipment[var2];
if (var3 >= 256 && var3 < 512 && !ArchiveDiskAction.getKitDefinition(var3 - 256).method4445()) {
var1 = true;
}
if (var1) {
return null;
} else {
ModelData[] var7 = new ModelData[12];
var3 = 0;
int var5;
for (int var4 = 0; var4 < 12; ++var4) {
var5 = this.equipment[var4];
ModelData var6;
if (var5 >= 256 && var5 < 512) {
var6 = ArchiveDiskAction.getKitDefinition(var5 - 256).method4441();
if (var6 != null) {
var7[var3++] = var6;
}
}
if (var5 >= 512) {
var6 = WorldMapArea.getItemDefinition(var5 - 512).method4649(this.isFemale);
if (var6 != null) {
var7[var3++] = var6;
}
}
}
ModelData var8 = new ModelData(var7, var3);
for (var5 = 0; var5 < 5; ++var5) {
if (this.bodyColors[var5] < class247.field3291[var5].length) {
var8.recolor(ModelData0.field1870[var5], class247.field3291[var5][this.bodyColors[var5]]);
}
if (this.bodyColors[var5] < Message.field604[var5].length) {
var8.recolor(WorldMapCacheName.field309[var5], Message.field604[var5][this.bodyColors[var5]]);
}
}
return var8;
if (var3 >= 512 && !WorldMapArea.getItemDefinition(var3 - 512).method4683(this.isFemale)) {
var1 = true;
}
}
if (var1) {
return null;
}
ModelData[] var7 = new ModelData[12];
var3 = 0;
int var5;
for (int var4 = 0; var4 < 12; ++var4) {
var5 = this.equipment[var4];
ModelData var6;
if (var5 >= 256 && var5 < 512) {
var6 = ArchiveDiskAction.getKitDefinition(var5 - 256).method4441();
if (var6 != null) {
var7[var3++] = var6;
}
}
if (var5 >= 512) {
var6 = WorldMapArea.getItemDefinition(var5 - 512).method4649(this.isFemale);
if (var6 != null) {
var7[var3++] = var6;
}
}
}
ModelData var8 = new ModelData(var7, var3);
for (var5 = 0; var5 < 5; ++var5) {
if (this.bodyColors[var5] < class247.field3291[var5].length) {
var8.recolor(ModelData0.field1870[var5], class247.field3291[var5][this.bodyColors[var5]]);
}
if (this.bodyColors[var5] < Message.field604[var5].length) {
var8.recolor(WorldMapCacheName.field309[var5], Message.field604[var5][this.bodyColors[var5]]);
}
}
return var8;
}
@ObfuscatedName("c")
@@ -424,14 +420,13 @@ public class PlayerAppearance {
signature = "(Lhp;II)Z",
garbageValue = "-435811450"
)
@Export("SpriteBuffer_loadSpriteFlat")
public static boolean SpriteBuffer_loadSpriteFlat(AbstractArchive var0, int var1) {
@Export("SpriteBuffer_bufferFileFlat")
public static boolean SpriteBuffer_bufferFileFlat(AbstractArchive var0, int var1) {
byte[] var2 = var0.takeFileFlat(var1);
if (var2 == null) {
return false;
} else {
class185.SpriteBuffer_decode(var2);
return true;
}
class185.SpriteBuffer_decode(var2);
return true;
}
}

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

@@ -231,10 +231,9 @@ public final class Projectile extends Entity {
Model var2 = var1.getModel(this.frame);
if (var2 == null) {
return null;
} else {
var2.rotateZ(this.pitch);
return var2;
}
var2.rotateZ(this.pitch);
return var2;
}
@ObfuscatedName("q")
@@ -247,15 +246,14 @@ public final class Projectile extends Entity {
HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0);
if (var1 != null) {
return var1;
} else {
byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0);
var1 = new HitSplatDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2));
}
HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0);
return var1;
}
byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0);
var1 = new HitSplatDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2));
}
HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0);
return var1;
}
}

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

File diff suppressed because it is too large Load Diff

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

@@ -81,6 +81,7 @@ public class RawPcmStream extends PcmStream {
@ObfuscatedSignature(
signature = "()Ldx;"
)
@Export("firstSubStream")
protected PcmStream firstSubStream() {
return null;
}
@@ -89,6 +90,7 @@ public class RawPcmStream extends PcmStream {
@ObfuscatedSignature(
signature = "()Ldx;"
)
@Export("nextSubStream")
protected PcmStream nextSubStream() {
return null;
}
@@ -163,7 +165,8 @@ public class RawPcmStream extends PcmStream {
this.field1471 = var5 + var5 - 1 - this.field1471;
this.field1469 = -this.field1469;
}
} else if (this.field1469 < 0) {
}
if (this.field1469 < 0) {
while (true) {
var9 = this.method2641(var1, var9, var5, var3, var4.samples[this.end - 1]);
if (this.field1471 >= var5) {
@@ -172,111 +175,109 @@ public class RawPcmStream extends PcmStream {
this.field1471 = var6 - 1 - (var6 - 1 - this.field1471) % var8;
}
} else {
while (true) {
var9 = this.method2543(var1, var9, var6, var3, var4.samples[this.start]);
if (this.field1471 < var6) {
return;
}
this.field1471 = var5 + (this.field1471 - var5) % var8;
}
}
} else {
if (this.numLoops > 0) {
if (this.field1478) {
label119: {
if (this.field1469 < 0) {
var9 = this.method2641(var1, var2, var5, var3, var4.samples[this.start]);
if (this.field1471 >= var5) {
return;
}
while (true) {
var9 = this.method2543(var1, var9, var6, var3, var4.samples[this.start]);
if (this.field1471 < var6) {
return;
}
this.field1471 = var5 + var5 - 1 - this.field1471;
this.field1469 = -this.field1469;
if (--this.numLoops == 0) {
break label119;
}
this.field1471 = var5 + (this.field1471 - var5) % var8;
}
}
if (this.numLoops > 0) {
if (this.field1478) {
label119: {
if (this.field1469 < 0) {
var9 = this.method2641(var1, var2, var5, var3, var4.samples[this.start]);
if (this.field1471 >= var5) {
return;
}
do {
var9 = this.method2543(var1, var9, var6, var3, var4.samples[this.end - 1]);
if (this.field1471 < var6) {
return;
}
this.field1471 = var5 + var5 - 1 - this.field1471;
this.field1469 = -this.field1469;
if (--this.numLoops == 0) {
break label119;
}
}
this.field1471 = var6 + var6 - 1 - this.field1471;
this.field1469 = -this.field1469;
if (--this.numLoops == 0) {
break;
}
do {
var9 = this.method2543(var1, var9, var6, var3, var4.samples[this.end - 1]);
if (this.field1471 < var6) {
return;
}
var9 = this.method2641(var1, var9, var5, var3, var4.samples[this.start]);
if (this.field1471 >= var5) {
return;
}
this.field1471 = var6 + var6 - 1 - this.field1471;
this.field1469 = -this.field1469;
if (--this.numLoops == 0) {
break;
}
this.field1471 = var5 + var5 - 1 - this.field1471;
this.field1469 = -this.field1469;
} while(--this.numLoops != 0);
var9 = this.method2641(var1, var9, var5, var3, var4.samples[this.start]);
if (this.field1471 >= var5) {
return;
}
this.field1471 = var5 + var5 - 1 - this.field1471;
this.field1469 = -this.field1469;
} while(--this.numLoops != 0);
}
} else {
int var10;
if (this.field1469 < 0) {
while (true) {
var9 = this.method2641(var1, var9, var5, var3, var4.samples[this.end - 1]);
if (this.field1471 >= var5) {
return;
}
var10 = (var6 - 1 - this.field1471) / var8;
if (var10 >= this.numLoops) {
this.field1471 += var8 * this.numLoops;
this.numLoops = 0;
break;
}
this.field1471 += var8 * var10;
this.numLoops -= var10;
}
} else {
int var10;
if (this.field1469 < 0) {
while (true) {
var9 = this.method2641(var1, var9, var5, var3, var4.samples[this.end - 1]);
if (this.field1471 >= var5) {
return;
}
var10 = (var6 - 1 - this.field1471) / var8;
if (var10 >= this.numLoops) {
this.field1471 += var8 * this.numLoops;
this.numLoops = 0;
break;
}
this.field1471 += var8 * var10;
this.numLoops -= var10;
while (true) {
var9 = this.method2543(var1, var9, var6, var3, var4.samples[this.start]);
if (this.field1471 < var6) {
return;
}
} else {
while (true) {
var9 = this.method2543(var1, var9, var6, var3, var4.samples[this.start]);
if (this.field1471 < var6) {
return;
}
var10 = (this.field1471 - var5) / var8;
if (var10 >= this.numLoops) {
this.field1471 -= var8 * this.numLoops;
this.numLoops = 0;
break;
}
this.field1471 -= var8 * var10;
this.numLoops -= var10;
var10 = (this.field1471 - var5) / var8;
if (var10 >= this.numLoops) {
this.field1471 -= var8 * this.numLoops;
this.numLoops = 0;
break;
}
this.field1471 -= var8 * var10;
this.numLoops -= var10;
}
}
}
if (this.field1469 < 0) {
this.method2641(var1, var9, 0, var3, 0);
if (this.field1471 < 0) {
this.field1471 = -1;
this.method2647();
this.remove();
}
} else {
this.method2543(var1, var9, var7, var3, 0);
if (this.field1471 >= var7) {
this.field1471 = var7;
this.method2647();
this.remove();
}
}
}
if (this.field1469 < 0) {
this.method2641(var1, var9, 0, var3, 0);
if (this.field1471 < 0) {
this.field1471 = -1;
this.method2647();
this.remove();
}
} else {
this.method2543(var1, var9, var7, var3, 0);
if (this.field1471 >= var7) {
this.field1471 = var7;
this.method2647();
this.remove();
}
}
}
}
@@ -768,51 +769,49 @@ public class RawPcmStream extends PcmStream {
this.field1472 = 0;
this.remove();
return true;
} else {
this.method2525();
return false;
}
} else {
if (this.field1472 < var1) {
this.field1480 = 1;
this.field1479 = var1 - this.field1472;
} else if (this.field1472 > var1) {
this.field1480 = -1;
this.field1479 = this.field1472 - var1;
} else {
this.field1480 = 0;
}
if (this.field1482 < var2) {
this.field1481 = 1;
if (this.field1479 == 0 || this.field1479 > var2 - this.field1482) {
this.field1479 = var2 - this.field1482;
}
} else if (this.field1482 > var2) {
this.field1481 = -1;
if (this.field1479 == 0 || this.field1479 > this.field1482 - var2) {
this.field1479 = this.field1482 - var2;
}
} else {
this.field1481 = 0;
}
if (this.field1474 < var3) {
this.field1468 = 1;
if (this.field1479 == 0 || this.field1479 > var3 - this.field1474) {
this.field1479 = var3 - this.field1474;
}
} else if (this.field1474 > var3) {
this.field1468 = -1;
if (this.field1479 == 0 || this.field1479 > this.field1474 - var3) {
this.field1479 = this.field1474 - var3;
}
} else {
this.field1468 = 0;
}
this.method2525();
return false;
}
if (this.field1472 < var1) {
this.field1480 = 1;
this.field1479 = var1 - this.field1472;
} else if (this.field1472 > var1) {
this.field1480 = -1;
this.field1479 = this.field1472 - var1;
} else {
this.field1480 = 0;
}
if (this.field1482 < var2) {
this.field1481 = 1;
if (this.field1479 == 0 || this.field1479 > var2 - this.field1482) {
this.field1479 = var2 - this.field1482;
}
} else if (this.field1482 > var2) {
this.field1481 = -1;
if (this.field1479 == 0 || this.field1479 > this.field1482 - var2) {
this.field1479 = this.field1482 - var2;
}
} else {
this.field1481 = 0;
}
if (this.field1474 < var3) {
this.field1468 = 1;
if (this.field1479 == 0 || this.field1479 > var3 - this.field1474) {
this.field1479 = var3 - this.field1474;
}
} else if (this.field1474 > var3) {
this.field1468 = -1;
if (this.field1479 == 0 || this.field1479 > this.field1474 - var3) {
this.field1479 = this.field1474 - var3;
}
} else {
this.field1468 = 0;
}
return false;
}
@ObfuscatedName("ay")

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

@@ -478,11 +478,10 @@ public class Scene {
public boolean method3076(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) {
if (var7 == null) {
return true;
} else {
int var12 = var5 * 64 + var2 * 128;
int var13 = var6 * 64 + var3 * 128;
return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11);
}
int var12 = var5 * 64 + var2 * 128;
int var13 = var6 * 64 + var3 * 128;
return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11);
}
@ObfuscatedName("r")
@@ -493,35 +492,34 @@ public class Scene {
public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) {
if (var6 == null) {
return true;
} else {
int var11 = var2 - var5;
int var12 = var3 - var5;
int var13 = var5 + var2;
int var14 = var3 + var5;
if (var10) {
if (var7 > 640 && var7 < 1408) {
var14 += 128;
}
if (var7 > 1152 && var7 < 1920) {
var13 += 128;
}
if (var7 > 1664 || var7 < 384) {
var12 -= 128;
}
if (var7 > 128 && var7 < 896) {
var11 -= 128;
}
}
int var11 = var2 - var5;
int var12 = var3 - var5;
int var13 = var5 + var2;
int var14 = var3 + var5;
if (var10) {
if (var7 > 640 && var7 < 1408) {
var14 += 128;
}
var11 /= 128;
var12 /= 128;
var13 /= 128;
var14 /= 128;
return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0);
if (var7 > 1152 && var7 < 1920) {
var13 += 128;
}
if (var7 > 1664 || var7 < 384) {
var12 -= 128;
}
if (var7 > 128 && var7 < 896) {
var11 -= 128;
}
}
var11 /= 128;
var12 /= 128;
var13 /= 128;
var14 /= 128;
return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0);
}
@ObfuscatedName("v")
@@ -744,19 +742,18 @@ public class Scene {
public GameObject method3195(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3];
if (var4 == null) {
return null;
} else {
for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
GameObject var6 = var4.gameObjects[var5];
long var8 = var6.tag;
boolean var7 = WorldMapLabel.method420(var8) == 2;
if (var7 && var2 == var6.startX && var3 == var6.startY) {
return var6;
}
}
return null;
}
for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
GameObject var6 = var4.gameObjects[var5];
long var8 = var6.tag;
boolean var7 = WorldMapLabel.method420(var8) == 2;
if (var7 && var2 == var6.startX && var3 == var6.startY) {
return var6;
}
}
return null;
}
@ObfuscatedName("ad")
@@ -788,19 +785,18 @@ public class Scene {
public long getGameObjectTag(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3];
if (var4 == null) {
return 0L;
} else {
for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
GameObject var6 = var4.gameObjects[var5];
long var8 = var6.tag;
boolean var7 = WorldMapLabel.method420(var8) == 2;
if (var7 && var2 == var6.startX && var3 == var6.startY) {
return var6.tag;
}
}
return 0L;
}
for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
GameObject var6 = var4.gameObjects[var5];
long var8 = var6.tag;
boolean var7 = WorldMapLabel.method420(var8) == 2;
if (var7 && var2 == var6.startX && var3 == var6.startY) {
return var6.tag;
}
}
return 0L;
}
@ObfuscatedName("az")
@@ -815,22 +811,24 @@ public class Scene {
public int getObjectFlags(int var1, int var2, int var3, long var4) {
Tile var6 = this.tiles[var1][var2][var3];
if (var6 == null) {
return -1;
} else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) {
return var6.boundaryObject.flags & 255;
} else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) {
return var6.wallDecoration.flags & 255;
} else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) {
return var6.floorDecoration.flags & 255;
} else {
for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) {
if (var6.gameObjects[var7].tag == var4) {
return var6.gameObjects[var7].flags & 255;
}
}
return -1;
}
if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) {
return var6.boundaryObject.flags & 255;
}
if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) {
return var6.wallDecoration.flags & 255;
}
if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) {
return var6.floorDecoration.flags & 255;
}
for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) {
if (var6.gameObjects[var7].tag == var4) {
return var6.gameObjects[var7].flags & 255;
}
}
return -1;
}
@ObfuscatedName("ao")
@@ -2129,187 +2127,187 @@ public class Scene {
int var4 = this.field1810[var1][var2][var3];
if (var4 == -Scene_drawnCount) {
return false;
} else if (var4 == Scene_drawnCount) {
return true;
} else {
int var5 = var2 << 7;
int var6 = var3 << 7;
if (this.method3102(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3102(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) {
this.field1810[var1][var2][var3] = Scene_drawnCount;
return true;
} else {
this.field1810[var1][var2][var3] = -Scene_drawnCount;
return false;
}
}
if (var4 == Scene_drawnCount) {
return true;
}
int var5 = var2 << 7;
int var6 = var3 << 7;
if (this.method3102(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3102(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) {
this.field1810[var1][var2][var3] = Scene_drawnCount;
return true;
}
this.field1810[var1][var2][var3] = -Scene_drawnCount;
return false;
}
@ObfuscatedName("bi")
boolean method3194(int var1, int var2, int var3, int var4) {
if (!this.method3181(var1, var2, var3)) {
return false;
} else {
int var5 = var2 << 7;
int var6 = var3 << 7;
int var7 = this.tileHeights[var1][var2][var3] - 1;
int var8 = var7 - 120;
int var9 = var7 - 230;
int var10 = var7 - 238;
if (var4 < 16) {
if (var4 == 1) {
if (var5 > Scene_cameraX) {
if (!this.method3102(var5, var7, var6)) {
return false;
}
if (!this.method3102(var5, var7, var6 + 128)) {
return false;
}
}
if (var1 > 0) {
if (!this.method3102(var5, var8, var6)) {
return false;
}
if (!this.method3102(var5, var8, var6 + 128)) {
return false;
}
}
if (!this.method3102(var5, var9, var6)) {
}
int var5 = var2 << 7;
int var6 = var3 << 7;
int var7 = this.tileHeights[var1][var2][var3] - 1;
int var8 = var7 - 120;
int var9 = var7 - 230;
int var10 = var7 - 238;
if (var4 < 16) {
if (var4 == 1) {
if (var5 > Scene_cameraX) {
if (!this.method3102(var5, var7, var6)) {
return false;
}
if (!this.method3102(var5, var9, var6 + 128)) {
if (!this.method3102(var5, var7, var6 + 128)) {
return false;
}
return true;
}
if (var4 == 2) {
if (var6 < Scene_cameraZ) {
if (!this.method3102(var5, var7, var6 + 128)) {
return false;
}
if (!this.method3102(var5 + 128, var7, var6 + 128)) {
return false;
}
}
if (var1 > 0) {
if (!this.method3102(var5, var8, var6 + 128)) {
return false;
}
if (!this.method3102(var5 + 128, var8, var6 + 128)) {
return false;
}
}
if (!this.method3102(var5, var9, var6 + 128)) {
if (var1 > 0) {
if (!this.method3102(var5, var8, var6)) {
return false;
}
if (!this.method3102(var5 + 128, var9, var6 + 128)) {
if (!this.method3102(var5, var8, var6 + 128)) {
return false;
}
return true;
}
if (var4 == 4) {
if (var5 < Scene_cameraX) {
if (!this.method3102(var5 + 128, var7, var6)) {
return false;
}
if (!this.method3102(var5 + 128, var7, var6 + 128)) {
return false;
}
}
if (var1 > 0) {
if (!this.method3102(var5 + 128, var8, var6)) {
return false;
}
if (!this.method3102(var5 + 128, var8, var6 + 128)) {
return false;
}
}
if (!this.method3102(var5 + 128, var9, var6)) {
return false;
}
if (!this.method3102(var5 + 128, var9, var6 + 128)) {
return false;
}
return true;
if (!this.method3102(var5, var9, var6)) {
return false;
}
if (var4 == 8) {
if (var6 > Scene_cameraZ) {
if (!this.method3102(var5, var7, var6)) {
return false;
}
if (!this.method3102(var5 + 128, var7, var6)) {
return false;
}
}
if (var1 > 0) {
if (!this.method3102(var5, var8, var6)) {
return false;
}
if (!this.method3102(var5 + 128, var8, var6)) {
return false;
}
}
if (!this.method3102(var5, var9, var6)) {
return false;
}
if (!this.method3102(var5 + 128, var9, var6)) {
return false;
}
return true;
if (!this.method3102(var5, var9, var6 + 128)) {
return false;
}
return true;
}
if (!this.method3102(var5 + 64, var10, var6 + 64)) {
return false;
} else if (var4 == 16) {
return this.method3102(var5, var9, var6 + 128);
} else if (var4 == 32) {
return this.method3102(var5 + 128, var9, var6 + 128);
} else if (var4 == 64) {
return this.method3102(var5 + 128, var9, var6);
} else if (var4 == 128) {
return this.method3102(var5, var9, var6);
} else {
if (var4 == 2) {
if (var6 < Scene_cameraZ) {
if (!this.method3102(var5, var7, var6 + 128)) {
return false;
}
if (!this.method3102(var5 + 128, var7, var6 + 128)) {
return false;
}
}
if (var1 > 0) {
if (!this.method3102(var5, var8, var6 + 128)) {
return false;
}
if (!this.method3102(var5 + 128, var8, var6 + 128)) {
return false;
}
}
if (!this.method3102(var5, var9, var6 + 128)) {
return false;
}
if (!this.method3102(var5 + 128, var9, var6 + 128)) {
return false;
}
return true;
}
if (var4 == 4) {
if (var5 < Scene_cameraX) {
if (!this.method3102(var5 + 128, var7, var6)) {
return false;
}
if (!this.method3102(var5 + 128, var7, var6 + 128)) {
return false;
}
}
if (var1 > 0) {
if (!this.method3102(var5 + 128, var8, var6)) {
return false;
}
if (!this.method3102(var5 + 128, var8, var6 + 128)) {
return false;
}
}
if (!this.method3102(var5 + 128, var9, var6)) {
return false;
}
if (!this.method3102(var5 + 128, var9, var6 + 128)) {
return false;
}
return true;
}
if (var4 == 8) {
if (var6 > Scene_cameraZ) {
if (!this.method3102(var5, var7, var6)) {
return false;
}
if (!this.method3102(var5 + 128, var7, var6)) {
return false;
}
}
if (var1 > 0) {
if (!this.method3102(var5, var8, var6)) {
return false;
}
if (!this.method3102(var5 + 128, var8, var6)) {
return false;
}
}
if (!this.method3102(var5, var9, var6)) {
return false;
}
if (!this.method3102(var5 + 128, var9, var6)) {
return false;
}
return true;
}
}
if (!this.method3102(var5 + 64, var10, var6 + 64)) {
return false;
}
if (var4 == 16) {
return this.method3102(var5, var9, var6 + 128);
}
if (var4 == 32) {
return this.method3102(var5 + 128, var9, var6 + 128);
}
if (var4 == 64) {
return this.method3102(var5 + 128, var9, var6);
}
if (var4 == 128) {
return this.method3102(var5, var9, var6);
}
return true;
}
@ObfuscatedName("bg")
boolean method3116(int var1, int var2, int var3, int var4) {
if (!this.method3181(var1, var2, var3)) {
return false;
} else {
int var5 = var2 << 7;
int var6 = var3 << 7;
return this.method3102(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3102(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1);
}
int var5 = var2 << 7;
int var6 = var3 << 7;
return this.method3102(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3102(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1);
}
@ObfuscatedName("bh")
@@ -2319,41 +2317,37 @@ public class Scene {
if (var3 == var2 && var5 == var4) {
if (!this.method3181(var1, var2, var4)) {
return false;
} else {
var7 = var2 << 7;
var8 = var4 << 7;
return this.method3102(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3102(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3102(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3102(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1);
}
} else {
for (var7 = var2; var7 <= var3; ++var7) {
for (var8 = var4; var8 <= var5; ++var8) {
if (this.field1810[var1][var7][var8] == -Scene_drawnCount) {
return false;
}
}
}
var7 = (var2 << 7) + 1;
var8 = (var4 << 7) + 2;
int var9 = this.tileHeights[var1][var2][var4] - var6;
if (!this.method3102(var7, var9, var8)) {
return false;
} else {
int var10 = (var3 << 7) - 1;
if (!this.method3102(var10, var9, var8)) {
var7 = var2 << 7;
var8 = var4 << 7;
return this.method3102(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3102(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3102(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3102(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1);
}
for (var7 = var2; var7 <= var3; ++var7) {
for (var8 = var4; var8 <= var5; ++var8) {
if (this.field1810[var1][var7][var8] == -Scene_drawnCount) {
return false;
} else {
int var11 = (var5 << 7) - 1;
if (!this.method3102(var7, var9, var11)) {
return false;
} else if (!this.method3102(var10, var9, var11)) {
return false;
} else {
return true;
}
}
}
}
var7 = (var2 << 7) + 1;
var8 = (var4 << 7) + 2;
int var9 = this.tileHeights[var1][var2][var4] - var6;
if (!this.method3102(var7, var9, var8)) {
return false;
}
int var10 = (var3 << 7) - 1;
if (!this.method3102(var10, var9, var8)) {
return false;
}
int var11 = (var5 << 7) - 1;
if (!this.method3102(var7, var9, var11)) {
return false;
}
if (!this.method3102(var10, var9, var11)) {
return false;
}
return true;
}
@ObfuscatedName("bm")
@@ -2538,9 +2532,8 @@ public class Scene {
int var7 = var3 * 128 / var5 + Scene_viewportXCenter;
int var8 = var6 * 128 / var5 + Scene_viewportYCenter;
return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax;
} else {
return false;
}
return false;
}
@ObfuscatedName("au")
@@ -2571,25 +2564,25 @@ public class Scene {
static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
if (var1 < var2 && var1 < var3 && var1 < var4) {
return false;
} else if (var1 > var2 && var1 > var3 && var1 > var4) {
return false;
} else if (var0 < var5 && var0 < var6 && var0 < var7) {
return false;
} else if (var0 > var5 && var0 > var6 && var0 > var7) {
return false;
} else {
int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2);
int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3);
int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7);
if (var8 == 0) {
if (var9 != 0) {
return var9 < 0 ? var10 <= 0 : var10 >= 0;
} else {
return true;
}
} else {
return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0;
}
}
if (var1 > var2 && var1 > var3 && var1 > var4) {
return false;
}
if (var0 < var5 && var0 < var6 && var0 < var7) {
return false;
}
if (var0 > var5 && var0 > var6 && var0 > var7) {
return false;
}
int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2);
int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3);
int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7);
if (var8 == 0) {
if (var9 != 0) {
return var9 < 0 ? var10 <= 0 : var10 >= 0;
}
return true;
}
return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0;
}
}

21
runescape-client/src/main/java/ScriptEvent.java
View File

@@ -138,24 +138,28 @@ public class ScriptEvent extends Node {
if (var0 == ScriptOpcodes.IF_GETX) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.x;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETY) {
}
if (var0 == ScriptOpcodes.IF_GETY) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.y;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETWIDTH) {
}
if (var0 == ScriptOpcodes.IF_GETWIDTH) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.width;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETHEIGHT) {
}
if (var0 == ScriptOpcodes.IF_GETHEIGHT) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.height;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETHIDE) {
}
if (var0 == ScriptOpcodes.IF_GETHIDE) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETLAYER) {
}
if (var0 == ScriptOpcodes.IF_GETLAYER) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.parentId;
return 1;
} else {
return 2;
}
return 2;
}
@ObfuscatedName("go")
@@ -178,9 +182,8 @@ public class ScriptEvent extends Node {
int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7;
int var9 = Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7;
return var7 * var9 + var8 * (128 - var7) >> 7;
} else {
return 0;
}
return 0;
}
@ObfuscatedName("iq")

13
runescape-client/src/main/java/ScriptFrame.java
View File

@@ -338,14 +338,13 @@ public class ScriptFrame {
if (var1.offset != Client.packetWriter.serverPacketLength) {
throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength);
} else {
for (var2 = 0; var2 < Client.npcCount; ++var2) {
if (Client.npcs[Client.npcIndices[var2]] == null) {
throw new RuntimeException(var2 + "," + Client.npcCount);
}
}
}
for (var2 = 0; var2 < Client.npcCount; ++var2) {
if (Client.npcs[Client.npcIndices[var2]] == null) {
throw new RuntimeException(var2 + "," + Client.npcCount);
}
}
}
@ObfuscatedName("hf")

119
runescape-client/src/main/java/SequenceDefinition.java
View File

@@ -249,11 +249,10 @@ public class SequenceDefinition extends DualNode {
var2 &= 65535;
if (var3 == null) {
return var1.toSharedSequenceModel(true);
} else {
Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2));
var4.animate(var3, var2);
return var4;
}
Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2));
var4.animate(var3, var2);
return var4;
}
@ObfuscatedName("l")
@@ -268,28 +267,27 @@ public class SequenceDefinition extends DualNode {
var2 &= 65535;
if (var4 == null) {
return var1.toSharedSequenceModel(true);
} else {
Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2));
var3 &= 3;
if (var3 == 1) {
var5.rotateY270Ccw();
} else if (var3 == 2) {
var5.rotateY180();
} else if (var3 == 3) {
var5.rotateY90Ccw();
}
var5.animate(var4, var2);
if (var3 == 1) {
var5.rotateY90Ccw();
} else if (var3 == 2) {
var5.rotateY180();
} else if (var3 == 3) {
var5.rotateY270Ccw();
}
return var5;
}
Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2));
var3 &= 3;
if (var3 == 1) {
var5.rotateY270Ccw();
} else if (var3 == 2) {
var5.rotateY180();
} else if (var3 == 3) {
var5.rotateY90Ccw();
}
var5.animate(var4, var2);
if (var3 == 1) {
var5.rotateY90Ccw();
} else if (var3 == 2) {
var5.rotateY180();
} else if (var3 == 3) {
var5.rotateY270Ccw();
}
return var5;
}
@ObfuscatedName("b")
@@ -304,11 +302,10 @@ public class SequenceDefinition extends DualNode {
var2 &= 65535;
if (var3 == null) {
return var1.toSharedSpotAnimationModel(true);
} else {
Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2));
var4.animate(var3, var2);
return var4;
}
Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2));
var4.animate(var3, var2);
return var4;
}
@ObfuscatedName("i")
@@ -323,21 +320,19 @@ public class SequenceDefinition extends DualNode {
var2 &= 65535;
if (var5 == null) {
return var3.transformActorModel(var1, var4);
} else {
var4 = var3.frameIds[var4];
Frames var6 = class30.getFrames(var4 >> 16);
var4 &= 65535;
Model var7;
if (var6 == null) {
var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2));
var7.animate(var5, var2);
return var7;
} else {
var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4));
var7.animate2(var5, var2, var6, var4, this.field3518);
return var7;
}
}
var4 = var3.frameIds[var4];
Frames var6 = class30.getFrames(var4 >> 16);
var4 &= 65535;
Model var7;
if (var6 == null) {
var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2));
var7.animate(var5, var2);
return var7;
}
var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4));
var7.animate2(var5, var2, var6, var4, this.field3518);
return var7;
}
@ObfuscatedName("c")
@@ -352,26 +347,24 @@ public class SequenceDefinition extends DualNode {
var3 &= 65535;
if (var4 == null) {
return var1.toSharedSequenceModel(true);
} else {
Frames var5 = null;
int var6 = 0;
if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) {
var6 = this.chatFrameIds[var2];
var5 = class30.getFrames(var6 >> 16);
var6 &= 65535;
}
Model var7;
if (var5 != null && var6 != 65535) {
var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6));
var7.animate(var4, var3);
var7.animate(var5, var6);
return var7;
} else {
var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3));
var7.animate(var4, var3);
return var7;
}
}
Frames var5 = null;
int var6 = 0;
if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) {
var6 = this.chatFrameIds[var2];
var5 = class30.getFrames(var6 >> 16);
var6 &= 65535;
}
Model var7;
if (var5 != null && var6 != 65535) {
var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6));
var7.animate(var4, var3);
var7.animate(var5, var6);
return var7;
}
var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3));
var7.animate(var4, var3);
return var7;
}
}

161
runescape-client/src/main/java/Skeleton.java
View File

@@ -150,90 +150,87 @@ public class Skeleton extends Node {
int var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2];
if (var4 == 0) {
throw new RuntimeException();
} else {
Widget var6 = class80.getWidget(var3);
if (var6.children == null) {
var6.children = new Widget[var5 + 1];
}
if (var6.children.length <= var5) {
Widget[] var7 = new Widget[var5 + 1];
for (int var8 = 0; var8 < var6.children.length; ++var8) {
var7[var8] = var6.children[var8];
}
var6.children = var7;
}
if (var5 > 0 && var6.children[var5 - 1] == null) {
throw new RuntimeException("" + (var5 - 1));
} else {
Widget var12 = new Widget();
var12.type = var4;
var12.parentId = var12.id = var6.id;
var12.childIndex = var5;
var12.isIf3 = true;
var6.children[var5] = var12;
if (var2) {
Interpreter.field1111 = var12;
} else {
Calendar.field2507 = var12;
}
Strings.method4120(var6);
return 1;
}
}
} else {
Widget var9;
if (var0 == ScriptOpcodes.CC_DELETE) {
var9 = var2 ? Interpreter.field1111 : Calendar.field2507;
Widget var10 = class80.getWidget(var9.id);
var10.children[var9.childIndex] = null;
Strings.method4120(var10);
return 1;
} else if (var0 == ScriptOpcodes.CC_DELETEALL) {
var9 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
var9.children = null;
Strings.method4120(var9);
return 1;
} else if (var0 != ScriptOpcodes.CC_FIND) {
if (var0 == ScriptOpcodes.IF_FIND) {
var9 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
if (var9 != null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1;
if (var2) {
Interpreter.field1111 = var9;
} else {
Calendar.field2507 = var9;
}
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
}
return 1;
} else {
return 2;
}
} else {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
Widget var11 = Client.getWidgetChild(var3, var4);
if (var11 != null && var4 != -1) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1;
if (var2) {
Interpreter.field1111 = var11;
} else {
Calendar.field2507 = var11;
}
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
}
return 1;
Widget var6 = class80.getWidget(var3);
if (var6.children == null) {
var6.children = new Widget[var5 + 1];
}
if (var6.children.length <= var5) {
Widget[] var7 = new Widget[var5 + 1];
for (int var8 = 0; var8 < var6.children.length; ++var8) {
var7[var8] = var6.children[var8];
}
var6.children = var7;
}
if (var5 > 0 && var6.children[var5 - 1] == null) {
throw new RuntimeException("" + (var5 - 1));
}
Widget var12 = new Widget();
var12.type = var4;
var12.parentId = var12.id = var6.id;
var12.childIndex = var5;
var12.isIf3 = true;
var6.children[var5] = var12;
if (var2) {
Interpreter.field1111 = var12;
} else {
Calendar.field2507 = var12;
}
Strings.method4120(var6);
return 1;
}
Widget var9;
if (var0 == ScriptOpcodes.CC_DELETE) {
var9 = var2 ? Interpreter.field1111 : Calendar.field2507;
Widget var10 = class80.getWidget(var9.id);
var10.children[var9.childIndex] = null;
Strings.method4120(var10);
return 1;
}
if (var0 == ScriptOpcodes.CC_DELETEALL) {
var9 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
var9.children = null;
Strings.method4120(var9);
return 1;
}
if (var0 == ScriptOpcodes.CC_FIND) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
Widget var11 = Client.getWidgetChild(var3, var4);
if (var11 != null && var4 != -1) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1;
if (var2) {
Interpreter.field1111 = var11;
} else {
Calendar.field2507 = var11;
}
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
}
return 1;
}
if (var0 == ScriptOpcodes.IF_FIND) {
var9 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
if (var9 != null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1;
if (var2) {
Interpreter.field1111 = var9;
} else {
Calendar.field2507 = var9;
}
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
}
return 1;
}
return 2;
}
}

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

@@ -60,22 +60,21 @@ public class SoundCache {
RawSound var7 = (RawSound)this.rawSounds.get(var5);
if (var7 != null) {
return var7;
} else if (var3 != null && var3[0] <= 0) {
return null;
} else {
SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2);
if (var8 == null) {
return null;
} else {
var7 = var8.toRawSound();
this.rawSounds.put(var7, var5);
if (var3 != null) {
var3[0] -= var7.samples.length;
}
return var7;
}
}
if (var3 != null && var3[0] <= 0) {
return null;
}
SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2);
if (var8 == null) {
return null;
}
var7 = var8.toRawSound();
this.rawSounds.put(var7, var5);
if (var3 != null) {
var3[0] -= var7.samples.length;
}
return var7;
}
@ObfuscatedName("w")
@@ -91,28 +90,27 @@ public class SoundCache {
RawSound var7 = (RawSound)this.rawSounds.get(var5);
if (var7 != null) {
return var7;
} else if (var3 != null && var3[0] <= 0) {
return null;
} else {
VorbisSample var8 = (VorbisSample)this.musicSamples.get(var5);
if (var8 == null) {
var8 = VorbisSample.readMusicSample(this.musicSampleIndex, var1, var2);
if (var8 == null) {
return null;
}
this.musicSamples.put(var8, var5);
}
var7 = var8.toRawSound(var3);
if (var7 == null) {
return null;
} else {
var8.remove();
this.rawSounds.put(var7, var5);
return var7;
}
}
if (var3 != null && var3[0] <= 0) {
return null;
}
VorbisSample var8 = (VorbisSample)this.musicSamples.get(var5);
if (var8 == null) {
var8 = VorbisSample.readMusicSample(this.musicSampleIndex, var1, var2);
if (var8 == null) {
return null;
}
this.musicSamples.put(var8, var5);
}
var7 = var8.toRawSound(var3);
if (var7 == null) {
return null;
}
var8.remove();
this.rawSounds.put(var7, var5);
return var7;
}
@ObfuscatedName("e")
@@ -124,11 +122,11 @@ public class SoundCache {
public RawSound getSoundEffect(int var1, int[] var2) {
if (this.soundEffectIndex.getGroupCount() == 1) {
return this.getSoundEffect0(0, var1, var2);
} else if (this.soundEffectIndex.getGroupFileCount(var1) == 1) {
return this.getSoundEffect0(var1, 0, var2);
} else {
throw new RuntimeException();
}
if (this.soundEffectIndex.getGroupFileCount(var1) == 1) {
return this.getSoundEffect0(var1, 0, var2);
}
throw new RuntimeException();
}
@ObfuscatedName("p")
@@ -140,11 +138,11 @@ public class SoundCache {
public RawSound getMusicSample(int var1, int[] var2) {
if (this.musicSampleIndex.getGroupCount() == 1) {
return this.getMusicSample0(0, var1, var2);
} else if (this.musicSampleIndex.getGroupFileCount(var1) == 1) {
return this.getMusicSample0(var1, 0, var2);
} else {
throw new RuntimeException();
}
if (this.musicSampleIndex.getGroupFileCount(var1) == 1) {
return this.getMusicSample0(var1, 0, var2);
}
throw new RuntimeException();
}
@ObfuscatedName("eb")

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

@@ -78,9 +78,8 @@ public class SoundEffect {
}
return var1;
} else {
return 0;
}
return 0;
}
@ObfuscatedName("p")
@@ -97,29 +96,28 @@ public class SoundEffect {
if (var1 == 0) {
return new byte[0];
} else {
var2 = var1 * 22050 / 1000;
byte[] var3 = new byte[var2];
}
var2 = var1 * 22050 / 1000;
byte[] var3 = new byte[var2];
for (int var4 = 0; var4 < 10; ++var4) {
if (this.instruments[var4] != null) {
int var5 = this.instruments[var4].duration * 22050 / 1000;
int var6 = this.instruments[var4].offset * 22050 / 1000;
int[] var7 = this.instruments[var4].synthesize(var5, this.instruments[var4].duration);
for (int var4 = 0; var4 < 10; ++var4) {
if (this.instruments[var4] != null) {
int var5 = this.instruments[var4].duration * 22050 / 1000;
int var6 = this.instruments[var4].offset * 22050 / 1000;
int[] var7 = this.instruments[var4].synthesize(var5, this.instruments[var4].duration);
for (int var8 = 0; var8 < var5; ++var8) {
int var9 = (var7[var8] >> 8) + var3[var8 + var6];
if ((var9 + 128 & -256) != 0) {
var9 = var9 >> 31 ^ 127;
}
var3[var8 + var6] = (byte)var9;
for (int var8 = 0; var8 < var5; ++var8) {
int var9 = (var7[var8] >> 8) + var3[var8 + var6];
if ((var9 + 128 & -256) != 0) {
var9 = var9 >> 31 ^ 127;
}
var3[var8 + var6] = (byte)var9;
}
}
return var3;
}
return var3;
}
@ObfuscatedName("q")

4
runescape-client/src/main/java/class326.java → runescape-client/src/main/java/SpriteBuffer.java
View File

@@ -2,12 +2,14 @@ import java.awt.Desktop;
import java.awt.Desktop.Action;
import java.net.URI;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("lm")
public class class326 {
@Implements("SpriteBuffer")
public class SpriteBuffer {
@ObfuscatedName("q")
@ObfuscatedGetter(
intValue = -180195353

71
runescape-client/src/main/java/StructDefinition.java
View File

@@ -427,52 +427,51 @@ public class StructDefinition extends DualNode {
if (var1 > Client.npcCount) {
throw new RuntimeException("");
} else {
Client.npcCount = 0;
}
Client.npcCount = 0;
for (var2 = 0; var2 < var1; ++var2) {
int var3 = Client.npcIndices[var2];
NPC var4 = Client.npcs[var3];
int var5 = var0.readBits(1);
if (var5 == 0) {
for (var2 = 0; var2 < var1; ++var2) {
int var3 = Client.npcIndices[var2];
NPC var4 = Client.npcs[var3];
int var5 = var0.readBits(1);
if (var5 == 0) {
Client.npcIndices[++Client.npcCount - 1] = var3;
var4.npcCycle = Client.cycle;
} else {
int var6 = var0.readBits(2);
if (var6 == 0) {
Client.npcIndices[++Client.npcCount - 1] = var3;
var4.npcCycle = Client.cycle;
Client.field859[++Client.field697 - 1] = var3;
} else {
int var6 = var0.readBits(2);
if (var6 == 0) {
int var7;
int var8;
if (var6 == 1) {
Client.npcIndices[++Client.npcCount - 1] = var3;
var4.npcCycle = Client.cycle;
Client.field859[++Client.field697 - 1] = var3;
} else {
int var7;
int var8;
if (var6 == 1) {
Client.npcIndices[++Client.npcCount - 1] = var3;
var4.npcCycle = Client.cycle;
var7 = var0.readBits(3);
var4.method1974(var7, (byte)1);
var8 = var0.readBits(1);
if (var8 == 1) {
Client.field859[++Client.field697 - 1] = var3;
}
} else if (var6 == 2) {
Client.npcIndices[++Client.npcCount - 1] = var3;
var4.npcCycle = Client.cycle;
var7 = var0.readBits(3);
var4.method1974(var7, (byte)2);
var8 = var0.readBits(3);
var4.method1974(var8, (byte)2);
int var9 = var0.readBits(1);
if (var9 == 1) {
Client.field859[++Client.field697 - 1] = var3;
}
} else if (var6 == 3) {
Client.field776[++Client.field775 - 1] = var3;
var7 = var0.readBits(3);
var4.method1974(var7, (byte)1);
var8 = var0.readBits(1);
if (var8 == 1) {
Client.field859[++Client.field697 - 1] = var3;
}
} else if (var6 == 2) {
Client.npcIndices[++Client.npcCount - 1] = var3;
var4.npcCycle = Client.cycle;
var7 = var0.readBits(3);
var4.method1974(var7, (byte)2);
var8 = var0.readBits(3);
var4.method1974(var8, (byte)2);
int var9 = var0.readBits(1);
if (var9 == 1) {
Client.field859[++Client.field697 - 1] = var3;
}
} else if (var6 == 3) {
Client.field776[++Client.field775 - 1] = var3;
}
}
}
}
}
}

26
runescape-client/src/main/java/StudioGame.java
View File

@@ -74,19 +74,8 @@ public enum StudioGame implements Enumerated {
if (var0 == ScriptOpcodes.CC_GETTARGETMASK) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = HealthBar.method1957(class268.getWidgetClickMask(var3));
return 1;
} else if (var0 != ScriptOpcodes.CC_GETOP) {
if (var0 == ScriptOpcodes.CC_GETOPBASE) {
if (var3.dataText == null) {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
} else {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.dataText;
}
return 1;
} else {
return 2;
}
} else {
}
if (var0 == ScriptOpcodes.CC_GETOP) {
int var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
--var4;
if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) {
@@ -97,5 +86,16 @@ public enum StudioGame implements Enumerated {
return 1;
}
if (var0 == ScriptOpcodes.CC_GETOPBASE) {
if (var3.dataText == null) {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
} else {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.dataText;
}
return 1;
}
return 2;
}
}

Some files were not shown because too many files have changed in this diff Show More