diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java
index 246ec924b4..40632f8838 100644
--- a/runescape-client/src/main/java/AbstractByteArrayCopier.java
+++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java
@@ -16,10 +16,6 @@ public abstract class AbstractByteArrayCopier {
@Export("__gu_et")
static IndexCache __gu_et;
- static {
- directBufferUnavailable = false;
- }
-
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(I)[B",
@@ -63,30 +59,29 @@ public abstract class AbstractByteArrayCopier {
garbageValue = "-1941491045"
)
public static void method4023(int var0) {
- if(var0 != -1) {
- if(Widget.loadedWidgetGroups[var0]) {
- Widget.Widget_indexCache.__h_399(var0);
- if(Widget.widgets[var0] != null) {
- boolean var1 = true;
+ if(var0 != -1 && Widget.loadedWidgetGroups[var0]) {
+ Widget.Widget_indexCache.__h_399(var0);
+ if(Widget.widgets[var0] != null) {
+ boolean var1 = true;
- for(int var2 = 0; var2 < Widget.widgets[var0].length; ++var2) {
- if(Widget.widgets[var0][var2] != null) {
- if(Widget.widgets[var0][var2].type != 2) {
- Widget.widgets[var0][var2] = null;
- } else {
- var1 = false;
- }
+ for(int var2 = 0; var2 < Widget.widgets[var0].length; ++var2) {
+ if(Widget.widgets[var0][var2] != null) {
+ if(Widget.widgets[var0][var2].type != 2) {
+ Widget.widgets[var0][var2] = null;
+ } else {
+ var1 = false;
}
}
-
- if(var1) {
- Widget.widgets[var0] = null;
- }
-
- Widget.loadedWidgetGroups[var0] = false;
}
+
+ if(var1) {
+ Widget.widgets[var0] = null;
+ }
+
+ Widget.loadedWidgetGroups[var0] = false;
}
}
+
}
@ObfuscatedName("gb")
@@ -101,4 +96,8 @@ public abstract class AbstractByteArrayCopier {
var0.packetBuffer.writeShort(Huffman.canvasHeight);
Client.packetWriter.__q_167(var0);
}
+
+ static {
+ directBufferUnavailable = false;
+ }
}
diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java
index c78e90518f..4cfdbe2a0e 100644
--- a/runescape-client/src/main/java/AbstractFont.java
+++ b/runescape-client/src/main/java/AbstractFont.java
@@ -77,20 +77,6 @@ public abstract class AbstractFont extends Rasterizer2D {
@Export("kerning")
byte[] kerning;
- static {
- AbstractFont_strike = -1;
- AbstractFont_underline = -1;
- AbstractFont_previousShadow = -1;
- AbstractFont_shadow = -1;
- AbstractFont_previousColor = 0;
- AbstractFont_color = 0;
- AbstractFont_alpha = 256;
- AbstractFont_justificationTotal = 0;
- AbstractFont_justificationCurrent = 0;
- AbstractFont_random = new Random();
- AbstractFont_lines = new String[100];
- }
-
AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) {
this.pixels = new byte[256][];
this.ascent = 0;
@@ -149,57 +135,57 @@ public abstract class AbstractFont extends Rasterizer2D {
this.advances[var3] = var1[var2++] & 255;
}
- int[] var10 = new int[256];
+ int[] var12 = new int[256];
int[] var4 = new int[256];
int var5;
for(var5 = 0; var5 < 256; ++var5) {
- var10[var5] = var1[var2++] & 255;
+ var12[var5] = var1[var2++] & 255;
}
for(var5 = 0; var5 < 256; ++var5) {
var4[var5] = var1[var2++] & 255;
}
- byte[][] var11 = new byte[256][];
+ byte[][] var6 = new byte[256][];
- int var8;
- for(int var6 = 0; var6 < 256; ++var6) {
- var11[var6] = new byte[var10[var6]];
- byte var7 = 0;
+ int var7;
+ for(int var8 = 0; var8 < 256; ++var8) {
+ var6[var8] = new byte[var12[var8]];
+ byte var9 = 0;
- for(var8 = 0; var8 < var11[var6].length; ++var8) {
- var7 += var1[var2++];
- var11[var6][var8] = var7;
+ for(var7 = 0; var7 < var6[var8].length; ++var7) {
+ var9 += var1[var2++];
+ var6[var8][var7] = var9;
}
}
- byte[][] var12 = new byte[256][];
+ byte[][] var13 = new byte[256][];
- int var13;
- for(var13 = 0; var13 < 256; ++var13) {
- var12[var13] = new byte[var10[var13]];
- byte var14 = 0;
+ int var14;
+ for(var14 = 0; var14 < 256; ++var14) {
+ var13[var14] = new byte[var12[var14]];
+ byte var10 = 0;
- for(int var9 = 0; var9 < var12[var13].length; ++var9) {
- var14 += var1[var2++];
- var12[var13][var9] = var14;
+ for(int var11 = 0; var11 < var13[var14].length; ++var11) {
+ var10 += var1[var2++];
+ var13[var14][var11] = var10;
}
}
this.kerning = new byte[65536];
- for(var13 = 0; var13 < 256; ++var13) {
- if(var13 != 32 && var13 != 160) {
- for(var8 = 0; var8 < 256; ++var8) {
- if(var8 != 32 && var8 != 160) {
- this.kerning[var8 + (var13 << 8)] = (byte)method5658(var11, var12, var4, this.advances, var10, var13, var8);
+ for(var14 = 0; var14 < 256; ++var14) {
+ if(var14 != 32 && var14 != 160) {
+ for(var7 = 0; var7 < 256; ++var7) {
+ if(var7 != 32 && var7 != 160) {
+ this.kerning[var7 + (var14 << 8)] = (byte)method5658(var6, var13, var4, this.advances, var12, var14, var7);
}
}
}
}
- this.ascent = var4[32] + var10[32];
+ this.ascent = var4[32] + var12[32];
}
}
@@ -241,7 +227,7 @@ public abstract class AbstractFont extends Rasterizer2D {
int var8 = MouseHandler.method1085(var7.substring(4));
var4 += AbstractFont_modIconSprites[var8].width;
var3 = -1;
- } catch (Exception var10) {
+ } catch (Exception var9) {
;
}
}
@@ -325,7 +311,7 @@ public abstract class AbstractFont extends Rasterizer2D {
int var17 = MouseHandler.method1085(var16.substring(4));
var4 += AbstractFont_modIconSprites[var17].width;
var11 = 0;
- } catch (Exception var20) {
+ } catch (Exception var18) {
;
}
}
@@ -406,6 +392,7 @@ public abstract class AbstractFont extends Rasterizer2D {
this.reset(var4, var5);
this.draw0(var1, var2, var3);
}
+
}
@ObfuscatedName("y")
@@ -416,6 +403,7 @@ public abstract class AbstractFont extends Rasterizer2D {
AbstractFont_alpha = var6;
this.draw0(var1, var2, var3);
}
+
}
@ObfuscatedName("h")
@@ -425,6 +413,7 @@ public abstract class AbstractFont extends Rasterizer2D {
this.reset(var4, var5);
this.draw0(var1, var2 - this.stringWidth(var1), var3);
}
+
}
@ObfuscatedName("b")
@@ -434,6 +423,7 @@ public abstract class AbstractFont extends Rasterizer2D {
this.reset(var4, var5);
this.draw0(var1, var2 - this.stringWidth(var1) / 2, var3);
}
+
}
@ObfuscatedName("c")
@@ -510,6 +500,7 @@ public abstract class AbstractFont extends Rasterizer2D {
this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var7);
}
+
}
@ObfuscatedName("v")
@@ -527,6 +518,7 @@ public abstract class AbstractFont extends Rasterizer2D {
this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8);
}
+
}
@ObfuscatedName("ag")
@@ -547,6 +539,7 @@ public abstract class AbstractFont extends Rasterizer2D {
this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var10);
}
+
}
@ObfuscatedName("aq")
@@ -568,6 +561,7 @@ public abstract class AbstractFont extends Rasterizer2D {
this.drawWithOffsets0(var1, var2, var3, var7, (int[])null);
}
+
}
@ObfuscatedName("aj")
@@ -655,26 +649,26 @@ public abstract class AbstractFont extends Rasterizer2D {
if(var7 == '<') {
var4 = var6;
} else {
- int var9;
+ int var8;
if(var7 == '>' && var4 != -1) {
- String var8 = var1.substring(var4 + 1, var6);
+ String var9 = var1.substring(var4 + 1, var6);
var4 = -1;
- if(var8.equals("lt")) {
+ if(var9.equals("lt")) {
var7 = '<';
} else {
- if(!var8.equals("gt")) {
- if(var8.startsWith("img=")) {
+ if(!var9.equals("gt")) {
+ if(var9.startsWith("img=")) {
try {
- var9 = MouseHandler.method1085(var8.substring(4));
- IndexedSprite var10 = AbstractFont_modIconSprites[var9];
- var10.__q_496(var2, var3 + this.ascent - var10.height);
- var2 += var10.width;
+ var8 = MouseHandler.method1085(var9.substring(4));
+ IndexedSprite var13 = AbstractFont_modIconSprites[var8];
+ var13.__q_496(var2, var3 + this.ascent - var13.height);
+ var2 += var13.width;
var5 = -1;
- } catch (Exception var14) {
+ } catch (Exception var11) {
;
}
} else {
- this.decodeTag(var8);
+ this.decodeTag(var9);
}
continue;
}
@@ -693,20 +687,20 @@ public abstract class AbstractFont extends Rasterizer2D {
}
int var12 = this.widths[var7];
- var9 = this.heights[var7];
+ var8 = this.heights[var7];
if(var7 != ' ') {
if(AbstractFont_alpha == 256) {
if(AbstractFont_shadow != -1) {
- AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow);
+ AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow);
}
- this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color);
+ this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var8, AbstractFont_color);
} else {
if(AbstractFont_shadow != -1) {
- AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow, AbstractFont_alpha);
+ AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow, AbstractFont_alpha);
}
- this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha);
+ this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var8, AbstractFont_color, AbstractFont_alpha);
}
} else if(AbstractFont_justificationTotal > 0) {
AbstractFont_justificationCurrent += AbstractFont_justificationTotal;
@@ -714,16 +708,16 @@ public abstract class AbstractFont extends Rasterizer2D {
AbstractFont_justificationCurrent &= 255;
}
- int var13 = this.advances[var7];
+ int var10 = this.advances[var7];
if(AbstractFont_strike != -1) {
- Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike);
+ Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var10, AbstractFont_strike);
}
if(AbstractFont_underline != -1) {
- Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline);
+ Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var10, AbstractFont_underline);
}
- var2 += var13;
+ var2 += var10;
var5 = var7;
}
}
@@ -746,41 +740,41 @@ public abstract class AbstractFont extends Rasterizer2D {
if(var10 == '<') {
var6 = var9;
} else {
+ int var11;
int var12;
int var13;
- int var14;
if(var10 == '>' && var6 != -1) {
- String var11 = var1.substring(var6 + 1, var9);
+ String var14 = var1.substring(var6 + 1, var9);
var6 = -1;
- if(var11.equals("lt")) {
+ if(var14.equals("lt")) {
var10 = '<';
} else {
- if(!var11.equals("gt")) {
- if(var11.startsWith("img=")) {
+ if(!var14.equals("gt")) {
+ if(var14.startsWith("img=")) {
try {
if(var4 != null) {
- var12 = var4[var8];
+ var11 = var4[var8];
+ } else {
+ var11 = 0;
+ }
+
+ if(var5 != null) {
+ var12 = var5[var8];
} else {
var12 = 0;
}
- if(var5 != null) {
- var13 = var5[var8];
- } else {
- var13 = 0;
- }
-
++var8;
- var14 = MouseHandler.method1085(var11.substring(4));
- IndexedSprite var15 = AbstractFont_modIconSprites[var14];
- var15.__q_496(var12 + var2, var13 + (var3 + this.ascent - var15.height));
- var2 += var15.width;
+ var13 = MouseHandler.method1085(var14.substring(4));
+ IndexedSprite var18 = AbstractFont_modIconSprites[var13];
+ var18.__q_496(var11 + var2, var12 + (var3 + this.ascent - var18.height));
+ var2 += var18.width;
var7 = -1;
- } catch (Exception var19) {
+ } catch (Exception var16) {
;
}
} else {
- this.decodeTag(var11);
+ this.decodeTag(var14);
}
continue;
}
@@ -799,33 +793,33 @@ public abstract class AbstractFont extends Rasterizer2D {
}
int var17 = this.widths[var10];
- var12 = this.heights[var10];
+ var11 = this.heights[var10];
if(var4 != null) {
- var13 = var4[var8];
+ var12 = var4[var8];
} else {
- var13 = 0;
+ var12 = 0;
}
if(var5 != null) {
- var14 = var5[var8];
+ var13 = var5[var8];
} else {
- var14 = 0;
+ var13 = 0;
}
++var8;
if(var10 != ' ') {
if(AbstractFont_alpha == 256) {
if(AbstractFont_shadow != -1) {
- AbstractFont_drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow);
+ AbstractFont_drawGlyph(this.pixels[var10], var12 + var2 + this.leftBearings[var10] + 1, var3 + var13 + this.topBearings[var10] + 1, var17, var11, AbstractFont_shadow);
}
- this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color);
+ this.drawGlyph(this.pixels[var10], var12 + var2 + this.leftBearings[var10], var3 + var13 + this.topBearings[var10], var17, var11, AbstractFont_color);
} else {
if(AbstractFont_shadow != -1) {
- AbstractFont_drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow, AbstractFont_alpha);
+ AbstractFont_drawGlyphAlpha(this.pixels[var10], var12 + var2 + this.leftBearings[var10] + 1, var3 + var13 + this.topBearings[var10] + 1, var17, var11, AbstractFont_shadow, AbstractFont_alpha);
}
- this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha);
+ this.drawGlyphAlpha(this.pixels[var10], var12 + var2 + this.leftBearings[var10], var3 + var13 + this.topBearings[var10], var17, var11, AbstractFont_color, AbstractFont_alpha);
}
} else if(AbstractFont_justificationTotal > 0) {
AbstractFont_justificationCurrent += AbstractFont_justificationTotal;
@@ -833,16 +827,16 @@ public abstract class AbstractFont extends Rasterizer2D {
AbstractFont_justificationCurrent &= 255;
}
- int var18 = this.advances[var10];
+ int var15 = this.advances[var10];
if(AbstractFont_strike != -1) {
- Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike);
+ Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var15, AbstractFont_strike);
}
if(AbstractFont_underline != -1) {
- Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline);
+ Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var15, AbstractFont_underline);
}
- var2 += var18;
+ var2 += var15;
var7 = var10;
}
}
@@ -956,6 +950,7 @@ public abstract class AbstractFont extends Rasterizer2D {
if(var3 > 0 && var4 > 0) {
AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8);
}
+
}
@ObfuscatedName("ak")
@@ -1046,6 +1041,7 @@ public abstract class AbstractFont extends Rasterizer2D {
if(var3 > 0 && var4 > 0) {
AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6);
}
+
}
@ObfuscatedName("al")
@@ -1069,4 +1065,18 @@ public abstract class AbstractFont extends Rasterizer2D {
}
}
+
+ static {
+ AbstractFont_strike = -1;
+ AbstractFont_underline = -1;
+ AbstractFont_previousShadow = -1;
+ AbstractFont_shadow = -1;
+ AbstractFont_previousColor = 0;
+ AbstractFont_color = 0;
+ AbstractFont_alpha = 256;
+ AbstractFont_justificationTotal = 0;
+ AbstractFont_justificationCurrent = 0;
+ AbstractFont_random = new Random();
+ AbstractFont_lines = new String[100];
+ }
}
diff --git a/runescape-client/src/main/java/AbstractIndexCache.java b/runescape-client/src/main/java/AbstractIndexCache.java
index bfd06c03eb..db70925935 100644
--- a/runescape-client/src/main/java/AbstractIndexCache.java
+++ b/runescape-client/src/main/java/AbstractIndexCache.java
@@ -99,11 +99,6 @@ public abstract class AbstractIndexCache {
@Export("shallowRecords")
boolean shallowRecords;
- static {
- gzipDecompressor = new GzipDecompressor();
- __ir_s = 0;
- }
-
AbstractIndexCache(boolean var1, boolean var2) {
this.releaseArchives = var1;
this.shallowRecords = var2;
@@ -549,63 +544,63 @@ public abstract class AbstractIndexCache {
var8.xteaDecrypt(var2, 5, var8.array.length);
}
- byte[] var20 = Strings.decompressBytes(var18);
+ byte[] var19 = Strings.decompressBytes(var18);
if(this.releaseArchives) {
this.archives[var1] = null;
}
if(var3 > 1) {
- int var9 = var20.length;
+ int var9 = var19.length;
--var9;
- int var10 = var20[var9] & 255;
+ int var10 = var19[var9] & 255;
var9 -= var10 * var3 * 4;
- Buffer var11 = new Buffer(var20);
+ Buffer var11 = new Buffer(var19);
int[] var12 = new int[var3];
var11.index = var9;
+ int var13;
int var14;
- int var15;
- for(int var13 = 0; var13 < var10; ++var13) {
- var14 = 0;
+ for(int var15 = 0; var15 < var10; ++var15) {
+ var13 = 0;
- for(var15 = 0; var15 < var3; ++var15) {
- var14 += var11.readInt();
- var12[var15] += var14;
+ for(var14 = 0; var14 < var3; ++var14) {
+ var13 += var11.readInt();
+ var12[var14] += var13;
}
}
- byte[][] var19 = new byte[var3][];
+ byte[][] var20 = new byte[var3][];
- for(var14 = 0; var14 < var3; ++var14) {
- var19[var14] = new byte[var12[var14]];
- var12[var14] = 0;
+ for(var13 = 0; var13 < var3; ++var13) {
+ var20[var13] = new byte[var12[var13]];
+ var12[var13] = 0;
}
var11.index = var9;
- var14 = 0;
+ var13 = 0;
- for(var15 = 0; var15 < var10; ++var15) {
+ for(var14 = 0; var14 < var10; ++var14) {
int var16 = 0;
for(int var17 = 0; var17 < var3; ++var17) {
var16 += var11.readInt();
- System.arraycopy(var20, var14, var19[var17], var12[var17], var16);
+ System.arraycopy(var19, var13, var20[var17], var12[var17], var16);
var12[var17] += var16;
- var14 += var16;
+ var13 += var16;
}
}
- for(var15 = 0; var15 < var3; ++var15) {
+ for(var14 = 0; var14 < var3; ++var14) {
if(!this.shallowRecords) {
- var5[var4[var15]] = Projectile.byteArrayToObject(var19[var15], false);
+ var5[var4[var14]] = Projectile.byteArrayToObject(var20[var14], false);
} else {
- var5[var4[var15]] = var19[var15];
+ var5[var4[var14]] = var20[var14];
}
}
} else if(!this.shallowRecords) {
- var5[var4[0]] = Projectile.byteArrayToObject(var20, false);
+ var5[var4[0]] = Projectile.byteArrayToObject(var19, false);
} else {
- var5[var4[0]] = var20;
+ var5[var4[0]] = var19;
}
return true;
@@ -705,6 +700,7 @@ public abstract class AbstractIndexCache {
if(var2 >= 0) {
this.__f_392(var2);
}
+
}
@ObfuscatedName("ac")
@@ -780,4 +776,9 @@ public abstract class AbstractIndexCache {
return true;
}
}
+
+ static {
+ gzipDecompressor = new GzipDecompressor();
+ __ir_s = 0;
+ }
}
diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java
index c487caa190..0600bbfa40 100644
--- a/runescape-client/src/main/java/AbstractWorldMapIcon.java
+++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java
@@ -115,10 +115,11 @@ public abstract class AbstractWorldMapIcon {
int var5 = this.__w_18();
switch(var3.field3287.field3528) {
case 0:
- if(var1 < this.__e - var4 / 2 || var1 > var4 / 2 + this.__e) {
- return false;
+ if(var1 >= this.__e - var4 / 2 && var1 <= var4 / 2 + this.__e) {
+ break;
}
- break;
+
+ return false;
case 1:
if(var1 >= this.__e && var1 < var4 + this.__e) {
break;
diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java
index 4e6b943df3..1823aaac18 100644
--- a/runescape-client/src/main/java/Actor.java
+++ b/runescape-client/src/main/java/Actor.java
@@ -480,6 +480,7 @@ public abstract class Actor extends Entity {
this.hitSplatValues2[var9] = var4;
this.hitSplatCycles[var9] = var5 + var11 + var6;
}
+
}
@ObfuscatedName("bq")
@@ -489,36 +490,36 @@ public abstract class Actor extends Entity {
)
@Export("addHealthBar")
final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) {
- HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1);
- HealthBarDefinition var7;
- if(var8 != null) {
- var7 = var8;
+ HealthBarDefinition var7 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1);
+ HealthBarDefinition var8;
+ if(var7 != null) {
+ var8 = var7;
} else {
byte[] var9 = HealthBarDefinition.__ii_m.takeRecord(33, var1);
- var8 = new HealthBarDefinition();
+ var7 = new HealthBarDefinition();
if(var9 != null) {
- var8.read(new Buffer(var9));
+ var7.read(new Buffer(var9));
}
- HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1);
- var7 = var8;
+ HealthBarDefinition.HealthBarDefinition_cached.put(var7, (long)var1);
+ var8 = var7;
}
- var8 = var7;
+ var7 = var8;
HealthBar var14 = null;
HealthBar var10 = null;
- int var11 = var7.int2;
+ int var11 = var8.int2;
int var12 = 0;
HealthBar var13;
for(var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) {
++var12;
- if(var13.definition.__o == var8.__o) {
+ if(var13.definition.__o == var7.__o) {
var13.put(var2 + var4, var5, var6, var3);
return;
}
- if(var13.definition.int1 <= var8.int1) {
+ if(var13.definition.int1 <= var7.int1) {
var14 = var13;
}
@@ -529,7 +530,7 @@ public abstract class Actor extends Entity {
}
if(var10 != null || var12 < 4) {
- var13 = new HealthBar(var8);
+ var13 = new HealthBar(var7);
if(var14 == null) {
this.healthBars.addLast(var13);
} else {
@@ -540,8 +541,8 @@ public abstract class Actor extends Entity {
if(var12 >= 4) {
var10.remove();
}
-
}
+
}
@ObfuscatedName("bn")
@@ -551,25 +552,25 @@ public abstract class Actor extends Entity {
)
@Export("removeHealthBar")
final void removeHealthBar(int var1) {
- HealthBarDefinition var3 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1);
- HealthBarDefinition var2;
- if(var3 != null) {
- var2 = var3;
+ HealthBarDefinition var2 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1);
+ HealthBarDefinition var3;
+ if(var2 != null) {
+ var3 = var2;
} else {
byte[] var4 = HealthBarDefinition.__ii_m.takeRecord(33, var1);
- var3 = new HealthBarDefinition();
+ var2 = new HealthBarDefinition();
if(var4 != null) {
- var3.read(new Buffer(var4));
+ var2.read(new Buffer(var4));
}
- HealthBarDefinition.HealthBarDefinition_cached.put(var3, (long)var1);
- var2 = var3;
+ HealthBarDefinition.HealthBarDefinition_cached.put(var2, (long)var1);
+ var3 = var2;
}
- var3 = var2;
+ var2 = var3;
for(HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) {
- if(var3 == var5.definition) {
+ if(var2 == var5.definition) {
var5.remove();
return;
}
@@ -674,10 +675,10 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var8);
} else {
PacketBufferNode var9;
- Npc var13;
+ NPC var10;
if(var2 == 7) {
- var13 = Client.npcs[var3];
- if(var13 != null) {
+ var10 = Client.npcs[var3];
+ if(var10 != null) {
Client.mouseCrossX = var6;
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
@@ -693,8 +694,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9);
}
} else if(var2 == 8) {
- var13 = Client.npcs[var3];
- if(var13 != null) {
+ var10 = Client.npcs[var3];
+ if(var10 != null) {
Client.mouseCrossX = var6;
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
@@ -709,8 +710,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9);
}
} else if(var2 == 9) {
- var13 = Client.npcs[var3];
- if(var13 != null) {
+ var10 = Client.npcs[var3];
+ if(var10 != null) {
Client.mouseCrossX = var6;
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
@@ -723,8 +724,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9);
}
} else if(var2 == 10) {
- var13 = Client.npcs[var3];
- if(var13 != null) {
+ var10 = Client.npcs[var3];
+ if(var10 != null) {
Client.mouseCrossX = var6;
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
@@ -737,8 +738,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9);
}
} else if(var2 == 11) {
- var13 = Client.npcs[var3];
- if(var13 != null) {
+ var10 = Client.npcs[var3];
+ if(var10 != null) {
Client.mouseCrossX = var6;
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
@@ -751,8 +752,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9);
}
} else if(var2 == 12) {
- var13 = Client.npcs[var3];
- if(var13 != null) {
+ var10 = Client.npcs[var3];
+ if(var10 != null) {
Client.mouseCrossX = var6;
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
@@ -765,8 +766,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9);
}
} else if(var2 == 13) {
- var13 = Client.npcs[var3];
- if(var13 != null) {
+ var10 = Client.npcs[var3];
+ if(var10 != null) {
Client.mouseCrossX = var6;
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
@@ -779,10 +780,10 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9);
}
} else {
- Player var15;
+ Player var11;
if(var2 == 14) {
- var15 = Client.players[var3];
- if(var15 != null) {
+ var11 = Client.players[var3];
+ if(var11 != null) {
Client.mouseCrossX = var6;
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
@@ -798,8 +799,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9);
}
} else if(var2 == 15) {
- var15 = Client.players[var3];
- if(var15 != null) {
+ var11 = Client.players[var3];
+ if(var11 != null) {
Client.mouseCrossX = var6;
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
@@ -916,36 +917,36 @@ public abstract class Actor extends Entity {
class65.scene.menuOpen(SoundSystem.plane, var0, var1, true);
}
} else {
- PacketBufferNode var10;
- Widget var16;
+ PacketBufferNode var12;
+ Widget var13;
if(var2 == 24) {
- var16 = Huffman.getWidget(var1);
- boolean var12 = true;
- if(var16.contentType > 0) {
- var12 = ViewportMouse.method2957(var16);
+ var13 = Huffman.getWidget(var1);
+ boolean var14 = true;
+ if(var13.contentType > 0) {
+ var14 = ViewportMouse.method2957(var13);
}
- if(var12) {
- var10 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher);
- var10.packetBuffer.writeInt(var1);
- Client.packetWriter.__q_167(var10);
+ if(var14) {
+ var12 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher);
+ var12.packetBuffer.writeInt(var1);
+ Client.packetWriter.__q_167(var12);
}
} else {
if(var2 == 25) {
- var16 = class204.getWidgetChild(var1, var0);
- if(var16 != null) {
+ var13 = class204.getWidgetChild(var1, var0);
+ if(var13 != null) {
Player.method1281();
- class25.method350(var1, var0, class211.method4107(class1.getWidgetClickMask(var16)), var16.itemId);
+ class25.method350(var1, var0, class211.method4107(class1.getWidgetClickMask(var13)), var13.itemId);
Client.isItemSelected = 0;
- Client.selectedSpellActionName = class198.method3745(var16);
+ Client.selectedSpellActionName = class198.method3745(var13);
if(Client.selectedSpellActionName == null) {
Client.selectedSpellActionName = "null";
}
- if(var16.isIf3) {
- Client.selectedSpellName = var16.dataText + BufferedFile.colorStartTag(16777215);
+ if(var13.isIf3) {
+ Client.selectedSpellName = var13.dataText + BufferedFile.colorStartTag(16777215);
} else {
- Client.selectedSpellName = BufferedFile.colorStartTag(65280) + var16.spellName + BufferedFile.colorStartTag(16777215);
+ Client.selectedSpellName = BufferedFile.colorStartTag(65280) + var13.spellName + BufferedFile.colorStartTag(16777215);
}
}
@@ -955,28 +956,28 @@ public abstract class Actor extends Entity {
if(var2 == 26) {
WorldMapLabelSize.method198();
} else {
- int var11;
- Widget var14;
+ Widget var15;
+ int var17;
if(var2 == 28) {
var8 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeInt(var1);
Client.packetWriter.__q_167(var8);
- var14 = Huffman.getWidget(var1);
- if(var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) {
- var11 = var14.cs1Instructions[0][1];
- Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11];
- IndexCache.method4703(var11);
+ var15 = Huffman.getWidget(var1);
+ if(var15.cs1Instructions != null && var15.cs1Instructions[0][0] == 5) {
+ var17 = var15.cs1Instructions[0][1];
+ Varps.Varps_main[var17] = 1 - Varps.Varps_main[var17];
+ IndexCache.method4703(var17);
}
} else if(var2 == 29) {
var8 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeInt(var1);
Client.packetWriter.__q_167(var8);
- var14 = Huffman.getWidget(var1);
- if(var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) {
- var11 = var14.cs1Instructions[0][1];
- if(Varps.Varps_main[var11] != var14.cs1ComparisonValues[0]) {
- Varps.Varps_main[var11] = var14.cs1ComparisonValues[0];
- IndexCache.method4703(var11);
+ var15 = Huffman.getWidget(var1);
+ if(var15.cs1Instructions != null && var15.cs1Instructions[0][0] == 5) {
+ var17 = var15.cs1Instructions[0][1];
+ if(Varps.Varps_main[var17] != var15.cs1ComparisonValues[0]) {
+ Varps.Varps_main[var17] = var15.cs1ComparisonValues[0];
+ IndexCache.method4703(var17);
}
}
} else if(var2 == 30) {
@@ -1056,12 +1057,12 @@ public abstract class Actor extends Entity {
} else {
if(var2 == 38) {
Player.method1281();
- var16 = Huffman.getWidget(var1);
+ var13 = Huffman.getWidget(var1);
Client.isItemSelected = 1;
HealthBarDefinition.selectedItemSlot = var0;
ServerPacket.selectedItemWidget = var1;
MenuAction.selectedItemId = var3;
- class22.method295(var16);
+ class22.method295(var13);
Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(var3).name + BufferedFile.colorStartTag(16777215);
if(Client.selectedItemName == null) {
Client.selectedItemName = "null";
@@ -1116,8 +1117,8 @@ public abstract class Actor extends Entity {
BoundaryObject.__ej_jv = Huffman.getWidget(var1);
Client.__client_jz = var0;
} else if(var2 == 44) {
- var15 = Client.players[var3];
- if(var15 != null) {
+ var11 = Client.players[var3];
+ if(var11 != null) {
Client.mouseCrossX = var6;
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
@@ -1130,8 +1131,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9);
}
} else if(var2 == 45) {
- var15 = Client.players[var3];
- if(var15 != null) {
+ var11 = Client.players[var3];
+ if(var11 != null) {
Client.mouseCrossX = var6;
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
@@ -1144,8 +1145,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9);
}
} else if(var2 == 46) {
- var15 = Client.players[var3];
- if(var15 != null) {
+ var11 = Client.players[var3];
+ if(var11 != null) {
Client.mouseCrossX = var6;
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
@@ -1158,8 +1159,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9);
}
} else if(var2 == 47) {
- var15 = Client.players[var3];
- if(var15 != null) {
+ var11 = Client.players[var3];
+ if(var11 != null) {
Client.mouseCrossX = var6;
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
@@ -1172,8 +1173,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9);
}
} else if(var2 == 48) {
- var15 = Client.players[var3];
- if(var15 != null) {
+ var11 = Client.players[var3];
+ if(var11 != null) {
Client.mouseCrossX = var6;
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
@@ -1186,8 +1187,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9);
}
} else if(var2 == 49) {
- var15 = Client.players[var3];
- if(var15 != null) {
+ var11 = Client.players[var3];
+ if(var11 != null) {
Client.mouseCrossX = var6;
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
@@ -1200,8 +1201,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9);
}
} else if(var2 == 50) {
- var15 = Client.players[var3];
- if(var15 != null) {
+ var11 = Client.players[var3];
+ if(var11 != null) {
Client.mouseCrossX = var6;
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
@@ -1214,8 +1215,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9);
}
} else if(var2 == 51) {
- var15 = Client.players[var3];
- if(var15 != null) {
+ var11 = Client.players[var3];
+ if(var11 != null) {
Client.mouseCrossX = var6;
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
@@ -1228,21 +1229,21 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9);
}
} else {
- label921: {
+ label415: {
if(var2 != 57) {
if(var2 == 58) {
- var16 = class204.getWidgetChild(var1, var0);
- if(var16 != null) {
+ var13 = class204.getWidgetChild(var1, var0);
+ if(var13 != null) {
var9 = Interpreter.method1915(ClientPacket.__gs_cs, Client.packetWriter.isaacCipher);
var9.packetBuffer.writeShortLE(Client.__client_lc);
var9.packetBuffer.writeIntLE16(var1);
var9.packetBuffer.writeShortLE(Client.__client_mh);
var9.packetBuffer.__bx_323(var0);
var9.packetBuffer.writeInt(ServerBuild.__iy_lo);
- var9.packetBuffer.__bx_323(var16.itemId);
+ var9.packetBuffer.__bx_323(var13.itemId);
Client.packetWriter.__q_167(var9);
}
- break label921;
+ break label415;
}
if(var2 == 1001) {
@@ -1258,7 +1259,7 @@ public abstract class Actor extends Entity {
var8.packetBuffer.__bo_322(var0 + class50.baseX);
var8.packetBuffer.__bx_323(GraphicsObject.baseY + var1);
Client.packetWriter.__q_167(var8);
- break label921;
+ break label415;
}
if(var2 == 1002) {
@@ -1269,7 +1270,7 @@ public abstract class Actor extends Entity {
var8 = Interpreter.method1915(ClientPacket.__gs_al, Client.packetWriter.isaacCipher);
var8.packetBuffer.__bo_322(var3);
Client.packetWriter.__q_167(var8);
- break label921;
+ break label415;
}
if(var2 == 1003) {
@@ -1277,20 +1278,20 @@ public abstract class Actor extends Entity {
Client.mouseCrossY = var7;
Client.mouseCrossColor = 2;
Client.mouseCrossState = 0;
- var13 = Client.npcs[var3];
- if(var13 != null) {
- NpcDefinition var17 = var13.definition;
- if(var17.transforms != null) {
- var17 = var17.transform();
+ var10 = Client.npcs[var3];
+ if(var10 != null) {
+ NPCDefinition var16 = var10.definition;
+ if(var16.transforms != null) {
+ var16 = var16.transform();
}
- if(var17 != null) {
- var10 = Interpreter.method1915(ClientPacket.__gs_ar, Client.packetWriter.isaacCipher);
- var10.packetBuffer.__bo_322(var17.id);
- Client.packetWriter.__q_167(var10);
+ if(var16 != null) {
+ var12 = Interpreter.method1915(ClientPacket.__gs_ar, Client.packetWriter.isaacCipher);
+ var12.packetBuffer.__bo_322(var16.id);
+ Client.packetWriter.__q_167(var12);
}
}
- break label921;
+ break label415;
}
if(var2 == 1004) {
@@ -1301,13 +1302,13 @@ public abstract class Actor extends Entity {
var8 = Interpreter.method1915(ClientPacket.__gs_p, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeShortLE(var3);
Client.packetWriter.__q_167(var8);
- break label921;
+ break label415;
}
if(var2 == 1005) {
- var16 = Huffman.getWidget(var1);
- if(var16 != null && var16.itemQuantities[var0] >= 100000) {
- WorldMapIcon1.method219(27, "", var16.itemQuantities[var0] + " x " + Skills.getItemDefinition(var3).name);
+ var13 = Huffman.getWidget(var1);
+ if(var13 != null && var13.itemQuantities[var0] >= 100000) {
+ WorldMapIcon1.method219(27, "", var13.itemQuantities[var0] + " x " + Skills.getItemDefinition(var3).name);
} else {
var9 = Interpreter.method1915(ClientPacket.__gs_p, Client.packetWriter.isaacCipher);
var9.packetBuffer.writeShortLE(var3);
@@ -1317,20 +1318,20 @@ public abstract class Actor extends Entity {
Client.__client_ju = 0;
BoundaryObject.__ej_jv = Huffman.getWidget(var1);
Client.__client_jz = var0;
- break label921;
+ break label415;
}
if(var2 != 1007) {
if(var2 == 1008 || var2 == 1011 || var2 == 1010 || var2 == 1009 || var2 == 1012) {
class60.worldMap0.menuAction(var2, var3, new TileLocation(var0), new TileLocation(var1));
}
- break label921;
+ break label415;
}
}
- var16 = class204.getWidgetChild(var1, var0);
- if(var16 != null) {
- class171.method3494(var3, var1, var0, var16.itemId, var5);
+ var13 = class204.getWidgetChild(var1, var0);
+ if(var13 != null) {
+ class171.method3494(var3, var1, var0, var13.itemId, var5);
}
}
}
diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java
index a6157a7c73..6e24cbc8cd 100644
--- a/runescape-client/src/main/java/Animation.java
+++ b/runescape-client/src/main/java/Animation.java
@@ -43,13 +43,6 @@ public class Animation {
@Export("hasAlphaTransform")
boolean hasAlphaTransform;
- static {
- __dz_m = new int[500];
- __dz_f = new int[500];
- __dz_q = new int[500];
- __dz_w = new int[500];
- }
-
@ObfuscatedSignature(
signature = "([BLek;)V"
)
@@ -133,4 +126,11 @@ public class Animation {
}
}
+
+ static {
+ __dz_m = new int[500];
+ __dz_f = new int[500];
+ __dz_q = new int[500];
+ __dz_w = new int[500];
+ }
}
diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java
index 3395856851..4cd5da3cac 100644
--- a/runescape-client/src/main/java/AttackOption.java
+++ b/runescape-client/src/main/java/AttackOption.java
@@ -33,6 +33,7 @@ public enum AttackOption implements Enumerated {
)
@Export("AttackOption_hidden")
AttackOption_hidden(3);
+
@ObfuscatedName("sp")
@Export("__cj_sp")
static short[] __cj_sp;
@@ -52,7 +53,7 @@ public enum AttackOption implements Enumerated {
@Export("id")
final int id;
- AttackOption(int var3) {
+ private AttackOption(int var3) {
this.id = var3;
}
@@ -101,45 +102,45 @@ public enum AttackOption implements Enumerated {
char var9;
if(var7 != 0) {
var9 = (char)var7;
- boolean var14 = false;
+ boolean var10 = false;
} else {
var9 = var0.charAt(var5++);
}
- char var10;
+ char var14;
if(var8 != 0) {
- var10 = (char)var8;
- boolean var15 = false;
+ var14 = (char)var8;
+ boolean var11 = false;
} else {
- var10 = var1.charAt(var6++);
+ var14 = var1.charAt(var6++);
}
- byte var11;
+ byte var16;
if(var9 == 198) {
- var11 = 69;
+ var16 = 69;
} else if(var9 == 230) {
- var11 = 101;
+ var16 = 101;
} else if(var9 == 223) {
- var11 = 115;
+ var16 = 115;
} else if(var9 == 338) {
- var11 = 69;
+ var16 = 69;
} else if(var9 == 339) {
- var11 = 101;
+ var16 = 101;
} else {
- var11 = 0;
+ var16 = 0;
}
- var7 = var11;
+ var7 = var16;
byte var12;
- if(var10 == 198) {
+ if(var14 == 198) {
var12 = 69;
- } else if(var10 == 230) {
+ } else if(var14 == 230) {
var12 = 101;
- } else if(var10 == 223) {
+ } else if(var14 == 223) {
var12 = 115;
- } else if(var10 == 338) {
+ } else if(var14 == 338) {
var12 = 69;
- } else if(var10 == 339) {
+ } else if(var14 == 339) {
var12 = 101;
} else {
var12 = 0;
@@ -147,28 +148,28 @@ public enum AttackOption implements Enumerated {
var8 = var12;
var9 = class12.method155(var9, var2);
- var10 = class12.method155(var10, var2);
- if(var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) {
+ var14 = class12.method155(var14, var2);
+ if(var9 != var14 && Character.toUpperCase(var9) != Character.toUpperCase(var14)) {
var9 = Character.toLowerCase(var9);
- var10 = Character.toLowerCase(var10);
- if(var10 != var9) {
- return CollisionMap.method3631(var9, var2) - CollisionMap.method3631(var10, var2);
+ var14 = Character.toLowerCase(var14);
+ if(var14 != var9) {
+ return CollisionMap.method3631(var9, var2) - CollisionMap.method3631(var14, var2);
}
}
}
- int var16 = Math.min(var3, var4);
+ int var15 = Math.min(var3, var4);
int var17;
- char var20;
- for(var17 = 0; var17 < var16; ++var17) {
- char var18 = var0.charAt(var17);
- var20 = var1.charAt(var17);
- if(var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) {
+ char var18;
+ for(var17 = 0; var17 < var15; ++var17) {
+ char var19 = var0.charAt(var17);
+ var18 = var1.charAt(var17);
+ if(var18 != var19 && Character.toUpperCase(var19) != Character.toUpperCase(var18)) {
+ var19 = Character.toLowerCase(var19);
var18 = Character.toLowerCase(var18);
- var20 = Character.toLowerCase(var20);
- if(var18 != var20) {
- return CollisionMap.method3631(var18, var2) - CollisionMap.method3631(var20, var2);
+ if(var19 != var18) {
+ return CollisionMap.method3631(var19, var2) - CollisionMap.method3631(var18, var2);
}
}
}
@@ -177,11 +178,11 @@ public enum AttackOption implements Enumerated {
if(var17 != 0) {
return var17;
} else {
- for(int var19 = 0; var19 < var16; ++var19) {
- var20 = var0.charAt(var19);
- char var13 = var1.charAt(var19);
- if(var20 != var13) {
- return CollisionMap.method3631(var20, var2) - CollisionMap.method3631(var13, var2);
+ for(int var20 = 0; var20 < var15; ++var20) {
+ var18 = var0.charAt(var20);
+ char var13 = var1.charAt(var20);
+ if(var18 != var13) {
+ return CollisionMap.method3631(var18, var2) - CollisionMap.method3631(var13, var2);
}
}
@@ -209,7 +210,7 @@ public enum AttackOption implements Enumerated {
if(var1 >= 24) {
throw new IOException();
}
- } catch (Exception var4) {
+ } catch (Exception var3) {
for(int var2 = 0; var2 < 24; ++var2) {
var0[var2] = -1;
}
diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java
index 84c98f85b8..eb7617df13 100644
--- a/runescape-client/src/main/java/AudioFilter.java
+++ b/runescape-client/src/main/java/AudioFilter.java
@@ -31,11 +31,6 @@ public class AudioFilter {
@Export("__o")
int[] __o;
- static {
- __di_u = new float[2][8];
- __di_g = new int[2][8];
- }
-
AudioFilter() {
this.__m = new int[2];
this.__q = new int[2][2][4];
@@ -158,4 +153,9 @@ public class AudioFilter {
float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0);
return var1 * 3.1415927F / 11025.0F;
}
+
+ static {
+ __di_u = new float[2][8];
+ __di_g = new int[2][8];
+ }
}
diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java
index f265d60cf0..c9a8314a3e 100644
--- a/runescape-client/src/main/java/Bounds.java
+++ b/runescape-client/src/main/java/Bounds.java
@@ -159,10 +159,10 @@ public class Bounds {
int var7 = -var4;
for(int var8 = 0; var7 <= var4; ++var8) {
- double var15 = ((double)var7 - var0) / var2;
- double var13 = Math.exp(-var15 * var15 / 2.0D) / Math.sqrt(6.283185307179586D);
- double var11 = var13 / var2;
- var6[var8] = var11;
+ double var9 = ((double)var7 - var0) / var2;
+ double var11 = Math.exp(-var9 * var9 / 2.0D) / Math.sqrt(6.283185307179586D);
+ double var13 = var11 / var2;
+ var6[var8] = var13;
++var7;
}
diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java
index 12b1fe48b4..35b3c07a29 100644
--- a/runescape-client/src/main/java/Buddy.java
+++ b/runescape-client/src/main/java/Buddy.java
@@ -82,7 +82,7 @@ public class Buddy extends User {
for(var1 = 0; var1 < Client.npcCount; ++var1) {
int var4 = Client.npcIndices[var1];
- Npc var3 = Client.npcs[var4];
+ NPC var3 = Client.npcs[var4];
if(var3 != null && var3.overheadTextCyclesRemaining > 0) {
--var3.overheadTextCyclesRemaining;
if(var3.overheadTextCyclesRemaining == 0) {
diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java
index a278f911ea..6290cc8df1 100644
--- a/runescape-client/src/main/java/Buffer.java
+++ b/runescape-client/src/main/java/Buffer.java
@@ -1,4 +1,5 @@
import java.math.BigInteger;
+import java.util.logging.Logger;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
@@ -24,42 +25,6 @@ public class Buffer extends Node {
@Export("index")
public int index;
- static {
- __gr_q = new int[256];
-
- int var2;
- for(int var1 = 0; var1 < 256; ++var1) {
- int var0 = var1;
-
- for(var2 = 0; var2 < 8; ++var2) {
- if((var0 & 1) == 1) {
- var0 = var0 >>> 1 ^ -306674912;
- } else {
- var0 >>>= 1;
- }
- }
-
- __gr_q[var1] = var0;
- }
-
- __gr_o = new long[256];
-
- for(var2 = 0; var2 < 256; ++var2) {
- long var4 = (long)var2;
-
- for(int var3 = 0; var3 < 8; ++var3) {
- if((var4 & 1L) == 1L) {
- var4 = var4 >>> 1 ^ -3932672073523589310L;
- } else {
- var4 >>>= 1;
- }
- }
-
- __gr_o[var2] = var4;
- }
-
- }
-
public Buffer(int var1) {
this.array = Canvas.method862(var1);
this.index = 0;
@@ -204,22 +169,22 @@ public class Buffer extends Node {
)
@Export("__j_296")
public void __j_296(CharSequence var1) {
- int var3 = var1.length();
- int var4 = 0;
+ int var2 = var1.length();
+ int var3 = 0;
- for(int var5 = 0; var5 < var3; ++var5) {
- char var6 = var1.charAt(var5);
- if(var6 <= 127) {
- ++var4;
- } else if(var6 <= 2047) {
- var4 += 2;
+ for(int var4 = 0; var4 < var2; ++var4) {
+ char var5 = var1.charAt(var4);
+ if(var5 <= 127) {
+ ++var3;
+ } else if(var5 <= 2047) {
+ var3 += 2;
} else {
- var4 += 3;
+ var3 += 3;
}
}
this.array[++this.index - 1] = 0;
- this.__c_301(var4);
+ this.__c_301(var3);
this.index += class16.method190(this.array, this.index, var1);
}
@@ -279,11 +244,14 @@ public class Buffer extends Node {
public void writeSmartByteShort(int var1) {
if(var1 >= 0 && var1 < 128) {
this.writeByte(var1);
- } else if(var1 >= 0 && var1 < 32768) {
- this.writeShort(var1 + 32768);
} else {
- throw new IllegalArgumentException();
+ if(var1 < 0 || var1 >= 32768) {
+ throw new IllegalArgumentException();
+ }
+
+ this.writeShort(var1 + 32768);
}
+
}
@ObfuscatedName("c")
@@ -472,60 +440,60 @@ public class Buffer extends Node {
if(var2 + this.index > this.array.length) {
throw new IllegalStateException("");
} else {
- byte[] var4 = this.array;
- int var5 = this.index;
- char[] var6 = new char[var2];
- int var7 = 0;
- int var8 = var5;
+ byte[] var3 = this.array;
+ int var4 = this.index;
+ char[] var5 = new char[var2];
+ int var6 = 0;
+ int var7 = var4;
- int var11;
- for(int var9 = var5 + var2; var8 < var9; var6[var7++] = (char)var11) {
- int var10 = var4[var8++] & 255;
+ int var8;
+ for(int var9 = var4 + var2; var7 < var9; var5[var6++] = (char)var8) {
+ int var10 = var3[var7++] & 255;
if(var10 < 128) {
if(var10 == 0) {
- var11 = 65533;
+ var8 = 65533;
} else {
- var11 = var10;
+ var8 = var10;
}
} else if(var10 < 192) {
- var11 = 65533;
+ var8 = 65533;
} else if(var10 < 224) {
- if(var8 < var9 && (var4[var8] & 192) == 128) {
- var11 = (var10 & 31) << 6 | var4[var8++] & 63;
- if(var11 < 128) {
- var11 = 65533;
+ if(var7 < var9 && (var3[var7] & 192) == 128) {
+ var8 = (var10 & 31) << 6 | var3[var7++] & 63;
+ if(var8 < 128) {
+ var8 = 65533;
}
} else {
- var11 = 65533;
+ var8 = 65533;
}
} else if(var10 < 240) {
- if(var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) {
- var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63;
- if(var11 < 2048) {
- var11 = 65533;
+ if(var7 + 1 < var9 && (var3[var7] & 192) == 128 && (var3[var7 + 1] & 192) == 128) {
+ var8 = (var10 & 15) << 12 | (var3[var7++] & 63) << 6 | var3[var7++] & 63;
+ if(var8 < 2048) {
+ var8 = 65533;
}
} else {
- var11 = 65533;
+ var8 = 65533;
}
} else if(var10 < 248) {
- if(var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) {
- var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63;
- if(var11 >= 65536 && var11 <= 1114111) {
- var11 = 65533;
+ if(var7 + 2 < var9 && (var3[var7] & 192) == 128 && (var3[var7 + 1] & 192) == 128 && (var3[var7 + 2] & 192) == 128) {
+ var8 = (var10 & 7) << 18 | (var3[var7++] & 63) << 12 | (var3[var7++] & 63) << 6 | var3[var7++] & 63;
+ if(var8 >= 65536 && var8 <= 1114111) {
+ var8 = 65533;
} else {
- var11 = 65533;
+ var8 = 65533;
}
} else {
- var11 = 65533;
+ var8 = 65533;
}
} else {
- var11 = 65533;
+ var8 = 65533;
}
}
- String var3 = new String(var6, 0, var7);
+ String var11 = new String(var5, 0, var6);
this.index += var2;
- return var3;
+ return var11;
}
}
}
@@ -757,6 +725,7 @@ public class Buffer extends Node {
byte[] var7 = var6.toByteArray();
this.index = 0;
this.writeShort(var7.length);
+ Logger.getAnonymousLogger().warning("unsigned short " + var7.length);
this.__s_297(var7, 0, var7.length);
}
@@ -767,17 +736,17 @@ public class Buffer extends Node {
)
@Export("__aa_312")
public int __aa_312(int var1) {
- byte[] var3 = this.array;
- int var4 = this.index;
- int var5 = -1;
+ byte[] var2 = this.array;
+ int var3 = this.index;
+ int var4 = -1;
- for(int var6 = var1; var6 < var4; ++var6) {
- var5 = var5 >>> 8 ^ __gr_q[(var5 ^ var3[var6]) & 255];
+ for(int var5 = var1; var5 < var3; ++var5) {
+ var4 = var4 >>> 8 ^ __gr_q[(var4 ^ var2[var5]) & 255];
}
- var5 = ~var5;
- this.writeInt(var5);
- return var5;
+ var4 = ~var4;
+ this.writeInt(var4);
+ return var4;
}
@ObfuscatedName("ax")
@@ -788,18 +757,18 @@ public class Buffer extends Node {
@Export("__ax_313")
public boolean __ax_313() {
this.index -= 4;
- byte[] var2 = this.array;
- int var3 = this.index;
- int var4 = -1;
+ byte[] var1 = this.array;
+ int var2 = this.index;
+ int var3 = -1;
- int var5;
- for(var5 = 0; var5 < var3; ++var5) {
- var4 = var4 >>> 8 ^ __gr_q[(var4 ^ var2[var5]) & 255];
+ int var4;
+ for(var4 = 0; var4 < var2; ++var4) {
+ var3 = var3 >>> 8 ^ __gr_q[(var3 ^ var1[var4]) & 255];
}
- var4 = ~var4;
- var5 = this.readInt();
- return var5 == var4;
+ var3 = ~var3;
+ var4 = this.readInt();
+ return var4 == var3;
}
@ObfuscatedName("af")
@@ -1095,4 +1064,40 @@ public class Buffer extends Node {
HealthBarDefinition.HealthBarDefinition_cached.clear();
HealthBarDefinition.HealthBarDefinition_cachedSprites.clear();
}
+
+ static {
+ __gr_q = new int[256];
+
+ int var0;
+ for(int var1 = 0; var1 < 256; ++var1) {
+ int var2 = var1;
+
+ for(var0 = 0; var0 < 8; ++var0) {
+ if((var2 & 1) == 1) {
+ var2 = var2 >>> 1 ^ -306674912;
+ } else {
+ var2 >>>= 1;
+ }
+ }
+
+ __gr_q[var1] = var2;
+ }
+
+ __gr_o = new long[256];
+
+ for(var0 = 0; var0 < 256; ++var0) {
+ long var4 = (long)var0;
+
+ for(int var3 = 0; var3 < 8; ++var3) {
+ if((var4 & 1L) == 1L) {
+ var4 = var4 >>> 1 ^ -3932672073523589310L;
+ } else {
+ var4 >>>= 1;
+ }
+ }
+
+ __gr_o[var0] = var4;
+ }
+
+ }
}
diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java
index c6217ee7c9..0af59228f7 100644
--- a/runescape-client/src/main/java/BufferedFile.java
+++ b/runescape-client/src/main/java/BufferedFile.java
@@ -145,86 +145,86 @@ public class BufferedFile {
}
long var4 = this.__l;
- int var7 = var3;
- int var8;
+ int var6 = var3;
+ int var7;
if(this.__l >= this.__q && this.__l < this.__q + (long)this.__w) {
- var8 = (int)((long)this.__w - (this.__l - this.__q));
- if(var8 > var3) {
- var8 = var3;
+ var7 = (int)((long)this.__w - (this.__l - this.__q));
+ if(var7 > var3) {
+ var7 = var3;
}
- System.arraycopy(this.readBuffer, (int)(this.__l - this.__q), var1, var2, var8);
- this.__l += (long)var8;
- var2 += var8;
- var3 -= var8;
+ System.arraycopy(this.readBuffer, (int)(this.__l - this.__q), var1, var2, var7);
+ this.__l += (long)var7;
+ var2 += var7;
+ var3 -= var7;
}
if(var3 > this.readBuffer.length) {
this.accessFile.seek(this.__l);
- for(this.__d = this.__l; var3 > 0; var3 -= var8) {
- var8 = this.accessFile.read(var1, var2, var3);
- if(var8 == -1) {
+ for(this.__d = this.__l; var3 > 0; var3 -= var7) {
+ var7 = this.accessFile.read(var1, var2, var3);
+ if(var7 == -1) {
break;
}
- this.__d += (long)var8;
- this.__l += (long)var8;
- var2 += var8;
+ this.__d += (long)var7;
+ this.__l += (long)var7;
+ var2 += var7;
}
} else if(var3 > 0) {
this.load();
- var8 = var3;
+ var7 = var3;
if(var3 > this.__w) {
- var8 = this.__w;
+ var7 = this.__w;
}
- System.arraycopy(this.readBuffer, 0, var1, var2, var8);
- var2 += var8;
- var3 -= var8;
- this.__l += (long)var8;
+ System.arraycopy(this.readBuffer, 0, var1, var2, var7);
+ var2 += var7;
+ var3 -= var7;
+ this.__l += (long)var7;
}
if(-1L != this.__u) {
if(this.__u > this.__l && var3 > 0) {
- var8 = var2 + (int)(this.__u - this.__l);
- if(var8 > var3 + var2) {
- var8 = var3 + var2;
+ var7 = var2 + (int)(this.__u - this.__l);
+ if(var7 > var3 + var2) {
+ var7 = var3 + var2;
}
- while(var2 < var8) {
+ while(var2 < var7) {
var1[var2++] = 0;
--var3;
++this.__l;
}
}
- long var13 = -1L;
+ long var8 = -1L;
long var10 = -1L;
- if(this.__u >= var4 && this.__u < var4 + (long)var7) {
- var13 = this.__u;
+ if(this.__u >= var4 && this.__u < var4 + (long)var6) {
+ var8 = this.__u;
} else if(var4 >= this.__u && var4 < this.__u + (long)this.__g) {
- var13 = var4;
+ var8 = var4;
}
- if((long)this.__g + this.__u > var4 && this.__u + (long)this.__g <= var4 + (long)var7) {
+ if((long)this.__g + this.__u > var4 && this.__u + (long)this.__g <= var4 + (long)var6) {
var10 = (long)this.__g + this.__u;
- } else if((long)var7 + var4 > this.__u && (long)var7 + var4 <= this.__u + (long)this.__g) {
- var10 = (long)var7 + var4;
+ } else if((long)var6 + var4 > this.__u && (long)var6 + var4 <= this.__u + (long)this.__g) {
+ var10 = (long)var6 + var4;
}
- if(var13 > -1L && var10 > var13) {
- int var12 = (int)(var10 - var13);
- System.arraycopy(this.writeBuffer, (int)(var13 - this.__u), var1, (int)(var13 - var4) + var2, var12);
+ if(var8 > -1L && var10 > var8) {
+ int var12 = (int)(var10 - var8);
+ System.arraycopy(this.writeBuffer, (int)(var8 - this.__u), var1, (int)(var8 - var4) + var2, var12);
if(var10 > this.__l) {
var3 = (int)((long)var3 - (var10 - this.__l));
this.__l = var10;
}
}
}
- } catch (IOException var16) {
+ } catch (IOException var13) {
this.__d = -1L;
- throw var16;
+ throw var13;
}
if(var3 > 0) {
@@ -294,7 +294,6 @@ public class BufferedFile {
if(this.__l - this.__u > (long)this.__g) {
this.__g = (int)(this.__l - this.__u);
}
-
}
} else {
if(this.__d != this.__l) {
@@ -308,12 +307,12 @@ public class BufferedFile {
this.__e = this.__d;
}
- long var9 = -1L;
+ long var10 = -1L;
long var6 = -1L;
if(this.__l >= this.__q && this.__l < (long)this.__w + this.__q) {
- var9 = this.__l;
+ var10 = this.__l;
} else if(this.__q >= this.__l && this.__q < (long)var3 + this.__l) {
- var9 = this.__q;
+ var10 = this.__q;
}
if(this.__l + (long)var3 > this.__q && (long)var3 + this.__l <= (long)this.__w + this.__q) {
@@ -322,16 +321,17 @@ public class BufferedFile {
var6 = (long)this.__w + this.__q;
}
- if(var9 > -1L && var6 > var9) {
- int var8 = (int)(var6 - var9);
- System.arraycopy(var1, (int)(var9 + (long)var2 - this.__l), this.readBuffer, (int)(var9 - this.__q), var8);
+ if(var10 > -1L && var6 > var10) {
+ int var8 = (int)(var6 - var10);
+ System.arraycopy(var1, (int)(var10 + (long)var2 - this.__l), this.readBuffer, (int)(var10 - this.__q), var8);
}
this.__l += (long)var3;
}
- } catch (IOException var12) {
+
+ } catch (IOException var9) {
this.__d = -1L;
- throw var12;
+ throw var9;
}
}
diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java
index 3bca5ee7dd..67f9242932 100644
--- a/runescape-client/src/main/java/BufferedSink.java
+++ b/runescape-client/src/main/java/BufferedSink.java
@@ -142,10 +142,15 @@ public class BufferedSink implements Runnable {
@Export("run")
@ObfuscatedName("run")
public void run() {
- do {
- int var1;
- synchronized(this) {
- while(true) {
+ while(true) {
+ synchronized(this){}
+
+ while(true) {
+ boolean var13 = false;
+
+ int var1;
+ try {
+ var13 = true;
if(this.exception != null) {
return;
}
@@ -156,50 +161,60 @@ public class BufferedSink implements Runnable {
var1 = this.capacity - this.position + this.limit;
}
- if(var1 > 0) {
- break;
+ if(var1 <= 0) {
+ try {
+ this.outputStream.flush();
+ } catch (IOException var17) {
+ this.exception = var17;
+ return;
+ }
+
+ if(this.isClosed()) {
+ return;
+ }
+
+ try {
+ this.wait();
+ } catch (InterruptedException var18) {
+ ;
+ }
+ continue;
}
- try {
- this.outputStream.flush();
- } catch (IOException var11) {
- this.exception = var11;
- return;
- }
-
- if(this.isClosed()) {
- return;
- }
-
- try {
- this.wait();
- } catch (InterruptedException var12) {
+ var13 = false;
+ } finally {
+ if(var13) {
;
}
}
- }
- try {
- if(var1 + this.position <= this.capacity) {
- this.outputStream.write(this.buffer, this.position, var1);
- } else {
- int var7 = this.capacity - this.position;
- this.outputStream.write(this.buffer, this.position, var7);
- this.outputStream.write(this.buffer, 0, var1 - var7);
+ try {
+ if(var1 + this.position <= this.capacity) {
+ this.outputStream.write(this.buffer, this.position, var1);
+ } else {
+ int var2 = this.capacity - this.position;
+ this.outputStream.write(this.buffer, this.position, var2);
+ this.outputStream.write(this.buffer, 0, var1 - var2);
+ }
+ } catch (IOException var16) {
+ IOException var3 = var16;
+ synchronized(this) {
+ this.exception = var3;
+ return;
+ }
}
- } catch (IOException var10) {
- IOException var2 = var10;
+
synchronized(this) {
- this.exception = var2;
- return;
+ this.position = (var1 + this.position) % this.capacity;
}
- }
- synchronized(this) {
- this.position = (var1 + this.position) % this.capacity;
- }
- } while(!this.isClosed());
+ if(!this.isClosed()) {
+ break;
+ }
+ return;
+ }
+ }
}
@ObfuscatedName("m")
@@ -208,13 +223,13 @@ public class BufferedSink implements Runnable {
garbageValue = "449588720"
)
static void method3603() {
- Tiles.__bq_w = null;
- Fonts.__kz_o = null;
- class32.__ay_u = null;
- class307.__kc_g = null;
- Tiles.__bq_a = null;
- Tiles.__bq_l = null;
- Huffman.__gd_e = null;
+ Tiles.__bq_w = (byte[][][])null;
+ Fonts.__kz_o = (byte[][][])null;
+ class32.__ay_u = (byte[][][])null;
+ class307.__kc_g = (byte[][][])null;
+ Tiles.__bq_a = (int[][][])null;
+ Tiles.__bq_l = (byte[][][])null;
+ Huffman.__gd_e = (int[][])null;
class13.__i_x = null;
Formatting.__cy_d = null;
class214.__hf_k = null;
diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java
index f0aee8a0c5..d933690277 100644
--- a/runescape-client/src/main/java/BufferedSource.java
+++ b/runescape-client/src/main/java/BufferedSource.java
@@ -234,22 +234,22 @@ public class BufferedSource implements Runnable {
}
}
- int var7;
+ int var2;
try {
- var7 = this.inputStream.read(this.buffer, this.limit, var1);
- if(var7 == -1) {
+ var2 = this.inputStream.read(this.buffer, this.limit, var1);
+ if(var2 == -1) {
throw new EOFException();
}
} catch (IOException var11) {
- IOException var3 = var11;
+ IOException var4 = var11;
synchronized(this) {
- this.exception = var3;
+ this.exception = var4;
return;
}
}
synchronized(this) {
- this.limit = (var7 + this.limit) % this.capacity;
+ this.limit = (var2 + this.limit) % this.capacity;
}
}
}
@@ -261,7 +261,7 @@ public class BufferedSource implements Runnable {
)
static final void method3423(boolean var0) {
for(int var1 = 0; var1 < Client.npcCount; ++var1) {
- Npc var2 = Client.npcs[Client.npcIndices[var1]];
+ NPC var2 = Client.npcs[Client.npcIndices[var1]];
if(var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.__e_435()) {
int var3 = var2.x >> 7;
int var4 = var2.y >> 7;
diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java
index 97268c74fd..9995b76c79 100644
--- a/runescape-client/src/main/java/ByteArrayPool.java
+++ b/runescape-client/src/main/java/ByteArrayPool.java
@@ -44,15 +44,6 @@ public class ByteArrayPool {
@Export("indexCache13")
static IndexCache indexCache13;
- static {
- ByteArrayPool_smallCount = 0;
- ByteArrayPool_mediumCount = 0;
- ByteArrayPool_largeCount = 0;
- ByteArrayPool_small = new byte[1000][];
- ByteArrayPool_medium = new byte[250][];
- ByteArrayPool_large = new byte[50][];
- }
-
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "(IZI)[B",
@@ -92,15 +83,15 @@ public class ByteArrayPool {
}
if(class179.__fe_e != null) {
- for(int var4 = 0; var4 < __gi_g.length; ++var4) {
- if(__gi_g[var4] != var0) {
- if(var0 < __gi_g[var4]) {
+ for(int var3 = 0; var3 < __gi_g.length; ++var3) {
+ if(__gi_g[var3] != var0) {
+ if(var0 < __gi_g[var3]) {
;
}
- } else if(WorldMapSection2.__ah_l[var4] > 0) {
- byte[] var3 = class179.__fe_e[var4][--WorldMapSection2.__ah_l[var4]];
- class179.__fe_e[var4][WorldMapSection2.__ah_l[var4]] = null;
- return var3;
+ } else if(WorldMapSection2.__ah_l[var3] > 0) {
+ byte[] var4 = class179.__fe_e[var3][--WorldMapSection2.__ah_l[var3]];
+ class179.__fe_e[var3][WorldMapSection2.__ah_l[var3]] = null;
+ return var4;
}
}
}
@@ -115,8 +106,8 @@ public class ByteArrayPool {
)
public static String method4001(int var0, boolean var1) {
if(var1 && var0 >= 0) {
- int var3 = var0;
- String var2;
+ int var2 = var0;
+ String var3;
if(var1 && var0 >= 0) {
int var4 = 2;
@@ -124,28 +115,37 @@ public class ByteArrayPool {
var5 /= 10;
}
- char[] var6 = new char[var4];
- var6[0] = '+';
+ char[] var9 = new char[var4];
+ var9[0] = '+';
- for(int var7 = var4 - 1; var7 > 0; --var7) {
- int var8 = var3;
- var3 /= 10;
- int var9 = var8 - var3 * 10;
- if(var9 >= 10) {
- var6[var7] = (char)(var9 + 87);
+ for(int var6 = var4 - 1; var6 > 0; --var6) {
+ int var7 = var2;
+ var2 /= 10;
+ int var8 = var7 - var2 * 10;
+ if(var8 >= 10) {
+ var9[var6] = (char)(var8 + 87);
} else {
- var6[var7] = (char)(var9 + 48);
+ var9[var6] = (char)(var8 + 48);
}
}
- var2 = new String(var6);
+ var3 = new String(var9);
} else {
- var2 = Integer.toString(var0, 10);
+ var3 = Integer.toString(var0, 10);
}
- return var2;
+ return var3;
} else {
return Integer.toString(var0);
}
}
+
+ static {
+ ByteArrayPool_smallCount = 0;
+ ByteArrayPool_mediumCount = 0;
+ ByteArrayPool_largeCount = 0;
+ ByteArrayPool_small = new byte[1000][];
+ ByteArrayPool_medium = new byte[250][];
+ ByteArrayPool_large = new byte[50][];
+ }
}
diff --git a/runescape-client/src/main/java/Bzip2Decompressor.java b/runescape-client/src/main/java/Bzip2Decompressor.java
index b5cee0b5ba..e29eba2999 100644
--- a/runescape-client/src/main/java/Bzip2Decompressor.java
+++ b/runescape-client/src/main/java/Bzip2Decompressor.java
@@ -13,14 +13,11 @@ public final class Bzip2Decompressor {
@Export("Bzip2Decompressor_state")
static Bzip2State Bzip2Decompressor_state;
- static {
- Bzip2Decompressor_state = new Bzip2State();
- }
-
@ObfuscatedName("m")
@Export("Bzip2Decompressor_decompress")
public static int Bzip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) {
Bzip2State var5 = Bzip2Decompressor_state;
+ Bzip2State var6 = Bzip2Decompressor_state;
synchronized(Bzip2Decompressor_state) {
Bzip2Decompressor_state.__g = var2;
Bzip2Decompressor_state.__l = var4;
@@ -30,7 +27,7 @@ public final class Bzip2Decompressor {
Bzip2Decompressor_state.__j = 0;
Bzip2Decompressor_state.__z = 0;
Bzip2Decompressor_state.__e = 0;
- Bzip2Decompressor_state.__n = 0;
+ Bzip2Decompressor_state.surfaceOffsetY = 0;
method3725(Bzip2Decompressor_state);
var1 -= Bzip2Decompressor_state.__k;
Bzip2Decompressor_state.__g = null;
@@ -44,131 +41,131 @@ public final class Bzip2Decompressor {
signature = "(Lgt;)V"
)
static void method3705(Bzip2State var0) {
- byte var2 = var0.__i;
- int var3 = var0.__a;
- int var4 = var0.__c;
- int var5 = var0.__h;
- int[] var6 = WorldMapSection0.__y_p;
- int var7 = var0.__y;
- byte[] var8 = var0.__x;
- int var9 = var0.__d;
- int var10 = var0.__k;
- int var12 = var0.__ae + 1;
+ byte var1 = var0.__i;
+ int var2 = var0.__a;
+ int var3 = var0.__c;
+ int var4 = var0.__h;
+ int[] var5 = WorldMapSection0.__y_p;
+ int var6 = var0.__y;
+ byte[] var7 = var0.__x;
+ int var8 = var0.__d;
+ int var9 = var0.__k;
+ int var10 = var0.__ae + 1;
label65:
while(true) {
- if(var3 > 0) {
+ if(var2 > 0) {
while(true) {
- if(var10 == 0) {
+ if(var9 == 0) {
break label65;
}
- if(var3 == 1) {
- if(var10 == 0) {
- var3 = 1;
+ if(var2 == 1) {
+ if(var9 == 0) {
+ var2 = 1;
break label65;
}
- var8[var9] = var2;
- ++var9;
- --var10;
+ var7[var8] = var1;
+ ++var8;
+ --var9;
break;
}
- var8[var9] = var2;
- --var3;
- ++var9;
- --var10;
+ var7[var8] = var1;
+ --var2;
+ ++var8;
+ --var9;
}
}
- boolean var14 = true;
+ boolean var11 = true;
- byte var1;
- while(var14) {
- var14 = false;
- if(var4 == var12) {
- var3 = 0;
+ byte var12;
+ while(var11) {
+ var11 = false;
+ if(var3 == var10) {
+ var2 = 0;
break label65;
}
- var2 = (byte)var5;
- var7 = var6[var7];
- var1 = (byte)(var7 & 255);
- var7 >>= 8;
- ++var4;
- if(var1 != var5) {
- var5 = var1;
- if(var10 == 0) {
- var3 = 1;
+ var1 = (byte)var4;
+ var6 = var5[var6];
+ var12 = (byte)(var6 & 255);
+ var6 >>= 8;
+ ++var3;
+ if(var12 != var4) {
+ var4 = var12;
+ if(var9 == 0) {
+ var2 = 1;
break label65;
}
- var8[var9] = var2;
- ++var9;
- --var10;
- var14 = true;
- } else if(var4 == var12) {
- if(var10 == 0) {
- var3 = 1;
+ var7[var8] = var1;
+ ++var8;
+ --var9;
+ var11 = true;
+ } else if(var3 == var10) {
+ if(var9 == 0) {
+ var2 = 1;
break label65;
}
- var8[var9] = var2;
- ++var9;
- --var10;
- var14 = true;
+ var7[var8] = var1;
+ ++var8;
+ --var9;
+ var11 = true;
}
}
- var3 = 2;
- var7 = var6[var7];
- var1 = (byte)(var7 & 255);
- var7 >>= 8;
- ++var4;
- if(var4 != var12) {
- if(var1 != var5) {
- var5 = var1;
+ var2 = 2;
+ var6 = var5[var6];
+ var12 = (byte)(var6 & 255);
+ var6 >>= 8;
+ ++var3;
+ if(var3 != var10) {
+ if(var12 != var4) {
+ var4 = var12;
} else {
- var3 = 3;
- var7 = var6[var7];
- var1 = (byte)(var7 & 255);
- var7 >>= 8;
- ++var4;
- if(var4 != var12) {
- if(var1 != var5) {
- var5 = var1;
+ var2 = 3;
+ var6 = var5[var6];
+ var12 = (byte)(var6 & 255);
+ var6 >>= 8;
+ ++var3;
+ if(var3 != var10) {
+ if(var12 != var4) {
+ var4 = var12;
} else {
- var7 = var6[var7];
- var1 = (byte)(var7 & 255);
- var7 >>= 8;
- ++var4;
- var3 = (var1 & 255) + 4;
- var7 = var6[var7];
- var5 = (byte)(var7 & 255);
- var7 >>= 8;
- ++var4;
+ var6 = var5[var6];
+ var12 = (byte)(var6 & 255);
+ var6 >>= 8;
+ ++var3;
+ var2 = (var12 & 255) + 4;
+ var6 = var5[var6];
+ var4 = (byte)(var6 & 255);
+ var6 >>= 8;
+ ++var3;
}
}
}
}
}
- int var13 = var0.__n;
- var0.__n += var10 - var10;
- if(var0.__n < var13) {
+ int var13 = var0.surfaceOffsetY;
+ var0.surfaceOffsetY += var9 - var9;
+ if(var0.surfaceOffsetY < var13) {
;
}
- var0.__i = var2;
- var0.__a = var3;
- var0.__c = var4;
- var0.__h = var5;
- WorldMapSection0.__y_p = var6;
- var0.__y = var7;
- var0.__x = var8;
- var0.__d = var9;
- var0.__k = var10;
+ var0.__i = var1;
+ var0.__a = var2;
+ var0.__c = var3;
+ var0.__h = var4;
+ WorldMapSection0.__y_p = var5;
+ var0.__y = var6;
+ var0.__x = var7;
+ var0.__d = var8;
+ var0.__k = var9;
}
@ObfuscatedName("q")
@@ -176,6 +173,9 @@ public final class Bzip2Decompressor {
signature = "(Lgt;)V"
)
static void method3725(Bzip2State var0) {
+ boolean var1 = false;
+ boolean var2 = false;
+ boolean var3 = false;
boolean var4 = false;
boolean var5 = false;
boolean var6 = false;
@@ -191,314 +191,314 @@ public final class Bzip2Decompressor {
boolean var16 = false;
boolean var17 = false;
boolean var18 = false;
- boolean var19 = false;
- boolean var20 = false;
- boolean var21 = false;
- int var22 = 0;
- int[] var23 = null;
- int[] var24 = null;
- int[] var25 = null;
+ int var19 = 0;
+ int[] var20 = null;
+ int[] var21 = null;
+ int[] var22 = null;
var0.__s = 1;
if(WorldMapSection0.__y_p == null) {
WorldMapSection0.__y_p = new int[var0.__s * 100000];
}
- boolean var26 = true;
+ boolean var23 = true;
while(true) {
- while(var26) {
- byte var1 = method3707(var0);
- if(var1 == 23) {
+ while(var23) {
+ byte var24 = method3707(var0);
+ if(var24 == 23) {
return;
}
- var1 = method3707(var0);
- var1 = method3707(var0);
- var1 = method3707(var0);
- var1 = method3707(var0);
- var1 = method3707(var0);
- var1 = method3707(var0);
- var1 = method3707(var0);
- var1 = method3707(var0);
- var1 = method3707(var0);
- var1 = method3711(var0);
- if(var1 != 0) {
+ var24 = method3707(var0);
+ var24 = method3707(var0);
+ var24 = method3707(var0);
+ var24 = method3707(var0);
+ var24 = method3707(var0);
+ var24 = method3707(var0);
+ var24 = method3707(var0);
+ var24 = method3707(var0);
+ var24 = method3707(var0);
+ var24 = method3711(var0);
+ if(var24 != 0) {
;
}
var0.__t = 0;
- var1 = method3707(var0);
- var0.__t = var0.__t << 8 | var1 & 255;
- var1 = method3707(var0);
- var0.__t = var0.__t << 8 | var1 & 255;
- var1 = method3707(var0);
- var0.__t = var0.__t << 8 | var1 & 255;
+ var24 = method3707(var0);
+ var0.__t = var0.__t << 8 | var24 & 255;
+ var24 = method3707(var0);
+ var0.__t = var0.__t << 8 | var24 & 255;
+ var24 = method3707(var0);
+ var0.__t = var0.__t << 8 | var24 & 255;
- int var36;
- for(var36 = 0; var36 < 16; ++var36) {
- var1 = method3711(var0);
- if(var1 == 1) {
- var0.__aq[var36] = true;
+ int var25;
+ for(var25 = 0; var25 < 16; ++var25) {
+ var24 = method3711(var0);
+ if(var24 == 1) {
+ var0.__aq[var25] = true;
} else {
- var0.__aq[var36] = false;
+ var0.__aq[var25] = false;
}
}
- for(var36 = 0; var36 < 256; ++var36) {
- var0.__ag[var36] = false;
+ for(var25 = 0; var25 < 256; ++var25) {
+ var0.__ag[var25] = false;
}
- int var37;
- for(var36 = 0; var36 < 16; ++var36) {
- if(var0.__aq[var36]) {
- for(var37 = 0; var37 < 16; ++var37) {
- var1 = method3711(var0);
- if(var1 == 1) {
- var0.__ag[var37 + var36 * 16] = true;
+ int var26;
+ for(var25 = 0; var25 < 16; ++var25) {
+ if(var0.__aq[var25]) {
+ for(var26 = 0; var26 < 16; ++var26) {
+ var24 = method3711(var0);
+ if(var24 == 1) {
+ var0.__ag[var26 + var25 * 16] = true;
}
}
}
}
method3710(var0);
- int var39 = var0.__v + 2;
- int var40 = method3708(3, var0);
- int var41 = method3708(15, var0);
+ int var27 = var0.__v + 2;
+ int var28 = method3708(3, var0);
+ int var29 = method3708(15, var0);
- for(var36 = 0; var36 < var41; ++var36) {
- var37 = 0;
+ for(var25 = 0; var25 < var29; ++var25) {
+ var26 = 0;
while(true) {
- var1 = method3711(var0);
- if(var1 == 0) {
- var0.__ay[var36] = (byte)var37;
+ var24 = method3711(var0);
+ if(var24 == 0) {
+ var0.__ay[var25] = (byte)var26;
break;
}
- ++var37;
+ ++var26;
}
}
- byte[] var27 = new byte[6];
+ byte[] var30 = new byte[6];
- byte var29;
- for(var29 = 0; var29 < var40; var27[var29] = var29++) {
+ byte var31;
+ for(var31 = 0; var31 < var28; var30[var31] = var31++) {
;
}
- for(var36 = 0; var36 < var41; ++var36) {
- var29 = var0.__ay[var36];
+ for(var25 = 0; var25 < var29; ++var25) {
+ var31 = var0.__ay[var25];
- byte var28;
- for(var28 = var27[var29]; var29 > 0; --var29) {
- var27[var29] = var27[var29 - 1];
+ byte var32;
+ for(var32 = var30[var31]; var31 > 0; --var31) {
+ var30[var31] = var30[var31 - 1];
}
- var27[0] = var28;
- var0.__ac[var36] = var28;
+ var30[0] = var32;
+ var0.__ac[var25] = var32;
}
- int var38;
- for(var38 = 0; var38 < var40; ++var38) {
- int var50 = method3708(5, var0);
+ int var33;
+ int var50;
+ for(var50 = 0; var50 < var28; ++var50) {
+ var33 = method3708(5, var0);
- for(var36 = 0; var36 < var39; ++var36) {
+ for(var25 = 0; var25 < var27; ++var25) {
while(true) {
- var1 = method3711(var0);
- if(var1 == 0) {
- var0.__ah[var38][var36] = (byte)var50;
+ var24 = method3711(var0);
+ if(var24 == 0) {
+ var0.__ah[var50][var25] = (byte)var33;
break;
}
- var1 = method3711(var0);
- if(var1 == 0) {
- ++var50;
+ var24 = method3711(var0);
+ if(var24 == 0) {
+ ++var33;
} else {
- --var50;
+ --var33;
}
}
}
}
- for(var38 = 0; var38 < var40; ++var38) {
- byte var2 = 32;
- byte var3 = 0;
+ for(var50 = 0; var50 < var28; ++var50) {
+ byte var51 = 32;
+ byte var34 = 0;
- for(var36 = 0; var36 < var39; ++var36) {
- if(var0.__ah[var38][var36] > var3) {
- var3 = var0.__ah[var38][var36];
+ for(var25 = 0; var25 < var27; ++var25) {
+ if(var0.__ah[var50][var25] > var34) {
+ var34 = var0.__ah[var50][var25];
}
- if(var0.__ah[var38][var36] < var2) {
- var2 = var0.__ah[var38][var36];
+ if(var0.__ah[var50][var25] < var51) {
+ var51 = var0.__ah[var50][var25];
}
}
- method3706(var0.__ak[var38], var0.__aw[var38], var0.__al[var38], var0.__ah[var38], var2, var3, var39);
- var0.__ab[var38] = var2;
+ method3706(var0.__ak[var50], var0.__aw[var50], var0.__al[var50], var0.__ah[var50], var51, var34, var27);
+ var0.__ab[var50] = var51;
}
- int var42 = var0.__v + 1;
- int var43 = -1;
- byte var44 = 0;
+ var33 = var0.__v + 1;
+ int var52 = -1;
+ byte var35 = 0;
- for(var36 = 0; var36 <= 255; ++var36) {
- var0.__b[var36] = 0;
+ for(var25 = 0; var25 <= 255; ++var25) {
+ var0.__b[var25] = 0;
}
- int var56 = 4095;
+ int var36 = 4095;
- int var35;
- int var55;
- for(var35 = 15; var35 >= 0; --var35) {
- for(var55 = 15; var55 >= 0; --var55) {
- var0.__av[var56] = (byte)(var55 + var35 * 16);
- --var56;
+ int var37;
+ int var38;
+ for(var37 = 15; var37 >= 0; --var37) {
+ for(var38 = 15; var38 >= 0; --var38) {
+ var0.__av[var36] = (byte)(var38 + var37 * 16);
+ --var36;
}
- var0.__ar[var35] = var56 + 1;
+ var0.__ar[var37] = var36 + 1;
}
- int var47 = 0;
- byte var54;
- if(var44 == 0) {
- ++var43;
- var44 = 50;
- var54 = var0.__ac[var43];
- var22 = var0.__ab[var54];
- var23 = var0.__ak[var54];
- var25 = var0.__al[var54];
- var24 = var0.__aw[var54];
+ int var39 = 0;
+ byte var40;
+ if(var35 == 0) {
+ ++var52;
+ var35 = 50;
+ var40 = var0.__ac[var52];
+ var19 = var0.__ab[var40];
+ var20 = var0.__ak[var40];
+ var22 = var0.__al[var40];
+ var21 = var0.__aw[var40];
}
- int var45 = var44 - 1;
- int var51 = var22;
+ int var41 = var35 - 1;
+ int var42 = var19;
- int var52;
- byte var53;
- for(var52 = method3708(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) {
- ++var51;
- var53 = method3711(var0);
+ int var43;
+ byte var44;
+ for(var43 = method3708(var19, var0); var43 > var20[var42]; var43 = var43 << 1 | var44) {
+ ++var42;
+ var44 = method3711(var0);
}
- int var46 = var25[var52 - var24[var51]];
+ int var45 = var22[var43 - var21[var42]];
while(true) {
- while(var46 != var42) {
- if(var46 != 0 && var46 != 1) {
- int var33 = var46 - 1;
- int var30;
- if(var33 < 16) {
- var30 = var0.__ar[0];
+ while(var45 != var33) {
+ int var46;
+ int var47;
+ if(var45 != 0 && var45 != 1) {
+ var46 = var45 - 1;
+ int var48;
+ if(var46 < 16) {
+ var47 = var0.__ar[0];
- for(var1 = var0.__av[var30 + var33]; var33 > 3; var33 -= 4) {
- int var34 = var30 + var33;
- var0.__av[var34] = var0.__av[var34 - 1];
- var0.__av[var34 - 1] = var0.__av[var34 - 2];
- var0.__av[var34 - 2] = var0.__av[var34 - 3];
- var0.__av[var34 - 3] = var0.__av[var34 - 4];
+ for(var24 = var0.__av[var47 + var46]; var46 > 3; var46 -= 4) {
+ var48 = var47 + var46;
+ var0.__av[var48] = var0.__av[var48 - 1];
+ var0.__av[var48 - 1] = var0.__av[var48 - 2];
+ var0.__av[var48 - 2] = var0.__av[var48 - 3];
+ var0.__av[var48 - 3] = var0.__av[var48 - 4];
}
- while(var33 > 0) {
- var0.__av[var30 + var33] = var0.__av[var30 + var33 - 1];
- --var33;
+ while(var46 > 0) {
+ var0.__av[var47 + var46] = var0.__av[var47 + var46 - 1];
+ --var46;
}
- var0.__av[var30] = var1;
+ var0.__av[var47] = var24;
} else {
- int var31 = var33 / 16;
- int var32 = var33 % 16;
- var30 = var0.__ar[var31] + var32;
+ var48 = var46 / 16;
+ int var49 = var46 % 16;
+ var47 = var0.__ar[var48] + var49;
- for(var1 = var0.__av[var30]; var30 > var0.__ar[var31]; --var30) {
- var0.__av[var30] = var0.__av[var30 - 1];
+ for(var24 = var0.__av[var47]; var47 > var0.__ar[var48]; --var47) {
+ var0.__av[var47] = var0.__av[var47 - 1];
}
- ++var0.__ar[var31];
+ ++var0.__ar[var48];
- while(var31 > 0) {
- --var0.__ar[var31];
- var0.__av[var0.__ar[var31]] = var0.__av[var0.__ar[var31 - 1] + 16 - 1];
- --var31;
+ while(var48 > 0) {
+ --var0.__ar[var48];
+ var0.__av[var0.__ar[var48]] = var0.__av[var0.__ar[var48 - 1] + 16 - 1];
+ --var48;
}
--var0.__ar[0];
- var0.__av[var0.__ar[0]] = var1;
+ var0.__av[var0.__ar[0]] = var24;
if(var0.__ar[0] == 0) {
- var56 = 4095;
+ var36 = 4095;
- for(var35 = 15; var35 >= 0; --var35) {
- for(var55 = 15; var55 >= 0; --var55) {
- var0.__av[var56] = var0.__av[var0.__ar[var35] + var55];
- --var56;
+ for(var37 = 15; var37 >= 0; --var37) {
+ for(var38 = 15; var38 >= 0; --var38) {
+ var0.__av[var36] = var0.__av[var0.__ar[var37] + var38];
+ --var36;
}
- var0.__ar[var35] = var56 + 1;
+ var0.__ar[var37] = var36 + 1;
}
}
}
- ++var0.__b[var0.__aj[var1 & 255] & 255];
- WorldMapSection0.__y_p[var47] = var0.__aj[var1 & 255] & 255;
- ++var47;
- if(var45 == 0) {
- ++var43;
- var45 = 50;
- var54 = var0.__ac[var43];
- var22 = var0.__ab[var54];
- var23 = var0.__ak[var54];
- var25 = var0.__al[var54];
- var24 = var0.__aw[var54];
+ ++var0.__b[var0.__aj[var24 & 255] & 255];
+ WorldMapSection0.__y_p[var39] = var0.__aj[var24 & 255] & 255;
+ ++var39;
+ if(var41 == 0) {
+ ++var52;
+ var41 = 50;
+ var40 = var0.__ac[var52];
+ var19 = var0.__ab[var40];
+ var20 = var0.__ak[var40];
+ var22 = var0.__al[var40];
+ var21 = var0.__aw[var40];
}
- --var45;
- var51 = var22;
+ --var41;
+ var42 = var19;
- for(var52 = method3708(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) {
- ++var51;
- var53 = method3711(var0);
+ for(var43 = method3708(var19, var0); var43 > var20[var42]; var43 = var43 << 1 | var44) {
+ ++var42;
+ var44 = method3711(var0);
}
- var46 = var25[var52 - var24[var51]];
+ var45 = var22[var43 - var21[var42]];
} else {
- int var48 = -1;
- int var49 = 1;
+ var46 = -1;
+ var47 = 1;
do {
- if(var46 == 0) {
- var48 += var49;
- } else if(var46 == 1) {
- var48 += var49 * 2;
- }
-
- var49 *= 2;
if(var45 == 0) {
- ++var43;
- var45 = 50;
- var54 = var0.__ac[var43];
- var22 = var0.__ab[var54];
- var23 = var0.__ak[var54];
- var25 = var0.__al[var54];
- var24 = var0.__aw[var54];
+ var46 += var47;
+ } else if(var45 == 1) {
+ var46 += var47 * 2;
}
- --var45;
- var51 = var22;
-
- for(var52 = method3708(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) {
- ++var51;
- var53 = method3711(var0);
+ var47 *= 2;
+ if(var41 == 0) {
+ ++var52;
+ var41 = 50;
+ var40 = var0.__ac[var52];
+ var19 = var0.__ab[var40];
+ var20 = var0.__ak[var40];
+ var22 = var0.__al[var40];
+ var21 = var0.__aw[var40];
}
- var46 = var25[var52 - var24[var51]];
- } while(var46 == 0 || var46 == 1);
+ --var41;
+ var42 = var19;
- ++var48;
- var1 = var0.__aj[var0.__av[var0.__ar[0]] & 255];
+ for(var43 = method3708(var19, var0); var43 > var20[var42]; var43 = var43 << 1 | var44) {
+ ++var42;
+ var44 = method3711(var0);
+ }
- for(var0.__b[var1 & 255] += var48; var48 > 0; --var48) {
- WorldMapSection0.__y_p[var47] = var1 & 255;
- ++var47;
+ var45 = var22[var43 - var21[var42]];
+ } while(var45 == 0 || var45 == 1);
+
+ ++var46;
+ var24 = var0.__aj[var0.__av[var0.__ar[0]] & 255];
+
+ for(var0.__b[var24 & 255] += var46; var46 > 0; --var46) {
+ WorldMapSection0.__y_p[var39] = var24 & 255;
+ ++var39;
}
}
}
@@ -507,18 +507,18 @@ public final class Bzip2Decompressor {
var0.__i = 0;
var0.__r[0] = 0;
- for(var36 = 1; var36 <= 256; ++var36) {
- var0.__r[var36] = var0.__b[var36 - 1];
+ for(var25 = 1; var25 <= 256; ++var25) {
+ var0.__r[var25] = var0.__b[var25 - 1];
}
- for(var36 = 1; var36 <= 256; ++var36) {
- var0.__r[var36] += var0.__r[var36 - 1];
+ for(var25 = 1; var25 <= 256; ++var25) {
+ var0.__r[var25] += var0.__r[var25 - 1];
}
- for(var36 = 0; var36 < var47; ++var36) {
- var1 = (byte)(WorldMapSection0.__y_p[var36] & 255);
- WorldMapSection0.__y_p[var0.__r[var1 & 255]] |= var36 << 8;
- ++var0.__r[var1 & 255];
+ for(var25 = 0; var25 < var39; ++var25) {
+ var24 = (byte)(WorldMapSection0.__y_p[var25] & 255);
+ WorldMapSection0.__y_p[var0.__r[var24 & 255]] |= var25 << 8;
+ ++var0.__r[var24 & 255];
}
var0.__y = WorldMapSection0.__y_p[var0.__t] >> 8;
@@ -527,14 +527,14 @@ public final class Bzip2Decompressor {
var0.__h = (byte)(var0.__y & 255);
var0.__y >>= 8;
++var0.__c;
- var0.__ae = var47;
+ var0.__ae = var39;
method3705(var0);
if(var0.__ae + 1 == var0.__c && var0.__a == 0) {
- var26 = true;
+ var23 = true;
break;
}
- var26 = false;
+ var23 = false;
break;
}
}
@@ -574,9 +574,9 @@ public final class Bzip2Decompressor {
}
}
- int var3 = var1.__z >> var1.__j - var0 & (1 << var0) - 1;
+ int var2 = var1.__z >> var1.__j - var0 & (1 << var0) - 1;
var1.__j -= var0;
- return var3;
+ return var2;
}
@ObfuscatedName("g")
@@ -600,8 +600,9 @@ public final class Bzip2Decompressor {
int var7 = 0;
int var8;
+ int var9;
for(var8 = var4; var8 <= var5; ++var8) {
- for(int var9 = 0; var9 < var6; ++var9) {
+ for(var9 = 0; var9 < var6; ++var9) {
if(var8 == var3[var9]) {
var2[var7] = var9;
++var7;
@@ -625,12 +626,12 @@ public final class Bzip2Decompressor {
var0[var8] = 0;
}
- int var10 = 0;
+ var9 = 0;
for(var8 = var4; var8 <= var5; ++var8) {
- var10 += var1[var8 + 1] - var1[var8];
- var0[var8] = var10 - 1;
- var10 <<= 1;
+ var9 += var1[var8 + 1] - var1[var8];
+ var0[var8] = var9 - 1;
+ var9 <<= 1;
}
for(var8 = var4 + 1; var8 <= var5; ++var8) {
@@ -638,4 +639,8 @@ public final class Bzip2Decompressor {
}
}
+
+ static {
+ Bzip2Decompressor_state = new Bzip2State();
+ }
}
diff --git a/runescape-client/src/main/java/Bzip2State.java b/runescape-client/src/main/java/Bzip2State.java
index aca4b3ea42..22f253fdfe 100644
--- a/runescape-client/src/main/java/Bzip2State.java
+++ b/runescape-client/src/main/java/Bzip2State.java
@@ -59,7 +59,7 @@ public final class Bzip2State {
intValue = 1860254567
)
@Export("surfaceOffsetY")
- int __n;
+ int surfaceOffsetY;
@ObfuscatedName("i")
@Export("__i")
byte __i;
diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java
index 80de74600b..9414a1860f 100644
--- a/runescape-client/src/main/java/Canvas.java
+++ b/runescape-client/src/main/java/Canvas.java
@@ -119,21 +119,22 @@ public final class Canvas extends java.awt.Canvas {
static int method861(int var0, Script var1, boolean var2) {
int var3;
int var4;
+ Widget var6;
if(var0 == 100) {
class179.Interpreter_intStackSize -= 3;
var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- int var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
+ int var9 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
if(var4 == 0) {
throw new RuntimeException();
} else {
- Widget var6 = Huffman.getWidget(var3);
+ var6 = Huffman.getWidget(var3);
if(var6.children == null) {
- var6.children = new Widget[var5 + 1];
+ var6.children = new Widget[var9 + 1];
}
- if(var6.children.length <= var5) {
- Widget[] var7 = new Widget[var5 + 1];
+ if(var6.children.length <= var9) {
+ Widget[] var7 = new Widget[var9 + 1];
for(int var8 = 0; var8 < var6.children.length; ++var8) {
var7[var8] = var6.children[var8];
@@ -142,19 +143,19 @@ public final class Canvas extends java.awt.Canvas {
var6.children = var7;
}
- if(var5 > 0 && var6.children[var5 - 1] == null) {
- throw new RuntimeException("" + (var5 - 1));
+ if(var9 > 0 && var6.children[var9 - 1] == null) {
+ throw new RuntimeException("" + (var9 - 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;
+ Widget var10 = new Widget();
+ var10.type = var4;
+ var10.parentId = var10.id = var6.id;
+ var10.childIndex = var9;
+ var10.isIf3 = true;
+ var6.children[var9] = var10;
if(var2) {
- WorldMapIcon1.__t_i = var12;
+ WorldMapIcon1.__t_i = var10;
} else {
- class12.__n_n = var12;
+ class12.__n_n = var10;
}
class22.method295(var6);
@@ -162,27 +163,27 @@ public final class Canvas extends java.awt.Canvas {
}
}
} else {
- Widget var9;
+ Widget var5;
if(var0 == 101) {
- var9 = var2?WorldMapIcon1.__t_i:class12.__n_n;
- Widget var10 = Huffman.getWidget(var9.id);
- var10.children[var9.childIndex] = null;
- class22.method295(var10);
+ var5 = var2?WorldMapIcon1.__t_i:class12.__n_n;
+ var6 = Huffman.getWidget(var5.id);
+ var6.children[var5.childIndex] = null;
+ class22.method295(var6);
return 1;
} else if(var0 == 102) {
- var9 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
- var9.children = null;
- class22.method295(var9);
+ var5 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
+ var5.children = null;
+ class22.method295(var5);
return 1;
} else if(var0 != 200) {
if(var0 == 201) {
- var9 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
- if(var9 != null) {
+ var5 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
+ if(var5 != null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 1;
if(var2) {
- WorldMapIcon1.__t_i = var9;
+ WorldMapIcon1.__t_i = var5;
} else {
- class12.__n_n = var9;
+ class12.__n_n = var5;
}
} else {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
@@ -196,13 +197,13 @@ public final class Canvas extends java.awt.Canvas {
class179.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- Widget var11 = class204.getWidgetChild(var3, var4);
- if(var11 != null && var4 != -1) {
+ var6 = class204.getWidgetChild(var3, var4);
+ if(var6 != null && var4 != -1) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 1;
if(var2) {
- WorldMapIcon1.__t_i = var11;
+ WorldMapIcon1.__t_i = var6;
} else {
- class12.__n_n = var11;
+ class12.__n_n = var6;
}
} else {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java
index 662bf6a8b3..5c3c6cc072 100644
--- a/runescape-client/src/main/java/ChatChannel.java
+++ b/runescape-client/src/main/java/ChatChannel.java
@@ -117,18 +117,18 @@ public class ChatChannel {
var0.spotAnimationFrame = 0;
}
- int var3 = class50.getSpotAnimationDefinition(var0.spotAnimation).sequence;
- if(var3 != -1) {
- SequenceDefinition var2 = WorldMapAreaData.getSequenceDefinition(var3);
- if(var2 != null && var2.frameIds != null) {
+ int var2 = class50.getSpotAnimationDefinition(var0.spotAnimation).sequence;
+ if(var2 != -1) {
+ SequenceDefinition var3 = WorldMapAreaData.getSequenceDefinition(var2);
+ if(var3 != null && var3.frameIds != null) {
++var0.spotAnimationFrameCycle;
- if(var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) {
+ if(var0.spotAnimationFrame < var3.frameIds.length && var0.spotAnimationFrameCycle > var3.frameLengths[var0.spotAnimationFrame]) {
var0.spotAnimationFrameCycle = 1;
++var0.spotAnimationFrame;
- Script.method2201(var2, var0.spotAnimationFrame, var0.x, var0.y);
+ Script.method2201(var3, var0.spotAnimationFrame, var0.x, var0.y);
}
- if(var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) {
+ if(var0.spotAnimationFrame >= var3.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3.frameIds.length)) {
var0.spotAnimation = -1;
}
} else {
@@ -217,100 +217,100 @@ public class ChatChannel {
int var4;
int var5;
- int var13;
+ int var6;
if(var0.type == 2) {
- var13 = 0;
+ var6 = 0;
for(var4 = 0; var4 < var0.height; ++var4) {
for(var5 = 0; var5 < var0.width; ++var5) {
- int var6 = (var0.paddingX + 32) * var5;
- int var7 = (var0.paddingY + 32) * var4;
- if(var13 < 20) {
- var6 += var0.inventoryXOffsets[var13];
- var7 += var0.inventoryYOffsets[var13];
+ int var7 = (var0.paddingX + 32) * var5;
+ int var8 = (var0.paddingY + 32) * var4;
+ if(var6 < 20) {
+ var7 += var0.inventoryXOffsets[var6];
+ var8 += var0.inventoryYOffsets[var6];
}
- if(var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) {
- Client.dragItemSlotDestination = var13;
+ if(var1 >= var7 && var2 >= var8 && var1 < var7 + 32 && var2 < var8 + 32) {
+ Client.dragItemSlotDestination = var6;
UserComparator6.__fg_jh = var0;
- if(var0.itemIds[var13] > 0) {
- ItemDefinition var8 = Skills.getItemDefinition(var0.itemIds[var13] - 1);
+ if(var0.itemIds[var6] > 0) {
+ ItemDefinition var9 = Skills.getItemDefinition(var0.itemIds[var6] - 1);
if(Client.isItemSelected == 1 && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
- if(var0.id != ServerPacket.selectedItemWidget || var13 != HealthBarDefinition.selectedItemSlot) {
- Tiles.method1106("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id);
+ if(var0.id != ServerPacket.selectedItemWidget || var6 != HealthBarDefinition.selectedItemSlot) {
+ Tiles.method1106("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16748608) + var9.name, 31, var9.id, var6, var0.id);
}
} else if(Client.isSpellSelected && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
if((FloorDecoration.selectedSpellFlags & 16) == 16) {
- Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id);
+ Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16748608) + var9.name, 32, var9.id, var6, var0.id);
}
} else {
- String[] var9 = var8.inventoryActions;
- int var10 = -1;
+ String[] var10 = var9.inventoryActions;
+ int var11 = -1;
if(Client.shiftClickDrop && WorldMapEvent.method779()) {
- var10 = var8.getShiftClickIndex();
+ var11 = var9.getShiftClickIndex();
}
- int var11;
+ int var12;
if(WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
- for(var11 = 4; var11 >= 3; --var11) {
- if(var10 != var11) {
- AccessFile.method2726(var0, var8, var13, var11, false);
+ for(var12 = 4; var12 >= 3; --var12) {
+ if(var11 != var12) {
+ AccessFile.method2726(var0, var9, var6, var12, false);
}
}
}
if(SecureRandomFuture.method2101(class1.getWidgetClickMask(var0))) {
- Tiles.method1106("Use", BufferedFile.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id);
+ Tiles.method1106("Use", BufferedFile.colorStartTag(16748608) + var9.name, 38, var9.id, var6, var0.id);
}
if(WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
- for(var11 = 2; var11 >= 0; --var11) {
- if(var11 != var10) {
- AccessFile.method2726(var0, var8, var13, var11, false);
+ for(var12 = 2; var12 >= 0; --var12) {
+ if(var12 != var11) {
+ AccessFile.method2726(var0, var9, var6, var12, false);
}
}
- if(var10 >= 0) {
- AccessFile.method2726(var0, var8, var13, var10, true);
+ if(var11 >= 0) {
+ AccessFile.method2726(var0, var9, var6, var11, true);
}
}
- var9 = var0.itemActions;
- if(var9 != null) {
- for(var11 = 4; var11 >= 0; --var11) {
- if(var9[var11] != null) {
- byte var12 = 0;
- if(var11 == 0) {
- var12 = 39;
+ var10 = var0.itemActions;
+ if(var10 != null) {
+ for(var12 = 4; var12 >= 0; --var12) {
+ if(var10[var12] != null) {
+ byte var13 = 0;
+ if(var12 == 0) {
+ var13 = 39;
}
- if(var11 == 1) {
- var12 = 40;
+ if(var12 == 1) {
+ var13 = 40;
}
- if(var11 == 2) {
- var12 = 41;
+ if(var12 == 2) {
+ var13 = 41;
}
- if(var11 == 3) {
- var12 = 42;
+ if(var12 == 3) {
+ var13 = 42;
}
- if(var11 == 4) {
- var12 = 43;
+ if(var12 == 4) {
+ var13 = 43;
}
- Tiles.method1106(var9[var11], BufferedFile.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id);
+ Tiles.method1106(var10[var12], BufferedFile.colorStartTag(16748608) + var9.name, var13, var9.id, var6, var0.id);
}
}
}
- Tiles.method1106("Examine", BufferedFile.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id);
+ Tiles.method1106("Examine", BufferedFile.colorStartTag(16748608) + var9.name, 1005, var9.id, var6, var0.id);
}
}
}
- ++var13;
+ ++var6;
}
}
}
@@ -318,13 +318,14 @@ public class ChatChannel {
if(var0.isIf3) {
if(Client.isSpellSelected) {
if(WorldComparator.method58(class1.getWidgetClickMask(var0)) && (FloorDecoration.selectedSpellFlags & 32) == 32) {
- Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id);
+ Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + var0.dataText, 58, 0, var0.childIndex, var0.id);
}
} else {
- for(var13 = 9; var13 >= 5; --var13) {
- String var14 = GameShell.method1060(var0, var13);
+ String var14;
+ for(var6 = 9; var6 >= 5; --var6) {
+ var14 = GameShell.method1060(var0, var6);
if(var14 != null) {
- Tiles.method1106(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id);
+ Tiles.method1106(var14, var0.dataText, 1007, var6 + 1, var0.childIndex, var0.id);
}
}
@@ -334,15 +335,15 @@ public class ChatChannel {
}
for(var4 = 4; var4 >= 0; --var4) {
- String var15 = GameShell.method1060(var0, var4);
- if(var15 != null) {
- class16.insertMenuItem(var15, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.__fz);
+ var14 = GameShell.method1060(var0, var4);
+ if(var14 != null) {
+ class16.insertMenuItem(var14, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.__fz);
}
}
var5 = class1.getWidgetClickMask(var0);
- boolean var16 = (var5 & 1) != 0;
- if(var16) {
+ boolean var15 = (var5 & 1) != 0;
+ if(var15) {
Tiles.method1106("Continue", "", 30, 0, var0.childIndex, var0.id);
}
}
diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java
index a0871d5700..902b0f4d82 100644
--- a/runescape-client/src/main/java/ClanChat.java
+++ b/runescape-client/src/main/java/ClanChat.java
@@ -100,49 +100,49 @@ public class ClanChat extends UserList {
public final void readUpdate(Buffer var1) {
this.__x_473(var1.readStringCp1252NullTerminated());
long var2 = var1.readLong();
- long var5 = var2;
- String var4;
+ long var4 = var2;
+ String var6;
int var7;
if(var2 > 0L && var2 < 6582952005840035281L) {
if(var2 % 37L == 0L) {
- var4 = null;
+ var6 = null;
} else {
var7 = 0;
- for(long var13 = var2; var13 != 0L; var13 /= 37L) {
+ for(long var8 = var2; var8 != 0L; var8 /= 37L) {
++var7;
}
- StringBuilder var15 = new StringBuilder(var7);
+ StringBuilder var11 = new StringBuilder(var7);
- while(var5 != 0L) {
- long var11 = var5;
- var5 /= 37L;
- var15.append(class306.base37Table[(int)(var11 - 37L * var5)]);
+ while(var4 != 0L) {
+ long var9 = var4;
+ var4 /= 37L;
+ var11.append(class306.base37Table[(int)(var9 - 37L * var4)]);
}
- var4 = var15.reverse().toString();
+ var6 = var11.reverse().toString();
}
} else {
- var4 = null;
+ var6 = null;
}
- this.__q_472(var4);
+ this.__q_472(var6);
this.__k = var1.readByte();
var7 = var1.readUnsignedByte();
if(var7 != 255) {
this.clear();
- for(int var8 = 0; var8 < var7; ++var8) {
- ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType));
+ for(int var12 = 0; var12 < var7; ++var12) {
+ ClanMate var13 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType));
int var10 = var1.__ag_302();
- var9.set(var10, ++this.__i - 1);
- var9.rank = var1.readByte();
+ var13.set(var10, ++this.__i - 1);
+ var13.rank = var1.readByte();
var1.readStringCp1252NullTerminated();
- this.__cp_475(var9);
+ this.__cp_475(var13);
}
-
}
+
}
@ObfuscatedName("a")
diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java
index 7cedb7c49e..8e1d3134c0 100644
--- a/runescape-client/src/main/java/Client.java
+++ b/runescape-client/src/main/java/Client.java
@@ -824,7 +824,7 @@ public final class Client extends GameShell implements Usernamed {
signature = "[Lcv;"
)
@Export("npcs")
- static Npc[] npcs;
+ static NPC[] npcs;
@ObfuscatedName("ep")
@ObfuscatedGetter(
intValue = -1569269731
@@ -1366,6 +1366,4997 @@ public final class Client extends GameShell implements Usernamed {
@Export("__client_lc")
static int __client_lc;
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ signature = "(I)V",
+ garbageValue = "-1773624745"
+ )
+ protected final void __j_113() {
+ __client_oa = class203.currentTimeMs() + 500L;
+ this.__ge_137();
+ if(rootWidgetGroup != -1) {
+ this.__iu_141(true);
+ }
+
+ }
+
+ @ObfuscatedName("aw")
+ @ObfuscatedSignature(
+ signature = "(I)V",
+ garbageValue = "1297880469"
+ )
+ protected final void setUp() {
+ WorldMapCacheName.method633(new int[]{20, 260, 10000}, new int[]{1000, 100, 500});
+ class2.port1 = gameBuild == 0?43594:worldId + 40000;
+ WorldMapArea.port2 = gameBuild == 0?443:worldId + 50000;
+ class203.port3 = class2.port1;
+ PlayerAppearance.__hi_g = class226.__ht_m;
+ class229.__hz_l = class226.__ht_f;
+ class227.__hj_e = class226.__ht_q;
+ IndexCacheLoader.__bd_x = class226.__ht_w;
+ TriBool.urlRequester = new UrlRequester();
+ this.setUpKeyboard();
+ this.setUpMouse();
+ class16.mouseWheel = this.mouseWheel();
+ Fonts.indexStore255 = new IndexStore(255, class168.dat2File, class168.idx255File, 500000);
+ ReflectionCheck.clientPreferences = class306.method5780();
+ this.setUpClipboard();
+ String var1 = Ignored.__ks_at;
+ class50.__af_m = this;
+ if(var1 != null) {
+ class50.__af_f = var1;
+ }
+
+ if(gameBuild != 0) {
+ displayFps = true;
+ }
+
+ GroundItem.method2095(ReflectionCheck.clientPreferences.windowMode);
+ WorldMapArea.friendSystem = new FriendSystem(KeyHandler.loginType);
+ }
+
+ @ObfuscatedName("al")
+ @ObfuscatedSignature(
+ signature = "(I)V",
+ garbageValue = "1445885427"
+ )
+ protected final void __al_111() {
+ ++cycle;
+ this.doCycleJs5();
+ class3.method41();
+
+ int var1;
+ try {
+ if(class214.__hf_o == 1) {
+ var1 = class214.midiPcmStream.__f_341();
+ if(var1 > 0 && class214.midiPcmStream.isReady()) {
+ var1 -= FaceNormal.__el_x;
+ if(var1 < 0) {
+ var1 = 0;
+ }
+
+ class214.midiPcmStream.__m_340(var1);
+ } else {
+ class214.midiPcmStream.clear();
+ class214.midiPcmStream.removeAll();
+ if(class214.__hf_u != null) {
+ class214.__hf_o = 2;
+ } else {
+ class214.__hf_o = 0;
+ }
+
+ class13.musicTrack = null;
+ class307.soundCache = null;
+ }
+ }
+ } catch (Exception var54) {
+ var54.printStackTrace();
+ class214.midiPcmStream.clear();
+ class214.__hf_o = 0;
+ class13.musicTrack = null;
+ class307.soundCache = null;
+ class214.__hf_u = null;
+ }
+
+ class13.playPcmPlayers();
+ class171.method3498();
+ MouseHandler var2 = MouseHandler.MouseHandler_instance;
+ MouseHandler var3 = MouseHandler.MouseHandler_instance;
+ synchronized(MouseHandler.MouseHandler_instance) {
+ MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButton0;
+ MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_x0;
+ MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_y0;
+ MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_millis0;
+ MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButton0;
+ MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedX0;
+ MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedY0;
+ MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis0;
+ MouseHandler.MouseHandler_lastButton0 = 0;
+ }
+
+ if(class16.mouseWheel != null) {
+ var1 = class16.mouseWheel.useRotation();
+ mouseWheelRotation = var1;
+ }
+
+ if(gameState == 0) {
+ class171.method3497();
+ class11.method145();
+ } else if(gameState == 5) {
+ class54.method1092(this);
+ class171.method3497();
+ class11.method145();
+ } else if(gameState != 10 && gameState != 11) {
+ if(gameState == 20) {
+ class54.method1092(this);
+ this.doCycleLoggedOut();
+ } else if(gameState == 25) {
+ UserComparator10.method3352(false);
+ __client_fe = 0;
+ boolean var55 = true;
+
+ int var4;
+ for(var4 = 0; var4 < class40.regionLandArchives.length; ++var4) {
+ if(IndexCacheLoader.regionMapArchiveIds[var4] != -1 && class40.regionLandArchives[var4] == null) {
+ class40.regionLandArchives[var4] = SecureRandomFuture.indexCache5.takeRecord(IndexCacheLoader.regionMapArchiveIds[var4], 0);
+ if(class40.regionLandArchives[var4] == null) {
+ var55 = false;
+ ++__client_fe;
+ }
+ }
+
+ if(MouseHandler.regionLandArchiveIds[var4] != -1 && HealthBarUpdate.regionMapArchives[var4] == null) {
+ HealthBarUpdate.regionMapArchives[var4] = SecureRandomFuture.indexCache5.takeRecordEncrypted(MouseHandler.regionLandArchiveIds[var4], 0, class190.xteaKeys[var4]);
+ if(HealthBarUpdate.regionMapArchives[var4] == null) {
+ var55 = false;
+ ++__client_fe;
+ }
+ }
+ }
+
+ if(!var55) {
+ __client_gh = 1;
+ } else {
+ __client_fk = 0;
+ var55 = true;
+
+ int var5;
+ int var6;
+ for(var4 = 0; var4 < class40.regionLandArchives.length; ++var4) {
+ byte[] var7 = HealthBarUpdate.regionMapArchives[var4];
+ if(var7 != null) {
+ var5 = (class308.regions[var4] >> 8) * 64 - class50.baseX;
+ var6 = (class308.regions[var4] & 255) * 64 - GraphicsObject.baseY;
+ if(isInInstance) {
+ var5 = 10;
+ var6 = 10;
+ }
+
+ var55 &= TextureProvider.method2774(var7, var5, var6);
+ }
+ }
+
+ if(!var55) {
+ __client_gh = 2;
+ } else {
+ if(__client_gh != 0) {
+ class68.drawLoadingMessage("Loading - please wait.
(100%)", true);
+ }
+
+ class13.playPcmPlayers();
+ class65.scene.clear();
+
+ for(var4 = 0; var4 < 4; ++var4) {
+ collisionMaps[var4].clear();
+ }
+
+ int var56;
+ for(var4 = 0; var4 < 4; ++var4) {
+ for(var56 = 0; var56 < 104; ++var56) {
+ for(var5 = 0; var5 < 104; ++var5) {
+ Tiles.Tiles_renderFlags[var4][var56][var5] = 0;
+ }
+ }
+ }
+
+ class13.playPcmPlayers();
+ Tiles.Tiles_minPlane = 99;
+ Tiles.__bq_w = new byte[4][104][104];
+ Fonts.__kz_o = new byte[4][104][104];
+ class32.__ay_u = new byte[4][104][104];
+ class307.__kc_g = new byte[4][104][104];
+ Tiles.__bq_a = new int[4][105][105];
+ Tiles.__bq_l = new byte[4][105][105];
+ Huffman.__gd_e = new int[105][105];
+ class13.__i_x = new int[104];
+ Formatting.__cy_d = new int[104];
+ class214.__hf_k = new int[104];
+ WorldMapSectionType.__h_n = new int[104];
+ Message.__bm_i = new int[104];
+ var4 = class40.regionLandArchives.length;
+ SpriteMask.method4390();
+ UserComparator10.method3352(true);
+ int var8;
+ int var9;
+ int var10;
+ int var11;
+ int var12;
+ int var13;
+ int var14;
+ int var15;
+ int var16;
+ int var17;
+ int var18;
+ int var19;
+ int var20;
+ int var21;
+ if(!isInInstance) {
+ byte[] var22;
+ for(var56 = 0; var56 < var4; ++var56) {
+ var5 = (class308.regions[var56] >> 8) * 64 - class50.baseX;
+ var6 = (class308.regions[var56] & 255) * 64 - GraphicsObject.baseY;
+ var22 = class40.regionLandArchives[var56];
+ if(var22 != null) {
+ class13.playPcmPlayers();
+ Varcs.method2166(var22, var5, var6, GameObject.__eh_fy * 8 - 48, WorldMapLabelSize.__s_fi * 8 - 48, collisionMaps);
+ }
+ }
+
+ for(var56 = 0; var56 < var4; ++var56) {
+ var5 = (class308.regions[var56] >> 8) * 64 - class50.baseX;
+ var6 = (class308.regions[var56] & 255) * 64 - GraphicsObject.baseY;
+ var22 = class40.regionLandArchives[var56];
+ if(var22 == null && WorldMapLabelSize.__s_fi < 800) {
+ class13.playPcmPlayers();
+ UserComparator6.method3390(var5, var6, 64, 64);
+ }
+ }
+
+ UserComparator10.method3352(true);
+
+ for(var56 = 0; var56 < var4; ++var56) {
+ byte[] var23 = HealthBarUpdate.regionMapArchives[var56];
+ if(var23 != null) {
+ var6 = (class308.regions[var56] >> 8) * 64 - class50.baseX;
+ var21 = (class308.regions[var56] & 255) * 64 - GraphicsObject.baseY;
+ class13.playPcmPlayers();
+ Scene var24 = class65.scene;
+ CollisionMap[] var25 = collisionMaps;
+ Buffer var26 = new Buffer(var23);
+ var8 = -1;
+
+ while(true) {
+ var9 = var26.__at_308();
+ if(var9 == 0) {
+ break;
+ }
+
+ var8 += var9;
+ var10 = 0;
+
+ while(true) {
+ var11 = var26.__ae_307();
+ if(var11 == 0) {
+ break;
+ }
+
+ var10 += var11 - 1;
+ var12 = var10 & 63;
+ var13 = var10 >> 6 & 63;
+ var14 = var10 >> 12;
+ var15 = var26.readUnsignedByte();
+ var16 = var15 >> 2;
+ var17 = var15 & 3;
+ var18 = var6 + var13;
+ var19 = var12 + var21;
+ if(var18 > 0 && var19 > 0 && var18 < 103 && var19 < 103) {
+ var20 = var14;
+ if((Tiles.Tiles_renderFlags[1][var18][var19] & 2) == 2) {
+ var20 = var14 - 1;
+ }
+
+ CollisionMap var27 = null;
+ if(var20 >= 0) {
+ var27 = var25[var20];
+ }
+
+ class227.method4446(var14, var18, var19, var8, var17, var16, var24, var27);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ int var57;
+ int var58;
+ int var59;
+ if(isInInstance) {
+ var56 = 0;
+
+ label998:
+ while(true) {
+ if(var56 >= 4) {
+ for(var56 = 0; var56 < 13; ++var56) {
+ for(var5 = 0; var5 < 13; ++var5) {
+ var6 = instanceChunkTemplates[0][var56][var5];
+ if(var6 == -1) {
+ UserComparator6.method3390(var56 * 8, var5 * 8, 8, 8);
+ }
+ }
+ }
+
+ UserComparator10.method3352(true);
+ var56 = 0;
+
+ while(true) {
+ if(var56 >= 4) {
+ break label998;
+ }
+
+ class13.playPcmPlayers();
+
+ for(var5 = 0; var5 < 13; ++var5) {
+ for(var6 = 0; var6 < 13; ++var6) {
+ var21 = instanceChunkTemplates[var56][var5][var6];
+ if(var21 != -1) {
+ var57 = var21 >> 24 & 3;
+ var58 = var21 >> 1 & 3;
+ var59 = var21 >> 14 & 1023;
+ var8 = var21 >> 3 & 2047;
+ var9 = (var59 / 8 << 8) + var8 / 8;
+
+ for(var10 = 0; var10 < class308.regions.length; ++var10) {
+ if(class308.regions[var10] == var9 && HealthBarUpdate.regionMapArchives[var10] != null) {
+ ServerPacket.method3662(HealthBarUpdate.regionMapArchives[var10], var56, var5 * 8, var6 * 8, var57, (var59 & 7) * 8, (var8 & 7) * 8, var58, class65.scene, collisionMaps);
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ ++var56;
+ }
+ }
+
+ class13.playPcmPlayers();
+
+ for(var5 = 0; var5 < 13; ++var5) {
+ for(var6 = 0; var6 < 13; ++var6) {
+ boolean var60 = false;
+ var57 = instanceChunkTemplates[var56][var5][var6];
+ if(var57 != -1) {
+ var58 = var57 >> 24 & 3;
+ var59 = var57 >> 1 & 3;
+ var8 = var57 >> 14 & 1023;
+ var9 = var57 >> 3 & 2047;
+ var10 = (var8 / 8 << 8) + var9 / 8;
+
+ for(var11 = 0; var11 < class308.regions.length; ++var11) {
+ if(class308.regions[var11] == var10 && class40.regionLandArchives[var11] != null) {
+ class204.method4013(class40.regionLandArchives[var11], var56, var5 * 8, var6 * 8, var58, (var8 & 7) * 8, (var9 & 7) * 8, var59, collisionMaps);
+ var60 = true;
+ break;
+ }
+ }
+ }
+
+ if(!var60) {
+ var58 = var56;
+ var59 = var5 * 8;
+ var8 = var6 * 8;
+
+ for(var9 = 0; var9 < 8; ++var9) {
+ for(var10 = 0; var10 < 8; ++var10) {
+ Tiles.Tiles_heights[var58][var9 + var59][var10 + var8] = 0;
+ }
+ }
+
+ if(var59 > 0) {
+ for(var9 = 1; var9 < 8; ++var9) {
+ Tiles.Tiles_heights[var58][var59][var8 + var9] = Tiles.Tiles_heights[var58][var59 - 1][var8 + var9];
+ }
+ }
+
+ if(var8 > 0) {
+ for(var9 = 1; var9 < 8; ++var9) {
+ Tiles.Tiles_heights[var58][var59 + var9][var8] = Tiles.Tiles_heights[var58][var59 + var9][var8 - 1];
+ }
+ }
+
+ if(var59 > 0 && Tiles.Tiles_heights[var58][var59 - 1][var8] != 0) {
+ Tiles.Tiles_heights[var58][var59][var8] = Tiles.Tiles_heights[var58][var59 - 1][var8];
+ } else if(var8 > 0 && Tiles.Tiles_heights[var58][var59][var8 - 1] != 0) {
+ Tiles.Tiles_heights[var58][var59][var8] = Tiles.Tiles_heights[var58][var59][var8 - 1];
+ } else if(var59 > 0 && var8 > 0 && Tiles.Tiles_heights[var58][var59 - 1][var8 - 1] != 0) {
+ Tiles.Tiles_heights[var58][var59][var8] = Tiles.Tiles_heights[var58][var59 - 1][var8 - 1];
+ }
+ }
+ }
+ }
+
+ ++var56;
+ }
+ }
+
+ UserComparator10.method3352(true);
+ class13.playPcmPlayers();
+ Scene var61 = class65.scene;
+ CollisionMap[] var62 = collisionMaps;
+
+ for(var6 = 0; var6 < 4; ++var6) {
+ for(var21 = 0; var21 < 104; ++var21) {
+ for(var57 = 0; var57 < 104; ++var57) {
+ if((Tiles.Tiles_renderFlags[var6][var21][var57] & 1) == 1) {
+ var58 = var6;
+ if((Tiles.Tiles_renderFlags[1][var21][var57] & 2) == 2) {
+ var58 = var6 - 1;
+ }
+
+ if(var58 >= 0) {
+ var62[var58].__w_285(var21, var57);
+ }
+ }
+ }
+ }
+ }
+
+ Tiles.__bq_p += (int)(Math.random() * 5.0D) - 2;
+ if(Tiles.__bq_p < -8) {
+ Tiles.__bq_p = -8;
+ }
+
+ if(Tiles.__bq_p > 8) {
+ Tiles.__bq_p = 8;
+ }
+
+ Tiles.__bq_v += (int)(Math.random() * 5.0D) - 2;
+ if(Tiles.__bq_v < -16) {
+ Tiles.__bq_v = -16;
+ }
+
+ if(Tiles.__bq_v > 16) {
+ Tiles.__bq_v = 16;
+ }
+
+ for(var6 = 0; var6 < 4; ++var6) {
+ byte[][] var63 = Tiles.__bq_l[var6];
+ var10 = (int)Math.sqrt(5100.0D);
+ var11 = var10 * 768 >> 8;
+
+ int var28;
+ for(var12 = 1; var12 < 103; ++var12) {
+ for(var13 = 1; var13 < 103; ++var13) {
+ var14 = Tiles.Tiles_heights[var6][var13 + 1][var12] - Tiles.Tiles_heights[var6][var13 - 1][var12];
+ var15 = Tiles.Tiles_heights[var6][var13][var12 + 1] - Tiles.Tiles_heights[var6][var13][var12 - 1];
+ var16 = (int)Math.sqrt((double)(var15 * var15 + var14 * var14 + 65536));
+ var17 = (var14 << 8) / var16;
+ var18 = 65536 / var16;
+ var19 = (var15 << 8) / var16;
+ var20 = (var19 * -50 + var17 * -50 + var18 * -10) / var11 + 96;
+ var28 = (var63[var13 - 1][var12] >> 2) + (var63[var13][var12 - 1] >> 2) + (var63[var13 + 1][var12] >> 3) + (var63[var13][var12 + 1] >> 3) + (var63[var13][var12] >> 1);
+ Huffman.__gd_e[var13][var12] = var20 - var28;
+ }
+ }
+
+ for(var12 = 0; var12 < 104; ++var12) {
+ class13.__i_x[var12] = 0;
+ Formatting.__cy_d[var12] = 0;
+ class214.__hf_k[var12] = 0;
+ WorldMapSectionType.__h_n[var12] = 0;
+ Message.__bm_i[var12] = 0;
+ }
+
+ for(var12 = -5; var12 < 109; ++var12) {
+ for(var13 = 0; var13 < 104; ++var13) {
+ var14 = var12 + 5;
+ UnderlayDefinition var29;
+ if(var14 >= 0 && var14 < 104) {
+ var15 = Tiles.__bq_w[var6][var14][var13] & 255;
+ if(var15 > 0) {
+ var29 = StudioGame.method4550(var15 - 1);
+ class13.__i_x[var13] += var29.hue;
+ Formatting.__cy_d[var13] += var29.saturation;
+ class214.__hf_k[var13] += var29.lightness;
+ WorldMapSectionType.__h_n[var13] += var29.hueMultiplier;
+ ++Message.__bm_i[var13];
+ }
+ }
+
+ var15 = var12 - 5;
+ if(var15 >= 0 && var15 < 104) {
+ var16 = Tiles.__bq_w[var6][var15][var13] & 255;
+ if(var16 > 0) {
+ var29 = StudioGame.method4550(var16 - 1);
+ class13.__i_x[var13] -= var29.hue;
+ Formatting.__cy_d[var13] -= var29.saturation;
+ class214.__hf_k[var13] -= var29.lightness;
+ WorldMapSectionType.__h_n[var13] -= var29.hueMultiplier;
+ --Message.__bm_i[var13];
+ }
+ }
+ }
+
+ if(var12 >= 1 && var12 < 103) {
+ var13 = 0;
+ var14 = 0;
+ var15 = 0;
+ var16 = 0;
+ var17 = 0;
+
+ for(var18 = -5; var18 < 109; ++var18) {
+ var19 = var18 + 5;
+ if(var19 >= 0 && var19 < 104) {
+ var13 += class13.__i_x[var19];
+ var14 += Formatting.__cy_d[var19];
+ var15 += class214.__hf_k[var19];
+ var16 += WorldMapSectionType.__h_n[var19];
+ var17 += Message.__bm_i[var19];
+ }
+
+ var20 = var18 - 5;
+ if(var20 >= 0 && var20 < 104) {
+ var13 -= class13.__i_x[var20];
+ var14 -= Formatting.__cy_d[var20];
+ var15 -= class214.__hf_k[var20];
+ var16 -= WorldMapSectionType.__h_n[var20];
+ var17 -= Message.__bm_i[var20];
+ }
+
+ if(var18 >= 1 && var18 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var12][var18] & 2) != 0 || (Tiles.Tiles_renderFlags[var6][var12][var18] & 16) == 0)) {
+ if(var6 < Tiles.Tiles_minPlane) {
+ Tiles.Tiles_minPlane = var6;
+ }
+
+ var28 = Tiles.__bq_w[var6][var12][var18] & 255;
+ int var66 = Fonts.__kz_o[var6][var12][var18] & 255;
+ if(var28 > 0 || var66 > 0) {
+ int var30 = Tiles.Tiles_heights[var6][var12][var18];
+ int var31 = Tiles.Tiles_heights[var6][var12 + 1][var18];
+ int var32 = Tiles.Tiles_heights[var6][var12 + 1][var18 + 1];
+ int var33 = Tiles.Tiles_heights[var6][var12][var18 + 1];
+ int var34 = Huffman.__gd_e[var12][var18];
+ int var35 = Huffman.__gd_e[var12 + 1][var18];
+ int var36 = Huffman.__gd_e[var12 + 1][var18 + 1];
+ int var37 = Huffman.__gd_e[var12][var18 + 1];
+ int var38 = -1;
+ int var39 = -1;
+ int var40;
+ int var41;
+ int var42;
+ if(var28 > 0) {
+ var40 = var13 * 256 / var16;
+ var41 = var14 / var17;
+ var42 = var15 / var17;
+ var38 = WorldMapAreaData.method712(var40, var41, var42);
+ var40 = var40 + Tiles.__bq_p & 255;
+ var42 += Tiles.__bq_v;
+ if(var42 < 0) {
+ var42 = 0;
+ } else if(var42 > 255) {
+ var42 = 255;
+ }
+
+ var39 = WorldMapAreaData.method712(var40, var41, var42);
+ }
+
+ OverlayDefinition var43;
+ if(var6 > 0) {
+ boolean var44 = true;
+ if(var28 == 0 && class32.__ay_u[var6][var12][var18] != 0) {
+ var44 = false;
+ }
+
+ if(var66 > 0) {
+ var42 = var66 - 1;
+ var43 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var42);
+ OverlayDefinition var45;
+ if(var43 != null) {
+ var45 = var43;
+ } else {
+ byte[] var46 = OverlayDefinition.__jf_m.takeRecord(4, var42);
+ var43 = new OverlayDefinition();
+ if(var46 != null) {
+ var43.read(new Buffer(var46), var42);
+ }
+
+ var43.init();
+ OverlayDefinition.__jf_f.put(var43, (long)var42);
+ var45 = var43;
+ }
+
+ if(!var45.__o) {
+ var44 = false;
+ }
+ }
+
+ if(var44 && var30 == var31 && var30 == var32 && var33 == var30) {
+ Tiles.__bq_a[var6][var12][var18] |= 2340;
+ }
+ }
+
+ var40 = 0;
+ if(var39 != -1) {
+ var40 = Rasterizer3D.Rasterizer3D_colorPalette[class15.method183(var39, 96)];
+ }
+
+ if(var66 == 0) {
+ var61.addTile(var6, var12, var18, 0, 0, -1, var30, var31, var32, var33, class15.method183(var38, var34), class15.method183(var38, var35), class15.method183(var38, var36), class15.method183(var38, var37), 0, 0, 0, 0, var40, 0);
+ } else {
+ var41 = class32.__ay_u[var6][var12][var18] + 1;
+ byte var67 = class307.__kc_g[var6][var12][var18];
+ int var68 = var66 - 1;
+ OverlayDefinition var69 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var68);
+ if(var69 != null) {
+ var43 = var69;
+ } else {
+ byte[] var47 = OverlayDefinition.__jf_m.takeRecord(4, var68);
+ var69 = new OverlayDefinition();
+ if(var47 != null) {
+ var69.read(new Buffer(var47), var68);
+ }
+
+ var69.init();
+ OverlayDefinition.__jf_f.put(var69, (long)var68);
+ var43 = var69;
+ }
+
+ int var70 = var43.texture;
+ int var48;
+ int var49;
+ int var50;
+ int var51;
+ if(var70 >= 0) {
+ var49 = Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var70);
+ var48 = -1;
+ } else if(var43.rgb == 16711935) {
+ var48 = -2;
+ var70 = -1;
+ var49 = -2;
+ } else {
+ var48 = WorldMapAreaData.method712(var43.hue, var43.saturation, var43.lightness);
+ var50 = var43.hue + Tiles.__bq_p & 255;
+ var51 = var43.lightness + Tiles.__bq_v;
+ if(var51 < 0) {
+ var51 = 0;
+ } else if(var51 > 255) {
+ var51 = 255;
+ }
+
+ var49 = WorldMapAreaData.method712(var50, var43.saturation, var51);
+ }
+
+ var50 = 0;
+ if(var49 != -2) {
+ var50 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var49, 96)];
+ }
+
+ if(var43.rgb2 != -1) {
+ var51 = var43.hue2 + Tiles.__bq_p & 255;
+ int var52 = var43.lightness2 + Tiles.__bq_v;
+ if(var52 < 0) {
+ var52 = 0;
+ } else if(var52 > 255) {
+ var52 = 255;
+ }
+
+ var49 = WorldMapAreaData.method712(var51, var43.saturation2, var52);
+ var50 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var49, 96)];
+ }
+
+ var61.addTile(var6, var12, var18, var41, var67, var70, var30, var31, var32, var33, class15.method183(var38, var34), class15.method183(var38, var35), class15.method183(var38, var36), class15.method183(var38, var37), class25.method348(var48, var34), class25.method348(var48, var35), class25.method348(var48, var36), class25.method348(var48, var37), var40, var50);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ for(var12 = 1; var12 < 103; ++var12) {
+ for(var13 = 1; var13 < 103; ++var13) {
+ if((Tiles.Tiles_renderFlags[var6][var13][var12] & 8) != 0) {
+ var18 = 0;
+ } else if(var6 > 0 && (Tiles.Tiles_renderFlags[1][var13][var12] & 2) != 0) {
+ var18 = var6 - 1;
+ } else {
+ var18 = var6;
+ }
+
+ var61.setTileMinPlane(var6, var13, var12, var18);
+ }
+ }
+
+ Tiles.__bq_w[var6] = (byte[][])null;
+ Fonts.__kz_o[var6] = (byte[][])null;
+ class32.__ay_u[var6] = (byte[][])null;
+ class307.__kc_g[var6] = (byte[][])null;
+ Tiles.__bq_l[var6] = (byte[][])null;
+ }
+
+ var61.__aw_247(-50, -10, -50);
+
+ for(var6 = 0; var6 < 104; ++var6) {
+ for(var21 = 0; var21 < 104; ++var21) {
+ if((Tiles.Tiles_renderFlags[1][var6][var21] & 2) == 2) {
+ var61.setLinkBelow(var6, var21);
+ }
+ }
+ }
+
+ var6 = 1;
+ var21 = 2;
+ var57 = 4;
+
+ for(var58 = 0; var58 < 4; ++var58) {
+ if(var58 > 0) {
+ var6 <<= 3;
+ var21 <<= 3;
+ var57 <<= 3;
+ }
+
+ for(var59 = 0; var59 <= var58; ++var59) {
+ for(var8 = 0; var8 <= 104; ++var8) {
+ for(var9 = 0; var9 <= 104; ++var9) {
+ short var64;
+ if((Tiles.__bq_a[var59][var9][var8] & var6) != 0) {
+ var10 = var8;
+ var11 = var8;
+ var12 = var59;
+
+ for(var13 = var59; var10 > 0 && (Tiles.__bq_a[var59][var9][var10 - 1] & var6) != 0; --var10) {
+ ;
+ }
+
+ while(var11 < 104 && (Tiles.__bq_a[var59][var9][var11 + 1] & var6) != 0) {
+ ++var11;
+ }
+
+ label649:
+ while(var12 > 0) {
+ for(var14 = var10; var14 <= var11; ++var14) {
+ if((Tiles.__bq_a[var12 - 1][var9][var14] & var6) == 0) {
+ break label649;
+ }
+ }
+
+ --var12;
+ }
+
+ label638:
+ while(var13 < var58) {
+ for(var14 = var10; var14 <= var11; ++var14) {
+ if((Tiles.__bq_a[var13 + 1][var9][var14] & var6) == 0) {
+ break label638;
+ }
+ }
+
+ ++var13;
+ }
+
+ var14 = (var11 - var10 + 1) * (var13 + 1 - var12);
+ if(var14 >= 8) {
+ var64 = 240;
+ var16 = Tiles.Tiles_heights[var13][var9][var10] - var64;
+ var17 = Tiles.Tiles_heights[var12][var9][var10];
+ Scene.Scene_addOccluder(var58, 1, var9 * 128, var9 * 128, var10 * 128, var11 * 128 + 128, var16, var17);
+
+ for(var18 = var12; var18 <= var13; ++var18) {
+ for(var19 = var10; var19 <= var11; ++var19) {
+ Tiles.__bq_a[var18][var9][var19] &= ~var6;
+ }
+ }
+ }
+ }
+
+ if((Tiles.__bq_a[var59][var9][var8] & var21) != 0) {
+ var10 = var9;
+ var11 = var9;
+ var12 = var59;
+
+ for(var13 = var59; var10 > 0 && (Tiles.__bq_a[var59][var10 - 1][var8] & var21) != 0; --var10) {
+ ;
+ }
+
+ while(var11 < 104 && (Tiles.__bq_a[var59][var11 + 1][var8] & var21) != 0) {
+ ++var11;
+ }
+
+ label702:
+ while(var12 > 0) {
+ for(var14 = var10; var14 <= var11; ++var14) {
+ if((Tiles.__bq_a[var12 - 1][var14][var8] & var21) == 0) {
+ break label702;
+ }
+ }
+
+ --var12;
+ }
+
+ label691:
+ while(var13 < var58) {
+ for(var14 = var10; var14 <= var11; ++var14) {
+ if((Tiles.__bq_a[var13 + 1][var14][var8] & var21) == 0) {
+ break label691;
+ }
+ }
+
+ ++var13;
+ }
+
+ var14 = (var11 - var10 + 1) * (var13 + 1 - var12);
+ if(var14 >= 8) {
+ var64 = 240;
+ var16 = Tiles.Tiles_heights[var13][var10][var8] - var64;
+ var17 = Tiles.Tiles_heights[var12][var10][var8];
+ Scene.Scene_addOccluder(var58, 2, var10 * 128, var11 * 128 + 128, var8 * 128, var8 * 128, var16, var17);
+
+ for(var18 = var12; var18 <= var13; ++var18) {
+ for(var19 = var10; var19 <= var11; ++var19) {
+ Tiles.__bq_a[var18][var19][var8] &= ~var21;
+ }
+ }
+ }
+ }
+
+ if((Tiles.__bq_a[var59][var9][var8] & var57) != 0) {
+ var10 = var9;
+ var11 = var9;
+ var12 = var8;
+
+ for(var13 = var8; var12 > 0 && (Tiles.__bq_a[var59][var9][var12 - 1] & var57) != 0; --var12) {
+ ;
+ }
+
+ while(var13 < 104 && (Tiles.__bq_a[var59][var9][var13 + 1] & var57) != 0) {
+ ++var13;
+ }
+
+ label755:
+ while(var10 > 0) {
+ for(var14 = var12; var14 <= var13; ++var14) {
+ if((Tiles.__bq_a[var59][var10 - 1][var14] & var57) == 0) {
+ break label755;
+ }
+ }
+
+ --var10;
+ }
+
+ label744:
+ while(var11 < 104) {
+ for(var14 = var12; var14 <= var13; ++var14) {
+ if((Tiles.__bq_a[var59][var11 + 1][var14] & var57) == 0) {
+ break label744;
+ }
+ }
+
+ ++var11;
+ }
+
+ if((var13 - var12 + 1) * (var11 - var10 + 1) >= 4) {
+ var14 = Tiles.Tiles_heights[var59][var10][var12];
+ Scene.Scene_addOccluder(var58, 4, var10 * 128, var11 * 128 + 128, var12 * 128, var13 * 128 + 128, var14, var14);
+
+ for(var15 = var10; var15 <= var11; ++var15) {
+ for(var16 = var12; var16 <= var13; ++var16) {
+ Tiles.__bq_a[var59][var15][var16] &= ~var57;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ UserComparator10.method3352(true);
+ var6 = Tiles.Tiles_minPlane;
+ if(var6 > SoundSystem.plane) {
+ var6 = SoundSystem.plane;
+ }
+
+ if(var6 < SoundSystem.plane - 1) {
+ var6 = SoundSystem.plane - 1;
+ }
+
+ if(isLowDetail) {
+ class65.scene.init(Tiles.Tiles_minPlane);
+ } else {
+ class65.scene.init(0);
+ }
+
+ for(var21 = 0; var21 < 104; ++var21) {
+ for(var57 = 0; var57 < 104; ++var57) {
+ TilePaint.method3061(var21, var57);
+ }
+ }
+
+ class13.playPcmPlayers();
+ ScriptEvent.method1179();
+ ObjectDefinition.__jr_o.clear();
+ PacketBufferNode var65;
+ if(TextureProvider.client.hasFrame()) {
+ var65 = Interpreter.method1915(ClientPacket.__gs_x, packetWriter.isaacCipher);
+ var65.packetBuffer.writeInt(1057001181);
+ packetWriter.__q_167(var65);
+ }
+
+ if(!isInInstance) {
+ var21 = (GameObject.__eh_fy - 6) / 8;
+ var57 = (GameObject.__eh_fy + 6) / 8;
+ var58 = (WorldMapLabelSize.__s_fi - 6) / 8;
+ var59 = (WorldMapLabelSize.__s_fi + 6) / 8;
+
+ for(var8 = var21 - 1; var8 <= var57 + 1; ++var8) {
+ for(var9 = var58 - 1; var9 <= var59 + 1; ++var9) {
+ if(var8 < var21 || var8 > var57 || var9 < var58 || var9 > var59) {
+ SecureRandomFuture.indexCache5.__ar_402("m" + var8 + "_" + var9);
+ SecureRandomFuture.indexCache5.__ar_402("l" + var8 + "_" + var9);
+ }
+ }
+ }
+ }
+
+ GameShell.updateGameState(30);
+ class13.playPcmPlayers();
+ BufferedSink.method3603();
+ var65 = Interpreter.method1915(ClientPacket.__gs_bv, packetWriter.isaacCipher);
+ packetWriter.__q_167(var65);
+ class11.method145();
+ }
+ }
+ }
+ } else {
+ class54.method1092(this);
+ }
+
+ if(gameState == 30) {
+ this.doCycleLoggedIn();
+ } else if(gameState == 40 || gameState == 45) {
+ this.doCycleLoggedOut();
+ }
+
+ }
+
+ @ObfuscatedName("ab")
+ @ObfuscatedSignature(
+ signature = "(ZI)V",
+ garbageValue = "106302203"
+ )
+ @Export("methodDraw")
+ protected final void methodDraw(boolean var1) {
+ boolean var2;
+ label139: {
+ try {
+ if(class214.__hf_o == 2) {
+ if(class13.musicTrack == null) {
+ class13.musicTrack = MusicTrack.readTrack(class214.__hf_u, class30.musicTrackArchiveId, GrandExchangeOffer.musicTrackFileId);
+ if(class13.musicTrack == null) {
+ var2 = false;
+ break label139;
+ }
+ }
+
+ if(class307.soundCache == null) {
+ class307.soundCache = new SoundCache(class214.__hf_q, class214.__hf_f);
+ }
+
+ if(class214.midiPcmStream.loadMusicTrack(class13.musicTrack, class1.__f_m, class307.soundCache, 22050)) {
+ class214.midiPcmStream.clearAll();
+ class214.midiPcmStream.__m_340(WorldMapLabel.__aj_e);
+ class214.midiPcmStream.setMusicTrack(class13.musicTrack, RectangleMode.musicTrackBoolean);
+ class214.__hf_o = 0;
+ class13.musicTrack = null;
+ class307.soundCache = null;
+ class214.__hf_u = null;
+ var2 = true;
+ break label139;
+ }
+ }
+ } catch (Exception var4) {
+ var4.printStackTrace();
+ class214.midiPcmStream.clear();
+ class214.__hf_o = 0;
+ class13.musicTrack = null;
+ class307.soundCache = null;
+ class214.__hf_u = null;
+ }
+
+ var2 = false;
+ }
+
+ if(var2 && __client_qq && WorldMapCacheName.pcmPlayer0 != null) {
+ WorldMapCacheName.pcmPlayer0.tryDiscard();
+ }
+
+ if((gameState == 10 || gameState == 20 || gameState == 30) && __client_oa != 0L && class203.currentTimeMs() > __client_oa) {
+ GroundItem.method2095(SpotAnimationDefinition.method4822());
+ }
+
+ int var3;
+ if(var1) {
+ for(var3 = 0; var3 < 100; ++var3) {
+ __client_od[var3] = true;
+ }
+ }
+
+ if(gameState == 0) {
+ this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1);
+ } else if(gameState == 5) {
+ IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
+ } else if(gameState != 10 && gameState != 11) {
+ if(gameState == 20) {
+ IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
+ } else if(gameState == 25) {
+ if(__client_gh == 1) {
+ if(__client_fe > __client_fn) {
+ __client_fn = __client_fe;
+ }
+
+ var3 = (__client_fn * 50 - __client_fe * 50) / __client_fn;
+ class68.drawLoadingMessage("Loading - please wait.
(" + var3 + "%)", false);
+ } else if(__client_gh == 2) {
+ if(__client_fk > __client_gp) {
+ __client_gp = __client_fk;
+ }
+
+ var3 = (__client_gp * 50 - __client_fk * 50) / __client_gp + 50;
+ class68.drawLoadingMessage("Loading - please wait.
(" + var3 + "%)", false);
+ } else {
+ class68.drawLoadingMessage("Loading - please wait.", false);
+ }
+ } else if(gameState == 30) {
+ this.drawLoggedIn();
+ } else if(gameState == 40) {
+ class68.drawLoadingMessage("Connection lost
Please wait - attempting to reestablish", false);
+ } else if(gameState == 45) {
+ class68.drawLoadingMessage("Please wait...", false);
+ }
+ } else {
+ IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
+ }
+
+ if(gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) {
+ for(var3 = 0; var3 < rootWidgetCount; ++var3) {
+ if(__client_ot[var3]) {
+ class197.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]);
+ __client_ot[var3] = false;
+ }
+ }
+ } else if(gameState > 0) {
+ class197.rasterProvider.drawFull(0, 0);
+
+ for(var3 = 0; var3 < rootWidgetCount; ++var3) {
+ __client_ot[var3] = false;
+ }
+ }
+
+ }
+
+ @ObfuscatedName("ae")
+ @ObfuscatedSignature(
+ signature = "(I)V",
+ garbageValue = "-1879956387"
+ )
+ protected final void kill0() {
+ if(class196.varcs.hasUnwrittenChanges()) {
+ class196.varcs.write();
+ }
+
+ if(Projectile.mouseRecorder != null) {
+ Projectile.mouseRecorder.isRunning = false;
+ }
+
+ Projectile.mouseRecorder = null;
+ packetWriter.close();
+ if(KeyHandler.KeyHandler_instance != null) {
+ KeyHandler var1 = KeyHandler.KeyHandler_instance;
+ KeyHandler var2 = KeyHandler.KeyHandler_instance;
+ synchronized(KeyHandler.KeyHandler_instance) {
+ KeyHandler.KeyHandler_instance = null;
+ }
+ }
+
+ if(MouseHandler.MouseHandler_instance != null) {
+ MouseHandler var8 = MouseHandler.MouseHandler_instance;
+ MouseHandler var10 = MouseHandler.MouseHandler_instance;
+ synchronized(MouseHandler.MouseHandler_instance) {
+ MouseHandler.MouseHandler_instance = null;
+ }
+ }
+
+ class16.mouseWheel = null;
+ if(WorldMapCacheName.pcmPlayer0 != null) {
+ WorldMapCacheName.pcmPlayer0.shutdown();
+ }
+
+ if(AbstractIndexCache.pcmPlayer1 != null) {
+ AbstractIndexCache.pcmPlayer1.shutdown();
+ }
+
+ if(NetCache.NetCache_socket != null) {
+ NetCache.NetCache_socket.close();
+ }
+
+ RunException.method3431();
+ if(TriBool.urlRequester != null) {
+ TriBool.urlRequester.close();
+ TriBool.urlRequester = null;
+ }
+
+ try {
+ class168.dat2File.close();
+
+ for(int var9 = 0; var9 < class168.idxCount; ++var9) {
+ IndexStoreAction.idxFiles[var9].close();
+ }
+
+ class168.idx255File.close();
+ class168.randomDat.close();
+ } catch (Exception var7) {
+ ;
+ }
+
+ }
+
+ @ObfuscatedName("au")
+ @ObfuscatedSignature(
+ signature = "(I)V",
+ garbageValue = "1860808291"
+ )
+ protected final void __au_110() {
+ }
+
+ @ObfuscatedName("init")
+ public final void __init_109() {
+ try {
+ if(this.checkHost()) {
+ ClientParameter[] var1 = class4.method47();
+ int var3 = 0;
+
+ while(true) {
+ int var2;
+ if(var3 >= var1.length) {
+ class237.method4539();
+ class50.worldHost = this.getCodeBase().getHost();
+ String var25 = class15.serverBuild.name;
+ byte var26 = 0;
+
+ try {
+ class168.idxCount = 21;
+ PacketBuffer.__hx_z = var26;
+
+ try {
+ class266.osName = System.getProperty("os.name");
+ } catch (Exception var20) {
+ class266.osName = "Unknown";
+ }
+
+ WorldMapSection3.osNameLowerCase = class266.osName.toLowerCase();
+
+ try {
+ WorldMapSection1.userHomeDirectory = System.getProperty("user.home");
+ if(WorldMapSection1.userHomeDirectory != null) {
+ WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/";
+ }
+ } catch (Exception var19) {
+ ;
+ }
+
+ try {
+ if(WorldMapSection3.osNameLowerCase.startsWith("win")) {
+ if(WorldMapSection1.userHomeDirectory == null) {
+ WorldMapSection1.userHomeDirectory = System.getenv("USERPROFILE");
+ }
+ } else if(WorldMapSection1.userHomeDirectory == null) {
+ WorldMapSection1.userHomeDirectory = System.getenv("HOME");
+ }
+
+ if(WorldMapSection1.userHomeDirectory != null) {
+ WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/";
+ }
+ } catch (Exception var18) {
+ ;
+ }
+
+ if(WorldMapSection1.userHomeDirectory == null) {
+ WorldMapSection1.userHomeDirectory = "~/";
+ }
+
+ WorldMapSection2.cacheDirectoryLocations = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", WorldMapSection1.userHomeDirectory, "/tmp/", ""};
+ Canvas.__ao_s = new String[]{".jagex_cache_" + PacketBuffer.__hx_z, ".file_store_" + PacketBuffer.__hx_z};
+ int var27 = 0;
+
+ label262:
+ while(var27 < 4) {
+ String var28 = var27 == 0?"":"" + var27;
+ class337.clDat = new File(WorldMapSection1.userHomeDirectory, "jagex_cl_oldschool_" + var25 + var28 + ".dat");
+ String var30 = null;
+ String var31 = null;
+ boolean var32 = false;
+ int var14;
+ File var33;
+ if(class337.clDat.exists()) {
+ try {
+ AccessFile var11 = new AccessFile(class337.clDat, "rw", 10000L);
+
+ int var12;
+ Buffer var13;
+ for(var13 = new Buffer((int)var11.length()); var13.index < var13.array.length; var13.index += var12) {
+ var12 = var11.read(var13.array, var13.index, var13.array.length - var13.index);
+ if(var12 == -1) {
+ throw new IOException();
+ }
+ }
+
+ var13.index = 0;
+ var12 = var13.readUnsignedByte();
+ if(var12 < 1 || var12 > 3) {
+ throw new IOException("" + var12);
+ }
+
+ var14 = 0;
+ if(var12 > 1) {
+ var14 = var13.readUnsignedByte();
+ }
+
+ if(var12 <= 2) {
+ var30 = var13.readStringCp1252NullCircumfixed();
+ if(var14 == 1) {
+ var31 = var13.readStringCp1252NullCircumfixed();
+ }
+ } else {
+ var30 = var13.__aw_304();
+ if(var14 == 1) {
+ var31 = var13.__aw_304();
+ }
+ }
+
+ var11.close();
+ } catch (IOException var22) {
+ var22.printStackTrace();
+ }
+
+ if(var30 != null) {
+ var33 = new File(var30);
+ if(!var33.exists()) {
+ var30 = null;
+ }
+ }
+
+ if(var30 != null) {
+ var33 = new File(var30, "test.dat");
+ if(!DevicePcmPlayerProvider.method847(var33, true)) {
+ var30 = null;
+ }
+ }
+ }
+
+ if(var30 == null && var27 == 0) {
+ label237:
+ for(var2 = 0; var2 < Canvas.__ao_s.length; ++var2) {
+ for(int var34 = 0; var34 < WorldMapSection2.cacheDirectoryLocations.length; ++var34) {
+ File var37 = new File(WorldMapSection2.cacheDirectoryLocations[var34] + Canvas.__ao_s[var2] + File.separatorChar + "oldschool" + File.separatorChar);
+ if(var37.exists() && DevicePcmPlayerProvider.method847(new File(var37, "test.dat"), true)) {
+ var30 = var37.toString();
+ var32 = true;
+ break label237;
+ }
+ }
+ }
+ }
+
+ if(var30 == null) {
+ var30 = WorldMapSection1.userHomeDirectory + File.separatorChar + "jagexcache" + var28 + File.separatorChar + "oldschool" + File.separatorChar + var25 + File.separatorChar;
+ var32 = true;
+ }
+
+ File var15;
+ File var36;
+ File[] var38;
+ File[] var39;
+ if(var31 != null) {
+ var36 = new File(var31);
+ var33 = new File(var30);
+
+ try {
+ var38 = var36.listFiles();
+ var39 = var38;
+
+ for(var14 = 0; var14 < var39.length; ++var14) {
+ var15 = var39[var14];
+ File var16 = new File(var33, var15.getName());
+ boolean var17 = var15.renameTo(var16);
+ if(!var17) {
+ throw new IOException();
+ }
+ }
+ } catch (Exception var21) {
+ var21.printStackTrace();
+ }
+
+ var32 = true;
+ }
+
+ if(var32) {
+ class14.method167(new File(var30), (File)null);
+ }
+
+ var36 = new File(var30);
+ class168.__fs_o = var36;
+ if(!class168.__fs_o.exists()) {
+ class168.__fs_o.mkdirs();
+ }
+
+ var38 = class168.__fs_o.listFiles();
+ if(var38 != null) {
+ var39 = var38;
+
+ for(var14 = 0; var14 < var39.length; ++var14) {
+ var15 = var39[var14];
+ if(!DevicePcmPlayerProvider.method847(var15, false)) {
+ ++var27;
+ continue label262;
+ }
+ }
+ }
+ break;
+ }
+
+ File var29 = class168.__fs_o;
+ class171.__fo_f = var29;
+ if(!class171.__fo_f.exists()) {
+ throw new RuntimeException("");
+ }
+
+ class171.__fo_m = true;
+ Interpreter.method1976();
+ class168.dat2File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0);
+ class168.idx255File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx255"), "rw", 1048576L), 6000, 0);
+ IndexStoreAction.idxFiles = new BufferedFile[class168.idxCount];
+
+ for(int var35 = 0; var35 < class168.idxCount; ++var35) {
+ IndexStoreAction.idxFiles[var35] = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx" + var35), "rw", 1048576L), 6000, 0);
+ }
+ } catch (Exception var23) {
+ NPCDefinition.sendStackTrace((String)null, var23);
+ }
+
+ TextureProvider.client = this;
+ RunException.__fx_w = clientType;
+ this.startThread(765, 503, 180);
+ break;
+ }
+
+ ClientParameter var4 = var1[var3];
+ String var5 = this.getParameter(var4.id);
+ if(var5 != null) {
+ switch(Integer.parseInt(var4.id)) {
+ case 1:
+ useBufferedSocket = Integer.parseInt(var5) != 0;
+ case 2:
+ case 11:
+ case 13:
+ case 16:
+ default:
+ break;
+ case 3:
+ if(var5.equalsIgnoreCase("true")) {
+ isMembersWorld = true;
+ } else {
+ isMembersWorld = false;
+ }
+ break;
+ case 4:
+ if(clientType == -1) {
+ clientType = Integer.parseInt(var5);
+ }
+ break;
+ case 5:
+ worldProperties = Integer.parseInt(var5);
+ break;
+ case 6:
+ language = Integer.parseInt(var5);
+ break;
+ case 7:
+ int var6 = Integer.parseInt(var5);
+ ServerBuild[] var7 = new ServerBuild[]{ServerBuild.__iy_q, ServerBuild.__iy_w, ServerBuild.__iy_m, ServerBuild.__iy_f};
+ ServerBuild[] var8 = var7;
+ var2 = 0;
+
+ ServerBuild var9;
+ while(true) {
+ if(var2 >= var8.length) {
+ var9 = null;
+ break;
+ }
+
+ ServerBuild var10 = var8[var2];
+ if(var6 == var10.id) {
+ var9 = var10;
+ break;
+ }
+
+ ++var2;
+ }
+
+ class15.serverBuild = var9;
+ break;
+ case 8:
+ if(var5.equalsIgnoreCase("true")) {
+ ;
+ }
+ break;
+ case 9:
+ class21.__b_by = var5;
+ break;
+ case 10:
+ class22.studioGame = (StudioGame)ScriptFrame.findEnumerated(ClientPacket.method3664(), Integer.parseInt(var5));
+ if(class22.studioGame == StudioGame.__is_u) {
+ KeyHandler.loginType = LoginType.__lx_m;
+ } else {
+ KeyHandler.loginType = LoginType.__lx_e;
+ }
+ break;
+ case 12:
+ worldId = Integer.parseInt(var5);
+ break;
+ case 14:
+ AbstractIndexCache.__ir_bu = Integer.parseInt(var5);
+ break;
+ case 15:
+ gameBuild = Integer.parseInt(var5);
+ break;
+ case 17:
+ ServerBuild.worldsUrl = var5;
+ }
+ }
+
+ ++var3;
+ }
+ }
+
+ } catch (RuntimeException var24) {
+ throw Players.method2120(var24, "client.init()");
+ }
+ }
+
+ @ObfuscatedName("ef")
+ @ObfuscatedSignature(
+ signature = "(B)V",
+ garbageValue = "-78"
+ )
+ @Export("doCycleJs5")
+ void doCycleJs5() {
+ if(gameState != 1000) {
+ long var1 = class203.currentTimeMs();
+ int var3 = (int)(var1 - NetCache.__iq_q);
+ NetCache.__iq_q = var1;
+ if(var3 > 200) {
+ var3 = 200;
+ }
+
+ NetCache.__iq_f += var3;
+ boolean var4;
+ if(NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) {
+ var4 = true;
+ } else if(NetCache.NetCache_socket == null) {
+ var4 = false;
+ } else {
+ try {
+ label205: {
+ if(NetCache.__iq_f > 30000) {
+ throw new IOException();
+ }
+
+ NetFileRequest var5;
+ Buffer var6;
+ while(NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) {
+ var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first();
+ var6 = new Buffer(4);
+ var6.writeByte(1);
+ var6.writeMedium((int)var5.key);
+ NetCache.NetCache_socket.write(var6.array, 0, 4);
+ NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key);
+ --NetCache.NetCache_pendingPriorityWritesCount;
+ ++NetCache.NetCache_pendingPriorityResponsesCount;
+ }
+
+ while(NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) {
+ var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.last();
+ var6 = new Buffer(4);
+ var6.writeByte(0);
+ var6.writeMedium((int)var5.key);
+ NetCache.NetCache_socket.write(var6.array, 0, 4);
+ var5.removeDual();
+ NetCache.NetCache_pendingResponses.put(var5, var5.key);
+ --NetCache.NetCache_pendingWritesCount;
+ ++NetCache.NetCache_pendingResponsesCount;
+ }
+
+ for(int var7 = 0; var7 < 100; ++var7) {
+ int var8 = NetCache.NetCache_socket.available();
+ if(var8 < 0) {
+ throw new IOException();
+ }
+
+ if(var8 == 0) {
+ break;
+ }
+
+ NetCache.__iq_f = 0;
+ byte var9 = 0;
+ if(ModelData0.NetCache_currentResponse == null) {
+ var9 = 8;
+ } else if(NetCache.__iq_j == 0) {
+ var9 = 1;
+ }
+
+ int var10;
+ int var11;
+ int var12;
+ int var13;
+ if(var9 > 0) {
+ var10 = var9 - NetCache.NetCache_responseHeaderBuffer.index;
+ if(var10 > var8) {
+ var10 = var8;
+ }
+
+ NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.index, var10);
+ if(NetCache.__iq_b != 0) {
+ for(var11 = 0; var11 < var10; ++var11) {
+ NetCache.NetCache_responseHeaderBuffer.array[NetCache.NetCache_responseHeaderBuffer.index + var11] ^= NetCache.__iq_b;
+ }
+ }
+
+ NetCache.NetCache_responseHeaderBuffer.index += var10;
+ if(NetCache.NetCache_responseHeaderBuffer.index < var9) {
+ break;
+ }
+
+ if(ModelData0.NetCache_currentResponse == null) {
+ NetCache.NetCache_responseHeaderBuffer.index = 0;
+ var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte();
+ var12 = NetCache.NetCache_responseHeaderBuffer.__ag_302();
+ int var14 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte();
+ var13 = NetCache.NetCache_responseHeaderBuffer.readInt();
+ long var15 = (long)(var12 + (var11 << 16));
+ NetFileRequest var17 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var15);
+ WorldComparator.__u_n = true;
+ if(var17 == null) {
+ var17 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var15);
+ WorldComparator.__u_n = false;
+ }
+
+ if(var17 == null) {
+ throw new IOException();
+ }
+
+ int var18 = var14 == 0?5:9;
+ ModelData0.NetCache_currentResponse = var17;
+ class22.NetCache_responseArchiveBuffer = new Buffer(var13 + var18 + ModelData0.NetCache_currentResponse.padding);
+ class22.NetCache_responseArchiveBuffer.writeByte(var14);
+ class22.NetCache_responseArchiveBuffer.writeInt(var13);
+ NetCache.__iq_j = 8;
+ NetCache.NetCache_responseHeaderBuffer.index = 0;
+ } else if(NetCache.__iq_j == 0) {
+ if(NetCache.NetCache_responseHeaderBuffer.array[0] == -1) {
+ NetCache.__iq_j = 1;
+ NetCache.NetCache_responseHeaderBuffer.index = 0;
+ } else {
+ ModelData0.NetCache_currentResponse = null;
+ }
+ }
+ } else {
+ var10 = class22.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding;
+ var11 = 512 - NetCache.__iq_j;
+ if(var11 > var10 - class22.NetCache_responseArchiveBuffer.index) {
+ var11 = var10 - class22.NetCache_responseArchiveBuffer.index;
+ }
+
+ if(var11 > var8) {
+ var11 = var8;
+ }
+
+ NetCache.NetCache_socket.read(class22.NetCache_responseArchiveBuffer.array, class22.NetCache_responseArchiveBuffer.index, var11);
+ if(NetCache.__iq_b != 0) {
+ for(var12 = 0; var12 < var11; ++var12) {
+ class22.NetCache_responseArchiveBuffer.array[class22.NetCache_responseArchiveBuffer.index + var12] ^= NetCache.__iq_b;
+ }
+ }
+
+ class22.NetCache_responseArchiveBuffer.index += var11;
+ NetCache.__iq_j += var11;
+ if(var10 == class22.NetCache_responseArchiveBuffer.index) {
+ if(16711935L == ModelData0.NetCache_currentResponse.key) {
+ Players.NetCache_reference = class22.NetCache_responseArchiveBuffer;
+
+ for(var12 = 0; var12 < 256; ++var12) {
+ IndexCache var22 = NetCache.NetCache_indexCaches[var12];
+ if(var22 != null) {
+ Players.NetCache_reference.index = var12 * 8 + 5;
+ var13 = Players.NetCache_reference.readInt();
+ int var23 = Players.NetCache_reference.readInt();
+ var22.loadIndexReference(var13, var23);
+ }
+ }
+ } else {
+ NetCache.NetCache_crc.reset();
+ NetCache.NetCache_crc.update(class22.NetCache_responseArchiveBuffer.array, 0, var10);
+ var12 = (int)NetCache.NetCache_crc.getValue();
+ if(var12 != ModelData0.NetCache_currentResponse.crc) {
+ try {
+ NetCache.NetCache_socket.close();
+ } catch (Exception var20) {
+ ;
+ }
+
+ ++NetCache.NetCache_crcMismatches;
+ NetCache.NetCache_socket = null;
+ NetCache.__iq_b = (byte)((int)(Math.random() * 255.0D + 1.0D));
+ var4 = false;
+ break label205;
+ }
+
+ NetCache.NetCache_crcMismatches = 0;
+ NetCache.NetCache_ioExceptions = 0;
+ ModelData0.NetCache_currentResponse.indexCache.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), WorldComparator.__u_n);
+ }
+
+ ModelData0.NetCache_currentResponse.remove();
+ if(WorldComparator.__u_n) {
+ --NetCache.NetCache_pendingPriorityResponsesCount;
+ } else {
+ --NetCache.NetCache_pendingResponsesCount;
+ }
+
+ NetCache.__iq_j = 0;
+ ModelData0.NetCache_currentResponse = null;
+ class22.NetCache_responseArchiveBuffer = null;
+ } else {
+ if(NetCache.__iq_j != 512) {
+ break;
+ }
+
+ NetCache.__iq_j = 0;
+ }
+ }
+ }
+
+ var4 = true;
+ }
+ } catch (IOException var21) {
+ try {
+ NetCache.NetCache_socket.close();
+ } catch (Exception var19) {
+ ;
+ }
+
+ ++NetCache.NetCache_ioExceptions;
+ NetCache.NetCache_socket = null;
+ var4 = false;
+ }
+ }
+
+ if(!var4) {
+ this.doCycleJs5Connect();
+ }
+ }
+
+ }
+
+ @ObfuscatedName("ev")
+ @ObfuscatedSignature(
+ signature = "(B)V",
+ garbageValue = "111"
+ )
+ @Export("doCycleJs5Connect")
+ void doCycleJs5Connect() {
+ if(NetCache.NetCache_crcMismatches >= 4) {
+ this.error("js5crc");
+ gameState = 1000;
+ } else {
+ if(NetCache.NetCache_ioExceptions >= 4) {
+ if(gameState <= 5) {
+ this.error("js5io");
+ gameState = 1000;
+ return;
+ }
+
+ __client_dp = 3000;
+ NetCache.NetCache_ioExceptions = 3;
+ }
+
+ if(--__client_dp + 1 <= 0) {
+ try {
+ if(js5ConnectState == 0) {
+ class210.js5SocketTask = GameShell.taskHandler.newSocketTask(class50.worldHost, class203.port3);
+ ++js5ConnectState;
+ }
+
+ if(js5ConnectState == 1) {
+ if(class210.js5SocketTask.status == 2) {
+ this.js5Error(-1);
+ return;
+ }
+
+ if(class210.js5SocketTask.status == 1) {
+ ++js5ConnectState;
+ }
+ }
+
+ if(js5ConnectState == 2) {
+ if(useBufferedSocket) {
+ DynamicObject.js5Socket = BufferedFile.method2719((Socket)class210.js5SocketTask.result, 40000, 5000);
+ } else {
+ DynamicObject.js5Socket = new NetSocket((Socket)class210.js5SocketTask.result, GameShell.taskHandler, 5000);
+ }
+
+ Buffer var1 = new Buffer(5);
+ var1.writeByte(15);
+ var1.writeInt(180);
+ DynamicObject.js5Socket.write(var1.array, 0, 5);
+ ++js5ConnectState;
+ GameObject.js5StartTimeMs = class203.currentTimeMs();
+ }
+
+ if(js5ConnectState == 3) {
+ if(DynamicObject.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) {
+ int var10 = DynamicObject.js5Socket.readUnsignedByte();
+ if(var10 != 0) {
+ this.js5Error(var10);
+ return;
+ }
+
+ ++js5ConnectState;
+ } else if(class203.currentTimeMs() - GameObject.js5StartTimeMs > 30000L) {
+ this.js5Error(-2);
+ return;
+ }
+ }
+
+ if(js5ConnectState == 4) {
+ AbstractSocket var11 = DynamicObject.js5Socket;
+ boolean var2 = gameState > 20;
+ if(NetCache.NetCache_socket != null) {
+ try {
+ NetCache.NetCache_socket.close();
+ } catch (Exception var8) {
+ ;
+ }
+
+ NetCache.NetCache_socket = null;
+ }
+
+ NetCache.NetCache_socket = var11;
+ UserComparator9.method3343(var2);
+ NetCache.NetCache_responseHeaderBuffer.index = 0;
+ ModelData0.NetCache_currentResponse = null;
+ class22.NetCache_responseArchiveBuffer = null;
+ NetCache.__iq_j = 0;
+
+ while(true) {
+ NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first();
+ if(var3 == null) {
+ while(true) {
+ var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first();
+ if(var3 == null) {
+ if(NetCache.__iq_b != 0) {
+ try {
+ Buffer var4 = new Buffer(4);
+ var4.writeByte(4);
+ var4.writeByte(NetCache.__iq_b);
+ var4.writeShort(0);
+ NetCache.NetCache_socket.write(var4.array, 0, 4);
+ } catch (IOException var7) {
+ try {
+ NetCache.NetCache_socket.close();
+ } catch (Exception var6) {
+ ;
+ }
+
+ ++NetCache.NetCache_ioExceptions;
+ NetCache.NetCache_socket = null;
+ }
+ }
+
+ NetCache.__iq_f = 0;
+ NetCache.__iq_q = class203.currentTimeMs();
+ class210.js5SocketTask = null;
+ DynamicObject.js5Socket = null;
+ js5ConnectState = 0;
+ js5Errors = 0;
+ return;
+ }
+
+ NetCache.NetCache_pendingWritesQueue.addLast(var3);
+ NetCache.NetCache_pendingWrites.put(var3, var3.key);
+ ++NetCache.NetCache_pendingWritesCount;
+ --NetCache.NetCache_pendingResponsesCount;
+ }
+ }
+
+ NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key);
+ ++NetCache.NetCache_pendingPriorityWritesCount;
+ --NetCache.NetCache_pendingPriorityResponsesCount;
+ }
+ }
+ } catch (IOException var9) {
+ this.js5Error(-3);
+ }
+ }
+ }
+
+ }
+
+ @ObfuscatedName("ea")
+ @ObfuscatedSignature(
+ signature = "(IS)V",
+ garbageValue = "2348"
+ )
+ @Export("js5Error")
+ void js5Error(int var1) {
+ class210.js5SocketTask = null;
+ DynamicObject.js5Socket = null;
+ js5ConnectState = 0;
+ if(class2.port1 == class203.port3) {
+ class203.port3 = WorldMapArea.port2;
+ } else {
+ class203.port3 = class2.port1;
+ }
+
+ ++js5Errors;
+ if(js5Errors < 2 || var1 != 7 && var1 != 9) {
+ if(js5Errors >= 2 && var1 == 6) {
+ this.error("js5connect_outofdate");
+ gameState = 1000;
+ } else if(js5Errors >= 4) {
+ if(gameState <= 5) {
+ this.error("js5connect");
+ gameState = 1000;
+ } else {
+ __client_dp = 3000;
+ }
+ }
+ } else if(gameState <= 5) {
+ this.error("js5connect_full");
+ gameState = 1000;
+ } else {
+ __client_dp = 3000;
+ }
+
+ }
+
+ @ObfuscatedName("fg")
+ @ObfuscatedSignature(
+ signature = "(B)V",
+ garbageValue = "-110"
+ )
+ @Export("doCycleLoggedOut")
+ final void doCycleLoggedOut() {
+ Object var1 = packetWriter.getSocket();
+ PacketBuffer var2 = packetWriter.packetBuffer;
+
+ try {
+ if(loginState == 0) {
+ if(WorldMapIcon1.secureRandom == null && (secureRandomFuture.isDone() || __client_ex > 250)) {
+ WorldMapIcon1.secureRandom = secureRandomFuture.get();
+ secureRandomFuture.shutdown();
+ secureRandomFuture = null;
+ }
+
+ if(WorldMapIcon1.secureRandom != null) {
+ if(var1 != null) {
+ ((AbstractSocket)var1).close();
+ var1 = null;
+ }
+
+ UserComparator3.socketTask = null;
+ __client_fh = false;
+ __client_ex = 0;
+ loginState = 1;
+ }
+ }
+
+ if(loginState == 1) {
+ if(UserComparator3.socketTask == null) {
+ UserComparator3.socketTask = GameShell.taskHandler.newSocketTask(class50.worldHost, class203.port3);
+ }
+
+ if(UserComparator3.socketTask.status == 2) {
+ throw new IOException();
+ }
+
+ if(UserComparator3.socketTask.status == 1) {
+ if(useBufferedSocket) {
+ var1 = BufferedFile.method2719((Socket)UserComparator3.socketTask.result, 40000, 5000);
+ } else {
+ var1 = new NetSocket((Socket)UserComparator3.socketTask.result, GameShell.taskHandler, 5000);
+ }
+
+ packetWriter.setSocket((AbstractSocket)var1);
+ UserComparator3.socketTask = null;
+ loginState = 2;
+ }
+ }
+
+ if(loginState == 2) {
+ packetWriter.__m_165();
+ PacketBufferNode var3;
+ if(PacketBufferNode.__gg_u == 0) {
+ var3 = new PacketBufferNode();
+ } else {
+ var3 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.__gg_u];
+ }
+
+ var3.__m = null;
+ var3.__f = 0;
+ var3.packetBuffer = new PacketBuffer(5000);
+ var3.packetBuffer.writeByte(LoginPacket.__gl_m.id);
+ packetWriter.__q_167(var3);
+ packetWriter.__f_166();
+ var2.index = 0;
+ loginState = 3;
+ }
+
+ int var4;
+ boolean var16;
+ if(loginState == 3) {
+ if(WorldMapCacheName.pcmPlayer0 != null) {
+ WorldMapCacheName.pcmPlayer0.__ac_176();
+ }
+
+ if(AbstractIndexCache.pcmPlayer1 != null) {
+ AbstractIndexCache.pcmPlayer1.__ac_176();
+ }
+
+ var16 = true;
+ if(useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) {
+ var16 = false;
+ }
+
+ if(var16) {
+ var4 = ((AbstractSocket)var1).readUnsignedByte();
+ if(WorldMapCacheName.pcmPlayer0 != null) {
+ WorldMapCacheName.pcmPlayer0.__ac_176();
+ }
+
+ if(AbstractIndexCache.pcmPlayer1 != null) {
+ AbstractIndexCache.pcmPlayer1.__ac_176();
+ }
+
+ if(var4 != 0) {
+ IsaacCipher.method4093(var4);
+ return;
+ }
+
+ var2.index = 0;
+ loginState = 4;
+ }
+ }
+
+ int var5;
+ if(loginState == 4) {
+ if(var2.index < 8) {
+ var5 = ((AbstractSocket)var1).available();
+ if(var5 > 8 - var2.index) {
+ var5 = 8 - var2.index;
+ }
+
+ if(var5 > 0) {
+ ((AbstractSocket)var1).read(var2.array, var2.index, var5);
+ var2.index += var5;
+ }
+ }
+
+ if(var2.index == 8) {
+ var2.index = 0;
+ MusicPatchNode2.__hd_fc = var2.readLong();
+ loginState = 5;
+ }
+ }
+
+ if(loginState == 5) {
+ packetWriter.packetBuffer.index = 0;
+ packetWriter.__m_165();
+ PacketBuffer var6 = new PacketBuffer(500);
+ int[] var7 = new int[]{WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt()};
+ var6.index = 0;
+ var6.writeByte(1);
+ var6.writeInt(var7[0]);
+ var6.writeInt(var7[1]);
+ var6.writeInt(var7[2]);
+ var6.writeInt(var7[3]);
+ var6.writeLong(MusicPatchNode2.__hd_fc);
+ if(gameState == 40) {
+ var6.writeInt(Skills.__hc_ef[0]);
+ var6.writeInt(Skills.__hc_ef[1]);
+ var6.writeInt(Skills.__hc_ef[2]);
+ var6.writeInt(Skills.__hc_ef[3]);
+ } else {
+ var6.writeByte(field658.ordinal());
+ switch(field658.field1984) {
+ case 0:
+ case 3:
+ var6.writeMedium(class13.__i_af);
+ ++var6.index;
+ break;
+ case 1:
+ var6.index += 4;
+ break;
+ case 2:
+ var6.writeInt(((Integer)ReflectionCheck.clientPreferences.parameters.get(Integer.valueOf(class279.method5357(Login.Login_username)))).intValue());
+ }
+
+ var6.writeByte(class313.field3834.ordinal());
+ var6.writeStringCp1252NullTerminated(Login.Login_password);
+ }
+
+ var6.encryptRsa(class83.__cm_m, class83.__cm_f);
+ Skills.__hc_ef = var7;
+ PacketBufferNode var8;
+ if(PacketBufferNode.__gg_u == 0) {
+ var8 = new PacketBufferNode();
+ } else {
+ var8 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.__gg_u];
+ }
+
+ var8.__m = null;
+ var8.__f = 0;
+ var8.packetBuffer = new PacketBuffer(5000);
+ var8.packetBuffer.index = 0;
+ if(gameState == 40) {
+ var8.packetBuffer.writeByte(LoginPacket.__gl_w.id);
+ } else {
+ var8.packetBuffer.writeByte(LoginPacket.__gl_q.id);
+ }
+
+ var8.packetBuffer.writeShort(0);
+ int var9 = var8.packetBuffer.index;
+ var8.packetBuffer.writeInt(180);
+ var8.packetBuffer.writeInt(1);
+ var8.packetBuffer.writeByte(clientType);
+ var8.packetBuffer.__s_297(var6.array, 0, var6.index);
+ int var10 = var8.packetBuffer.index;
+ var8.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username);
+ var8.packetBuffer.writeByte((isResizable?1:0) << 1 | (isLowDetail?1:0));
+ var8.packetBuffer.writeShort(SoundCache.canvasWidth);
+ var8.packetBuffer.writeShort(Huffman.canvasHeight);
+ Varps.method4400(var8.packetBuffer);
+ var8.packetBuffer.writeStringCp1252NullTerminated(class21.__b_by);
+ var8.packetBuffer.writeInt(AbstractIndexCache.__ir_bu);
+ Buffer var11 = new Buffer(WorldMapLabelSize.platformInfo.size());
+ WorldMapLabelSize.platformInfo.write(var11);
+ var8.packetBuffer.__s_297(var11.array, 0, var11.array.length);
+ var8.packetBuffer.writeByte(clientType);
+ var8.packetBuffer.writeInt(0);
+ var8.packetBuffer.writeInt(AbstractIndexCache.indexCache0.hash);
+ var8.packetBuffer.writeInt(Skeleton.indexCache1.hash);
+ var8.packetBuffer.writeInt(ObjectSound.indexCache2.hash);
+ var8.packetBuffer.writeInt(WorldMapIcon1.indexCache3.hash);
+ var8.packetBuffer.writeInt(class25.indexCache4.hash);
+ var8.packetBuffer.writeInt(SecureRandomFuture.indexCache5.hash);
+ var8.packetBuffer.writeInt(UserComparator3.indexCache6.hash);
+ var8.packetBuffer.writeInt(class40.indexCache7.hash);
+ var8.packetBuffer.writeInt(WorldMapSection3.indexCache8.hash);
+ var8.packetBuffer.writeInt(class238.indexCache9.hash);
+ var8.packetBuffer.writeInt(class16.indexCache10.hash);
+ var8.packetBuffer.writeInt(Login.indexCache11.hash);
+ var8.packetBuffer.writeInt(Formatting.indexCache12.hash);
+ var8.packetBuffer.writeInt(ByteArrayPool.indexCache13.hash);
+ var8.packetBuffer.writeInt(class2.indexCache14.hash);
+ var8.packetBuffer.writeInt(WorldMapSection1.indexCache15.hash);
+ var8.packetBuffer.writeInt(0);
+ var8.packetBuffer.writeInt(class22.indexCache16.hash);
+ var8.packetBuffer.writeInt(WorldMapLabelSize.__s_dq.hash);
+ var8.packetBuffer.writeInt(ItemContainer.__bc_dm.hash);
+ var8.packetBuffer.writeInt(AbstractByteArrayCopier.__gu_et.hash);
+ var8.packetBuffer.xteaEncrypt(var7, var10, var8.packetBuffer.index);
+ var8.packetBuffer.__y_299(var8.packetBuffer.index - var9);
+ packetWriter.__q_167(var8);
+ packetWriter.__f_166();
+ packetWriter.isaacCipher = new IsaacCipher(var7);
+ int[] var12 = new int[4];
+
+ for(int var13 = 0; var13 < 4; ++var13) {
+ var12[var13] = var7[var13] + 50;
+ }
+
+ var2.newIsaacCipher(var12);
+ loginState = 6;
+ }
+
+ if(loginState == 6 && ((AbstractSocket)var1).available() > 0) {
+ var5 = ((AbstractSocket)var1).readUnsignedByte();
+ if(var5 == 21 && gameState == 20) {
+ loginState = 9;
+ } else if(var5 == 2) {
+ loginState = 11;
+ } else if(var5 == 15 && gameState == 40) {
+ packetWriter.serverPacket0Length = -1;
+ loginState = 16;
+ } else if(var5 == 64) {
+ loginState = 7;
+ } else if(var5 == 23 && __client_ej < 1) {
+ ++__client_ej;
+ loginState = 0;
+ } else {
+ if(var5 != 29) {
+ IsaacCipher.method4093(var5);
+ return;
+ }
+
+ loginState = 14;
+ }
+ }
+
+ if(loginState == 7 && ((AbstractSocket)var1).available() > 0) {
+ WorldMapSection1.__as_ey = ((AbstractSocket)var1).readUnsignedByte();
+ loginState = 8;
+ }
+
+ if(loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection1.__as_ey) {
+ ((AbstractSocket)var1).read(var2.array, 0, WorldMapSection1.__as_ey);
+ var2.index = 0;
+ loginState = 6;
+ }
+
+ if(loginState == 9 && ((AbstractSocket)var1).available() > 0) {
+ __client_el = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60;
+ loginState = 10;
+ }
+
+ if(loginState == 10) {
+ __client_ex = 0;
+ class54.method1089("You have only just left another world.", "Your profile will be transferred in:", __client_el / 60 + " seconds.");
+ if(--__client_el <= 0) {
+ loginState = 0;
+ }
+ } else {
+ if(loginState == 11 && ((AbstractSocket)var1).available() >= 1) {
+ __client_eo = ((AbstractSocket)var1).readUnsignedByte();
+ loginState = 12;
+ }
+
+ if(loginState == 12 && ((AbstractSocket)var1).available() >= __client_eo) {
+ var16 = ((AbstractSocket)var1).readUnsignedByte() == 1;
+ ((AbstractSocket)var1).read(var2.array, 0, 4);
+ var2.index = 0;
+ boolean var17 = false;
+ if(var16) {
+ var4 = var2.readByteIsaac() << 24;
+ var4 |= var2.readByteIsaac() << 16;
+ var4 |= var2.readByteIsaac() << 8;
+ var4 |= var2.readByteIsaac();
+ int var20 = class279.method5357(Login.Login_username);
+ if(ReflectionCheck.clientPreferences.parameters.size() >= 10 && !ReflectionCheck.clientPreferences.parameters.containsKey(Integer.valueOf(var20))) {
+ Iterator var23 = ReflectionCheck.clientPreferences.parameters.entrySet().iterator();
+ var23.next();
+ var23.remove();
+ }
+
+ ReflectionCheck.clientPreferences.parameters.put(Integer.valueOf(var20), Integer.valueOf(var4));
+ }
+
+ if(Login_isUsernameRemembered) {
+ ReflectionCheck.clientPreferences.rememberedUsername = Login.Login_username;
+ } else {
+ ReflectionCheck.clientPreferences.rememberedUsername = null;
+ }
+
+ WorldMapSection0.method247();
+ rights = ((AbstractSocket)var1).readUnsignedByte();
+ __client_mn = ((AbstractSocket)var1).readUnsignedByte() == 1;
+ localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte();
+ localPlayerIndex <<= 8;
+ localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte();
+ __client_jo = ((AbstractSocket)var1).readUnsignedByte();
+ ((AbstractSocket)var1).read(var2.array, 0, 1);
+ var2.index = 0;
+ ServerPacket[] var21 = class27.method429();
+ int var24 = var2.readSmartByteShortIsaac();
+ if(var24 < 0 || var24 >= var21.length) {
+ throw new IOException(var24 + " " + var2.index);
+ }
+
+ packetWriter.serverPacket0 = var21[var24];
+ packetWriter.serverPacket0Length = packetWriter.serverPacket0.length;
+ ((AbstractSocket)var1).read(var2.array, 0, 2);
+ var2.index = 0;
+ packetWriter.serverPacket0Length = var2.__ag_302();
+
+ try {
+ Client var25 = TextureProvider.client;
+ JSObject.getWindow(var25).call("zap", (Object[])null);
+ } catch (Throwable var14) {
+ ;
+ }
+
+ loginState = 13;
+ }
+
+ if(loginState == 13) {
+ if(((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) {
+ var2.index = 0;
+ ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacket0Length);
+ timer.__w_456();
+ WorldMapSection1.method808();
+ class11.updatePlayer(var2);
+ GameObject.__eh_fy = -1;
+ class50.loadRegions(false, var2);
+ packetWriter.serverPacket0 = null;
+ }
+ } else {
+ if(loginState == 14 && ((AbstractSocket)var1).available() >= 2) {
+ var2.index = 0;
+ ((AbstractSocket)var1).read(var2.array, 0, 2);
+ var2.index = 0;
+ IndexCacheLoader.__bd_er = var2.__ag_302();
+ loginState = 15;
+ }
+
+ if(loginState == 15 && ((AbstractSocket)var1).available() >= IndexCacheLoader.__bd_er) {
+ var2.index = 0;
+ ((AbstractSocket)var1).read(var2.array, 0, IndexCacheLoader.__bd_er);
+ var2.index = 0;
+ String var18 = var2.readStringCp1252NullTerminated();
+ String var22 = var2.readStringCp1252NullTerminated();
+ String var26 = var2.readStringCp1252NullTerminated();
+ class54.method1089(var18, var22, var26);
+ GameShell.updateGameState(10);
+ }
+
+ if(loginState != 16) {
+ ++__client_ex;
+ if(__client_ex > 2000) {
+ if(__client_ej < 1) {
+ if(class203.port3 == class2.port1) {
+ class203.port3 = WorldMapArea.port2;
+ } else {
+ class203.port3 = class2.port1;
+ }
+
+ ++__client_ej;
+ loginState = 0;
+ } else {
+ IsaacCipher.method4093(-3);
+ }
+ }
+ } else {
+ if(packetWriter.serverPacket0Length == -1) {
+ if(((AbstractSocket)var1).available() < 2) {
+ return;
+ }
+
+ ((AbstractSocket)var1).read(var2.array, 0, 2);
+ var2.index = 0;
+ packetWriter.serverPacket0Length = var2.__ag_302();
+ }
+
+ if(((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) {
+ ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacket0Length);
+ var2.index = 0;
+ var5 = packetWriter.serverPacket0Length;
+ timer.__u_458();
+ packetWriter.__m_165();
+ packetWriter.packetBuffer.index = 0;
+ packetWriter.serverPacket0 = null;
+ packetWriter.__k = null;
+ packetWriter.surfaceOffsetY = null;
+ packetWriter.__i = null;
+ packetWriter.serverPacket0Length = 0;
+ packetWriter.__x = 0;
+ rebootTimer = 0;
+ menuOptionsCount = 0;
+ isMenuOpen = false;
+ minimapState = 0;
+ destinationX = 0;
+
+ for(var4 = 0; var4 < 2048; ++var4) {
+ players[var4] = null;
+ }
+
+ Canvas.localPlayer = null;
+
+ for(var4 = 0; var4 < npcs.length; ++var4) {
+ NPC var19 = npcs[var4];
+ if(var19 != null) {
+ var19.targetIndex = -1;
+ var19.false0 = false;
+ }
+ }
+
+ SpriteMask.method4389();
+ GameShell.updateGameState(30);
+
+ for(var4 = 0; var4 < 100; ++var4) {
+ __client_od[var4] = true;
+ }
+
+ AbstractByteArrayCopier.method4024();
+ class11.updatePlayer(var2);
+ if(var5 != var2.index) {
+ throw new RuntimeException();
+ }
+ }
+ }
+ }
+ }
+ } catch (IOException var15) {
+ if(__client_ej < 1) {
+ if(class2.port1 == class203.port3) {
+ class203.port3 = WorldMapArea.port2;
+ } else {
+ class203.port3 = class2.port1;
+ }
+
+ ++__client_ej;
+ loginState = 0;
+ } else {
+ IsaacCipher.method4093(-2);
+ }
+ }
+
+ }
+
+ @ObfuscatedName("fx")
+ @ObfuscatedSignature(
+ signature = "(I)V",
+ garbageValue = "1646308927"
+ )
+ @Export("doCycleLoggedIn")
+ final void doCycleLoggedIn() {
+ if(rebootTimer > 1) {
+ --rebootTimer;
+ }
+
+ if(__client_fd > 0) {
+ --__client_fd;
+ }
+
+ if(__client_fh) {
+ __client_fh = false;
+ class48.method868();
+ } else {
+ if(!isMenuOpen) {
+ class30.method569();
+ }
+
+ int var1;
+ for(var1 = 0; var1 < 100 && this.__hg_138(packetWriter); ++var1) {
+ ;
+ }
+
+ if(gameState == 30) {
+ while(true) {
+ ReflectionCheck var2 = (ReflectionCheck)class322.reflectionChecks.last();
+ boolean var3;
+ if(var2 == null) {
+ var3 = false;
+ } else {
+ var3 = true;
+ }
+
+ int var4;
+ PacketBufferNode var5;
+ if(!var3) {
+ PacketBufferNode var6;
+ int var7;
+ if(timer.__q) {
+ var6 = Interpreter.method1915(ClientPacket.__gs_o, packetWriter.isaacCipher);
+ var6.packetBuffer.writeByte(0);
+ var7 = var6.packetBuffer.index;
+ timer.write(var6.packetBuffer);
+ var6.packetBuffer.__h_300(var6.packetBuffer.index - var7);
+ packetWriter.__q_167(var6);
+ timer.__o_457();
+ }
+
+ Object var8 = Projectile.mouseRecorder.lock;
+ Object var18 = Projectile.mouseRecorder.lock;
+ int var9;
+ int var10;
+ int var11;
+ int var12;
+ int var13;
+ int var14;
+ int var15;
+ int var16;
+ int var17;
+ synchronized(Projectile.mouseRecorder.lock) {
+ if(!__client_ai) {
+ Projectile.mouseRecorder.index = 0;
+ } else if(MouseHandler.MouseHandler_lastButton != 0 || Projectile.mouseRecorder.index >= 40) {
+ var5 = null;
+ var4 = 0;
+ var9 = 0;
+ var10 = 0;
+ var11 = 0;
+
+ for(var12 = 0; var12 < Projectile.mouseRecorder.index && (var5 == null || var5.packetBuffer.index - var4 < 246); ++var12) {
+ var9 = var12;
+ var13 = Projectile.mouseRecorder.ys[var12];
+ if(var13 < -1) {
+ var13 = -1;
+ } else if(var13 > 65534) {
+ var13 = 65534;
+ }
+
+ var14 = Projectile.mouseRecorder.xs[var12];
+ if(var14 < -1) {
+ var14 = -1;
+ } else if(var14 > 65534) {
+ var14 = 65534;
+ }
+
+ if(var14 != __client_cn || var13 != __client_cq) {
+ if(var5 == null) {
+ var5 = Interpreter.method1915(ClientPacket.__gs_ak, packetWriter.isaacCipher);
+ var5.packetBuffer.writeByte(0);
+ var4 = var5.packetBuffer.index;
+ var5.packetBuffer.index += 2;
+ var10 = 0;
+ var11 = 0;
+ }
+
+ if(-1L != __client_ch) {
+ var15 = var14 - __client_cn;
+ var16 = var13 - __client_cq;
+ var17 = (int)((Projectile.mouseRecorder.millis[var12] - __client_ch) / 20L);
+ var10 = (int)((long)var10 + (Projectile.mouseRecorder.millis[var12] - __client_ch) % 20L);
+ } else {
+ var15 = var14;
+ var16 = var13;
+ var17 = Integer.MAX_VALUE;
+ }
+
+ __client_cn = var14;
+ __client_cq = var13;
+ if(var17 < 8 && var15 >= -32 && var15 <= 31 && var16 >= -32 && var16 <= 31) {
+ var15 += 32;
+ var16 += 32;
+ var5.packetBuffer.writeShort((var17 << 12) + var16 + (var15 << 6));
+ } else if(var17 < 32 && var15 >= -128 && var15 <= 127 && var16 >= -128 && var16 <= 127) {
+ var15 += 128;
+ var16 += 128;
+ var5.packetBuffer.writeByte(var17 + 128);
+ var5.packetBuffer.writeShort(var16 + (var15 << 8));
+ } else if(var17 < 32) {
+ var5.packetBuffer.writeByte(var17 + 192);
+ if(var14 != -1 && var13 != -1) {
+ var5.packetBuffer.writeInt(var14 | var13 << 16);
+ } else {
+ var5.packetBuffer.writeInt(Integer.MIN_VALUE);
+ }
+ } else {
+ var5.packetBuffer.writeShort((var17 & 8191) + 57344);
+ if(var14 != -1 && var13 != -1) {
+ var5.packetBuffer.writeInt(var14 | var13 << 16);
+ } else {
+ var5.packetBuffer.writeInt(Integer.MIN_VALUE);
+ }
+ }
+
+ ++var11;
+ __client_ch = Projectile.mouseRecorder.millis[var12];
+ }
+ }
+
+ if(var5 != null) {
+ var5.packetBuffer.__h_300(var5.packetBuffer.index - var4);
+ var12 = var5.packetBuffer.index;
+ var5.packetBuffer.index = var4;
+ var5.packetBuffer.writeByte(var10 / var11);
+ var5.packetBuffer.writeByte(var10 % var11);
+ var5.packetBuffer.index = var12;
+ packetWriter.__q_167(var5);
+ }
+
+ if(var9 >= Projectile.mouseRecorder.index) {
+ Projectile.mouseRecorder.index = 0;
+ } else {
+ Projectile.mouseRecorder.index -= var9;
+ System.arraycopy(Projectile.mouseRecorder.xs, var9, Projectile.mouseRecorder.xs, 0, Projectile.mouseRecorder.index);
+ System.arraycopy(Projectile.mouseRecorder.ys, var9, Projectile.mouseRecorder.ys, 0, Projectile.mouseRecorder.index);
+ System.arraycopy(Projectile.mouseRecorder.millis, var9, Projectile.mouseRecorder.millis, 0, Projectile.mouseRecorder.index);
+ }
+ }
+ }
+
+ long var19;
+ PacketBufferNode var30;
+ if(MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.__lp_ca && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) {
+ var19 = (MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L) / 50L;
+ if(var19 > 4095L) {
+ var19 = 4095L;
+ }
+
+ mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis * -1L;
+ var4 = MouseHandler.MouseHandler_lastPressedY;
+ if(var4 < 0) {
+ var4 = 0;
+ } else if(var4 > Huffman.canvasHeight) {
+ var4 = Huffman.canvasHeight;
+ }
+
+ var9 = MouseHandler.MouseHandler_lastPressedX;
+ if(var9 < 0) {
+ var9 = 0;
+ } else if(var9 > SoundCache.canvasWidth) {
+ var9 = SoundCache.canvasWidth;
+ }
+
+ var10 = (int)var19;
+ var30 = Interpreter.method1915(ClientPacket.__gs_ap, packetWriter.isaacCipher);
+ var30.packetBuffer.writeShort((var10 << 1) + (MouseHandler.MouseHandler_lastButton == 2?1:0));
+ var30.packetBuffer.writeShort(var9);
+ var30.packetBuffer.writeShort(var4);
+ packetWriter.__q_167(var30);
+ }
+
+ if(KeyHandler.__an_cl > 0) {
+ var6 = Interpreter.method1915(ClientPacket.__gs_bj, packetWriter.isaacCipher);
+ var6.packetBuffer.writeShort(0);
+ var7 = var6.packetBuffer.index;
+ var19 = class203.currentTimeMs();
+
+ for(var10 = 0; var10 < KeyHandler.__an_cl; ++var10) {
+ long var21 = var19 - __client_pp;
+ if(var21 > 16777215L) {
+ var21 = 16777215L;
+ }
+
+ __client_pp = var19;
+ var6.packetBuffer.__ai_315(KeyHandler.__an_cp[var10]);
+ var6.packetBuffer.writeMedium((int)var21);
+ }
+
+ var6.packetBuffer.__y_299(var6.packetBuffer.index - var7);
+ packetWriter.__q_167(var6);
+ }
+
+ if(__client_iy > 0) {
+ --__client_iy;
+ }
+
+ if(KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) {
+ __client_is = true;
+ }
+
+ if(__client_is && __client_iy <= 0) {
+ __client_iy = 20;
+ __client_is = false;
+ var6 = Interpreter.method1915(ClientPacket.__gs_at, packetWriter.isaacCipher);
+ var6.packetBuffer.__bx_323(cameraPitchTarget);
+ var6.packetBuffer.writeShortLE(minimapOrientation);
+ packetWriter.__q_167(var6);
+ }
+
+ if(class230.__hy_az && !__client_cw) {
+ __client_cw = true;
+ var6 = Interpreter.method1915(ClientPacket.__gs_bf, packetWriter.isaacCipher);
+ var6.packetBuffer.writeByte(1);
+ packetWriter.__q_167(var6);
+ }
+
+ if(!class230.__hy_az && __client_cw) {
+ __client_cw = false;
+ var6 = Interpreter.method1915(ClientPacket.__gs_bf, packetWriter.isaacCipher);
+ var6.packetBuffer.writeByte(0);
+ packetWriter.__q_167(var6);
+ }
+
+ if(class60.worldMap0 != null) {
+ class60.worldMap0.__f_518();
+ }
+
+ class266.method5120();
+ Message.method1228();
+ if(gameState != 30) {
+ return;
+ }
+
+ Canvas.method855();
+ WorldMapIcon1.method212();
+ ++packetWriter.__x;
+ if(packetWriter.__x > 750) {
+ class48.method868();
+ return;
+ }
+
+ var1 = Players.Players_count;
+ int[] var31 = Players.Players_indices;
+
+ for(var4 = 0; var4 < var1; ++var4) {
+ Player var20 = players[var31[var4]];
+ if(var20 != null) {
+ class65.method1232(var20, 1);
+ }
+ }
+
+ for(var1 = 0; var1 < npcCount; ++var1) {
+ var7 = npcIndices[var1];
+ NPC var32 = npcs[var7];
+ if(var32 != null) {
+ class65.method1232(var32, var32.definition.size);
+ }
+ }
+
+ Buddy.method5554();
+ ++__client_gy;
+ if(mouseCrossColor != 0) {
+ mouseCrossState += 20;
+ if(mouseCrossState >= 400) {
+ mouseCrossColor = 0;
+ }
+ }
+
+ if(BoundaryObject.__ej_jv != null) {
+ ++__client_ju;
+ if(__client_ju >= 15) {
+ class22.method295(BoundaryObject.__ej_jv);
+ BoundaryObject.__ej_jv = null;
+ }
+ }
+
+ Widget var33 = Clock.mousedOverWidgetIf1;
+ Widget var34 = AccessFile.__dk_lm;
+ Clock.mousedOverWidgetIf1 = null;
+ AccessFile.__dk_lm = null;
+ draggedOnWidget = null;
+ __client_nt = false;
+ __client_nn = false;
+ __client_pm = 0;
+
+ while(Decimator.method2490() && __client_pm < 128) {
+ if(rights >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && IndexStoreAction.__ik_cn == 66) {
+ String var22 = KeyHandler.method839();
+ TextureProvider.client.clipboardSetString(var22);
+ } else if(oculusOrbState != 1 || GzipDecompressor.__go_ck <= 0) {
+ __client_pn[__client_pm] = IndexStoreAction.__ik_cn;
+ __client_pq[__client_pm] = GzipDecompressor.__go_ck;
+ ++__client_pm;
+ }
+ }
+
+ if(FriendSystem.jmodCheck() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) {
+ var4 = Canvas.localPlayer.plane - mouseWheelRotation;
+ if(var4 < 0) {
+ var4 = 0;
+ } else if(var4 > 3) {
+ var4 = 3;
+ }
+
+ if(var4 != Canvas.localPlayer.plane) {
+ var9 = Canvas.localPlayer.pathX[0] + class50.baseX;
+ var10 = Canvas.localPlayer.pathY[0] + GraphicsObject.baseY;
+ var30 = Interpreter.method1915(ClientPacket.__gs_bx, packetWriter.isaacCipher);
+ var30.packetBuffer.writeIntME(0);
+ var30.packetBuffer.writeShortLE(var10);
+ var30.packetBuffer.__ai_315(var4);
+ var30.packetBuffer.writeShort(var9);
+ packetWriter.__q_167(var30);
+ }
+
+ mouseWheelRotation = 0;
+ }
+
+ if(rootWidgetGroup != -1) {
+ class231.method4517(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0);
+ }
+
+ ++cycleCntr;
+
+ while(true) {
+ Widget var23;
+ ScriptEvent var24;
+ Widget var35;
+ do {
+ var24 = (ScriptEvent)__client_oh.removeLast();
+ if(var24 == null) {
+ while(true) {
+ do {
+ var24 = (ScriptEvent)__client_oc.removeLast();
+ if(var24 == null) {
+ while(true) {
+ do {
+ var24 = (ScriptEvent)scriptEvents.removeLast();
+ if(var24 == null) {
+ this.__hi_139();
+ WorldMapSectionType.method254();
+ if(clickedWidget != null) {
+ this.__jh_142();
+ }
+
+ PacketBufferNode var25;
+ if(DevicePcmPlayerProvider.dragInventoryWidget != null) {
+ class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
+ ++itemDragDuration;
+ if(MouseHandler.MouseHandler_currentButton == 0) {
+ if(__client_jl) {
+ if(UserComparator6.__fg_jh == DevicePcmPlayerProvider.dragInventoryWidget && dragItemSlotSource != dragItemSlotDestination) {
+ Widget var26 = DevicePcmPlayerProvider.dragInventoryWidget;
+ byte var27 = 0;
+ if(__client_mb == 1 && var26.contentType == 206) {
+ var27 = 1;
+ }
+
+ if(var26.itemIds[dragItemSlotDestination] <= 0) {
+ var27 = 0;
+ }
+
+ if(class168.method3461(class1.getWidgetClickMask(var26))) {
+ var10 = dragItemSlotSource;
+ var11 = dragItemSlotDestination;
+ var26.itemIds[var11] = var26.itemIds[var10];
+ var26.itemQuantities[var11] = var26.itemQuantities[var10];
+ var26.itemIds[var10] = -1;
+ var26.itemQuantities[var10] = 0;
+ } else if(var27 == 1) {
+ var10 = dragItemSlotSource;
+ var11 = dragItemSlotDestination;
+
+ while(var10 != var11) {
+ if(var10 > var11) {
+ var26.swapItems(var10 - 1, var10);
+ --var10;
+ } else if(var10 < var11) {
+ var26.swapItems(var10 + 1, var10);
+ ++var10;
+ }
+ }
+ } else {
+ var26.swapItems(dragItemSlotDestination, dragItemSlotSource);
+ }
+
+ var25 = Interpreter.method1915(ClientPacket.__gs_ce, packetWriter.isaacCipher);
+ var25.packetBuffer.writeShort(dragItemSlotDestination);
+ var25.packetBuffer.writeShortLE(dragItemSlotSource);
+ var25.packetBuffer.writeInt(DevicePcmPlayerProvider.dragInventoryWidget.id);
+ var25.packetBuffer.__ai_315(var27);
+ packetWriter.__q_167(var25);
+ }
+ } else if(this.shouldLeftClickOpenMenu()) {
+ this.openMenu(__client_ja, __client_je);
+ } else if(menuOptionsCount > 0) {
+ var4 = __client_ja;
+ var9 = __client_je;
+ class231.method4520(UnitPriceComparator.tempMenuAction, var4, var9);
+ UnitPriceComparator.tempMenuAction = null;
+ }
+
+ __client_ju = 10;
+ MouseHandler.MouseHandler_lastButton = 0;
+ DevicePcmPlayerProvider.dragInventoryWidget = null;
+ } else if(itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > __client_ja + 5 || MouseHandler.MouseHandler_x < __client_ja - 5 || MouseHandler.MouseHandler_y > __client_je + 5 || MouseHandler.MouseHandler_y < __client_je - 5)) {
+ __client_jl = true;
+ }
+ }
+
+ if(Scene.method3187()) {
+ var4 = Scene.Scene_selectedX;
+ var9 = Scene.Scene_selectedY;
+ var25 = Interpreter.method1915(ClientPacket.__gs_ct, packetWriter.isaacCipher);
+ var25.packetBuffer.writeByte(5);
+ var25.packetBuffer.__bo_322(var9 + GraphicsObject.baseY);
+ var25.packetBuffer.__bo_322(var4 + class50.baseX);
+ var25.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?(KeyHandler.KeyHandler_pressedKeys[81]?2:1):0);
+ packetWriter.__q_167(var25);
+ Scene.method3103();
+ mouseCrossX = MouseHandler.MouseHandler_lastPressedX;
+ mouseCrossY = MouseHandler.MouseHandler_lastPressedY;
+ mouseCrossColor = 1;
+ mouseCrossState = 0;
+ destinationX = var4;
+ destinationY = var9;
+ }
+
+ if(var33 != Clock.mousedOverWidgetIf1) {
+ if(var33 != null) {
+ class22.method295(var33);
+ }
+
+ if(Clock.mousedOverWidgetIf1 != null) {
+ class22.method295(Clock.mousedOverWidgetIf1);
+ }
+ }
+
+ if(var34 != AccessFile.__dk_lm && __client_lb == __client_ls) {
+ if(var34 != null) {
+ class22.method295(var34);
+ }
+
+ if(AccessFile.__dk_lm != null) {
+ class22.method295(AccessFile.__dk_lm);
+ }
+ }
+
+ if(AccessFile.__dk_lm != null) {
+ if(__client_lb < __client_ls) {
+ ++__client_lb;
+ if(__client_ls == __client_lb) {
+ class22.method295(AccessFile.__dk_lm);
+ }
+ }
+ } else if(__client_lb > 0) {
+ --__client_lb;
+ }
+
+ class54.method1091();
+ if(isCameraLocked) {
+ var4 = class3.__w_qs * 128 + 64;
+ var9 = MusicPatchPcmStream.__hq_qg * 128 + 64;
+ var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - AbstractWorldMapIcon.__ak_qj;
+ if(WorldMapSection1.cameraX < var4) {
+ WorldMapSection1.cameraX = (var4 - WorldMapSection1.cameraX) * class30.__ar_qw / 1000 + WorldMapSection1.cameraX + ClientPacket.__gs_qh;
+ if(WorldMapSection1.cameraX > var4) {
+ WorldMapSection1.cameraX = var4;
+ }
+ }
+
+ if(WorldMapSection1.cameraX > var4) {
+ WorldMapSection1.cameraX -= class30.__ar_qw * (WorldMapSection1.cameraX - var4) / 1000 + ClientPacket.__gs_qh;
+ if(WorldMapSection1.cameraX < var4) {
+ WorldMapSection1.cameraX = var4;
+ }
+ }
+
+ if(GrandExchangeEvents.cameraY < var10) {
+ GrandExchangeEvents.cameraY = (var10 - GrandExchangeEvents.cameraY) * class30.__ar_qw / 1000 + GrandExchangeEvents.cameraY + ClientPacket.__gs_qh;
+ if(GrandExchangeEvents.cameraY > var10) {
+ GrandExchangeEvents.cameraY = var10;
+ }
+ }
+
+ if(GrandExchangeEvents.cameraY > var10) {
+ GrandExchangeEvents.cameraY -= class30.__ar_qw * (GrandExchangeEvents.cameraY - var10) / 1000 + ClientPacket.__gs_qh;
+ if(GrandExchangeEvents.cameraY < var10) {
+ GrandExchangeEvents.cameraY = var10;
+ }
+ }
+
+ if(class11.cameraZ < var9) {
+ class11.cameraZ = (var9 - class11.cameraZ) * class30.__ar_qw / 1000 + class11.cameraZ + ClientPacket.__gs_qh;
+ if(class11.cameraZ > var9) {
+ class11.cameraZ = var9;
+ }
+ }
+
+ if(class11.cameraZ > var9) {
+ class11.cameraZ -= class30.__ar_qw * (class11.cameraZ - var9) / 1000 + ClientPacket.__gs_qh;
+ if(class11.cameraZ < var9) {
+ class11.cameraZ = var9;
+ }
+ }
+
+ var4 = GrandExchangeOffer.__x_rg * 128 + 64;
+ var9 = KeyHandler.__an_ra * 128 + 64;
+ var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - IndexStoreAction.__ik_rt;
+ var11 = var4 - WorldMapSection1.cameraX;
+ var12 = var10 - GrandExchangeEvents.cameraY;
+ var13 = var9 - class11.cameraZ;
+ var14 = (int)Math.sqrt((double)(var13 * var13 + var11 * var11));
+ var15 = (int)(Math.atan2((double)var12, (double)var14) * 325.949D) & 2047;
+ var16 = (int)(Math.atan2((double)var11, (double)var13) * -325.949D) & 2047;
+ if(var15 < 128) {
+ var15 = 128;
+ }
+
+ if(var15 > 383) {
+ var15 = 383;
+ }
+
+ if(WorldMapIcon1.cameraPitch < var15) {
+ WorldMapIcon1.cameraPitch = (var15 - WorldMapIcon1.cameraPitch) * class171.__fo_ro / 1000 + WorldMapIcon1.cameraPitch + VertexNormal.__dq_rq;
+ if(WorldMapIcon1.cameraPitch > var15) {
+ WorldMapIcon1.cameraPitch = var15;
+ }
+ }
+
+ if(WorldMapIcon1.cameraPitch > var15) {
+ WorldMapIcon1.cameraPitch -= class171.__fo_ro * (WorldMapIcon1.cameraPitch - var15) / 1000 + VertexNormal.__dq_rq;
+ if(WorldMapIcon1.cameraPitch < var15) {
+ WorldMapIcon1.cameraPitch = var15;
+ }
+ }
+
+ var17 = var16 - MusicPatchNode.cameraYaw;
+ if(var17 > 1024) {
+ var17 -= 2048;
+ }
+
+ if(var17 < -1024) {
+ var17 += 2048;
+ }
+
+ if(var17 > 0) {
+ MusicPatchNode.cameraYaw = MusicPatchNode.cameraYaw + VertexNormal.__dq_rq + var17 * class171.__fo_ro / 1000;
+ MusicPatchNode.cameraYaw &= 2047;
+ }
+
+ if(var17 < 0) {
+ MusicPatchNode.cameraYaw -= VertexNormal.__dq_rq + -var17 * class171.__fo_ro / 1000;
+ MusicPatchNode.cameraYaw &= 2047;
+ }
+
+ int var36 = var16 - MusicPatchNode.cameraYaw;
+ if(var36 > 1024) {
+ var36 -= 2048;
+ }
+
+ if(var36 < -1024) {
+ var36 += 2048;
+ }
+
+ if(var36 < 0 && var17 > 0 || var36 > 0 && var17 < 0) {
+ MusicPatchNode.cameraYaw = var16;
+ }
+ }
+
+ for(var4 = 0; var4 < 5; ++var4) {
+ ++__client_rk[var4];
+ }
+
+ class196.varcs.tryWrite();
+ var4 = class22.method297();
+ var9 = KeyHandler.KeyHandler_idleCycles;
+ if(var4 > 15000 && var9 > 15000) {
+ __client_fd = 250;
+ MouseHandler.MouseHandler_idleCycles = 14500;
+ var30 = Interpreter.method1915(ClientPacket.__gs_ax, packetWriter.isaacCipher);
+ packetWriter.__q_167(var30);
+ }
+
+ WorldMapArea.friendSystem.__w_154();
+ ++packetWriter.__d;
+ if(packetWriter.__d > 50) {
+ var30 = Interpreter.method1915(ClientPacket.__gs_c, packetWriter.isaacCipher);
+ packetWriter.__q_167(var30);
+ }
+
+ try {
+ packetWriter.__f_166();
+ } catch (IOException var28) {
+ class48.method868();
+ }
+
+ return;
+ }
+
+ var23 = var24.widget;
+ if(var23.childIndex < 0) {
+ break;
+ }
+
+ var35 = Huffman.getWidget(var23.parentId);
+ } while(var35 == null || var35.children == null || var23.childIndex >= var35.children.length || var23 != var35.children[var23.childIndex]);
+
+ AbstractIndexCache.runScript(var24);
+ }
+ }
+
+ var23 = var24.widget;
+ if(var23.childIndex < 0) {
+ break;
+ }
+
+ var35 = Huffman.getWidget(var23.parentId);
+ } while(var35 == null || var35.children == null || var23.childIndex >= var35.children.length || var23 != var35.children[var23.childIndex]);
+
+ AbstractIndexCache.runScript(var24);
+ }
+ }
+
+ var23 = var24.widget;
+ if(var23.childIndex < 0) {
+ break;
+ }
+
+ var35 = Huffman.getWidget(var23.parentId);
+ } while(var35 == null || var35.children == null || var23.childIndex >= var35.children.length || var23 != var35.children[var23.childIndex]);
+
+ AbstractIndexCache.runScript(var24);
+ }
+ }
+
+ var5 = Interpreter.method1915(ClientPacket.__gs_cw, packetWriter.isaacCipher);
+ var5.packetBuffer.writeByte(0);
+ var4 = var5.packetBuffer.index;
+ WorldMapLabel.method443(var5.packetBuffer);
+ var5.packetBuffer.__h_300(var5.packetBuffer.index - var4);
+ packetWriter.__q_167(var5);
+ }
+ }
+ }
+
+ }
+
+ @ObfuscatedName("ge")
+ @ObfuscatedSignature(
+ signature = "(I)V",
+ garbageValue = "-1792846917"
+ )
+ @Export("__ge_137")
+ void __ge_137() {
+ int var1 = SoundCache.canvasWidth;
+ int var2 = Huffman.canvasHeight;
+ if(super.contentWidth < var1) {
+ var1 = super.contentWidth;
+ }
+
+ if(super.contentHeight < var2) {
+ var2 = super.contentHeight;
+ }
+
+ if(ReflectionCheck.clientPreferences != null) {
+ try {
+ Client var3 = TextureProvider.client;
+ Object[] var4 = new Object[]{Integer.valueOf(SpotAnimationDefinition.method4822())};
+ JSObject.getWindow(var3).call("resize", var4);
+ } catch (Throwable var5) {
+ ;
+ }
+ }
+
+ }
+
+ @ObfuscatedName("gs")
+ @ObfuscatedSignature(
+ signature = "(I)V",
+ garbageValue = "-1433182492"
+ )
+ @Export("drawLoggedIn")
+ final void drawLoggedIn() {
+ if(rootWidgetGroup != -1) {
+ ClientPreferences.method1809(rootWidgetGroup);
+ }
+
+ int var1;
+ for(var1 = 0; var1 < rootWidgetCount; ++var1) {
+ if(__client_od[var1]) {
+ __client_ot[var1] = true;
+ }
+
+ __client_oq[var1] = __client_od[var1];
+ __client_od[var1] = false;
+ }
+
+ __client_oo = cycle;
+ __client_lq = -1;
+ __client_ln = -1;
+ UserComparator6.__fg_jh = null;
+ if(rootWidgetGroup != -1) {
+ rootWidgetCount = 0;
+ Interpreter.drawWidgets(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1);
+ }
+
+ Rasterizer2D.Rasterizer2D_resetClip();
+ if(showMouseCross) {
+ if(mouseCrossColor == 1) {
+ KeyHandler.crossSprites[mouseCrossState / 100].drawAt2(mouseCrossX - 8, mouseCrossY - 8);
+ }
+
+ if(mouseCrossColor == 2) {
+ KeyHandler.crossSprites[mouseCrossState / 100 + 4].drawAt2(mouseCrossX - 8, mouseCrossY - 8);
+ }
+ }
+
+ int var2;
+ int var3;
+ int var4;
+ int var5;
+ int var6;
+ int var7;
+ if(!isMenuOpen) {
+ if(__client_lq != -1) {
+ class39.drawMenuActionTextAt(__client_lq, __client_ln);
+ }
+ } else {
+ var1 = class25.menuX;
+ var2 = GameShell.menuY;
+ var3 = class214.menuWidth;
+ var4 = AbstractWorldMapIcon.menuHeight;
+ int var8 = 6116423;
+ Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var8);
+ Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0);
+ Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0);
+ class2.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var8, -1);
+ var5 = MouseHandler.MouseHandler_x;
+ var6 = MouseHandler.MouseHandler_y;
+
+ int var9;
+ int var10;
+ for(var7 = 0; var7 < menuOptionsCount; ++var7) {
+ var9 = var2 + (menuOptionsCount - 1 - var7) * 15 + 31;
+ var10 = 16777215;
+ if(var5 > var1 && var5 < var3 + var1 && var6 > var9 - 13 && var6 < var9 + 3) {
+ var10 = 16776960;
+ }
+
+ Font var11 = class2.fontBold12;
+ String var12;
+ if(var7 < 0) {
+ var12 = "";
+ } else if(menuTargetNames[var7].length() > 0) {
+ var12 = menuActions[var7] + " " + menuTargetNames[var7];
+ } else {
+ var12 = menuActions[var7];
+ }
+
+ var11.draw(var12, var1 + 3, var9, var10, 0);
+ }
+
+ var7 = class25.menuX;
+ var9 = GameShell.menuY;
+ var10 = class214.menuWidth;
+ int var15 = AbstractWorldMapIcon.menuHeight;
+
+ for(int var18 = 0; var18 < rootWidgetCount; ++var18) {
+ if(rootWidgetXs[var18] + rootWidgetWidths[var18] > var7 && rootWidgetXs[var18] < var7 + var10 && rootWidgetYs[var18] + rootWidgetHeights[var18] > var9 && rootWidgetYs[var18] < var9 + var15) {
+ __client_ot[var18] = true;
+ }
+ }
+ }
+
+ if(gameDrawingMode == 3) {
+ for(var1 = 0; var1 < rootWidgetCount; ++var1) {
+ if(__client_oq[var1]) {
+ Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128);
+ } else if(__client_ot[var1]) {
+ Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128);
+ }
+ }
+ }
+
+ var1 = SoundSystem.plane;
+ var2 = Canvas.localPlayer.x;
+ var3 = Canvas.localPlayer.y;
+ var4 = __client_gy;
+
+ for(ObjectSound var13 = (ObjectSound)ObjectSound.objectSounds.last(); var13 != null; var13 = (ObjectSound)ObjectSound.objectSounds.previous()) {
+ if(var13.soundEffectId != -1 || var13.soundEffectIds != null) {
+ var5 = 0;
+ if(var2 > var13.__o) {
+ var5 += var2 - var13.__o;
+ } else if(var2 < var13.__q) {
+ var5 += var13.__q - var2;
+ }
+
+ if(var3 > var13.__u) {
+ var5 += var3 - var13.__u;
+ } else if(var3 < var13.__w) {
+ var5 += var13.__w - var3;
+ }
+
+ if(var5 - 64 <= var13.__g && __client_qc != 0 && var1 == var13.__f) {
+ var5 -= 64;
+ if(var5 < 0) {
+ var5 = 0;
+ }
+
+ var6 = (var13.__g - var5) * __client_qc / var13.__g;
+ Object var14;
+ SoundEffect var16;
+ RawSound var17;
+ RawPcmStream var19;
+ if(var13.stream1 == null) {
+ if(var13.soundEffectId >= 0) {
+ var14 = null;
+ var16 = SoundEffect.readSoundEffect(class25.indexCache4, var13.soundEffectId, 0);
+ if(var16 != null) {
+ var17 = var16.toRawSound().resample(MilliClock.decimator);
+ var19 = RawPcmStream.method2497(var17, 100, var6);
+ var19.__x_181(-1);
+ TaskHandler.pcmStreamMixer.addSubStream(var19);
+ var13.stream1 = var19;
+ }
+ }
+ } else {
+ var13.stream1.__a_182(var6);
+ }
+
+ if(var13.stream2 == null) {
+ if(var13.soundEffectIds != null && (var13.surfaceOffsetY -= var4) <= 0) {
+ var7 = (int)(Math.random() * (double)var13.soundEffectIds.length);
+ var14 = null;
+ var16 = SoundEffect.readSoundEffect(class25.indexCache4, var13.soundEffectIds[var7], 0);
+ if(var16 != null) {
+ var17 = var16.toRawSound().resample(MilliClock.decimator);
+ var19 = RawPcmStream.method2497(var17, 100, var6);
+ var19.__x_181(0);
+ TaskHandler.pcmStreamMixer.addSubStream(var19);
+ var13.stream2 = var19;
+ var13.surfaceOffsetY = var13.__x + (int)(Math.random() * (double)(var13.__d - var13.__x));
+ }
+ }
+ } else {
+ var13.stream2.__a_182(var6);
+ if(!var13.stream2.hasNext()) {
+ var13.stream2 = null;
+ }
+ }
+ } else {
+ if(var13.stream1 != null) {
+ TaskHandler.pcmStreamMixer.removeSubStream(var13.stream1);
+ var13.stream1 = null;
+ }
+
+ if(var13.stream2 != null) {
+ TaskHandler.pcmStreamMixer.removeSubStream(var13.stream2);
+ var13.stream2 = null;
+ }
+ }
+ }
+ }
+
+ __client_gy = 0;
+ }
+
+ @ObfuscatedName("hg")
+ @ObfuscatedSignature(
+ signature = "(Lcl;I)Z",
+ garbageValue = "1488446149"
+ )
+ @Export("__hg_138")
+ final boolean __hg_138(PacketWriter var1) {
+ AbstractSocket var2 = var1.getSocket();
+ PacketBuffer var3 = var1.packetBuffer;
+ if(var2 == null) {
+ return false;
+ } else {
+ String var4;
+ int var5;
+ try {
+ int var6;
+ if(var1.serverPacket0 == null) {
+ if(var1.__e) {
+ if(!var2.isAvailable(1)) {
+ return false;
+ }
+
+ var2.read(var1.packetBuffer.array, 0, 1);
+ var1.__x = 0;
+ var1.__e = false;
+ }
+
+ var3.index = 0;
+ if(var3.__ig_334()) {
+ if(!var2.isAvailable(1)) {
+ return false;
+ }
+
+ var2.read(var1.packetBuffer.array, 1, 1);
+ var1.__x = 0;
+ }
+
+ var1.__e = true;
+ ServerPacket[] var7 = class27.method429();
+ var6 = var3.readSmartByteShortIsaac();
+ if(var6 < 0 || var6 >= var7.length) {
+ throw new IOException(var6 + " " + var3.index);
+ }
+
+ var1.serverPacket0 = var7[var6];
+ var1.serverPacket0Length = var1.serverPacket0.length;
+ }
+
+ if(var1.serverPacket0Length == -1) {
+ if(!var2.isAvailable(1)) {
+ return false;
+ }
+
+ var1.getSocket().read(var3.array, 0, 1);
+ var1.serverPacket0Length = var3.array[0] & 255;
+ }
+
+ if(var1.serverPacket0Length == -2) {
+ if(!var2.isAvailable(2)) {
+ return false;
+ }
+
+ var1.getSocket().read(var3.array, 0, 2);
+ var3.index = 0;
+ var1.serverPacket0Length = var3.__ag_302();
+ }
+
+ if(!var2.isAvailable(var1.serverPacket0Length)) {
+ return false;
+ }
+
+ var3.index = 0;
+ var2.read(var3.array, 0, var1.serverPacket0Length);
+ var1.__x = 0;
+ timer.__m_453();
+ var1.__i = var1.surfaceOffsetY;
+ var1.surfaceOffsetY = var1.__k;
+ var1.__k = var1.serverPacket0;
+ if(ServerPacket.__ge_ax == var1.serverPacket0) {
+ class16.method189(class190.field2344);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_be == var1.serverPacket0) {
+ isCameraLocked = true;
+ class3.__w_qs = var3.readUnsignedByte();
+ MusicPatchPcmStream.__hq_qg = var3.readUnsignedByte();
+ AbstractWorldMapIcon.__ak_qj = var3.__ag_302();
+ ClientPacket.__gs_qh = var3.readUnsignedByte();
+ class30.__ar_qw = var3.readUnsignedByte();
+ if(class30.__ar_qw >= 100) {
+ WorldMapSection1.cameraX = class3.__w_qs * 128 + 64;
+ class11.cameraZ = MusicPatchPcmStream.__hq_qg * 128 + 64;
+ GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection1.cameraX, class11.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.__ak_qj;
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ int var37;
+ if(ServerPacket.__ge_aj == var1.serverPacket0) {
+ for(var37 = 0; var37 < players.length; ++var37) {
+ if(players[var37] != null) {
+ players[var37].sequence = -1;
+ }
+ }
+
+ for(var37 = 0; var37 < npcs.length; ++var37) {
+ if(npcs[var37] != null) {
+ npcs[var37].sequence = -1;
+ }
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_s == var1.serverPacket0) {
+ Canvas.__ao_gk = var3.__bq_318();
+ WorldMapSection3.__p_go = var3.readUnsignedByteNegate();
+
+ while(var3.index < var1.serverPacket0Length) {
+ var37 = var3.readUnsignedByte();
+ class190 var38 = RunException.method3430()[var37];
+ class16.method189(var38);
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ Widget var8;
+ if(ServerPacket.__ge_bx == var1.serverPacket0) {
+ var37 = var3.__aq_303();
+ var6 = var3.__bf_332();
+ var8 = Huffman.getWidget(var6);
+ if(var37 != var8.sequenceId || var37 == -1) {
+ var8.sequenceId = var37;
+ var8.modelFrame = 0;
+ var8.modelFrameCycle = 0;
+ class22.method295(var8);
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ Widget var9;
+ if(ServerPacket.__ge_ar == var1.serverPacket0) {
+ var37 = var3.__bf_332();
+ var9 = Huffman.getWidget(var37);
+ var9.modelType = 3;
+ var9.modelId = Canvas.localPlayer.appearance.getChatHeadId();
+ class22.method295(var9);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_f == var1.serverPacket0) {
+ TextureProvider.method2773();
+ var1.serverPacket0 = null;
+ return false;
+ }
+
+ if(ServerPacket.__ge_l == var1.serverPacket0) {
+ var37 = var3.__bp_331();
+ var9 = Huffman.getWidget(var37);
+
+ for(var5 = 0; var5 < var9.itemIds.length; ++var5) {
+ var9.itemIds[var5] = -1;
+ var9.itemIds[var5] = 0;
+ }
+
+ class22.method295(var9);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ int var10;
+ int var11;
+ int var12;
+ int var13;
+ if(ServerPacket.__ge_bg == var1.serverPacket0) {
+ var37 = var3.readInt();
+ var6 = var3.__ag_302();
+ if(var37 < -70000) {
+ var6 += 32768;
+ }
+
+ if(var37 >= 0) {
+ var8 = Huffman.getWidget(var37);
+ } else {
+ var8 = null;
+ }
+
+ if(var8 != null) {
+ for(var10 = 0; var10 < var8.itemIds.length; ++var10) {
+ var8.itemIds[var10] = 0;
+ var8.itemQuantities[var10] = 0;
+ }
+ }
+
+ PlayerType.method4547(var6);
+ var10 = var3.__ag_302();
+
+ for(var11 = 0; var11 < var10; ++var11) {
+ var12 = var3.__ag_302();
+ var13 = var3.readUnsignedByte();
+ if(var13 == 255) {
+ var13 = var3.__bf_332();
+ }
+
+ if(var8 != null && var11 < var8.itemIds.length) {
+ var8.itemIds[var11] = var12;
+ var8.itemQuantities[var11] = var13;
+ }
+
+ WorldMapManager.itemContainerSetItem(var6, var11, var12 - 1, var13);
+ }
+
+ if(var8 != null) {
+ class22.method295(var8);
+ }
+
+ class12.method159();
+ __client_nz[++__client_ns - 1 & 31] = var6 & 32767;
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_e == var1.serverPacket0) {
+ class16.method189(class190.field2341);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bb == var1.serverPacket0) {
+ UserComparator7.method3360(var3, var1.serverPacket0Length);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bm == var1.serverPacket0) {
+ WorldMapSection3.__p_go = var3.readUnsignedByteNegate();
+ Canvas.__ao_gk = var3.__bq_318();
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ boolean var14;
+ if(ServerPacket.__ge_b == var1.serverPacket0) {
+ var37 = var3.readInt();
+ var14 = var3.readUnsignedByte() == 1;
+ var8 = Huffman.getWidget(var37);
+ if(var14 != var8.isHidden) {
+ var8.isHidden = var14;
+ class22.method295(var8);
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bu == var1.serverPacket0) {
+ byte var39 = var3.__bn_319();
+ var6 = var3.__bu_325();
+ Varps.Varps_temp[var6] = var39;
+ if(Varps.Varps_main[var6] != var39) {
+ Varps.Varps_main[var6] = var39;
+ }
+
+ IndexCache.method4703(var6);
+ __client_nr[++__client_nd - 1 & 31] = var6;
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_a == var1.serverPacket0) {
+ class16.method189(class190.field2347);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bq == var1.serverPacket0) {
+ var37 = var3.readUnsignedByte();
+ if(var3.readUnsignedByte() == 0) {
+ grandExchangeOffers[var37] = new GrandExchangeOffer();
+ var3.index += 18;
+ } else {
+ --var3.index;
+ grandExchangeOffers[var37] = new GrandExchangeOffer(var3, false);
+ }
+
+ __client_nv = cycleCntr;
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_cj == var1.serverPacket0) {
+ var37 = var3.__bm_326();
+ rootWidgetGroup = var37;
+ this.__iu_141(false);
+ DevicePcmPlayerProvider.method845(var37);
+ WorldMapSection3.runWidgetOnLoadListener(rootWidgetGroup);
+
+ for(var6 = 0; var6 < 100; ++var6) {
+ __client_od[var6] = true;
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bo == var1.serverPacket0) {
+ class12.method159();
+ runEnergy = var3.readUnsignedByte();
+ __client_ni = cycleCntr;
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ Widget var15;
+ if(ServerPacket.__ge_af == var1.serverPacket0) {
+ var37 = var3.__bm_326();
+ var6 = var3.__bm_326();
+ var5 = var3.__bm_326();
+ var10 = var3.__bf_332();
+ var15 = Huffman.getWidget(var10);
+ if(var37 != var15.modelAngleX || var5 != var15.modelAngleY || var6 != var15.modelZoom) {
+ var15.modelAngleX = var37;
+ var15.modelAngleY = var5;
+ var15.modelZoom = var6;
+ class22.method295(var15);
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_al == var1.serverPacket0) {
+ hintArrowType = var3.readUnsignedByte();
+ if(hintArrowType == 1) {
+ hintArrowNpcIndex = var3.__ag_302();
+ }
+
+ if(hintArrowType >= 2 && hintArrowType <= 6) {
+ if(hintArrowType == 2) {
+ hintArrowSubX = 64;
+ hintArrowSubY = 64;
+ }
+
+ if(hintArrowType == 3) {
+ hintArrowSubX = 0;
+ hintArrowSubY = 64;
+ }
+
+ if(hintArrowType == 4) {
+ hintArrowSubX = 128;
+ hintArrowSubY = 64;
+ }
+
+ if(hintArrowType == 5) {
+ hintArrowSubX = 64;
+ hintArrowSubY = 0;
+ }
+
+ if(hintArrowType == 6) {
+ hintArrowSubX = 64;
+ hintArrowSubY = 128;
+ }
+
+ hintArrowType = 2;
+ hintArrowX = var3.__ag_302();
+ hintArrowY = var3.__ag_302();
+ hintArrowHeight = var3.readUnsignedByte();
+ }
+
+ if(hintArrowType == 10) {
+ hintArrowPlayerIndex = var3.__ag_302();
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_cv == var1.serverPacket0) {
+ Skeleton.method3062(var3, var1.serverPacket0Length);
+ ScriptFrame.method1138();
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_m == var1.serverPacket0) {
+ class50.loadRegions(false, var1.packetBuffer);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ Widget var16;
+ if(ServerPacket.__ge_ap == var1.serverPacket0) {
+ var37 = var3.__bu_325();
+ var6 = var3.__by_324();
+ var5 = var3.__bp_331();
+ var16 = Huffman.getWidget(var5);
+ var16.__bh = var37 + (var6 << 16);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_ba == var1.serverPacket0) {
+ if(rootWidgetGroup != -1) {
+ GrandExchangeEvents.method74(rootWidgetGroup, 0);
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_h == var1.serverPacket0) {
+ var37 = var3.readInt();
+ var6 = var3.__ag_302();
+ if(var6 == 65535) {
+ var6 = -1;
+ }
+
+ var5 = var3.__bf_332();
+ var16 = Huffman.getWidget(var37);
+ ItemDefinition var40;
+ if(!var16.isIf3) {
+ if(var6 == -1) {
+ var16.modelType = 0;
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ var40 = Skills.getItemDefinition(var6);
+ var16.modelType = 4;
+ var16.modelId = var6;
+ var16.modelAngleX = var40.xan2d;
+ var16.modelAngleY = var40.yan2d;
+ var16.modelZoom = var40.zoom2d * 100 / var5;
+ class22.method295(var16);
+ } else {
+ var16.itemId = var6;
+ var16.itemQuantity = var5;
+ var40 = Skills.getItemDefinition(var6);
+ var16.modelAngleX = var40.xan2d;
+ var16.modelAngleY = var40.yan2d;
+ var16.modelAngleZ = var40.zan2d;
+ var16.modelOffsetX = var40.offsetX2d;
+ var16.modelOffsetY = var40.offsetY2d;
+ var16.modelZoom = var40.zoom2d;
+ if(var40.isStackable == 1) {
+ var16.itemQuantityMode = 1;
+ } else {
+ var16.itemQuantityMode = 2;
+ }
+
+ if(var16.__bf > 0) {
+ var16.modelZoom = var16.modelZoom * 32 / var16.__bf;
+ } else if(var16.rawWidth > 0) {
+ var16.modelZoom = var16.modelZoom * 32 / var16.rawWidth;
+ }
+
+ class22.method295(var16);
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ String var17;
+ boolean var18;
+ if(ServerPacket.__ge_w == var1.serverPacket0) {
+ var37 = var3.__ae_307();
+ var14 = var3.readUnsignedByte() == 1;
+ var17 = "";
+ var18 = false;
+ if(var14) {
+ var17 = var3.readStringCp1252NullTerminated();
+ if(WorldMapArea.friendSystem.isIgnored(new Username(var17, KeyHandler.loginType))) {
+ var18 = true;
+ }
+ }
+
+ String var41 = var3.readStringCp1252NullTerminated();
+ if(!var18) {
+ WorldMapIcon1.method219(var37, var17, var41);
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bi == var1.serverPacket0) {
+ IndexCacheLoader.field512 = WorldMapElement.method4783(var3.readUnsignedByte());
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_n == var1.serverPacket0) {
+ class16.method189(class190.field2345);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_j == var1.serverPacket0) {
+ var18 = var3.readBoolean();
+ if(var18) {
+ if(ClientParameter.field3645 == null) {
+ ClientParameter.field3645 = new class248();
+ }
+ } else {
+ ClientParameter.field3645 = null;
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ long var19;
+ if(ServerPacket.__ge_aa == var1.serverPacket0) {
+ var37 = var3.__bt_330();
+ var6 = var3.__bu_325();
+ if(var6 == 65535) {
+ var6 = -1;
+ }
+
+ var5 = var3.__bf_332();
+ var10 = var3.__ag_302();
+ if(var10 == 65535) {
+ var10 = -1;
+ }
+
+ for(var11 = var10; var11 <= var6; ++var11) {
+ var19 = (long)var11 + ((long)var5 << 32);
+ Node var42 = widgetClickMasks.get(var19);
+ if(var42 != null) {
+ var42.remove();
+ }
+
+ widgetClickMasks.put(new IntegerNode(var37), var19);
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_cy == var1.serverPacket0) {
+ class3.updateNpcs(true, var3);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_az == var1.serverPacket0) {
+ if(PacketWriter.clanChat != null) {
+ PacketWriter.clanChat.__a_474(var3);
+ }
+
+ UserComparator8.method3349();
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_z == var1.serverPacket0) {
+ class16.method189(class190.field2346);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ String var21;
+ if(ServerPacket.__ge_by == var1.serverPacket0) {
+ var21 = var3.readStringCp1252NullTerminated();
+ Object[] var46 = new Object[var21.length() + 1];
+
+ for(var5 = var21.length() - 1; var5 >= 0; --var5) {
+ if(var21.charAt(var5) == 's') {
+ var46[var5 + 1] = var3.readStringCp1252NullTerminated();
+ } else {
+ var46[var5 + 1] = new Integer(var3.readInt());
+ }
+ }
+
+ var46[0] = new Integer(var3.readInt());
+ ScriptEvent var49 = new ScriptEvent();
+ var49.args0 = var46;
+ AbstractIndexCache.runScript(var49);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_ag == var1.serverPacket0) {
+ class16.method189(class190.field2343);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_i == var1.serverPacket0) {
+ class16.method189(class190.field2350);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bj == var1.serverPacket0) {
+ destinationX = var3.readUnsignedByte();
+ if(destinationX == 255) {
+ destinationX = 0;
+ }
+
+ destinationY = var3.readUnsignedByte();
+ if(destinationY == 255) {
+ destinationY = 0;
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_cr == var1.serverPacket0) {
+ for(var37 = 0; var37 < VarpDefinition.__ix_f; ++var37) {
+ VarpDefinition var44 = SecureRandomCallable.method1140(var37);
+ if(var44 != null) {
+ Varps.Varps_temp[var37] = 0;
+ Varps.Varps_main[var37] = 0;
+ }
+ }
+
+ class12.method159();
+ __client_nd += 32;
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_an == var1.serverPacket0) {
+ var37 = var3.readInt();
+ var6 = var3.__ag_302();
+ if(var37 < -70000) {
+ var6 += 32768;
+ }
+
+ if(var37 >= 0) {
+ var8 = Huffman.getWidget(var37);
+ } else {
+ var8 = null;
+ }
+
+ for(; var3.index < var1.serverPacket0Length; WorldMapManager.itemContainerSetItem(var6, var10, var11 - 1, var12)) {
+ var10 = var3.__ae_307();
+ var11 = var3.__ag_302();
+ var12 = 0;
+ if(var11 != 0) {
+ var12 = var3.readUnsignedByte();
+ if(var12 == 255) {
+ var12 = var3.readInt();
+ }
+ }
+
+ if(var8 != null && var10 >= 0 && var10 < var8.itemIds.length) {
+ var8.itemIds[var10] = var11;
+ var8.itemQuantities[var10] = var12;
+ }
+ }
+
+ if(var8 != null) {
+ class22.method295(var8);
+ }
+
+ class12.method159();
+ __client_nz[++__client_ns - 1 & 31] = var6 & 32767;
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bl == var1.serverPacket0) {
+ var37 = var3.__ag_302();
+ var6 = var3.readUnsignedByte();
+ var5 = var3.__ag_302();
+ Ignored.queueSoundEffect(var37, var6, var5);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bc == var1.serverPacket0) {
+ var37 = var3.__bp_331();
+ var6 = var3.__br_328();
+ var5 = var3.__bl_327();
+ var16 = Huffman.getWidget(var37);
+ if(var5 != var16.rawX || var6 != var16.rawY || var16.xAlignment != 0 || var16.yAlignment != 0) {
+ var16.rawX = var5;
+ var16.rawY = var6;
+ var16.xAlignment = 0;
+ var16.yAlignment = 0;
+ class22.method295(var16);
+ this.alignWidget(var16);
+ if(var16.type == 0) {
+ class39.revalidateWidgetScroll(Widget.widgets[var37 >> 16], var16, false);
+ }
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_aw == var1.serverPacket0) {
+ var37 = var3.__bm_326();
+ var6 = var3.__bf_332();
+ var8 = Huffman.getWidget(var6);
+ if(var8.modelType != 2 || var37 != var8.modelId) {
+ var8.modelType = 2;
+ var8.modelId = var37;
+ class22.method295(var8);
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_ao == var1.serverPacket0) {
+ World var43 = new World();
+ var43.host = var3.readStringCp1252NullTerminated();
+ var43.id = var3.__ag_302();
+ var6 = var3.readInt();
+ var43.properties = var6;
+ GameShell.updateGameState(45);
+ var2.close();
+ var2 = null;
+ class31.changeWorld(var43);
+ var1.serverPacket0 = null;
+ return false;
+ }
+
+ if(ServerPacket.__ge_ay == var1.serverPacket0) {
+ WorldMapArea.friendSystem.ignoreList.read(var3, var1.serverPacket0Length);
+ class229.method4512();
+ __client_na = cycleCntr;
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_ah == var1.serverPacket0) {
+ class3.updateNpcs(false, var3);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ WidgetGroupParent var22;
+ if(ServerPacket.__ge_cs == var1.serverPacket0) {
+ var37 = var3.readInt();
+ var6 = var3.readInt();
+ WidgetGroupParent var48 = (WidgetGroupParent)widgetGroupParents.get((long)var6);
+ var22 = (WidgetGroupParent)widgetGroupParents.get((long)var37);
+ if(var22 != null) {
+ MenuAction.closeWidgetGroup(var22, var48 == null || var48.group != var22.group);
+ }
+
+ if(var48 != null) {
+ var48.remove();
+ widgetGroupParents.put(var48, (long)var37);
+ }
+
+ var15 = Huffman.getWidget(var6);
+ if(var15 != null) {
+ class22.method295(var15);
+ }
+
+ var15 = Huffman.getWidget(var37);
+ if(var15 != null) {
+ class22.method295(var15);
+ class39.revalidateWidgetScroll(Widget.widgets[var15.id >>> 16], var15, true);
+ }
+
+ if(rootWidgetGroup != -1) {
+ GrandExchangeEvents.method74(rootWidgetGroup, 1);
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_p == var1.serverPacket0) {
+ var37 = var3.__bp_331();
+ var6 = var3.__bu_325();
+ var5 = var6 >> 10 & 31;
+ var10 = var6 >> 5 & 31;
+ var11 = var6 & 31;
+ var12 = (var10 << 11) + (var5 << 19) + (var11 << 3);
+ Widget var47 = Huffman.getWidget(var37);
+ if(var12 != var47.color) {
+ var47.color = var12;
+ class22.method295(var47);
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_at == var1.serverPacket0) {
+ var37 = var3.readUnsignedByte();
+ var6 = var3.readUnsignedByte();
+ var5 = var3.readUnsignedByte();
+ var10 = var3.readUnsignedByte();
+ __client_rh[var37] = true;
+ __client_rd[var37] = var6;
+ __client_rl[var37] = var5;
+ __client_rj[var37] = var10;
+ __client_rk[var37] = 0;
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_ce == var1.serverPacket0) {
+ __client_pl = var3.readUnsignedByteNegate();
+ publicChatMode = var3.readUnsignedByteNegate();
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bp == var1.serverPacket0) {
+ rebootTimer = var3.__ag_302() * 30;
+ __client_ni = cycleCntr;
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_v == var1.serverPacket0) {
+ Canvas.__ao_gk = var3.readUnsignedByteNegate();
+ WorldMapSection3.__p_go = var3.readUnsignedByte();
+
+ for(var37 = WorldMapSection3.__p_go; var37 < WorldMapSection3.__p_go + 8; ++var37) {
+ for(var6 = Canvas.__ao_gk; var6 < Canvas.__ao_gk + 8; ++var6) {
+ if(groundItems[SoundSystem.plane][var37][var6] != null) {
+ groundItems[SoundSystem.plane][var37][var6] = null;
+ TilePaint.method3061(var37, var6);
+ }
+ }
+ }
+
+ for(class68 var45 = (class68)__client_kh.last(); var45 != null; var45 = (class68)__client_kh.previous()) {
+ if(var45.field913 >= WorldMapSection3.__p_go && var45.field913 < WorldMapSection3.__p_go + 8 && var45.field901 >= Canvas.__ao_gk && var45.field901 < Canvas.__ao_gk + 8 && var45.field911 == SoundSystem.plane) {
+ var45.field910 = 0;
+ }
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_ac == var1.serverPacket0) {
+ var37 = var3.__bf_332();
+ var6 = var3.__bm_326();
+ var8 = Huffman.getWidget(var37);
+ if(var8.modelType != 1 || var6 != var8.modelId) {
+ var8.modelType = 1;
+ var8.modelId = var6;
+ class22.method295(var8);
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_ak == var1.serverPacket0) {
+ var37 = var3.readUnsignedByte();
+ BufferedNetSocket.method3500(var37);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ long var23;
+ long var25;
+ long var27;
+ PlayerType var29;
+ if(ServerPacket.__ge_bs == var1.serverPacket0) {
+ var21 = var3.readStringCp1252NullTerminated();
+ var25 = var3.readLong();
+ var27 = (long)var3.__ag_302();
+ var19 = (long)var3.readMedium();
+ var29 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte());
+ var23 = (var27 << 32) + var19;
+ boolean var53 = false;
+
+ for(int var31 = 0; var31 < 100; ++var31) {
+ if(__client_pu[var31] == var23) {
+ var53 = true;
+ break;
+ }
+ }
+
+ if(var29.isUser && WorldMapArea.friendSystem.isIgnored(new Username(var21, KeyHandler.loginType))) {
+ var53 = true;
+ }
+
+ if(!var53 && __client_jc == 0) {
+ __client_pu[__client_pb] = var23;
+ __client_pb = (__client_pb + 1) % 100;
+ String var55 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
+ if(var29.modIcon != -1) {
+ GrandExchangeEvents.addChatMessage(9, ItemContainer.method1170(var29.modIcon) + var21, var55, Clock.method3534(var25));
+ } else {
+ GrandExchangeEvents.addChatMessage(9, var21, var55, Clock.method3534(var25));
+ }
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_as == var1.serverPacket0) {
+ class16.method189(class190.field2342);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_y == var1.serverPacket0) {
+ var37 = var3.readInt();
+ var4 = var3.readStringCp1252NullTerminated();
+ var8 = Huffman.getWidget(var37);
+ if(!var4.equals(var8.text)) {
+ var8.text = var4;
+ class22.method295(var8);
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_ai == var1.serverPacket0) {
+ class50.loadRegions(true, var1.packetBuffer);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_q == var1.serverPacket0) {
+ isCameraLocked = false;
+
+ for(var37 = 0; var37 < 5; ++var37) {
+ __client_rh[var37] = false;
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_cm == var1.serverPacket0) {
+ isCameraLocked = true;
+ GrandExchangeOffer.__x_rg = var3.readUnsignedByte();
+ KeyHandler.__an_ra = var3.readUnsignedByte();
+ IndexStoreAction.__ik_rt = var3.__ag_302();
+ VertexNormal.__dq_rq = var3.readUnsignedByte();
+ class171.__fo_ro = var3.readUnsignedByte();
+ if(class171.__fo_ro >= 100) {
+ var37 = GrandExchangeOffer.__x_rg * 128 + 64;
+ var6 = KeyHandler.__an_ra * 128 + 64;
+ var5 = class32.getTileHeight(var37, var6, SoundSystem.plane) - IndexStoreAction.__ik_rt;
+ var10 = var37 - WorldMapSection1.cameraX;
+ var11 = var5 - GrandExchangeEvents.cameraY;
+ var12 = var6 - class11.cameraZ;
+ var13 = (int)Math.sqrt((double)(var12 * var12 + var10 * var10));
+ WorldMapIcon1.cameraPitch = (int)(Math.atan2((double)var11, (double)var13) * 325.949D) & 2047;
+ MusicPatchNode.cameraYaw = (int)(Math.atan2((double)var10, (double)var12) * -325.949D) & 2047;
+ if(WorldMapIcon1.cameraPitch < 128) {
+ WorldMapIcon1.cameraPitch = 128;
+ }
+
+ if(WorldMapIcon1.cameraPitch > 383) {
+ WorldMapIcon1.cameraPitch = 383;
+ }
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bv == var1.serverPacket0) {
+ var37 = var3.__bf_332();
+ var6 = var3.__bm_326();
+ var8 = Huffman.getWidget(var37);
+ if(var8 != null && var8.type == 0) {
+ if(var6 > var8.scrollHeight - var8.height) {
+ var6 = var8.scrollHeight - var8.height;
+ }
+
+ if(var6 < 0) {
+ var6 = 0;
+ }
+
+ if(var6 != var8.scrollY) {
+ var8.scrollY = var6;
+ class22.method295(var8);
+ }
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_au == var1.serverPacket0) {
+ var37 = var3.__by_324();
+ Script.method2216(var37);
+ __client_nz[++__client_ns - 1 & 31] = var37 & 32767;
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bk == var1.serverPacket0) {
+ var3.index += 28;
+ if(var3.__ax_313()) {
+ class234.method4535(var3, var3.index - 28);
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_c == var1.serverPacket0) {
+ class12.method159();
+ var37 = var3.__bt_330();
+ var6 = var3.readUnsignedByteNegate();
+ var5 = var3.readUnsignedByte();
+ experience[var6] = var37;
+ currentLevels[var6] = var5;
+ levels[var6] = 1;
+
+ for(var10 = 0; var10 < 98; ++var10) {
+ if(var37 >= Skills.Skills_experienceTable[var10]) {
+ levels[var6] = var10 + 2;
+ }
+ }
+
+ changedSkills[++changedSkillsCount - 1 & 31] = var6;
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bz == var1.serverPacket0) {
+ var37 = var3.readInt();
+ var6 = var3.readInt();
+ var5 = DynamicObject.method2222();
+ PacketBufferNode var56 = Interpreter.method1915(ClientPacket.__gs_k, packetWriter.isaacCipher);
+ var56.packetBuffer.__ai_315(var5);
+ var56.packetBuffer.writeByte(GameShell.fps);
+ var56.packetBuffer.writeIntME(var37);
+ var56.packetBuffer.writeIntLE(var6);
+ packetWriter.__q_167(var56);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bt == var1.serverPacket0) {
+ class12.method159();
+ weight = var3.__aq_303();
+ __client_ni = cycleCntr;
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_aq == var1.serverPacket0) {
+ var18 = var3.readUnsignedByte() == 1;
+ if(var18) {
+ class15.__z_si = class203.currentTimeMs() - var3.readLong();
+ FloorDecoration.grandExchangeEvents = new GrandExchangeEvents(var3, true);
+ } else {
+ FloorDecoration.grandExchangeEvents = null;
+ }
+
+ __client_nc = cycleCntr;
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_av == var1.serverPacket0) {
+ WorldMapArea.friendSystem.__f_152();
+ __client_na = cycleCntr;
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_t == var1.serverPacket0) {
+ byte[] var54 = new byte[var1.serverPacket0Length];
+ var3.__jb_335(var54, 0, var54.length);
+ Buffer var52 = new Buffer(var54);
+ var17 = var52.readStringCp1252NullTerminated();
+ WorldMapCacheName.method635(var17, true, false);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_k == var1.serverPacket0) {
+ class16.method189(class190.field2352);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ WidgetGroupParent var50;
+ if(ServerPacket.__ge_bn == var1.serverPacket0) {
+ var37 = var3.index + var1.serverPacket0Length;
+ var6 = var3.__ag_302();
+ var5 = var3.__ag_302();
+ if(var6 != rootWidgetGroup) {
+ rootWidgetGroup = var6;
+ this.__iu_141(false);
+ DevicePcmPlayerProvider.method845(rootWidgetGroup);
+ WorldMapSection3.runWidgetOnLoadListener(rootWidgetGroup);
+
+ for(var10 = 0; var10 < 100; ++var10) {
+ __client_od[var10] = true;
+ }
+ }
+
+ for(; var5-- > 0; var50.keep = true) {
+ var10 = var3.readInt();
+ var11 = var3.__ag_302();
+ var12 = var3.readUnsignedByte();
+ var50 = (WidgetGroupParent)widgetGroupParents.get((long)var10);
+ if(var50 != null && var11 != var50.group) {
+ MenuAction.closeWidgetGroup(var50, true);
+ var50 = null;
+ }
+
+ if(var50 == null) {
+ var50 = SecureRandomCallable.method1143(var10, var11, var12);
+ }
+ }
+
+ for(var22 = (WidgetGroupParent)widgetGroupParents.first(); var22 != null; var22 = (WidgetGroupParent)widgetGroupParents.next()) {
+ if(var22.keep) {
+ var22.keep = false;
+ } else {
+ MenuAction.closeWidgetGroup(var22, true);
+ }
+ }
+
+ widgetClickMasks = new NodeHashTable(512);
+
+ while(var3.index < var37) {
+ var10 = var3.readInt();
+ var11 = var3.__ag_302();
+ var12 = var3.__ag_302();
+ var13 = var3.readInt();
+
+ for(int var51 = var11; var51 <= var12; ++var51) {
+ var23 = (long)var51 + ((long)var10 << 32);
+ widgetClickMasks.put(new IntegerNode(var13), var23);
+ }
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_br == var1.serverPacket0) {
+ var37 = var3.__bb_317();
+ var6 = var3.__bb_317();
+ var17 = var3.readStringCp1252NullTerminated();
+ if(var6 >= 1 && var6 <= 8) {
+ if(var17.equalsIgnoreCase("null")) {
+ var17 = null;
+ }
+
+ playerMenuActions[var6 - 1] = var17;
+ playerOptionsPriorities[var6 - 1] = var37 == 0;
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_ab == var1.serverPacket0) {
+ Clock.method3533(var3.readStringCp1252NullTerminated());
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_am == var1.serverPacket0) {
+ if(var1.serverPacket0Length == 0) {
+ PacketWriter.clanChat = null;
+ } else {
+ if(PacketWriter.clanChat == null) {
+ PacketWriter.clanChat = new ClanChat(KeyHandler.loginType, TextureProvider.client);
+ }
+
+ PacketWriter.clanChat.readUpdate(var3);
+ }
+
+ UserComparator8.method3349();
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_o == var1.serverPacket0) {
+ var37 = var3.__ag_302();
+ var6 = var3.readInt();
+ Varps.Varps_temp[var37] = var6;
+ if(Varps.Varps_main[var37] != var6) {
+ Varps.Varps_main[var37] = var6;
+ }
+
+ IndexCache.method4703(var37);
+ __client_nr[++__client_nd - 1 & 31] = var37;
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_g == var1.serverPacket0) {
+ class16.method189(class190.field2349);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_x == var1.serverPacket0) {
+ var37 = var3.readInt();
+ var50 = (WidgetGroupParent)widgetGroupParents.get((long)var37);
+ if(var50 != null) {
+ MenuAction.closeWidgetGroup(var50, true);
+ }
+
+ if(__client_mo != null) {
+ class22.method295(__client_mo);
+ __client_mo = null;
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bf == var1.serverPacket0) {
+ for(var37 = 0; var37 < Varps.Varps_main.length; ++var37) {
+ if(Varps.Varps_temp[var37] != Varps.Varps_main[var37]) {
+ Varps.Varps_main[var37] = Varps.Varps_temp[var37];
+ IndexCache.method4703(var37);
+ __client_nr[++__client_nd - 1 & 31] = var37;
+ }
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bd == var1.serverPacket0) {
+ WorldMapArea.friendSystem.__q_153(var3, var1.serverPacket0Length);
+ __client_na = cycleCntr;
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_r == var1.serverPacket0) {
+ var37 = var3.__bm_326();
+ if(var37 == 65535) {
+ var37 = -1;
+ }
+
+ AbstractUserComparator.method5437(var37);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_ad == var1.serverPacket0) {
+ var37 = var3.__bj_329();
+ var6 = var3.__bu_325();
+ if(var6 == 65535) {
+ var6 = -1;
+ }
+
+ HealthBar.method1994(var6, var37);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bw == var1.serverPacket0) {
+ var37 = var3.__bb_317();
+ var6 = var3.__bp_331();
+ var5 = var3.__bm_326();
+ var22 = (WidgetGroupParent)widgetGroupParents.get((long)var6);
+ if(var22 != null) {
+ MenuAction.closeWidgetGroup(var22, var5 != var22.group);
+ }
+
+ SecureRandomCallable.method1143(var6, var5, var37);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_d == var1.serverPacket0) {
+ var21 = var3.readStringCp1252NullTerminated();
+ var25 = (long)var3.__ag_302();
+ var27 = (long)var3.readMedium();
+ var29 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte());
+ long var30 = (var25 << 32) + var27;
+ boolean var32 = false;
+
+ for(int var33 = 0; var33 < 100; ++var33) {
+ if(var30 == __client_pu[var33]) {
+ var32 = true;
+ break;
+ }
+ }
+
+ if(WorldMapArea.friendSystem.isIgnored(new Username(var21, KeyHandler.loginType))) {
+ var32 = true;
+ }
+
+ if(!var32 && __client_jc == 0) {
+ __client_pu[__client_pb] = var30;
+ __client_pb = (__client_pb + 1) % 100;
+ String var57 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
+ byte var34;
+ if(var29.isPrivileged) {
+ var34 = 7;
+ } else {
+ var34 = 3;
+ }
+
+ if(var29.modIcon != -1) {
+ WorldMapIcon1.method219(var34, ItemContainer.method1170(var29.modIcon) + var21, var57);
+ } else {
+ WorldMapIcon1.method219(var34, var21, var57);
+ }
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_u == var1.serverPacket0) {
+ var37 = var3.readInt();
+ if(var37 != __client_il) {
+ __client_il = var37;
+ WorldMapArea.method428();
+ }
+
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_bh == var1.serverPacket0) {
+ minimapState = var3.readUnsignedByte();
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ if(ServerPacket.__ge_ae == var1.serverPacket0) {
+ var21 = var3.readStringCp1252NullTerminated();
+ var4 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
+ WorldMapIcon1.method219(6, var21, var4);
+ var1.serverPacket0 = null;
+ return true;
+ }
+
+ NPCDefinition.sendStackTrace("" + (var1.serverPacket0 != null?var1.serverPacket0.id:-1) + "," + (var1.surfaceOffsetY != null?var1.surfaceOffsetY.id:-1) + "," + (var1.__i != null?var1.__i.id:-1) + "," + var1.serverPacket0Length, (Throwable)null);
+ TextureProvider.method2773();
+ } catch (IOException var35) {
+ class48.method868();
+ } catch (Exception var36) {
+ var4 = "" + (var1.serverPacket0 != null?var1.serverPacket0.id:-1) + "," + (var1.surfaceOffsetY != null?var1.surfaceOffsetY.id:-1) + "," + (var1.__i != null?var1.__i.id:-1) + "," + var1.serverPacket0Length + "," + (Canvas.localPlayer.pathX[0] + class50.baseX) + "," + (Canvas.localPlayer.pathY[0] + GraphicsObject.baseY) + ",";
+
+ for(var5 = 0; var5 < var1.serverPacket0Length && var5 < 50; ++var5) {
+ var4 = var4 + var3.array[var5] + ",";
+ }
+
+ NPCDefinition.sendStackTrace(var4, var36);
+ TextureProvider.method2773();
+ }
+
+ return true;
+ }
+ }
+
+ @ObfuscatedName("hi")
+ @ObfuscatedSignature(
+ signature = "(I)V",
+ garbageValue = "-387903382"
+ )
+ @Export("__hi_139")
+ final void __hi_139() {
+ boolean var1 = false;
+
+ int var2;
+ int var3;
+ while(!var1) {
+ var1 = true;
+
+ for(var2 = 0; var2 < menuOptionsCount - 1; ++var2) {
+ if(menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) {
+ String var4 = menuTargetNames[var2];
+ menuTargetNames[var2] = menuTargetNames[var2 + 1];
+ menuTargetNames[var2 + 1] = var4;
+ String var5 = menuActions[var2];
+ menuActions[var2] = menuActions[var2 + 1];
+ menuActions[var2 + 1] = var5;
+ var3 = menuOpcodes[var2];
+ menuOpcodes[var2] = menuOpcodes[var2 + 1];
+ menuOpcodes[var2 + 1] = var3;
+ var3 = menuArguments1[var2];
+ menuArguments1[var2] = menuArguments1[var2 + 1];
+ menuArguments1[var2 + 1] = var3;
+ var3 = menuArguments2[var2];
+ menuArguments2[var2] = menuArguments2[var2 + 1];
+ menuArguments2[var2 + 1] = var3;
+ var3 = menuArguments0[var2];
+ menuArguments0[var2] = menuArguments0[var2 + 1];
+ menuArguments0[var2 + 1] = var3;
+ boolean var6 = menuShiftClick[var2];
+ menuShiftClick[var2] = menuShiftClick[var2 + 1];
+ menuShiftClick[var2 + 1] = var6;
+ var1 = false;
+ }
+ }
+ }
+
+ if(DevicePcmPlayerProvider.dragInventoryWidget == null && clickedWidget == null) {
+ int var12 = MouseHandler.MouseHandler_lastButton;
+ int var7;
+ int var11;
+ int var13;
+ if(isMenuOpen) {
+ int var14;
+ if(var12 != 1 && (AbstractRasterProvider.__lp_ca || var12 != 4)) {
+ var2 = MouseHandler.MouseHandler_x;
+ var14 = MouseHandler.MouseHandler_y;
+ if(var2 < class25.menuX - 10 || var2 > class25.menuX + class214.menuWidth + 10 || var14 < GameShell.menuY - 10 || var14 > AbstractWorldMapIcon.menuHeight + GameShell.menuY + 10) {
+ isMenuOpen = false;
+ Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight);
+ }
+ }
+
+ if(var12 == 1 || !AbstractRasterProvider.__lp_ca && var12 == 4) {
+ var2 = class25.menuX;
+ var14 = GameShell.menuY;
+ var7 = class214.menuWidth;
+ var3 = MouseHandler.MouseHandler_lastPressedX;
+ var11 = MouseHandler.MouseHandler_lastPressedY;
+ int var15 = -1;
+
+ for(int var16 = 0; var16 < menuOptionsCount; ++var16) {
+ var13 = (menuOptionsCount - 1 - var16) * 15 + var14 + 31;
+ if(var3 > var2 && var3 < var7 + var2 && var11 > var13 - 13 && var11 < var13 + 3) {
+ var15 = var16;
+ }
+ }
+
+ if(var15 != -1) {
+ WorldMapSection0.method245(var15);
+ }
+
+ isMenuOpen = false;
+ Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight);
+ }
+ } else {
+ var2 = menuOptionsCount - 1;
+ if((var12 == 1 || !AbstractRasterProvider.__lp_ca && var12 == 4) && var2 >= 0) {
+ var7 = menuOpcodes[var2];
+ if(var7 == 39 || var7 == 40 || var7 == 41 || var7 == 42 || var7 == 43 || var7 == 33 || var7 == 34 || var7 == 35 || var7 == 36 || var7 == 37 || var7 == 38 || var7 == 1005) {
+ label223: {
+ var3 = menuArguments1[var2];
+ var11 = menuArguments2[var2];
+ Widget var8 = Huffman.getWidget(var11);
+ var13 = class1.getWidgetClickMask(var8);
+ boolean var9 = (var13 >> 28 & 1) != 0;
+ if(!var9) {
+ Object var10 = null;
+ if(!class168.method3461(class1.getWidgetClickMask(var8))) {
+ break label223;
+ }
+ }
+
+ if(DevicePcmPlayerProvider.dragInventoryWidget != null && !__client_jl && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) {
+ var12 = __client_ja;
+ var13 = __client_je;
+ class231.method4520(UnitPriceComparator.tempMenuAction, var12, var13);
+ UnitPriceComparator.tempMenuAction = null;
+ }
+
+ __client_jl = false;
+ itemDragDuration = 0;
+ if(DevicePcmPlayerProvider.dragInventoryWidget != null) {
+ class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
+ }
+
+ DevicePcmPlayerProvider.dragInventoryWidget = Huffman.getWidget(var11);
+ dragItemSlotSource = var3;
+ __client_ja = MouseHandler.MouseHandler_lastPressedX;
+ __client_je = MouseHandler.MouseHandler_lastPressedY;
+ if(var2 >= 0) {
+ UnitPriceComparator.tempMenuAction = new MenuAction();
+ UnitPriceComparator.tempMenuAction.argument1 = menuArguments1[var2];
+ UnitPriceComparator.tempMenuAction.argument2 = menuArguments2[var2];
+ UnitPriceComparator.tempMenuAction.opcode = menuOpcodes[var2];
+ UnitPriceComparator.tempMenuAction.argument0 = menuArguments0[var2];
+ UnitPriceComparator.tempMenuAction.action = menuActions[var2];
+ }
+
+ class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
+ return;
+ }
+ }
+ }
+
+ if((var12 == 1 || !AbstractRasterProvider.__lp_ca && var12 == 4) && this.shouldLeftClickOpenMenu()) {
+ var12 = 2;
+ }
+
+ if((var12 == 1 || !AbstractRasterProvider.__lp_ca && var12 == 4) && menuOptionsCount > 0) {
+ WorldMapSection0.method245(var2);
+ }
+
+ if(var12 == 2 && menuOptionsCount > 0) {
+ this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
+ }
+ }
+
+ }
+ }
+
+ @ObfuscatedName("ht")
+ @ObfuscatedSignature(
+ signature = "(B)Z",
+ garbageValue = "109"
+ )
+ @Export("shouldLeftClickOpenMenu")
+ final boolean shouldLeftClickOpenMenu() {
+ int var1 = menuOptionsCount - 1;
+ return (__client_ku == 1 && menuOptionsCount > 2 || UserComparator7.method3364(var1)) && !menuShiftClick[var1];
+ }
+
+ @ObfuscatedName("hj")
+ @ObfuscatedSignature(
+ signature = "(IIB)V",
+ garbageValue = "1"
+ )
+ @Export("openMenu")
+ final void openMenu(int var1, int var2) {
+ int var3 = class2.fontBold12.stringWidth("Choose Option");
+
+ int var4;
+ for(var4 = 0; var4 < menuOptionsCount; ++var4) {
+ Font var5 = class2.fontBold12;
+ String var6;
+ if(var4 < 0) {
+ var6 = "";
+ } else if(menuTargetNames[var4].length() > 0) {
+ var6 = menuActions[var4] + " " + menuTargetNames[var4];
+ } else {
+ var6 = menuActions[var4];
+ }
+
+ int var7 = var5.stringWidth(var6);
+ if(var7 > var3) {
+ var3 = var7;
+ }
+ }
+
+ var3 += 8;
+ var4 = menuOptionsCount * 15 + 22;
+ int var8 = var1 - var3 / 2;
+ if(var3 + var8 > SoundCache.canvasWidth) {
+ var8 = SoundCache.canvasWidth - var3;
+ }
+
+ if(var8 < 0) {
+ var8 = 0;
+ }
+
+ int var9 = var2;
+ if(var4 + var2 > Huffman.canvasHeight) {
+ var9 = Huffman.canvasHeight - var4;
+ }
+
+ if(var9 < 0) {
+ var9 = 0;
+ }
+
+ class25.menuX = var8;
+ GameShell.menuY = var9;
+ class214.menuWidth = var3;
+ AbstractWorldMapIcon.menuHeight = menuOptionsCount * 15 + 22;
+ class65.scene.menuOpen(SoundSystem.plane, var1, var2, false);
+ isMenuOpen = true;
+ }
+
+ @ObfuscatedName("iu")
+ @ObfuscatedSignature(
+ signature = "(ZI)V",
+ garbageValue = "-271438207"
+ )
+ @Export("__iu_141")
+ final void __iu_141(boolean var1) {
+ int var2 = rootWidgetGroup;
+ int var3 = SoundCache.canvasWidth;
+ int var4 = Huffman.canvasHeight;
+ if(GroundItemPile.loadWidgetGroup(var2)) {
+ WorldMapRegion.notRevalidateWidgetScroll(Widget.widgets[var2], -1, var3, var4, var1);
+ }
+
+ }
+
+ @ObfuscatedName("ip")
+ @ObfuscatedSignature(
+ signature = "(Lho;B)V",
+ garbageValue = "0"
+ )
+ @Export("alignWidget")
+ void alignWidget(Widget var1) {
+ Widget var2 = var1.parentId == -1?null:Huffman.getWidget(var1.parentId);
+ int var3;
+ int var4;
+ if(var2 == null) {
+ var3 = SoundCache.canvasWidth;
+ var4 = Huffman.canvasHeight;
+ } else {
+ var3 = var2.width;
+ var4 = var2.height;
+ }
+
+ WorldMapSection3.alignWidgetSize(var1, var3, var4, false);
+ OverlayDefinition.alignWidgetPosition(var1, var3, var4);
+ }
+
+ @ObfuscatedName("jh")
+ @ObfuscatedSignature(
+ signature = "(I)V",
+ garbageValue = "715978124"
+ )
+ @Export("__jh_142")
+ final void __jh_142() {
+ class22.method295(clickedWidget);
+ ++MouseRecorder.widgetDragDuration;
+ if(__client_nt && __client_nn) {
+ int var1 = MouseHandler.MouseHandler_x;
+ int var2 = MouseHandler.MouseHandler_y;
+ var1 -= widgetClickX;
+ var2 -= widgetClickY;
+ if(var1 < __client_nw) {
+ var1 = __client_nw;
+ }
+
+ if(var1 + clickedWidget.width > __client_nw + clickedWidgetParent.width) {
+ var1 = __client_nw + clickedWidgetParent.width - clickedWidget.width;
+ }
+
+ if(var2 < __client_nl) {
+ var2 = __client_nl;
+ }
+
+ if(var2 + clickedWidget.height > __client_nl + clickedWidgetParent.height) {
+ var2 = __client_nl + clickedWidgetParent.height - clickedWidget.height;
+ }
+
+ int var3 = var1 - __client_nk;
+ int var4 = var2 - __client_np;
+ int var5 = clickedWidget.dragZoneSize;
+ if(MouseRecorder.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) {
+ isDraggingWidget = true;
+ }
+
+ int var6 = var1 - __client_nw + clickedWidgetParent.scrollX;
+ int var7 = var2 - __client_nl + clickedWidgetParent.scrollY;
+ ScriptEvent var8;
+ if(clickedWidget.onDrag != null && isDraggingWidget) {
+ var8 = new ScriptEvent();
+ var8.widget = clickedWidget;
+ var8.mouseX = var6;
+ var8.mouseY = var7;
+ var8.args0 = clickedWidget.onDrag;
+ AbstractIndexCache.runScript(var8);
+ }
+
+ if(MouseHandler.MouseHandler_currentButton == 0) {
+ int var10;
+ if(isDraggingWidget) {
+ if(clickedWidget.onDragComplete != null) {
+ var8 = new ScriptEvent();
+ var8.widget = clickedWidget;
+ var8.mouseX = var6;
+ var8.mouseY = var7;
+ var8.dragTarget = draggedOnWidget;
+ var8.args0 = clickedWidget.onDragComplete;
+ AbstractIndexCache.runScript(var8);
+ }
+
+ if(draggedOnWidget != null) {
+ Widget var13 = clickedWidget;
+ var10 = WorldMapRegion.method568(class1.getWidgetClickMask(var13));
+ Widget var11;
+ if(var10 == 0) {
+ var11 = null;
+ } else {
+ label100: {
+ for(int var12 = 0; var12 < var10; ++var12) {
+ var13 = Huffman.getWidget(var13.parentId);
+ if(var13 == null) {
+ var11 = null;
+ break label100;
+ }
+ }
+
+ var11 = var13;
+ }
+ }
+
+ if(var11 != null) {
+ PacketBufferNode var14 = Interpreter.method1915(ClientPacket.__gs_bk, packetWriter.isaacCipher);
+ var14.packetBuffer.__bo_322(clickedWidget.childIndex);
+ var14.packetBuffer.__bo_322(draggedOnWidget.itemId);
+ var14.packetBuffer.writeShort(draggedOnWidget.childIndex);
+ var14.packetBuffer.writeIntLE(clickedWidget.id);
+ var14.packetBuffer.writeIntME(draggedOnWidget.id);
+ var14.packetBuffer.writeShort(clickedWidget.itemId);
+ packetWriter.__q_167(var14);
+ }
+ }
+ } else if(this.shouldLeftClickOpenMenu()) {
+ this.openMenu(__client_nk + widgetClickX, __client_np + widgetClickY);
+ } else if(menuOptionsCount > 0) {
+ int var9 = widgetClickX + __client_nk;
+ var10 = widgetClickY + __client_np;
+ class231.method4520(UnitPriceComparator.tempMenuAction, var9, var10);
+ UnitPriceComparator.tempMenuAction = null;
+ }
+
+ clickedWidget = null;
+ }
+ } else if(MouseRecorder.widgetDragDuration > 1) {
+ clickedWidget = null;
+ }
+
+ }
+
+ @ObfuscatedName("kr")
+ @ObfuscatedSignature(
+ signature = "(B)Lkp;",
+ garbageValue = "-87"
+ )
+ public Username username() {
+ return Canvas.localPlayer != null?Canvas.localPlayer.username:null;
+ }
+
+ @ObfuscatedName("l")
+ @ObfuscatedSignature(
+ signature = "(Ljava/lang/CharSequence;I)I",
+ garbageValue = "-1464358697"
+ )
+ @Export("hashString")
+ public static int hashString(CharSequence var0) {
+ int var1 = var0.length();
+ int var2 = 0;
+
+ for(int var3 = 0; var3 < var1; ++var3) {
+ var2 = (var2 << 5) - var2 + HealthBar.charToByteCp1252(var0.charAt(var3));
+ }
+
+ return var2;
+ }
+
+ @ObfuscatedName("a")
+ @ObfuscatedSignature(
+ signature = "(Ljava/lang/String;B)I",
+ garbageValue = "0"
+ )
+ public static int method1692(String var0) {
+ return var0.length() + 2;
+ }
+
static {
__client_ai = true;
worldId = 1;
@@ -1408,9 +6399,9 @@ public final class Client extends GameShell implements Usernamed {
Login_isUsernameRemembered = false;
secureRandomFuture = new SecureRandomFuture();
__client_ev = null;
- npcs = new Npc['耀'];
+ npcs = new NPC[32768];
npcCount = 0;
- npcIndices = new int['耀'];
+ npcIndices = new int[32768];
__client_fw = 0;
__client_fg = new int[250];
packetWriter = new PacketWriter();
@@ -1607,7 +6598,7 @@ public final class Client extends GameShell implements Usernamed {
soundEffectCount = 0;
soundEffectIds = new int[50];
unknownSoundValues1 = new int[50];
- queuedSoundEffectDelays = new int[50];
+ queuedSoundEffectDelays = new int[50];
soundLocations = new int[50];
soundEffects = new SoundEffect[50];
isCameraLocked = false;
@@ -1643,4984 +6634,4 @@ public final class Client extends GameShell implements Usernamed {
__client_tp = new int[50];
__client_th = new int[50];
}
-
- @ObfuscatedName("j")
- @ObfuscatedSignature(
- signature = "(I)V",
- garbageValue = "-1773624745"
- )
- protected final void __j_113() {
- __client_oa = class203.currentTimeMs() + 500L;
- this.__ge_137();
- if(rootWidgetGroup != -1) {
- this.__iu_141(true);
- }
-
- }
-
- @ObfuscatedName("aw")
- @ObfuscatedSignature(
- signature = "(I)V",
- garbageValue = "1297880469"
- )
- protected final void setUp() {
- WorldMapCacheName.method633(new int[]{20, 260, 10000}, new int[]{1000, 100, 500});
- class2.port1 = gameBuild == 0?43594:worldId + 40000;
- WorldMapArea.port2 = gameBuild == 0?443:worldId + 50000;
- class203.port3 = class2.port1;
- PlayerAppearance.__hi_g = class226.__ht_m;
- class229.__hz_l = class226.__ht_f;
- class227.__hj_e = class226.__ht_q;
- IndexCacheLoader.__bd_x = class226.__ht_w;
- TriBool.urlRequester = new UrlRequester();
- this.setUpKeyboard();
- this.setUpMouse();
- class16.mouseWheel = this.mouseWheel();
- Fonts.indexStore255 = new IndexStore(255, class168.dat2File, class168.idx255File, 500000);
- ReflectionCheck.clientPreferences = class306.method5780();
- this.setUpClipboard();
- String var2 = Ignored.__ks_at;
- class50.__af_m = this;
- if(var2 != null) {
- class50.__af_f = var2;
- }
-
- if(gameBuild != 0) {
- displayFps = true;
- }
-
- GroundItem.method2095(ReflectionCheck.clientPreferences.windowMode);
- WorldMapArea.friendSystem = new FriendSystem(KeyHandler.loginType);
- }
-
- @ObfuscatedName("al")
- @ObfuscatedSignature(
- signature = "(I)V",
- garbageValue = "1445885427"
- )
- protected final void __al_111() {
- ++cycle;
- this.doCycleJs5();
- class3.method41();
-
- int var1;
- try {
- if(class214.__hf_o == 1) {
- var1 = class214.midiPcmStream.__f_341();
- if(var1 > 0 && class214.midiPcmStream.isReady()) {
- var1 -= FaceNormal.__el_x;
- if(var1 < 0) {
- var1 = 0;
- }
-
- class214.midiPcmStream.__m_340(var1);
- } else {
- class214.midiPcmStream.clear();
- class214.midiPcmStream.removeAll();
- if(class214.__hf_u != null) {
- class214.__hf_o = 2;
- } else {
- class214.__hf_o = 0;
- }
-
- class13.musicTrack = null;
- class307.soundCache = null;
- }
- }
- } catch (Exception var63) {
- var63.printStackTrace();
- class214.midiPcmStream.clear();
- class214.__hf_o = 0;
- class13.musicTrack = null;
- class307.soundCache = null;
- class214.__hf_u = null;
- }
-
- class13.playPcmPlayers();
- class171.method3498();
- MouseHandler var47 = MouseHandler.MouseHandler_instance;
- synchronized(MouseHandler.MouseHandler_instance) {
- MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButton0;
- MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_x0;
- MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_y0;
- MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_millis0;
- MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButton0;
- MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedX0;
- MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedY0;
- MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis0;
- MouseHandler.MouseHandler_lastButton0 = 0;
- }
-
- if(class16.mouseWheel != null) {
- var1 = class16.mouseWheel.useRotation();
- mouseWheelRotation = var1;
- }
-
- if(gameState == 0) {
- class171.method3497();
- class11.method145();
- } else if(gameState == 5) {
- class54.method1092(this);
- class171.method3497();
- class11.method145();
- } else if(gameState != 10 && gameState != 11) {
- if(gameState == 20) {
- class54.method1092(this);
- this.doCycleLoggedOut();
- } else if(gameState == 25) {
- UserComparator10.method3352(false);
- __client_fe = 0;
- boolean var64 = true;
-
- int var48;
- for(var48 = 0; var48 < class40.regionLandArchives.length; ++var48) {
- if(IndexCacheLoader.regionMapArchiveIds[var48] != -1 && class40.regionLandArchives[var48] == null) {
- class40.regionLandArchives[var48] = SecureRandomFuture.indexCache5.takeRecord(IndexCacheLoader.regionMapArchiveIds[var48], 0);
- if(class40.regionLandArchives[var48] == null) {
- var64 = false;
- ++__client_fe;
- }
- }
-
- if(MouseHandler.regionLandArchiveIds[var48] != -1 && HealthBarUpdate.regionMapArchives[var48] == null) {
- HealthBarUpdate.regionMapArchives[var48] = SecureRandomFuture.indexCache5.takeRecordEncrypted(MouseHandler.regionLandArchiveIds[var48], 0, class190.xteaKeys[var48]);
- if(HealthBarUpdate.regionMapArchives[var48] == null) {
- var64 = false;
- ++__client_fe;
- }
- }
- }
-
- if(!var64) {
- __client_gh = 1;
- } else {
- __client_fk = 0;
- var64 = true;
-
- int var4;
- int var5;
- for(var48 = 0; var48 < class40.regionLandArchives.length; ++var48) {
- byte[] var3 = HealthBarUpdate.regionMapArchives[var48];
- if(var3 != null) {
- var4 = (class308.regions[var48] >> 8) * 64 - class50.baseX;
- var5 = (class308.regions[var48] & 255) * 64 - GraphicsObject.baseY;
- if(isInInstance) {
- var4 = 10;
- var5 = 10;
- }
-
- var64 &= TextureProvider.method2774(var3, var4, var5);
- }
- }
-
- if(!var64) {
- __client_gh = 2;
- } else {
- if(__client_gh != 0) {
- class68.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true);
- }
-
- class13.playPcmPlayers();
- class65.scene.clear();
-
- for(var48 = 0; var48 < 4; ++var48) {
- collisionMaps[var48].clear();
- }
-
- int var49;
- for(var48 = 0; var48 < 4; ++var48) {
- for(var49 = 0; var49 < 104; ++var49) {
- for(var4 = 0; var4 < 104; ++var4) {
- Tiles.Tiles_renderFlags[var48][var49][var4] = 0;
- }
- }
- }
-
- class13.playPcmPlayers();
- Tiles.Tiles_minPlane = 99;
- Tiles.__bq_w = new byte[4][104][104];
- Fonts.__kz_o = new byte[4][104][104];
- class32.__ay_u = new byte[4][104][104];
- class307.__kc_g = new byte[4][104][104];
- Tiles.__bq_a = new int[4][105][105];
- Tiles.__bq_l = new byte[4][105][105];
- Huffman.__gd_e = new int[105][105];
- class13.__i_x = new int[104];
- Formatting.__cy_d = new int[104];
- class214.__hf_k = new int[104];
- WorldMapSectionType.__h_n = new int[104];
- Message.__bm_i = new int[104];
- var48 = class40.regionLandArchives.length;
- SpriteMask.method4390();
- UserComparator10.method3352(true);
- int var10;
- int var11;
- int var12;
- int var13;
- int var14;
- int var15;
- int var16;
- int var17;
- int var18;
- int var19;
- int var20;
- int var21;
- int var22;
- int var51;
- if(!isInInstance) {
- byte[] var6;
- for(var49 = 0; var49 < var48; ++var49) {
- var4 = (class308.regions[var49] >> 8) * 64 - class50.baseX;
- var5 = (class308.regions[var49] & 255) * 64 - GraphicsObject.baseY;
- var6 = class40.regionLandArchives[var49];
- if(var6 != null) {
- class13.playPcmPlayers();
- Varcs.method2166(var6, var4, var5, GameObject.__eh_fy * 8 - 48, WorldMapLabelSize.__s_fi * 8 - 48, collisionMaps);
- }
- }
-
- for(var49 = 0; var49 < var48; ++var49) {
- var4 = (class308.regions[var49] >> 8) * 64 - class50.baseX;
- var5 = (class308.regions[var49] & 255) * 64 - GraphicsObject.baseY;
- var6 = class40.regionLandArchives[var49];
- if(var6 == null && WorldMapLabelSize.__s_fi < 800) {
- class13.playPcmPlayers();
- UserComparator6.method3390(var4, var5, 64, 64);
- }
- }
-
- UserComparator10.method3352(true);
-
- for(var49 = 0; var49 < var48; ++var49) {
- byte[] var50 = HealthBarUpdate.regionMapArchives[var49];
- if(var50 != null) {
- var5 = (class308.regions[var49] >> 8) * 64 - class50.baseX;
- var51 = (class308.regions[var49] & 255) * 64 - GraphicsObject.baseY;
- class13.playPcmPlayers();
- Scene var7 = class65.scene;
- CollisionMap[] var8 = collisionMaps;
- Buffer var9 = new Buffer(var50);
- var10 = -1;
-
- while(true) {
- var11 = var9.__at_308();
- if(var11 == 0) {
- break;
- }
-
- var10 += var11;
- var12 = 0;
-
- while(true) {
- var13 = var9.__ae_307();
- if(var13 == 0) {
- break;
- }
-
- var12 += var13 - 1;
- var14 = var12 & 63;
- var15 = var12 >> 6 & 63;
- var16 = var12 >> 12;
- var17 = var9.readUnsignedByte();
- var18 = var17 >> 2;
- var19 = var17 & 3;
- var20 = var5 + var15;
- var21 = var14 + var51;
- if(var20 > 0 && var21 > 0 && var20 < 103 && var21 < 103) {
- var22 = var16;
- if((Tiles.Tiles_renderFlags[1][var20][var21] & 2) == 2) {
- var22 = var16 - 1;
- }
-
- CollisionMap var23 = null;
- if(var22 >= 0) {
- var23 = var8[var22];
- }
-
- class227.method4446(var16, var20, var21, var10, var19, var18, var7, var23);
- }
- }
- }
- }
- }
- }
-
- int var52;
- int var53;
- int var54;
- if(isInInstance) {
- var49 = 0;
-
- label1186:
- while(true) {
- if(var49 >= 4) {
- for(var49 = 0; var49 < 13; ++var49) {
- for(var4 = 0; var4 < 13; ++var4) {
- var5 = instanceChunkTemplates[0][var49][var4];
- if(var5 == -1) {
- UserComparator6.method3390(var49 * 8, var4 * 8, 8, 8);
- }
- }
- }
-
- UserComparator10.method3352(true);
- var49 = 0;
-
- while(true) {
- if(var49 >= 4) {
- break label1186;
- }
-
- class13.playPcmPlayers();
-
- for(var4 = 0; var4 < 13; ++var4) {
- for(var5 = 0; var5 < 13; ++var5) {
- var51 = instanceChunkTemplates[var49][var4][var5];
- if(var51 != -1) {
- var52 = var51 >> 24 & 3;
- var53 = var51 >> 1 & 3;
- var54 = var51 >> 14 & 1023;
- var10 = var51 >> 3 & 2047;
- var11 = (var54 / 8 << 8) + var10 / 8;
-
- for(var12 = 0; var12 < class308.regions.length; ++var12) {
- if(class308.regions[var12] == var11 && HealthBarUpdate.regionMapArchives[var12] != null) {
- ServerPacket.method3662(HealthBarUpdate.regionMapArchives[var12], var49, var4 * 8, var5 * 8, var52, (var54 & 7) * 8, (var10 & 7) * 8, var53, class65.scene, collisionMaps);
- break;
- }
- }
- }
- }
- }
-
- ++var49;
- }
- }
-
- class13.playPcmPlayers();
-
- for(var4 = 0; var4 < 13; ++var4) {
- for(var5 = 0; var5 < 13; ++var5) {
- boolean var72 = false;
- var52 = instanceChunkTemplates[var49][var4][var5];
- if(var52 != -1) {
- var53 = var52 >> 24 & 3;
- var54 = var52 >> 1 & 3;
- var10 = var52 >> 14 & 1023;
- var11 = var52 >> 3 & 2047;
- var12 = (var10 / 8 << 8) + var11 / 8;
-
- for(var13 = 0; var13 < class308.regions.length; ++var13) {
- if(class308.regions[var13] == var12 && class40.regionLandArchives[var13] != null) {
- class204.method4013(class40.regionLandArchives[var13], var49, var4 * 8, var5 * 8, var53, (var10 & 7) * 8, (var11 & 7) * 8, var54, collisionMaps);
- var72 = true;
- break;
- }
- }
- }
-
- if(!var72) {
- var53 = var49;
- var54 = var4 * 8;
- var10 = var5 * 8;
-
- for(var11 = 0; var11 < 8; ++var11) {
- for(var12 = 0; var12 < 8; ++var12) {
- Tiles.Tiles_heights[var53][var11 + var54][var12 + var10] = 0;
- }
- }
-
- if(var54 > 0) {
- for(var11 = 1; var11 < 8; ++var11) {
- Tiles.Tiles_heights[var53][var54][var10 + var11] = Tiles.Tiles_heights[var53][var54 - 1][var10 + var11];
- }
- }
-
- if(var10 > 0) {
- for(var11 = 1; var11 < 8; ++var11) {
- Tiles.Tiles_heights[var53][var54 + var11][var10] = Tiles.Tiles_heights[var53][var54 + var11][var10 - 1];
- }
- }
-
- if(var54 > 0 && Tiles.Tiles_heights[var53][var54 - 1][var10] != 0) {
- Tiles.Tiles_heights[var53][var54][var10] = Tiles.Tiles_heights[var53][var54 - 1][var10];
- } else if(var10 > 0 && Tiles.Tiles_heights[var53][var54][var10 - 1] != 0) {
- Tiles.Tiles_heights[var53][var54][var10] = Tiles.Tiles_heights[var53][var54][var10 - 1];
- } else if(var54 > 0 && var10 > 0 && Tiles.Tiles_heights[var53][var54 - 1][var10 - 1] != 0) {
- Tiles.Tiles_heights[var53][var54][var10] = Tiles.Tiles_heights[var53][var54 - 1][var10 - 1];
- }
- }
- }
- }
-
- ++var49;
- }
- }
-
- UserComparator10.method3352(true);
- class13.playPcmPlayers();
- Scene var65 = class65.scene;
- CollisionMap[] var71 = collisionMaps;
-
- for(var5 = 0; var5 < 4; ++var5) {
- for(var51 = 0; var51 < 104; ++var51) {
- for(var52 = 0; var52 < 104; ++var52) {
- if((Tiles.Tiles_renderFlags[var5][var51][var52] & 1) == 1) {
- var53 = var5;
- if((Tiles.Tiles_renderFlags[1][var51][var52] & 2) == 2) {
- var53 = var5 - 1;
- }
-
- if(var53 >= 0) {
- var71[var53].__w_285(var51, var52);
- }
- }
- }
- }
- }
-
- Tiles.__bq_p += (int)(Math.random() * 5.0D) - 2;
- if(Tiles.__bq_p < -8) {
- Tiles.__bq_p = -8;
- }
-
- if(Tiles.__bq_p > 8) {
- Tiles.__bq_p = 8;
- }
-
- Tiles.__bq_v += (int)(Math.random() * 5.0D) - 2;
- if(Tiles.__bq_v < -16) {
- Tiles.__bq_v = -16;
- }
-
- if(Tiles.__bq_v > 16) {
- Tiles.__bq_v = 16;
- }
-
- for(var5 = 0; var5 < 4; ++var5) {
- byte[][] var66 = Tiles.__bq_l[var5];
- var12 = (int)Math.sqrt(5100.0D);
- var13 = var12 * 768 >> 8;
-
- int var55;
- for(var14 = 1; var14 < 103; ++var14) {
- for(var15 = 1; var15 < 103; ++var15) {
- var16 = Tiles.Tiles_heights[var5][var15 + 1][var14] - Tiles.Tiles_heights[var5][var15 - 1][var14];
- var17 = Tiles.Tiles_heights[var5][var15][var14 + 1] - Tiles.Tiles_heights[var5][var15][var14 - 1];
- var18 = (int)Math.sqrt((double)(var17 * var17 + var16 * var16 + 65536));
- var19 = (var16 << 8) / var18;
- var20 = 65536 / var18;
- var21 = (var17 << 8) / var18;
- var22 = (var21 * -50 + var19 * -50 + var20 * -10) / var13 + 96;
- var55 = (var66[var15 - 1][var14] >> 2) + (var66[var15][var14 - 1] >> 2) + (var66[var15 + 1][var14] >> 3) + (var66[var15][var14 + 1] >> 3) + (var66[var15][var14] >> 1);
- Huffman.__gd_e[var15][var14] = var22 - var55;
- }
- }
-
- for(var14 = 0; var14 < 104; ++var14) {
- class13.__i_x[var14] = 0;
- Formatting.__cy_d[var14] = 0;
- class214.__hf_k[var14] = 0;
- WorldMapSectionType.__h_n[var14] = 0;
- Message.__bm_i[var14] = 0;
- }
-
- for(var14 = -5; var14 < 109; ++var14) {
- for(var15 = 0; var15 < 104; ++var15) {
- var16 = var14 + 5;
- if(var16 >= 0 && var16 < 104) {
- var17 = Tiles.__bq_w[var5][var16][var15] & 255;
- if(var17 > 0) {
- UnderlayDefinition var56 = StudioGame.method4550(var17 - 1);
- class13.__i_x[var15] += var56.hue;
- Formatting.__cy_d[var15] += var56.saturation;
- class214.__hf_k[var15] += var56.lightness;
- WorldMapSectionType.__h_n[var15] += var56.hueMultiplier;
- ++Message.__bm_i[var15];
- }
- }
-
- var17 = var14 - 5;
- if(var17 >= 0 && var17 < 104) {
- var18 = Tiles.__bq_w[var5][var17][var15] & 255;
- if(var18 > 0) {
- UnderlayDefinition var57 = StudioGame.method4550(var18 - 1);
- class13.__i_x[var15] -= var57.hue;
- Formatting.__cy_d[var15] -= var57.saturation;
- class214.__hf_k[var15] -= var57.lightness;
- WorldMapSectionType.__h_n[var15] -= var57.hueMultiplier;
- --Message.__bm_i[var15];
- }
- }
- }
-
- if(var14 >= 1 && var14 < 103) {
- var15 = 0;
- var16 = 0;
- var17 = 0;
- var18 = 0;
- var19 = 0;
-
- for(var20 = -5; var20 < 109; ++var20) {
- var21 = var20 + 5;
- if(var21 >= 0 && var21 < 104) {
- var15 += class13.__i_x[var21];
- var16 += Formatting.__cy_d[var21];
- var17 += class214.__hf_k[var21];
- var18 += WorldMapSectionType.__h_n[var21];
- var19 += Message.__bm_i[var21];
- }
-
- var22 = var20 - 5;
- if(var22 >= 0 && var22 < 104) {
- var15 -= class13.__i_x[var22];
- var16 -= Formatting.__cy_d[var22];
- var17 -= class214.__hf_k[var22];
- var18 -= WorldMapSectionType.__h_n[var22];
- var19 -= Message.__bm_i[var22];
- }
-
- if(var20 >= 1 && var20 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var14][var20] & 2) != 0 || (Tiles.Tiles_renderFlags[var5][var14][var20] & 16) == 0)) {
- if(var5 < Tiles.Tiles_minPlane) {
- Tiles.Tiles_minPlane = var5;
- }
-
- var55 = Tiles.__bq_w[var5][var14][var20] & 255;
- int var24 = Fonts.__kz_o[var5][var14][var20] & 255;
- if(var55 > 0 || var24 > 0) {
- int var25 = Tiles.Tiles_heights[var5][var14][var20];
- int var26 = Tiles.Tiles_heights[var5][var14 + 1][var20];
- int var27 = Tiles.Tiles_heights[var5][var14 + 1][var20 + 1];
- int var28 = Tiles.Tiles_heights[var5][var14][var20 + 1];
- int var29 = Huffman.__gd_e[var14][var20];
- int var30 = Huffman.__gd_e[var14 + 1][var20];
- int var31 = Huffman.__gd_e[var14 + 1][var20 + 1];
- int var32 = Huffman.__gd_e[var14][var20 + 1];
- int var33 = -1;
- int var34 = -1;
- int var35;
- int var36;
- int var37;
- if(var55 > 0) {
- var35 = var15 * 256 / var18;
- var36 = var16 / var19;
- var37 = var17 / var19;
- var33 = WorldMapAreaData.method712(var35, var36, var37);
- var35 = var35 + Tiles.__bq_p & 255;
- var37 += Tiles.__bq_v;
- if(var37 < 0) {
- var37 = 0;
- } else if(var37 > 255) {
- var37 = 255;
- }
-
- var34 = WorldMapAreaData.method712(var35, var36, var37);
- }
-
- OverlayDefinition var38;
- if(var5 > 0) {
- boolean var69 = true;
- if(var55 == 0 && class32.__ay_u[var5][var14][var20] != 0) {
- var69 = false;
- }
-
- if(var24 > 0) {
- var37 = var24 - 1;
- var38 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var37);
- OverlayDefinition var58;
- if(var38 != null) {
- var58 = var38;
- } else {
- byte[] var39 = OverlayDefinition.__jf_m.takeRecord(4, var37);
- var38 = new OverlayDefinition();
- if(var39 != null) {
- var38.read(new Buffer(var39), var37);
- }
-
- var38.init();
- OverlayDefinition.__jf_f.put(var38, (long)var37);
- var58 = var38;
- }
-
- if(!var58.__o) {
- var69 = false;
- }
- }
-
- if(var69 && var25 == var26 && var25 == var27 && var28 == var25) {
- Tiles.__bq_a[var5][var14][var20] |= 2340;
- }
- }
-
- var35 = 0;
- if(var34 != -1) {
- var35 = Rasterizer3D.Rasterizer3D_colorPalette[class15.method183(var34, 96)];
- }
-
- if(var24 == 0) {
- var65.addTile(var5, var14, var20, 0, 0, -1, var25, var26, var27, var28, class15.method183(var33, var29), class15.method183(var33, var30), class15.method183(var33, var31), class15.method183(var33, var32), 0, 0, 0, 0, var35, 0);
- } else {
- var36 = class32.__ay_u[var5][var14][var20] + 1;
- byte var70 = class307.__kc_g[var5][var14][var20];
- int var59 = var24 - 1;
- OverlayDefinition var40 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var59);
- if(var40 != null) {
- var38 = var40;
- } else {
- byte[] var41 = OverlayDefinition.__jf_m.takeRecord(4, var59);
- var40 = new OverlayDefinition();
- if(var41 != null) {
- var40.read(new Buffer(var41), var59);
- }
-
- var40.init();
- OverlayDefinition.__jf_f.put(var40, (long)var59);
- var38 = var40;
- }
-
- int var60 = var38.texture;
- int var42;
- int var43;
- int var44;
- int var45;
- if(var60 >= 0) {
- var43 = Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var60);
- var42 = -1;
- } else if(var38.rgb == 16711935) {
- var42 = -2;
- var60 = -1;
- var43 = -2;
- } else {
- var42 = WorldMapAreaData.method712(var38.hue, var38.saturation, var38.lightness);
- var44 = var38.hue + Tiles.__bq_p & 255;
- var45 = var38.lightness + Tiles.__bq_v;
- if(var45 < 0) {
- var45 = 0;
- } else if(var45 > 255) {
- var45 = 255;
- }
-
- var43 = WorldMapAreaData.method712(var44, var38.saturation, var45);
- }
-
- var44 = 0;
- if(var43 != -2) {
- var44 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var43, 96)];
- }
-
- if(var38.rgb2 != -1) {
- var45 = var38.hue2 + Tiles.__bq_p & 255;
- int var46 = var38.lightness2 + Tiles.__bq_v;
- if(var46 < 0) {
- var46 = 0;
- } else if(var46 > 255) {
- var46 = 255;
- }
-
- var43 = WorldMapAreaData.method712(var45, var38.saturation2, var46);
- var44 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var43, 96)];
- }
-
- var65.addTile(var5, var14, var20, var36, var70, var60, var25, var26, var27, var28, class15.method183(var33, var29), class15.method183(var33, var30), class15.method183(var33, var31), class15.method183(var33, var32), class25.method348(var42, var29), class25.method348(var42, var30), class25.method348(var42, var31), class25.method348(var42, var32), var35, var44);
- }
- }
- }
- }
- }
- }
-
- for(var14 = 1; var14 < 103; ++var14) {
- for(var15 = 1; var15 < 103; ++var15) {
- if((Tiles.Tiles_renderFlags[var5][var15][var14] & 8) != 0) {
- var20 = 0;
- } else if(var5 > 0 && (Tiles.Tiles_renderFlags[1][var15][var14] & 2) != 0) {
- var20 = var5 - 1;
- } else {
- var20 = var5;
- }
-
- var65.setTileMinPlane(var5, var15, var14, var20);
- }
- }
-
- Tiles.__bq_w[var5] = null;
- Fonts.__kz_o[var5] = null;
- class32.__ay_u[var5] = null;
- class307.__kc_g[var5] = null;
- Tiles.__bq_l[var5] = null;
- }
-
- var65.__aw_247(-50, -10, -50);
-
- for(var5 = 0; var5 < 104; ++var5) {
- for(var51 = 0; var51 < 104; ++var51) {
- if((Tiles.Tiles_renderFlags[1][var5][var51] & 2) == 2) {
- var65.setLinkBelow(var5, var51);
- }
- }
- }
-
- var5 = 1;
- var51 = 2;
- var52 = 4;
-
- for(var53 = 0; var53 < 4; ++var53) {
- if(var53 > 0) {
- var5 <<= 3;
- var51 <<= 3;
- var52 <<= 3;
- }
-
- for(var54 = 0; var54 <= var53; ++var54) {
- for(var10 = 0; var10 <= 104; ++var10) {
- for(var11 = 0; var11 <= 104; ++var11) {
- short var68;
- if((Tiles.__bq_a[var54][var11][var10] & var5) != 0) {
- var12 = var10;
- var13 = var10;
- var14 = var54;
-
- for(var15 = var54; var12 > 0 && (Tiles.__bq_a[var54][var11][var12 - 1] & var5) != 0; --var12) {
- ;
- }
-
- while(var13 < 104 && (Tiles.__bq_a[var54][var11][var13 + 1] & var5) != 0) {
- ++var13;
- }
-
- label837:
- while(var14 > 0) {
- for(var16 = var12; var16 <= var13; ++var16) {
- if((Tiles.__bq_a[var14 - 1][var11][var16] & var5) == 0) {
- break label837;
- }
- }
-
- --var14;
- }
-
- label826:
- while(var15 < var53) {
- for(var16 = var12; var16 <= var13; ++var16) {
- if((Tiles.__bq_a[var15 + 1][var11][var16] & var5) == 0) {
- break label826;
- }
- }
-
- ++var15;
- }
-
- var16 = (var13 - var12 + 1) * (var15 + 1 - var14);
- if(var16 >= 8) {
- var68 = 240;
- var18 = Tiles.Tiles_heights[var15][var11][var12] - var68;
- var19 = Tiles.Tiles_heights[var14][var11][var12];
- Scene.Scene_addOccluder(var53, 1, var11 * 128, var11 * 128, var12 * 128, var13 * 128 + 128, var18, var19);
-
- for(var20 = var14; var20 <= var15; ++var20) {
- for(var21 = var12; var21 <= var13; ++var21) {
- Tiles.__bq_a[var20][var11][var21] &= ~var5;
- }
- }
- }
- }
-
- if((Tiles.__bq_a[var54][var11][var10] & var51) != 0) {
- var12 = var11;
- var13 = var11;
- var14 = var54;
-
- for(var15 = var54; var12 > 0 && (Tiles.__bq_a[var54][var12 - 1][var10] & var51) != 0; --var12) {
- ;
- }
-
- while(var13 < 104 && (Tiles.__bq_a[var54][var13 + 1][var10] & var51) != 0) {
- ++var13;
- }
-
- label890:
- while(var14 > 0) {
- for(var16 = var12; var16 <= var13; ++var16) {
- if((Tiles.__bq_a[var14 - 1][var16][var10] & var51) == 0) {
- break label890;
- }
- }
-
- --var14;
- }
-
- label879:
- while(var15 < var53) {
- for(var16 = var12; var16 <= var13; ++var16) {
- if((Tiles.__bq_a[var15 + 1][var16][var10] & var51) == 0) {
- break label879;
- }
- }
-
- ++var15;
- }
-
- var16 = (var13 - var12 + 1) * (var15 + 1 - var14);
- if(var16 >= 8) {
- var68 = 240;
- var18 = Tiles.Tiles_heights[var15][var12][var10] - var68;
- var19 = Tiles.Tiles_heights[var14][var12][var10];
- Scene.Scene_addOccluder(var53, 2, var12 * 128, var13 * 128 + 128, var10 * 128, var10 * 128, var18, var19);
-
- for(var20 = var14; var20 <= var15; ++var20) {
- for(var21 = var12; var21 <= var13; ++var21) {
- Tiles.__bq_a[var20][var21][var10] &= ~var51;
- }
- }
- }
- }
-
- if((Tiles.__bq_a[var54][var11][var10] & var52) != 0) {
- var12 = var11;
- var13 = var11;
- var14 = var10;
-
- for(var15 = var10; var14 > 0 && (Tiles.__bq_a[var54][var11][var14 - 1] & var52) != 0; --var14) {
- ;
- }
-
- while(var15 < 104 && (Tiles.__bq_a[var54][var11][var15 + 1] & var52) != 0) {
- ++var15;
- }
-
- label943:
- while(var12 > 0) {
- for(var16 = var14; var16 <= var15; ++var16) {
- if((Tiles.__bq_a[var54][var12 - 1][var16] & var52) == 0) {
- break label943;
- }
- }
-
- --var12;
- }
-
- label932:
- while(var13 < 104) {
- for(var16 = var14; var16 <= var15; ++var16) {
- if((Tiles.__bq_a[var54][var13 + 1][var16] & var52) == 0) {
- break label932;
- }
- }
-
- ++var13;
- }
-
- if((var15 - var14 + 1) * (var13 - var12 + 1) >= 4) {
- var16 = Tiles.Tiles_heights[var54][var12][var14];
- Scene.Scene_addOccluder(var53, 4, var12 * 128, var13 * 128 + 128, var14 * 128, var15 * 128 + 128, var16, var16);
-
- for(var17 = var12; var17 <= var13; ++var17) {
- for(var18 = var14; var18 <= var15; ++var18) {
- Tiles.__bq_a[var54][var17][var18] &= ~var52;
- }
- }
- }
- }
- }
- }
- }
- }
-
- UserComparator10.method3352(true);
- var5 = Tiles.Tiles_minPlane;
- if(var5 > SoundSystem.plane) {
- var5 = SoundSystem.plane;
- }
-
- if(var5 < SoundSystem.plane - 1) {
- var5 = SoundSystem.plane - 1;
- }
-
- if(isLowDetail) {
- class65.scene.init(Tiles.Tiles_minPlane);
- } else {
- class65.scene.init(0);
- }
-
- for(var51 = 0; var51 < 104; ++var51) {
- for(var52 = 0; var52 < 104; ++var52) {
- TilePaint.method3061(var51, var52);
- }
- }
-
- class13.playPcmPlayers();
- ScriptEvent.method1179();
- ObjectDefinition.__jr_o.clear();
- PacketBufferNode var67;
- if(TextureProvider.client.hasFrame()) {
- var67 = Interpreter.method1915(ClientPacket.__gs_x, packetWriter.isaacCipher);
- var67.packetBuffer.writeInt(1057001181);
- packetWriter.__q_167(var67);
- }
-
- if(!isInInstance) {
- var51 = (GameObject.__eh_fy - 6) / 8;
- var52 = (GameObject.__eh_fy + 6) / 8;
- var53 = (WorldMapLabelSize.__s_fi - 6) / 8;
- var54 = (WorldMapLabelSize.__s_fi + 6) / 8;
-
- for(var10 = var51 - 1; var10 <= var52 + 1; ++var10) {
- for(var11 = var53 - 1; var11 <= var54 + 1; ++var11) {
- if(var10 < var51 || var10 > var52 || var11 < var53 || var11 > var54) {
- SecureRandomFuture.indexCache5.__ar_402("m" + var10 + "_" + var11);
- SecureRandomFuture.indexCache5.__ar_402("l" + var10 + "_" + var11);
- }
- }
- }
- }
-
- GameShell.updateGameState(30);
- class13.playPcmPlayers();
- BufferedSink.method3603();
- var67 = Interpreter.method1915(ClientPacket.__gs_bv, packetWriter.isaacCipher);
- packetWriter.__q_167(var67);
- class11.method145();
- }
- }
- }
- } else {
- class54.method1092(this);
- }
-
- if(gameState == 30) {
- this.doCycleLoggedIn();
- } else if(gameState == 40 || gameState == 45) {
- this.doCycleLoggedOut();
- }
-
- }
-
- @ObfuscatedName("ab")
- @ObfuscatedSignature(
- signature = "(ZI)V",
- garbageValue = "106302203"
- )
- @Export("methodDraw")
- protected final void methodDraw(boolean var1) {
- boolean var2;
- label166: {
- try {
- if(class214.__hf_o == 2) {
- if(class13.musicTrack == null) {
- class13.musicTrack = MusicTrack.readTrack(class214.__hf_u, class30.musicTrackArchiveId, GrandExchangeOffer.musicTrackFileId);
- if(class13.musicTrack == null) {
- var2 = false;
- break label166;
- }
- }
-
- if(class307.soundCache == null) {
- class307.soundCache = new SoundCache(class214.__hf_q, class214.__hf_f);
- }
-
- if(class214.midiPcmStream.loadMusicTrack(class13.musicTrack, class1.__f_m, class307.soundCache, 22050)) {
- class214.midiPcmStream.clearAll();
- class214.midiPcmStream.__m_340(WorldMapLabel.__aj_e);
- class214.midiPcmStream.setMusicTrack(class13.musicTrack, RectangleMode.musicTrackBoolean);
- class214.__hf_o = 0;
- class13.musicTrack = null;
- class307.soundCache = null;
- class214.__hf_u = null;
- var2 = true;
- break label166;
- }
- }
- } catch (Exception var6) {
- var6.printStackTrace();
- class214.midiPcmStream.clear();
- class214.__hf_o = 0;
- class13.musicTrack = null;
- class307.soundCache = null;
- class214.__hf_u = null;
- }
-
- var2 = false;
- }
-
- if(var2 && __client_qq && WorldMapCacheName.pcmPlayer0 != null) {
- WorldMapCacheName.pcmPlayer0.tryDiscard();
- }
-
- if((gameState == 10 || gameState == 20 || gameState == 30) && __client_oa != 0L && class203.currentTimeMs() > __client_oa) {
- GroundItem.method2095(SpotAnimationDefinition.method4822());
- }
-
- int var4;
- if(var1) {
- for(var4 = 0; var4 < 100; ++var4) {
- __client_od[var4] = true;
- }
- }
-
- if(gameState == 0) {
- this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1);
- } else if(gameState == 5) {
- IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
- } else if(gameState != 10 && gameState != 11) {
- if(gameState == 20) {
- IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
- } else if(gameState == 25) {
- if(__client_gh == 1) {
- if(__client_fe > __client_fn) {
- __client_fn = __client_fe;
- }
-
- var4 = (__client_fn * 50 - __client_fe * 50) / __client_fn;
- class68.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false);
- } else if(__client_gh == 2) {
- if(__client_fk > __client_gp) {
- __client_gp = __client_fk;
- }
-
- var4 = (__client_gp * 50 - __client_fk * 50) / __client_gp + 50;
- class68.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false);
- } else {
- class68.drawLoadingMessage("Loading - please wait.", false);
- }
- } else if(gameState == 30) {
- this.drawLoggedIn();
- } else if(gameState == 40) {
- class68.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false);
- } else if(gameState == 45) {
- class68.drawLoadingMessage("Please wait...", false);
- }
- } else {
- IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
- }
-
- if(gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) {
- for(var4 = 0; var4 < rootWidgetCount; ++var4) {
- if(__client_ot[var4]) {
- class197.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]);
- __client_ot[var4] = false;
- }
- }
- } else if(gameState > 0) {
- class197.rasterProvider.drawFull(0, 0);
-
- for(var4 = 0; var4 < rootWidgetCount; ++var4) {
- __client_ot[var4] = false;
- }
- }
-
- }
-
- @ObfuscatedName("ae")
- @ObfuscatedSignature(
- signature = "(I)V",
- garbageValue = "-1879956387"
- )
- protected final void kill0() {
- if(class196.varcs.hasUnwrittenChanges()) {
- class196.varcs.write();
- }
-
- if(Projectile.mouseRecorder != null) {
- Projectile.mouseRecorder.isRunning = false;
- }
-
- Projectile.mouseRecorder = null;
- packetWriter.close();
- if(KeyHandler.KeyHandler_instance != null) {
- KeyHandler var1 = KeyHandler.KeyHandler_instance;
- synchronized(KeyHandler.KeyHandler_instance) {
- KeyHandler.KeyHandler_instance = null;
- }
- }
-
- if(MouseHandler.MouseHandler_instance != null) {
- MouseHandler var8 = MouseHandler.MouseHandler_instance;
- synchronized(MouseHandler.MouseHandler_instance) {
- MouseHandler.MouseHandler_instance = null;
- }
- }
-
- class16.mouseWheel = null;
- if(WorldMapCacheName.pcmPlayer0 != null) {
- WorldMapCacheName.pcmPlayer0.shutdown();
- }
-
- if(AbstractIndexCache.pcmPlayer1 != null) {
- AbstractIndexCache.pcmPlayer1.shutdown();
- }
-
- if(NetCache.NetCache_socket != null) {
- NetCache.NetCache_socket.close();
- }
-
- RunException.method3431();
- if(TriBool.urlRequester != null) {
- TriBool.urlRequester.close();
- TriBool.urlRequester = null;
- }
-
- try {
- class168.dat2File.close();
-
- for(int var4 = 0; var4 < class168.idxCount; ++var4) {
- IndexStoreAction.idxFiles[var4].close();
- }
-
- class168.idx255File.close();
- class168.randomDat.close();
- } catch (Exception var7) {
- ;
- }
-
- }
-
- @ObfuscatedName("au")
- @ObfuscatedSignature(
- signature = "(I)V",
- garbageValue = "1860808291"
- )
- protected final void __au_110() {
- }
-
- @ObfuscatedName("init")
- public final void __init_109() {
- try {
- if(this.checkHost()) {
- ClientParameter[] var1 = class4.method47();
-
- int var9;
- for(int var2 = 0; var2 < var1.length; ++var2) {
- ClientParameter var3 = var1[var2];
- String var4 = this.getParameter(var3.id);
- if(var4 != null) {
- switch(Integer.parseInt(var3.id)) {
- case 1:
- useBufferedSocket = Integer.parseInt(var4) != 0;
- case 2:
- case 11:
- case 13:
- case 16:
- default:
- break;
- case 3:
- if(var4.equalsIgnoreCase("true")) {
- isMembersWorld = true;
- } else {
- isMembersWorld = false;
- }
- break;
- case 4:
- if(clientType == -1) {
- clientType = Integer.parseInt(var4);
- }
- break;
- case 5:
- worldProperties = Integer.parseInt(var4);
- break;
- case 6:
- language = Integer.parseInt(var4);
- break;
- case 7:
- int var6 = Integer.parseInt(var4);
- ServerBuild[] var7 = new ServerBuild[]{ServerBuild.__iy_q, ServerBuild.__iy_w, ServerBuild.__iy_m, ServerBuild.__iy_f};
- ServerBuild[] var8 = var7;
- var9 = 0;
-
- ServerBuild var5;
- while(true) {
- if(var9 >= var8.length) {
- var5 = null;
- break;
- }
-
- ServerBuild var10 = var8[var9];
- if(var6 == var10.id) {
- var5 = var10;
- break;
- }
-
- ++var9;
- }
-
- class15.serverBuild = var5;
- break;
- case 8:
- if(var4.equalsIgnoreCase("true")) {
- ;
- }
- break;
- case 9:
- class21.__b_by = var4;
- break;
- case 10:
- class22.studioGame = (StudioGame)ScriptFrame.findEnumerated(ClientPacket.method3664(), Integer.parseInt(var4));
- if(class22.studioGame == StudioGame.__is_u) {
- KeyHandler.loginType = LoginType.__lx_m;
- } else {
- KeyHandler.loginType = LoginType.__lx_e;
- }
- break;
- case 12:
- worldId = Integer.parseInt(var4);
- break;
- case 14:
- AbstractIndexCache.__ir_bu = Integer.parseInt(var4);
- break;
- case 15:
- gameBuild = Integer.parseInt(var4);
- break;
- case 17:
- ServerBuild.worldsUrl = var4;
- }
- }
- }
-
- class237.method4539();
- class50.worldHost = this.getCodeBase().getHost();
- String var33 = class15.serverBuild.name;
- byte var34 = 0;
-
- try {
- class168.idxCount = 21;
- PacketBuffer.__hx_z = var34;
-
- try {
- class266.osName = System.getProperty("os.name");
- } catch (Exception var28) {
- class266.osName = "Unknown";
- }
-
- WorldMapSection3.osNameLowerCase = class266.osName.toLowerCase();
-
- try {
- WorldMapSection1.userHomeDirectory = System.getProperty("user.home");
- if(WorldMapSection1.userHomeDirectory != null) {
- WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/";
- }
- } catch (Exception var27) {
- ;
- }
-
- try {
- if(WorldMapSection3.osNameLowerCase.startsWith("win")) {
- if(WorldMapSection1.userHomeDirectory == null) {
- WorldMapSection1.userHomeDirectory = System.getenv("USERPROFILE");
- }
- } else if(WorldMapSection1.userHomeDirectory == null) {
- WorldMapSection1.userHomeDirectory = System.getenv("HOME");
- }
-
- if(WorldMapSection1.userHomeDirectory != null) {
- WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/";
- }
- } catch (Exception var26) {
- ;
- }
-
- if(WorldMapSection1.userHomeDirectory == null) {
- WorldMapSection1.userHomeDirectory = "~/";
- }
-
- WorldMapSection2.cacheDirectoryLocations = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", WorldMapSection1.userHomeDirectory, "/tmp/", ""};
- Canvas.__ao_s = new String[]{".jagex_cache_" + PacketBuffer.__hx_z, ".file_store_" + PacketBuffer.__hx_z};
- int var17 = 0;
-
- label259:
- while(var17 < 4) {
- String var37 = var17 == 0?"":"" + var17;
- class337.clDat = new File(WorldMapSection1.userHomeDirectory, "jagex_cl_oldschool_" + var33 + var37 + ".dat");
- String var18 = null;
- String var39 = null;
- boolean var19 = false;
- File var42;
- if(class337.clDat.exists()) {
- try {
- AccessFile var20 = new AccessFile(class337.clDat, "rw", 10000L);
-
- int var11;
- Buffer var41;
- for(var41 = new Buffer((int)var20.length()); var41.index < var41.array.length; var41.index += var11) {
- var11 = var20.read(var41.array, var41.index, var41.array.length - var41.index);
- if(var11 == -1) {
- throw new IOException();
- }
- }
-
- var41.index = 0;
- var11 = var41.readUnsignedByte();
- if(var11 < 1 || var11 > 3) {
- throw new IOException("" + var11);
- }
-
- int var12 = 0;
- if(var11 > 1) {
- var12 = var41.readUnsignedByte();
- }
-
- if(var11 <= 2) {
- var18 = var41.readStringCp1252NullCircumfixed();
- if(var12 == 1) {
- var39 = var41.readStringCp1252NullCircumfixed();
- }
- } else {
- var18 = var41.__aw_304();
- if(var12 == 1) {
- var39 = var41.__aw_304();
- }
- }
-
- var20.close();
- } catch (IOException var30) {
- var30.printStackTrace();
- }
-
- if(var18 != null) {
- var42 = new File(var18);
- if(!var42.exists()) {
- var18 = null;
- }
- }
-
- if(var18 != null) {
- var42 = new File(var18, "test.dat");
- if(!DevicePcmPlayerProvider.method847(var42, true)) {
- var18 = null;
- }
- }
- }
-
- if(var18 == null && var17 == 0) {
- label234:
- for(var9 = 0; var9 < Canvas.__ao_s.length; ++var9) {
- for(int var21 = 0; var21 < WorldMapSection2.cacheDirectoryLocations.length; ++var21) {
- File var22 = new File(WorldMapSection2.cacheDirectoryLocations[var21] + Canvas.__ao_s[var9] + File.separatorChar + "oldschool" + File.separatorChar);
- if(var22.exists() && DevicePcmPlayerProvider.method847(new File(var22, "test.dat"), true)) {
- var18 = var22.toString();
- var19 = true;
- break label234;
- }
- }
- }
- }
-
- if(var18 == null) {
- var18 = WorldMapSection1.userHomeDirectory + File.separatorChar + "jagexcache" + var37 + File.separatorChar + "oldschool" + File.separatorChar + var33 + File.separatorChar;
- var19 = true;
- }
-
- if(var39 != null) {
- File var43 = new File(var39);
- var42 = new File(var18);
-
- try {
- File[] var44 = var43.listFiles();
- File[] var23 = var44;
-
- for(int var13 = 0; var13 < var23.length; ++var13) {
- File var14 = var23[var13];
- File var15 = new File(var42, var14.getName());
- boolean var16 = var14.renameTo(var15);
- if(!var16) {
- throw new IOException();
- }
- }
- } catch (Exception var29) {
- var29.printStackTrace();
- }
-
- var19 = true;
- }
-
- if(var19) {
- class14.method167(new File(var18), (File)null);
- }
-
- File var36 = new File(var18);
- class168.__fs_o = var36;
- if(!class168.__fs_o.exists()) {
- class168.__fs_o.mkdirs();
- }
-
- File[] var38 = class168.__fs_o.listFiles();
- if(var38 != null) {
- File[] var45 = var38;
-
- for(int var24 = 0; var24 < var45.length; ++var24) {
- File var40 = var45[var24];
- if(!DevicePcmPlayerProvider.method847(var40, false)) {
- ++var17;
- continue label259;
- }
- }
- }
- break;
- }
-
- File var35 = class168.__fs_o;
- class171.__fo_f = var35;
- if(!class171.__fo_f.exists()) {
- throw new RuntimeException("");
- }
-
- class171.__fo_m = true;
- Interpreter.method1976();
- class168.dat2File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0);
- class168.idx255File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx255"), "rw", 1048576L), 6000, 0);
- IndexStoreAction.idxFiles = new BufferedFile[class168.idxCount];
-
- for(int var25 = 0; var25 < class168.idxCount; ++var25) {
- IndexStoreAction.idxFiles[var25] = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx" + var25), "rw", 1048576L), 6000, 0);
- }
- } catch (Exception var31) {
- NpcDefinition.sendStackTrace((String)null, var31);
- }
-
- TextureProvider.client = this;
- RunException.__fx_w = clientType;
- this.startThread(765, 503, 180);
- }
- } catch (RuntimeException var32) {
- throw Players.method2120(var32, "client.init(" + ')');
- }
- }
-
- @ObfuscatedName("ef")
- @ObfuscatedSignature(
- signature = "(B)V",
- garbageValue = "-78"
- )
- @Export("doCycleJs5")
- void doCycleJs5() {
- if(gameState != 1000) {
- long var2 = class203.currentTimeMs();
- int var4 = (int)(var2 - NetCache.__iq_q);
- NetCache.__iq_q = var2;
- if(var4 > 200) {
- var4 = 200;
- }
-
- NetCache.__iq_f += var4;
- boolean var1;
- if(NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) {
- var1 = true;
- } else if(NetCache.NetCache_socket == null) {
- var1 = false;
- } else {
- try {
- label242: {
- if(NetCache.__iq_f > 30000) {
- throw new IOException();
- }
-
- NetFileRequest var5;
- Buffer var6;
- while(NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) {
- var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first();
- var6 = new Buffer(4);
- var6.writeByte(1);
- var6.writeMedium((int)var5.key);
- NetCache.NetCache_socket.write(var6.array, 0, 4);
- NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key);
- --NetCache.NetCache_pendingPriorityWritesCount;
- ++NetCache.NetCache_pendingPriorityResponsesCount;
- }
-
- while(NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) {
- var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.last();
- var6 = new Buffer(4);
- var6.writeByte(0);
- var6.writeMedium((int)var5.key);
- NetCache.NetCache_socket.write(var6.array, 0, 4);
- var5.removeDual();
- NetCache.NetCache_pendingResponses.put(var5, var5.key);
- --NetCache.NetCache_pendingWritesCount;
- ++NetCache.NetCache_pendingResponsesCount;
- }
-
- for(int var17 = 0; var17 < 100; ++var17) {
- int var18 = NetCache.NetCache_socket.available();
- if(var18 < 0) {
- throw new IOException();
- }
-
- if(var18 == 0) {
- break;
- }
-
- NetCache.__iq_f = 0;
- byte var7 = 0;
- if(ModelData0.NetCache_currentResponse == null) {
- var7 = 8;
- } else if(NetCache.__iq_j == 0) {
- var7 = 1;
- }
-
- int var8;
- int var9;
- int var10;
- int var12;
- if(var7 > 0) {
- var8 = var7 - NetCache.NetCache_responseHeaderBuffer.index;
- if(var8 > var18) {
- var8 = var18;
- }
-
- NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.index, var8);
- if(NetCache.__iq_b != 0) {
- for(var9 = 0; var9 < var8; ++var9) {
- NetCache.NetCache_responseHeaderBuffer.array[NetCache.NetCache_responseHeaderBuffer.index + var9] ^= NetCache.__iq_b;
- }
- }
-
- NetCache.NetCache_responseHeaderBuffer.index += var8;
- if(NetCache.NetCache_responseHeaderBuffer.index < var7) {
- break;
- }
-
- if(ModelData0.NetCache_currentResponse == null) {
- NetCache.NetCache_responseHeaderBuffer.index = 0;
- var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte();
- var10 = NetCache.NetCache_responseHeaderBuffer.__ag_302();
- int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte();
- var12 = NetCache.NetCache_responseHeaderBuffer.readInt();
- long var13 = (long)(var10 + (var9 << 16));
- NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13);
- WorldComparator.__u_n = true;
- if(var15 == null) {
- var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13);
- WorldComparator.__u_n = false;
- }
-
- if(var15 == null) {
- throw new IOException();
- }
-
- int var16 = var11 == 0?5:9;
- ModelData0.NetCache_currentResponse = var15;
- class22.NetCache_responseArchiveBuffer = new Buffer(var12 + var16 + ModelData0.NetCache_currentResponse.padding);
- class22.NetCache_responseArchiveBuffer.writeByte(var11);
- class22.NetCache_responseArchiveBuffer.writeInt(var12);
- NetCache.__iq_j = 8;
- NetCache.NetCache_responseHeaderBuffer.index = 0;
- } else if(NetCache.__iq_j == 0) {
- if(NetCache.NetCache_responseHeaderBuffer.array[0] == -1) {
- NetCache.__iq_j = 1;
- NetCache.NetCache_responseHeaderBuffer.index = 0;
- } else {
- ModelData0.NetCache_currentResponse = null;
- }
- }
- } else {
- var8 = class22.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding;
- var9 = 512 - NetCache.__iq_j;
- if(var9 > var8 - class22.NetCache_responseArchiveBuffer.index) {
- var9 = var8 - class22.NetCache_responseArchiveBuffer.index;
- }
-
- if(var9 > var18) {
- var9 = var18;
- }
-
- NetCache.NetCache_socket.read(class22.NetCache_responseArchiveBuffer.array, class22.NetCache_responseArchiveBuffer.index, var9);
- if(NetCache.__iq_b != 0) {
- for(var10 = 0; var10 < var9; ++var10) {
- class22.NetCache_responseArchiveBuffer.array[class22.NetCache_responseArchiveBuffer.index + var10] ^= NetCache.__iq_b;
- }
- }
-
- class22.NetCache_responseArchiveBuffer.index += var9;
- NetCache.__iq_j += var9;
- if(var8 == class22.NetCache_responseArchiveBuffer.index) {
- if(16711935L == ModelData0.NetCache_currentResponse.key) {
- Players.NetCache_reference = class22.NetCache_responseArchiveBuffer;
-
- for(var10 = 0; var10 < 256; ++var10) {
- IndexCache var19 = NetCache.NetCache_indexCaches[var10];
- if(var19 != null) {
- Players.NetCache_reference.index = var10 * 8 + 5;
- var12 = Players.NetCache_reference.readInt();
- int var20 = Players.NetCache_reference.readInt();
- var19.loadIndexReference(var12, var20);
- }
- }
- } else {
- NetCache.NetCache_crc.reset();
- NetCache.NetCache_crc.update(class22.NetCache_responseArchiveBuffer.array, 0, var8);
- var10 = (int)NetCache.NetCache_crc.getValue();
- if(var10 != ModelData0.NetCache_currentResponse.crc) {
- try {
- NetCache.NetCache_socket.close();
- } catch (Exception var23) {
- ;
- }
-
- ++NetCache.NetCache_crcMismatches;
- NetCache.NetCache_socket = null;
- NetCache.__iq_b = (byte)((int)(Math.random() * 255.0D + 1.0D));
- var1 = false;
- break label242;
- }
-
- NetCache.NetCache_crcMismatches = 0;
- NetCache.NetCache_ioExceptions = 0;
- ModelData0.NetCache_currentResponse.indexCache.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), WorldComparator.__u_n);
- }
-
- ModelData0.NetCache_currentResponse.remove();
- if(WorldComparator.__u_n) {
- --NetCache.NetCache_pendingPriorityResponsesCount;
- } else {
- --NetCache.NetCache_pendingResponsesCount;
- }
-
- NetCache.__iq_j = 0;
- ModelData0.NetCache_currentResponse = null;
- class22.NetCache_responseArchiveBuffer = null;
- } else {
- if(NetCache.__iq_j != 512) {
- break;
- }
-
- NetCache.__iq_j = 0;
- }
- }
- }
-
- var1 = true;
- }
- } catch (IOException var24) {
- try {
- NetCache.NetCache_socket.close();
- } catch (Exception var22) {
- ;
- }
-
- ++NetCache.NetCache_ioExceptions;
- NetCache.NetCache_socket = null;
- var1 = false;
- }
- }
-
- if(!var1) {
- this.doCycleJs5Connect();
- }
-
- }
- }
-
- @ObfuscatedName("ev")
- @ObfuscatedSignature(
- signature = "(B)V",
- garbageValue = "111"
- )
- @Export("doCycleJs5Connect")
- void doCycleJs5Connect() {
- if(NetCache.NetCache_crcMismatches >= 4) {
- this.error("js5crc");
- gameState = 1000;
- } else {
- if(NetCache.NetCache_ioExceptions >= 4) {
- if(gameState <= 5) {
- this.error("js5io");
- gameState = 1000;
- return;
- }
-
- __client_dp = 3000;
- NetCache.NetCache_ioExceptions = 3;
- }
-
- if(--__client_dp + 1 <= 0) {
- try {
- if(js5ConnectState == 0) {
- class210.js5SocketTask = GameShell.taskHandler.newSocketTask(class50.worldHost, class203.port3);
- ++js5ConnectState;
- }
-
- if(js5ConnectState == 1) {
- if(class210.js5SocketTask.status == 2) {
- this.js5Error(-1);
- return;
- }
-
- if(class210.js5SocketTask.status == 1) {
- ++js5ConnectState;
- }
- }
-
- if(js5ConnectState == 2) {
- if(useBufferedSocket) {
- DynamicObject.js5Socket = BufferedFile.method2719((Socket)class210.js5SocketTask.result, 40000, 5000);
- } else {
- DynamicObject.js5Socket = new NetSocket((Socket)class210.js5SocketTask.result, GameShell.taskHandler, 5000);
- }
-
- Buffer var1 = new Buffer(5);
- var1.writeByte(15);
- var1.writeInt(180);
- DynamicObject.js5Socket.write(var1.array, 0, 5);
- ++js5ConnectState;
- GameObject.js5StartTimeMs = class203.currentTimeMs();
- }
-
- if(js5ConnectState == 3) {
- if(DynamicObject.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) {
- int var5 = DynamicObject.js5Socket.readUnsignedByte();
- if(var5 != 0) {
- this.js5Error(var5);
- return;
- }
-
- ++js5ConnectState;
- } else if(class203.currentTimeMs() - GameObject.js5StartTimeMs > 30000L) {
- this.js5Error(-2);
- return;
- }
- }
-
- if(js5ConnectState == 4) {
- AbstractSocket var10 = DynamicObject.js5Socket;
- boolean var2 = gameState > 20;
- if(NetCache.NetCache_socket != null) {
- try {
- NetCache.NetCache_socket.close();
- } catch (Exception var8) {
- ;
- }
-
- NetCache.NetCache_socket = null;
- }
-
- NetCache.NetCache_socket = var10;
- UserComparator9.method3343(var2);
- NetCache.NetCache_responseHeaderBuffer.index = 0;
- ModelData0.NetCache_currentResponse = null;
- class22.NetCache_responseArchiveBuffer = null;
- NetCache.__iq_j = 0;
-
- while(true) {
- NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first();
- if(var3 == null) {
- while(true) {
- var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first();
- if(var3 == null) {
- if(NetCache.__iq_b != 0) {
- try {
- Buffer var11 = new Buffer(4);
- var11.writeByte(4);
- var11.writeByte(NetCache.__iq_b);
- var11.writeShort(0);
- NetCache.NetCache_socket.write(var11.array, 0, 4);
- } catch (IOException var7) {
- try {
- NetCache.NetCache_socket.close();
- } catch (Exception var6) {
- ;
- }
-
- ++NetCache.NetCache_ioExceptions;
- NetCache.NetCache_socket = null;
- }
- }
-
- NetCache.__iq_f = 0;
- NetCache.__iq_q = class203.currentTimeMs();
- class210.js5SocketTask = null;
- DynamicObject.js5Socket = null;
- js5ConnectState = 0;
- js5Errors = 0;
- return;
- }
-
- NetCache.NetCache_pendingWritesQueue.addLast(var3);
- NetCache.NetCache_pendingWrites.put(var3, var3.key);
- ++NetCache.NetCache_pendingWritesCount;
- --NetCache.NetCache_pendingResponsesCount;
- }
- }
-
- NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key);
- ++NetCache.NetCache_pendingPriorityWritesCount;
- --NetCache.NetCache_pendingPriorityResponsesCount;
- }
- }
- } catch (IOException var9) {
- this.js5Error(-3);
- }
-
- }
- }
- }
-
- @ObfuscatedName("ea")
- @ObfuscatedSignature(
- signature = "(IS)V",
- garbageValue = "2348"
- )
- @Export("js5Error")
- void js5Error(int var1) {
- class210.js5SocketTask = null;
- DynamicObject.js5Socket = null;
- js5ConnectState = 0;
- if(class2.port1 == class203.port3) {
- class203.port3 = WorldMapArea.port2;
- } else {
- class203.port3 = class2.port1;
- }
-
- ++js5Errors;
- if(js5Errors >= 2 && (var1 == 7 || var1 == 9)) {
- if(gameState <= 5) {
- this.error("js5connect_full");
- gameState = 1000;
- } else {
- __client_dp = 3000;
- }
- } else if(js5Errors >= 2 && var1 == 6) {
- this.error("js5connect_outofdate");
- gameState = 1000;
- } else if(js5Errors >= 4) {
- if(gameState <= 5) {
- this.error("js5connect");
- gameState = 1000;
- } else {
- __client_dp = 3000;
- }
- }
-
- }
-
- @ObfuscatedName("fg")
- @ObfuscatedSignature(
- signature = "(B)V",
- garbageValue = "-110"
- )
- @Export("doCycleLoggedOut")
- final void doCycleLoggedOut() {
- Object var1 = packetWriter.getSocket();
- PacketBuffer var2 = packetWriter.packetBuffer;
-
- try {
- if(loginState == 0) {
- if(WorldMapIcon1.secureRandom == null && (secureRandomFuture.isDone() || __client_ex > 250)) {
- WorldMapIcon1.secureRandom = secureRandomFuture.get();
- secureRandomFuture.shutdown();
- secureRandomFuture = null;
- }
-
- if(WorldMapIcon1.secureRandom != null) {
- if(var1 != null) {
- ((AbstractSocket)var1).close();
- var1 = null;
- }
-
- UserComparator3.socketTask = null;
- __client_fh = false;
- __client_ex = 0;
- loginState = 1;
- }
- }
-
- if(loginState == 1) {
- if(UserComparator3.socketTask == null) {
- UserComparator3.socketTask = GameShell.taskHandler.newSocketTask(class50.worldHost, class203.port3);
- }
-
- if(UserComparator3.socketTask.status == 2) {
- throw new IOException();
- }
-
- if(UserComparator3.socketTask.status == 1) {
- if(useBufferedSocket) {
- var1 = BufferedFile.method2719((Socket)UserComparator3.socketTask.result, 40000, 5000);
- } else {
- var1 = new NetSocket((Socket)UserComparator3.socketTask.result, GameShell.taskHandler, 5000);
- }
-
- packetWriter.setSocket((AbstractSocket)var1);
- UserComparator3.socketTask = null;
- loginState = 2;
- }
- }
-
- if(loginState == 2) {
- packetWriter.__m_165();
- PacketBufferNode var4;
- if(PacketBufferNode.__gg_u == 0) {
- var4 = new PacketBufferNode();
- } else {
- var4 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.__gg_u];
- }
-
- var4.__m = null;
- var4.__f = 0;
- var4.packetBuffer = new PacketBuffer(5000);
- var4.packetBuffer.writeByte(LoginPacket.__gl_m.id);
- packetWriter.__q_167(var4);
- packetWriter.__f_166();
- var2.index = 0;
- loginState = 3;
- }
-
- boolean var12;
- int var13;
- if(loginState == 3) {
- if(WorldMapCacheName.pcmPlayer0 != null) {
- WorldMapCacheName.pcmPlayer0.__ac_176();
- }
-
- if(AbstractIndexCache.pcmPlayer1 != null) {
- AbstractIndexCache.pcmPlayer1.__ac_176();
- }
-
- var12 = true;
- if(useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) {
- var12 = false;
- }
-
- if(var12) {
- var13 = ((AbstractSocket)var1).readUnsignedByte();
- if(WorldMapCacheName.pcmPlayer0 != null) {
- WorldMapCacheName.pcmPlayer0.__ac_176();
- }
-
- if(AbstractIndexCache.pcmPlayer1 != null) {
- AbstractIndexCache.pcmPlayer1.__ac_176();
- }
-
- if(var13 != 0) {
- IsaacCipher.method4093(var13);
- return;
- }
-
- var2.index = 0;
- loginState = 4;
- }
- }
-
- int var25;
- if(loginState == 4) {
- if(var2.index < 8) {
- var25 = ((AbstractSocket)var1).available();
- if(var25 > 8 - var2.index) {
- var25 = 8 - var2.index;
- }
-
- if(var25 > 0) {
- ((AbstractSocket)var1).read(var2.array, var2.index, var25);
- var2.index += var25;
- }
- }
-
- if(var2.index == 8) {
- var2.index = 0;
- MusicPatchNode2.__hd_fc = var2.readLong();
- loginState = 5;
- }
- }
-
- if(loginState == 5) {
- packetWriter.packetBuffer.index = 0;
- packetWriter.__m_165();
- PacketBuffer var3 = new PacketBuffer(500);
- int[] var20 = new int[]{WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt()};
- var3.index = 0;
- var3.writeByte(1);
- var3.writeInt(var20[0]);
- var3.writeInt(var20[1]);
- var3.writeInt(var20[2]);
- var3.writeInt(var20[3]);
- var3.writeLong(MusicPatchNode2.__hd_fc);
- if(gameState == 40) {
- var3.writeInt(Skills.__hc_ef[0]);
- var3.writeInt(Skills.__hc_ef[1]);
- var3.writeInt(Skills.__hc_ef[2]);
- var3.writeInt(Skills.__hc_ef[3]);
- } else {
- var3.writeByte(field658.rsOrdinal());
- switch(field658.field1984) {
- case 0:
- case 3:
- var3.writeMedium(class13.__i_af);
- ++var3.index;
- break;
- case 1:
- var3.index += 4;
- break;
- case 2:
- var3.writeInt(((Integer)ReflectionCheck.clientPreferences.parameters.get(Integer.valueOf(class279.method5357(Login.Login_username)))).intValue());
- }
-
- var3.writeByte(class313.field3834.rsOrdinal());
- var3.writeStringCp1252NullTerminated(Login.Login_password);
- }
-
- var3.encryptRsa(class83.__cm_m, class83.__cm_f);
- Skills.__hc_ef = var20;
- PacketBufferNode var6;
- if(PacketBufferNode.__gg_u == 0) {
- var6 = new PacketBufferNode();
- } else {
- var6 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.__gg_u];
- }
-
- var6.__m = null;
- var6.__f = 0;
- var6.packetBuffer = new PacketBuffer(5000);
- var6.packetBuffer.index = 0;
- if(gameState == 40) {
- var6.packetBuffer.writeByte(LoginPacket.__gl_w.id);
- } else {
- var6.packetBuffer.writeByte(LoginPacket.__gl_q.id);
- }
-
- var6.packetBuffer.writeShort(0);
- int var14 = var6.packetBuffer.index;
- var6.packetBuffer.writeInt(180);
- var6.packetBuffer.writeInt(1);
- var6.packetBuffer.writeByte(clientType);
- var6.packetBuffer.__s_297(var3.array, 0, var3.index);
- int var8 = var6.packetBuffer.index;
- var6.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username);
- var6.packetBuffer.writeByte((isResizable?1:0) << 1 | (isLowDetail?1:0));
- var6.packetBuffer.writeShort(SoundCache.canvasWidth);
- var6.packetBuffer.writeShort(Huffman.canvasHeight);
- Varps.method4400(var6.packetBuffer);
- var6.packetBuffer.writeStringCp1252NullTerminated(class21.__b_by);
- var6.packetBuffer.writeInt(AbstractIndexCache.__ir_bu);
- Buffer var9 = new Buffer(WorldMapLabelSize.platformInfo.size());
- WorldMapLabelSize.platformInfo.write(var9);
- var6.packetBuffer.__s_297(var9.array, 0, var9.array.length);
- var6.packetBuffer.writeByte(clientType);
- var6.packetBuffer.writeInt(0);
- var6.packetBuffer.writeInt(AbstractIndexCache.indexCache0.hash);
- var6.packetBuffer.writeInt(Skeleton.indexCache1.hash);
- var6.packetBuffer.writeInt(ObjectSound.indexCache2.hash);
- var6.packetBuffer.writeInt(WorldMapIcon1.indexCache3.hash);
- var6.packetBuffer.writeInt(class25.indexCache4.hash);
- var6.packetBuffer.writeInt(SecureRandomFuture.indexCache5.hash);
- var6.packetBuffer.writeInt(UserComparator3.indexCache6.hash);
- var6.packetBuffer.writeInt(class40.indexCache7.hash);
- var6.packetBuffer.writeInt(WorldMapSection3.indexCache8.hash);
- var6.packetBuffer.writeInt(class238.indexCache9.hash);
- var6.packetBuffer.writeInt(class16.indexCache10.hash);
- var6.packetBuffer.writeInt(Login.indexCache11.hash);
- var6.packetBuffer.writeInt(Formatting.indexCache12.hash);
- var6.packetBuffer.writeInt(ByteArrayPool.indexCache13.hash);
- var6.packetBuffer.writeInt(class2.indexCache14.hash);
- var6.packetBuffer.writeInt(WorldMapSection1.indexCache15.hash);
- var6.packetBuffer.writeInt(0);
- var6.packetBuffer.writeInt(class22.indexCache16.hash);
- var6.packetBuffer.writeInt(WorldMapLabelSize.__s_dq.hash);
- var6.packetBuffer.writeInt(ItemContainer.__bc_dm.hash);
- var6.packetBuffer.writeInt(AbstractByteArrayCopier.__gu_et.hash);
- var6.packetBuffer.xteaEncrypt(var20, var8, var6.packetBuffer.index);
- var6.packetBuffer.__y_299(var6.packetBuffer.index - var14);
- packetWriter.__q_167(var6);
- packetWriter.__f_166();
- packetWriter.isaacCipher = new IsaacCipher(var20);
- int[] var10 = new int[4];
-
- for(int var11 = 0; var11 < 4; ++var11) {
- var10[var11] = var20[var11] + 50;
- }
-
- var2.newIsaacCipher(var10);
- loginState = 6;
- }
-
- if(loginState == 6 && ((AbstractSocket)var1).available() > 0) {
- var25 = ((AbstractSocket)var1).readUnsignedByte();
- if(var25 == 21 && gameState == 20) {
- loginState = 9;
- } else if(var25 == 2) {
- loginState = 11;
- } else if(var25 == 15 && gameState == 40) {
- packetWriter.serverPacket0Length = -1;
- loginState = 16;
- } else if(var25 == 64) {
- loginState = 7;
- } else if(var25 == 23 && __client_ej < 1) {
- ++__client_ej;
- loginState = 0;
- } else {
- if(var25 != 29) {
- IsaacCipher.method4093(var25);
- return;
- }
-
- loginState = 14;
- }
- }
-
- if(loginState == 7 && ((AbstractSocket)var1).available() > 0) {
- WorldMapSection1.__as_ey = ((AbstractSocket)var1).readUnsignedByte();
- loginState = 8;
- }
-
- if(loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection1.__as_ey) {
- ((AbstractSocket)var1).read(var2.array, 0, WorldMapSection1.__as_ey);
- var2.index = 0;
- loginState = 6;
- }
-
- if(loginState == 9 && ((AbstractSocket)var1).available() > 0) {
- __client_el = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60;
- loginState = 10;
- }
-
- if(loginState == 10) {
- __client_ex = 0;
- class54.method1089("You have only just left another world.", "Your profile will be transferred in:", __client_el / 60 + " seconds.");
- if(--__client_el <= 0) {
- loginState = 0;
- }
-
- } else {
- if(loginState == 11 && ((AbstractSocket)var1).available() >= 1) {
- __client_eo = ((AbstractSocket)var1).readUnsignedByte();
- loginState = 12;
- }
-
- if(loginState == 12 && ((AbstractSocket)var1).available() >= __client_eo) {
- var12 = ((AbstractSocket)var1).readUnsignedByte() == 1;
- ((AbstractSocket)var1).read(var2.array, 0, 4);
- var2.index = 0;
- boolean var26 = false;
- if(var12) {
- var13 = var2.readByteIsaac() << 24;
- var13 |= var2.readByteIsaac() << 16;
- var13 |= var2.readByteIsaac() << 8;
- var13 |= var2.readByteIsaac();
- int var15 = class279.method5357(Login.Login_username);
- if(ReflectionCheck.clientPreferences.parameters.size() >= 10 && !ReflectionCheck.clientPreferences.parameters.containsKey(Integer.valueOf(var15))) {
- Iterator var24 = ReflectionCheck.clientPreferences.parameters.entrySet().iterator();
- var24.next();
- var24.remove();
- }
-
- ReflectionCheck.clientPreferences.parameters.put(Integer.valueOf(var15), Integer.valueOf(var13));
- }
-
- if(Login_isUsernameRemembered) {
- ReflectionCheck.clientPreferences.rememberedUsername = Login.Login_username;
- } else {
- ReflectionCheck.clientPreferences.rememberedUsername = null;
- }
-
- WorldMapSection0.method247();
- rights = ((AbstractSocket)var1).readUnsignedByte();
- __client_mn = ((AbstractSocket)var1).readUnsignedByte() == 1;
- localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte();
- localPlayerIndex <<= 8;
- localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte();
- __client_jo = ((AbstractSocket)var1).readUnsignedByte();
- ((AbstractSocket)var1).read(var2.array, 0, 1);
- var2.index = 0;
- ServerPacket[] var5 = class27.method429();
- int var16 = var2.readSmartByteShortIsaac();
- if(var16 < 0 || var16 >= var5.length) {
- throw new IOException(var16 + " " + var2.index);
- }
-
- packetWriter.serverPacket0 = var5[var16];
- packetWriter.serverPacket0Length = packetWriter.serverPacket0.length;
- ((AbstractSocket)var1).read(var2.array, 0, 2);
- var2.index = 0;
- packetWriter.serverPacket0Length = var2.__ag_302();
-
- try {
- Client var7 = TextureProvider.client;
- JSObject.getWindow(var7).call("zap", (Object[])null);
- } catch (Throwable var17) {
- ;
- }
-
- loginState = 13;
- }
-
- if(loginState == 13) {
- if(((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) {
- var2.index = 0;
- ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacket0Length);
- timer.__w_456();
- WorldMapSection1.method808();
- class11.updatePlayer(var2);
- GameObject.__eh_fy = -1;
- class50.loadRegions(false, var2);
- packetWriter.serverPacket0 = null;
- }
-
- } else {
- if(loginState == 14 && ((AbstractSocket)var1).available() >= 2) {
- var2.index = 0;
- ((AbstractSocket)var1).read(var2.array, 0, 2);
- var2.index = 0;
- IndexCacheLoader.__bd_er = var2.__ag_302();
- loginState = 15;
- }
-
- if(loginState == 15 && ((AbstractSocket)var1).available() >= IndexCacheLoader.__bd_er) {
- var2.index = 0;
- ((AbstractSocket)var1).read(var2.array, 0, IndexCacheLoader.__bd_er);
- var2.index = 0;
- String var19 = var2.readStringCp1252NullTerminated();
- String var21 = var2.readStringCp1252NullTerminated();
- String var22 = var2.readStringCp1252NullTerminated();
- class54.method1089(var19, var21, var22);
- GameShell.updateGameState(10);
- }
-
- if(loginState != 16) {
- ++__client_ex;
- if(__client_ex > 2000) {
- if(__client_ej < 1) {
- if(class203.port3 == class2.port1) {
- class203.port3 = WorldMapArea.port2;
- } else {
- class203.port3 = class2.port1;
- }
-
- ++__client_ej;
- loginState = 0;
- } else {
- IsaacCipher.method4093(-3);
- }
- }
- } else {
- if(packetWriter.serverPacket0Length == -1) {
- if(((AbstractSocket)var1).available() < 2) {
- return;
- }
-
- ((AbstractSocket)var1).read(var2.array, 0, 2);
- var2.index = 0;
- packetWriter.serverPacket0Length = var2.__ag_302();
- }
-
- if(((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) {
- ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacket0Length);
- var2.index = 0;
- var25 = packetWriter.serverPacket0Length;
- timer.__u_458();
- packetWriter.__m_165();
- packetWriter.packetBuffer.index = 0;
- packetWriter.serverPacket0 = null;
- packetWriter.__k = null;
- packetWriter.__n = null;
- packetWriter.__i = null;
- packetWriter.serverPacket0Length = 0;
- packetWriter.__x = 0;
- rebootTimer = 0;
- menuOptionsCount = 0;
- isMenuOpen = false;
- minimapState = 0;
- destinationX = 0;
-
- for(var13 = 0; var13 < 2048; ++var13) {
- players[var13] = null;
- }
-
- Canvas.localPlayer = null;
-
- for(var13 = 0; var13 < npcs.length; ++var13) {
- Npc var23 = npcs[var13];
- if(var23 != null) {
- var23.targetIndex = -1;
- var23.false0 = false;
- }
- }
-
- SpriteMask.method4389();
- GameShell.updateGameState(30);
-
- for(var13 = 0; var13 < 100; ++var13) {
- __client_od[var13] = true;
- }
-
- AbstractByteArrayCopier.method4024();
- class11.updatePlayer(var2);
- if(var25 != var2.index) {
- throw new RuntimeException();
- }
- }
- }
- }
- }
- } catch (IOException var18) {
- if(__client_ej < 1) {
- if(class2.port1 == class203.port3) {
- class203.port3 = WorldMapArea.port2;
- } else {
- class203.port3 = class2.port1;
- }
-
- ++__client_ej;
- loginState = 0;
- } else {
- IsaacCipher.method4093(-2);
- }
- }
- }
-
- @ObfuscatedName("fx")
- @ObfuscatedSignature(
- signature = "(I)V",
- garbageValue = "1646308927"
- )
- @Export("doCycleLoggedIn")
- final void doCycleLoggedIn() {
- if(rebootTimer > 1) {
- --rebootTimer;
- }
-
- if(__client_fd > 0) {
- --__client_fd;
- }
-
- if(__client_fh) {
- __client_fh = false;
- class48.method868();
- } else {
- if(!isMenuOpen) {
- class30.method569();
- }
-
- int var1;
- for(var1 = 0; var1 < 100 && this.__hg_138(packetWriter); ++var1) {
- ;
- }
-
- if(gameState == 30) {
- while(true) {
- ReflectionCheck var2 = (ReflectionCheck)class322.reflectionChecks.last();
- boolean var29;
- if(var2 == null) {
- var29 = false;
- } else {
- var29 = true;
- }
-
- int var3;
- PacketBufferNode var30;
- if(!var29) {
- PacketBufferNode var14;
- int var15;
- if(timer.__q) {
- var14 = Interpreter.method1915(ClientPacket.__gs_o, packetWriter.isaacCipher);
- var14.packetBuffer.writeByte(0);
- var15 = var14.packetBuffer.index;
- timer.write(var14.packetBuffer);
- var14.packetBuffer.__h_300(var14.packetBuffer.index - var15);
- packetWriter.__q_167(var14);
- timer.__o_457();
- }
-
- Object var34 = Projectile.mouseRecorder.lock;
- int var4;
- int var5;
- int var6;
- int var7;
- int var8;
- int var9;
- int var10;
- int var11;
- int var12;
- synchronized(Projectile.mouseRecorder.lock) {
- if(!__client_ai) {
- Projectile.mouseRecorder.index = 0;
- } else if(MouseHandler.MouseHandler_lastButton != 0 || Projectile.mouseRecorder.index >= 40) {
- var30 = null;
- var3 = 0;
- var4 = 0;
- var5 = 0;
- var6 = 0;
-
- for(var7 = 0; var7 < Projectile.mouseRecorder.index && (var30 == null || var30.packetBuffer.index - var3 < 246); ++var7) {
- var4 = var7;
- var8 = Projectile.mouseRecorder.ys[var7];
- if(var8 < -1) {
- var8 = -1;
- } else if(var8 > 65534) {
- var8 = 65534;
- }
-
- var9 = Projectile.mouseRecorder.xs[var7];
- if(var9 < -1) {
- var9 = -1;
- } else if(var9 > 65534) {
- var9 = 65534;
- }
-
- if(var9 != __client_cn || var8 != __client_cq) {
- if(var30 == null) {
- var30 = Interpreter.method1915(ClientPacket.__gs_ak, packetWriter.isaacCipher);
- var30.packetBuffer.writeByte(0);
- var3 = var30.packetBuffer.index;
- var30.packetBuffer.index += 2;
- var5 = 0;
- var6 = 0;
- }
-
- if(-1L != __client_ch) {
- var10 = var9 - __client_cn;
- var11 = var8 - __client_cq;
- var12 = (int)((Projectile.mouseRecorder.millis[var7] - __client_ch) / 20L);
- var5 = (int)((long)var5 + (Projectile.mouseRecorder.millis[var7] - __client_ch) % 20L);
- } else {
- var10 = var9;
- var11 = var8;
- var12 = Integer.MAX_VALUE;
- }
-
- __client_cn = var9;
- __client_cq = var8;
- if(var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) {
- var10 += 32;
- var11 += 32;
- var30.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6));
- } else if(var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) {
- var10 += 128;
- var11 += 128;
- var30.packetBuffer.writeByte(var12 + 128);
- var30.packetBuffer.writeShort(var11 + (var10 << 8));
- } else if(var12 < 32) {
- var30.packetBuffer.writeByte(var12 + 192);
- if(var9 != -1 && var8 != -1) {
- var30.packetBuffer.writeInt(var9 | var8 << 16);
- } else {
- var30.packetBuffer.writeInt(Integer.MIN_VALUE);
- }
- } else {
- var30.packetBuffer.writeShort((var12 & 8191) + 57344);
- if(var9 != -1 && var8 != -1) {
- var30.packetBuffer.writeInt(var9 | var8 << 16);
- } else {
- var30.packetBuffer.writeInt(Integer.MIN_VALUE);
- }
- }
-
- ++var6;
- __client_ch = Projectile.mouseRecorder.millis[var7];
- }
- }
-
- if(var30 != null) {
- var30.packetBuffer.__h_300(var30.packetBuffer.index - var3);
- var7 = var30.packetBuffer.index;
- var30.packetBuffer.index = var3;
- var30.packetBuffer.writeByte(var5 / var6);
- var30.packetBuffer.writeByte(var5 % var6);
- var30.packetBuffer.index = var7;
- packetWriter.__q_167(var30);
- }
-
- if(var4 >= Projectile.mouseRecorder.index) {
- Projectile.mouseRecorder.index = 0;
- } else {
- Projectile.mouseRecorder.index -= var4;
- System.arraycopy(Projectile.mouseRecorder.xs, var4, Projectile.mouseRecorder.xs, 0, Projectile.mouseRecorder.index);
- System.arraycopy(Projectile.mouseRecorder.ys, var4, Projectile.mouseRecorder.ys, 0, Projectile.mouseRecorder.index);
- System.arraycopy(Projectile.mouseRecorder.millis, var4, Projectile.mouseRecorder.millis, 0, Projectile.mouseRecorder.index);
- }
- }
- }
-
- PacketBufferNode var18;
- if(MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.__lp_ca && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) {
- long var16 = (MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L) / 50L;
- if(var16 > 4095L) {
- var16 = 4095L;
- }
-
- mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis * -1L;
- var3 = MouseHandler.MouseHandler_lastPressedY;
- if(var3 < 0) {
- var3 = 0;
- } else if(var3 > Huffman.canvasHeight) {
- var3 = Huffman.canvasHeight;
- }
-
- var4 = MouseHandler.MouseHandler_lastPressedX;
- if(var4 < 0) {
- var4 = 0;
- } else if(var4 > SoundCache.canvasWidth) {
- var4 = SoundCache.canvasWidth;
- }
-
- var5 = (int)var16;
- var18 = Interpreter.method1915(ClientPacket.__gs_ap, packetWriter.isaacCipher);
- var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2?1:0));
- var18.packetBuffer.writeShort(var4);
- var18.packetBuffer.writeShort(var3);
- packetWriter.__q_167(var18);
- }
-
- if(KeyHandler.__an_cl > 0) {
- var14 = Interpreter.method1915(ClientPacket.__gs_bj, packetWriter.isaacCipher);
- var14.packetBuffer.writeShort(0);
- var15 = var14.packetBuffer.index;
- long var19 = class203.currentTimeMs();
-
- for(var5 = 0; var5 < KeyHandler.__an_cl; ++var5) {
- long var21 = var19 - __client_pp;
- if(var21 > 16777215L) {
- var21 = 16777215L;
- }
-
- __client_pp = var19;
- var14.packetBuffer.__ai_315(KeyHandler.__an_cp[var5]);
- var14.packetBuffer.writeMedium((int)var21);
- }
-
- var14.packetBuffer.__y_299(var14.packetBuffer.index - var15);
- packetWriter.__q_167(var14);
- }
-
- if(__client_iy > 0) {
- --__client_iy;
- }
-
- if(KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) {
- __client_is = true;
- }
-
- if(__client_is && __client_iy <= 0) {
- __client_iy = 20;
- __client_is = false;
- var14 = Interpreter.method1915(ClientPacket.__gs_at, packetWriter.isaacCipher);
- var14.packetBuffer.__bx_323(cameraPitchTarget);
- var14.packetBuffer.writeShortLE(minimapOrientation);
- packetWriter.__q_167(var14);
- }
-
- if(class230.__hy_az && !__client_cw) {
- __client_cw = true;
- var14 = Interpreter.method1915(ClientPacket.__gs_bf, packetWriter.isaacCipher);
- var14.packetBuffer.writeByte(1);
- packetWriter.__q_167(var14);
- }
-
- if(!class230.__hy_az && __client_cw) {
- __client_cw = false;
- var14 = Interpreter.method1915(ClientPacket.__gs_bf, packetWriter.isaacCipher);
- var14.packetBuffer.writeByte(0);
- packetWriter.__q_167(var14);
- }
-
- if(class60.worldMap0 != null) {
- class60.worldMap0.__f_518();
- }
-
- class266.method5120();
- Message.method1228();
- if(gameState != 30) {
- return;
- }
-
- Canvas.method855();
- WorldMapIcon1.method212();
- ++packetWriter.__x;
- if(packetWriter.__x > 750) {
- class48.method868();
- return;
- }
-
- var1 = Players.Players_count;
- int[] var31 = Players.Players_indices;
-
- for(var3 = 0; var3 < var1; ++var3) {
- Player var23 = players[var31[var3]];
- if(var23 != null) {
- class65.method1232(var23, 1);
- }
- }
-
- for(var1 = 0; var1 < npcCount; ++var1) {
- var15 = npcIndices[var1];
- Npc var24 = npcs[var15];
- if(var24 != null) {
- class65.method1232(var24, var24.definition.size);
- }
- }
-
- Buddy.method5554();
- ++__client_gy;
- if(mouseCrossColor != 0) {
- mouseCrossState += 20;
- if(mouseCrossState >= 400) {
- mouseCrossColor = 0;
- }
- }
-
- if(BoundaryObject.__ej_jv != null) {
- ++__client_ju;
- if(__client_ju >= 15) {
- class22.method295(BoundaryObject.__ej_jv);
- BoundaryObject.__ej_jv = null;
- }
- }
-
- Widget var35 = Clock.mousedOverWidgetIf1;
- Widget var32 = AccessFile.__dk_lm;
- Clock.mousedOverWidgetIf1 = null;
- AccessFile.__dk_lm = null;
- draggedOnWidget = null;
- __client_nt = false;
- __client_nn = false;
- __client_pm = 0;
-
- while(Decimator.method2490() && __client_pm < 128) {
- if(rights >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && IndexStoreAction.__ik_cn == 66) {
- String var37 = KeyHandler.method839();
- TextureProvider.client.clipboardSetString(var37);
- } else if(oculusOrbState != 1 || GzipDecompressor.__go_ck <= 0) {
- __client_pn[__client_pm] = IndexStoreAction.__ik_cn;
- __client_pq[__client_pm] = GzipDecompressor.__go_ck;
- ++__client_pm;
- }
- }
-
- if(FriendSystem.jmodCheck() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) {
- var3 = Canvas.localPlayer.plane - mouseWheelRotation;
- if(var3 < 0) {
- var3 = 0;
- } else if(var3 > 3) {
- var3 = 3;
- }
-
- if(var3 != Canvas.localPlayer.plane) {
- var4 = Canvas.localPlayer.pathX[0] + class50.baseX;
- var5 = Canvas.localPlayer.pathY[0] + GraphicsObject.baseY;
- var18 = Interpreter.method1915(ClientPacket.__gs_bx, packetWriter.isaacCipher);
- var18.packetBuffer.writeIntME(0);
- var18.packetBuffer.writeShortLE(var5);
- var18.packetBuffer.__ai_315(var3);
- var18.packetBuffer.writeShort(var4);
- packetWriter.__q_167(var18);
- }
-
- mouseWheelRotation = 0;
- }
-
- if(rootWidgetGroup != -1) {
- class231.method4517(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0);
- }
-
- ++cycleCntr;
-
- while(true) {
- Widget var25;
- Widget var36;
- ScriptEvent var38;
- do {
- var38 = (ScriptEvent)__client_oh.removeLast();
- if(var38 == null) {
- while(true) {
- do {
- var38 = (ScriptEvent)__client_oc.removeLast();
- if(var38 == null) {
- while(true) {
- do {
- var38 = (ScriptEvent)scriptEvents.removeLast();
- if(var38 == null) {
- this.__hi_139();
- WorldMapSectionType.method254();
- if(clickedWidget != null) {
- this.__jh_142();
- }
-
- PacketBufferNode var40;
- if(DevicePcmPlayerProvider.dragInventoryWidget != null) {
- class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
- ++itemDragDuration;
- if(MouseHandler.MouseHandler_currentButton == 0) {
- if(__client_jl) {
- if(UserComparator6.__fg_jh == DevicePcmPlayerProvider.dragInventoryWidget && dragItemSlotSource != dragItemSlotDestination) {
- Widget var39 = DevicePcmPlayerProvider.dragInventoryWidget;
- byte var33 = 0;
- if(__client_mb == 1 && var39.contentType == 206) {
- var33 = 1;
- }
-
- if(var39.itemIds[dragItemSlotDestination] <= 0) {
- var33 = 0;
- }
-
- if(class168.method3461(class1.getWidgetClickMask(var39))) {
- var5 = dragItemSlotSource;
- var6 = dragItemSlotDestination;
- var39.itemIds[var6] = var39.itemIds[var5];
- var39.itemQuantities[var6] = var39.itemQuantities[var5];
- var39.itemIds[var5] = -1;
- var39.itemQuantities[var5] = 0;
- } else if(var33 == 1) {
- var5 = dragItemSlotSource;
- var6 = dragItemSlotDestination;
-
- while(var5 != var6) {
- if(var5 > var6) {
- var39.swapItems(var5 - 1, var5);
- --var5;
- } else if(var5 < var6) {
- var39.swapItems(var5 + 1, var5);
- ++var5;
- }
- }
- } else {
- var39.swapItems(dragItemSlotDestination, dragItemSlotSource);
- }
-
- var40 = Interpreter.method1915(ClientPacket.__gs_ce, packetWriter.isaacCipher);
- var40.packetBuffer.writeShort(dragItemSlotDestination);
- var40.packetBuffer.writeShortLE(dragItemSlotSource);
- var40.packetBuffer.writeInt(DevicePcmPlayerProvider.dragInventoryWidget.id);
- var40.packetBuffer.__ai_315(var33);
- packetWriter.__q_167(var40);
- }
- } else if(this.shouldLeftClickOpenMenu()) {
- this.openMenu(__client_ja, __client_je);
- } else if(menuOptionsCount > 0) {
- var3 = __client_ja;
- var4 = __client_je;
- class231.method4520(UnitPriceComparator.tempMenuAction, var3, var4);
- UnitPriceComparator.tempMenuAction = null;
- }
-
- __client_ju = 10;
- MouseHandler.MouseHandler_lastButton = 0;
- DevicePcmPlayerProvider.dragInventoryWidget = null;
- } else if(itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > __client_ja + 5 || MouseHandler.MouseHandler_x < __client_ja - 5 || MouseHandler.MouseHandler_y > __client_je + 5 || MouseHandler.MouseHandler_y < __client_je - 5)) {
- __client_jl = true;
- }
- }
-
- if(Scene.method3187()) {
- var3 = Scene.Scene_selectedX;
- var4 = Scene.Scene_selectedY;
- var40 = Interpreter.method1915(ClientPacket.__gs_ct, packetWriter.isaacCipher);
- var40.packetBuffer.writeByte(5);
- var40.packetBuffer.__bo_322(var4 + GraphicsObject.baseY);
- var40.packetBuffer.__bo_322(var3 + class50.baseX);
- var40.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?(KeyHandler.KeyHandler_pressedKeys[81]?2:1):0);
- packetWriter.__q_167(var40);
- Scene.method3103();
- mouseCrossX = MouseHandler.MouseHandler_lastPressedX;
- mouseCrossY = MouseHandler.MouseHandler_lastPressedY;
- mouseCrossColor = 1;
- mouseCrossState = 0;
- destinationX = var3;
- destinationY = var4;
- }
-
- if(var35 != Clock.mousedOverWidgetIf1) {
- if(var35 != null) {
- class22.method295(var35);
- }
-
- if(Clock.mousedOverWidgetIf1 != null) {
- class22.method295(Clock.mousedOverWidgetIf1);
- }
- }
-
- if(var32 != AccessFile.__dk_lm && __client_lb == __client_ls) {
- if(var32 != null) {
- class22.method295(var32);
- }
-
- if(AccessFile.__dk_lm != null) {
- class22.method295(AccessFile.__dk_lm);
- }
- }
-
- if(AccessFile.__dk_lm != null) {
- if(__client_lb < __client_ls) {
- ++__client_lb;
- if(__client_ls == __client_lb) {
- class22.method295(AccessFile.__dk_lm);
- }
- }
- } else if(__client_lb > 0) {
- --__client_lb;
- }
-
- class54.method1091();
- if(isCameraLocked) {
- var3 = class3.__w_qs * 128 + 64;
- var4 = MusicPatchPcmStream.__hq_qg * 128 + 64;
- var5 = class32.getTileHeight(var3, var4, SoundSystem.plane) - AbstractWorldMapIcon.__ak_qj;
- if(WorldMapSection1.cameraX < var3) {
- WorldMapSection1.cameraX = (var3 - WorldMapSection1.cameraX) * class30.__ar_qw / 1000 + WorldMapSection1.cameraX + ClientPacket.__gs_qh;
- if(WorldMapSection1.cameraX > var3) {
- WorldMapSection1.cameraX = var3;
- }
- }
-
- if(WorldMapSection1.cameraX > var3) {
- WorldMapSection1.cameraX -= class30.__ar_qw * (WorldMapSection1.cameraX - var3) / 1000 + ClientPacket.__gs_qh;
- if(WorldMapSection1.cameraX < var3) {
- WorldMapSection1.cameraX = var3;
- }
- }
-
- if(GrandExchangeEvents.cameraY < var5) {
- GrandExchangeEvents.cameraY = (var5 - GrandExchangeEvents.cameraY) * class30.__ar_qw / 1000 + GrandExchangeEvents.cameraY + ClientPacket.__gs_qh;
- if(GrandExchangeEvents.cameraY > var5) {
- GrandExchangeEvents.cameraY = var5;
- }
- }
-
- if(GrandExchangeEvents.cameraY > var5) {
- GrandExchangeEvents.cameraY -= class30.__ar_qw * (GrandExchangeEvents.cameraY - var5) / 1000 + ClientPacket.__gs_qh;
- if(GrandExchangeEvents.cameraY < var5) {
- GrandExchangeEvents.cameraY = var5;
- }
- }
-
- if(class11.cameraZ < var4) {
- class11.cameraZ = (var4 - class11.cameraZ) * class30.__ar_qw / 1000 + class11.cameraZ + ClientPacket.__gs_qh;
- if(class11.cameraZ > var4) {
- class11.cameraZ = var4;
- }
- }
-
- if(class11.cameraZ > var4) {
- class11.cameraZ -= class30.__ar_qw * (class11.cameraZ - var4) / 1000 + ClientPacket.__gs_qh;
- if(class11.cameraZ < var4) {
- class11.cameraZ = var4;
- }
- }
-
- var3 = GrandExchangeOffer.__x_rg * 128 + 64;
- var4 = KeyHandler.__an_ra * 128 + 64;
- var5 = class32.getTileHeight(var3, var4, SoundSystem.plane) - IndexStoreAction.__ik_rt;
- var6 = var3 - WorldMapSection1.cameraX;
- var7 = var5 - GrandExchangeEvents.cameraY;
- var8 = var4 - class11.cameraZ;
- var9 = (int)Math.sqrt((double)(var8 * var8 + var6 * var6));
- var10 = (int)(Math.atan2((double)var7, (double)var9) * 325.949D) & 2047;
- var11 = (int)(Math.atan2((double)var6, (double)var8) * -325.949D) & 2047;
- if(var10 < 128) {
- var10 = 128;
- }
-
- if(var10 > 383) {
- var10 = 383;
- }
-
- if(WorldMapIcon1.cameraPitch < var10) {
- WorldMapIcon1.cameraPitch = (var10 - WorldMapIcon1.cameraPitch) * class171.__fo_ro / 1000 + WorldMapIcon1.cameraPitch + VertexNormal.__dq_rq;
- if(WorldMapIcon1.cameraPitch > var10) {
- WorldMapIcon1.cameraPitch = var10;
- }
- }
-
- if(WorldMapIcon1.cameraPitch > var10) {
- WorldMapIcon1.cameraPitch -= class171.__fo_ro * (WorldMapIcon1.cameraPitch - var10) / 1000 + VertexNormal.__dq_rq;
- if(WorldMapIcon1.cameraPitch < var10) {
- WorldMapIcon1.cameraPitch = var10;
- }
- }
-
- var12 = var11 - MusicPatchNode.cameraYaw;
- if(var12 > 1024) {
- var12 -= 2048;
- }
-
- if(var12 < -1024) {
- var12 += 2048;
- }
-
- if(var12 > 0) {
- MusicPatchNode.cameraYaw = MusicPatchNode.cameraYaw + VertexNormal.__dq_rq + var12 * class171.__fo_ro / 1000;
- MusicPatchNode.cameraYaw &= 2047;
- }
-
- if(var12 < 0) {
- MusicPatchNode.cameraYaw -= VertexNormal.__dq_rq + -var12 * class171.__fo_ro / 1000;
- MusicPatchNode.cameraYaw &= 2047;
- }
-
- int var26 = var11 - MusicPatchNode.cameraYaw;
- if(var26 > 1024) {
- var26 -= 2048;
- }
-
- if(var26 < -1024) {
- var26 += 2048;
- }
-
- if(var26 < 0 && var12 > 0 || var26 > 0 && var12 < 0) {
- MusicPatchNode.cameraYaw = var11;
- }
- }
-
- for(var3 = 0; var3 < 5; ++var3) {
- ++__client_rk[var3];
- }
-
- class196.varcs.tryWrite();
- var3 = class22.method297();
- var4 = KeyHandler.KeyHandler_idleCycles;
- if(var3 > 15000 && var4 > 15000) {
- __client_fd = 250;
- MouseHandler.MouseHandler_idleCycles = 14500;
- var18 = Interpreter.method1915(ClientPacket.__gs_ax, packetWriter.isaacCipher);
- packetWriter.__q_167(var18);
- }
-
- WorldMapArea.friendSystem.__w_154();
- ++packetWriter.__d;
- if(packetWriter.__d > 50) {
- var18 = Interpreter.method1915(ClientPacket.__gs_c, packetWriter.isaacCipher);
- packetWriter.__q_167(var18);
- }
-
- try {
- packetWriter.__f_166();
- } catch (IOException var27) {
- class48.method868();
- }
-
- return;
- }
-
- var36 = var38.widget;
- if(var36.childIndex < 0) {
- break;
- }
-
- var25 = Huffman.getWidget(var36.parentId);
- } while(var25 == null || var25.children == null || var36.childIndex >= var25.children.length || var36 != var25.children[var36.childIndex]);
-
- AbstractIndexCache.runScript(var38);
- }
- }
-
- var36 = var38.widget;
- if(var36.childIndex < 0) {
- break;
- }
-
- var25 = Huffman.getWidget(var36.parentId);
- } while(var25 == null || var25.children == null || var36.childIndex >= var25.children.length || var36 != var25.children[var36.childIndex]);
-
- AbstractIndexCache.runScript(var38);
- }
- }
-
- var36 = var38.widget;
- if(var36.childIndex < 0) {
- break;
- }
-
- var25 = Huffman.getWidget(var36.parentId);
- } while(var25 == null || var25.children == null || var36.childIndex >= var25.children.length || var36 != var25.children[var36.childIndex]);
-
- AbstractIndexCache.runScript(var38);
- }
- }
-
- var30 = Interpreter.method1915(ClientPacket.__gs_cw, packetWriter.isaacCipher);
- var30.packetBuffer.writeByte(0);
- var3 = var30.packetBuffer.index;
- WorldMapLabel.method443(var30.packetBuffer);
- var30.packetBuffer.__h_300(var30.packetBuffer.index - var3);
- packetWriter.__q_167(var30);
- }
- }
- }
- }
-
- @ObfuscatedName("ge")
- @ObfuscatedSignature(
- signature = "(I)V",
- garbageValue = "-1792846917"
- )
- @Export("__ge_137")
- void __ge_137() {
- int var1 = SoundCache.canvasWidth;
- int var2 = Huffman.canvasHeight;
- if(super.contentWidth < var1) {
- var1 = super.contentWidth;
- }
-
- if(super.contentHeight < var2) {
- var2 = super.contentHeight;
- }
-
- if(ReflectionCheck.clientPreferences != null) {
- try {
- Client var3 = TextureProvider.client;
- Object[] var4 = new Object[]{Integer.valueOf(SpotAnimationDefinition.method4822())};
- JSObject.getWindow(var3).call("resize", var4);
- } catch (Throwable var5) {
- ;
- }
- }
-
- }
-
- @ObfuscatedName("gs")
- @ObfuscatedSignature(
- signature = "(I)V",
- garbageValue = "-1433182492"
- )
- @Export("drawLoggedIn")
- final void drawLoggedIn() {
- if(rootWidgetGroup != -1) {
- ClientPreferences.method1809(rootWidgetGroup);
- }
-
- int var1;
- for(var1 = 0; var1 < rootWidgetCount; ++var1) {
- if(__client_od[var1]) {
- __client_ot[var1] = true;
- }
-
- __client_oq[var1] = __client_od[var1];
- __client_od[var1] = false;
- }
-
- __client_oo = cycle;
- __client_lq = -1;
- __client_ln = -1;
- UserComparator6.__fg_jh = null;
- if(rootWidgetGroup != -1) {
- rootWidgetCount = 0;
- Interpreter.drawWidgets(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1);
- }
-
- Rasterizer2D.Rasterizer2D_resetClip();
- if(showMouseCross) {
- if(mouseCrossColor == 1) {
- KeyHandler.crossSprites[mouseCrossState / 100].drawAt2(mouseCrossX - 8, mouseCrossY - 8);
- }
-
- if(mouseCrossColor == 2) {
- KeyHandler.crossSprites[mouseCrossState / 100 + 4].drawAt2(mouseCrossX - 8, mouseCrossY - 8);
- }
- }
-
- int var2;
- int var3;
- int var4;
- int var6;
- int var7;
- int var8;
- if(!isMenuOpen) {
- if(__client_lq != -1) {
- class39.drawMenuActionTextAt(__client_lq, __client_ln);
- }
- } else {
- var1 = class25.menuX;
- var2 = GameShell.menuY;
- var3 = class214.menuWidth;
- var4 = AbstractWorldMapIcon.menuHeight;
- int var5 = 0x5d5447;
- Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5);
- Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0);
- Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0);
- class2.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1);
- var6 = MouseHandler.MouseHandler_x;
- var7 = MouseHandler.MouseHandler_y;
-
- int var9;
- int var10;
- for(var8 = 0; var8 < menuOptionsCount; ++var8) {
- var9 = var2 + (menuOptionsCount - 1 - var8) * 15 + 31;
- var10 = 0xffffff;
- if(var6 > var1 && var6 < var3 + var1 && var7 > var9 - 13 && var7 < var9 + 3) {
- var10 = 0xffff00;
- }
-
- Font var11 = class2.fontBold12;
- String var12;
- if(var8 < 0) {
- var12 = "";
- } else if(menuTargetNames[var8].length() > 0) {
- var12 = menuActions[var8] + " " + menuTargetNames[var8];
- } else {
- var12 = menuActions[var8];
- }
-
- var11.draw(var12, var1 + 3, var9, var10, 0);
- }
-
- var8 = class25.menuX;
- var9 = GameShell.menuY;
- var10 = class214.menuWidth;
- int var13 = AbstractWorldMapIcon.menuHeight;
-
- for(int var14 = 0; var14 < rootWidgetCount; ++var14) {
- if(rootWidgetXs[var14] + rootWidgetWidths[var14] > var8 && rootWidgetXs[var14] < var8 + var10 && rootWidgetYs[var14] + rootWidgetHeights[var14] > var9 && rootWidgetYs[var14] < var9 + var13) {
- __client_ot[var14] = true;
- }
- }
- }
-
- if(gameDrawingMode == 3) {
- for(var1 = 0; var1 < rootWidgetCount; ++var1) {
- if(__client_oq[var1]) {
- Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff00ff, 128);
- } else if(__client_ot[var1]) {
- Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff0000, 128);
- }
- }
- }
-
- var1 = SoundSystem.plane;
- var2 = Canvas.localPlayer.x;
- var3 = Canvas.localPlayer.y;
- var4 = __client_gy;
-
- for(ObjectSound var15 = (ObjectSound)ObjectSound.objectSounds.last(); var15 != null; var15 = (ObjectSound)ObjectSound.objectSounds.previous()) {
- if(var15.soundEffectId != -1 || var15.soundEffectIds != null) {
- var6 = 0;
- if(var2 > var15.__o) {
- var6 += var2 - var15.__o;
- } else if(var2 < var15.__q) {
- var6 += var15.__q - var2;
- }
-
- if(var3 > var15.__u) {
- var6 += var3 - var15.__u;
- } else if(var3 < var15.__w) {
- var6 += var15.__w - var3;
- }
-
- if(var6 - 64 <= var15.__g && __client_qc != 0 && var1 == var15.__f) {
- var6 -= 64;
- if(var6 < 0) {
- var6 = 0;
- }
-
- var7 = (var15.__g - var6) * __client_qc / var15.__g;
- Object var10000;
- if(var15.stream1 == null) {
- if(var15.soundEffectId >= 0) {
- var10000 = null;
- SoundEffect var16 = SoundEffect.readSoundEffect(class25.indexCache4, var15.soundEffectId, 0);
- if(var16 != null) {
- RawSound var17 = var16.toRawSound().resample(MilliClock.decimator);
- RawPcmStream var18 = RawPcmStream.method2497(var17, 100, var7);
- var18.__x_181(-1);
- TaskHandler.pcmStreamMixer.addSubStream(var18);
- var15.stream1 = var18;
- }
- }
- } else {
- var15.stream1.__a_182(var7);
- }
-
- if(var15.stream2 == null) {
- if(var15.soundEffectIds != null && (var15.__n -= var4) <= 0) {
- var8 = (int)(Math.random() * (double)var15.soundEffectIds.length);
- var10000 = null;
- SoundEffect var20 = SoundEffect.readSoundEffect(class25.indexCache4, var15.soundEffectIds[var8], 0);
- if(var20 != null) {
- RawSound var21 = var20.toRawSound().resample(MilliClock.decimator);
- RawPcmStream var19 = RawPcmStream.method2497(var21, 100, var7);
- var19.__x_181(0);
- TaskHandler.pcmStreamMixer.addSubStream(var19);
- var15.stream2 = var19;
- var15.__n = var15.__x + (int)(Math.random() * (double)(var15.__d - var15.__x));
- }
- }
- } else {
- var15.stream2.__a_182(var7);
- if(!var15.stream2.hasNext()) {
- var15.stream2 = null;
- }
- }
- } else {
- if(var15.stream1 != null) {
- TaskHandler.pcmStreamMixer.removeSubStream(var15.stream1);
- var15.stream1 = null;
- }
-
- if(var15.stream2 != null) {
- TaskHandler.pcmStreamMixer.removeSubStream(var15.stream2);
- var15.stream2 = null;
- }
- }
- }
- }
-
- __client_gy = 0;
- }
-
- @ObfuscatedName("hg")
- @ObfuscatedSignature(
- signature = "(Lcl;I)Z",
- garbageValue = "1488446149"
- )
- @Export("__hg_138")
- final boolean __hg_138(PacketWriter var1) {
- AbstractSocket var2 = var1.getSocket();
- PacketBuffer var3 = var1.packetBuffer;
- if(var2 == null) {
- return false;
- } else {
- String var17;
- int var18;
- try {
- int var5;
- if(var1.serverPacket0 == null) {
- if(var1.__e) {
- if(!var2.isAvailable(1)) {
- return false;
- }
-
- var2.read(var1.packetBuffer.array, 0, 1);
- var1.__x = 0;
- var1.__e = false;
- }
-
- var3.index = 0;
- if(var3.__ig_334()) {
- if(!var2.isAvailable(1)) {
- return false;
- }
-
- var2.read(var1.packetBuffer.array, 1, 1);
- var1.__x = 0;
- }
-
- var1.__e = true;
- ServerPacket[] var4 = class27.method429();
- var5 = var3.readSmartByteShortIsaac();
- if(var5 < 0 || var5 >= var4.length) {
- throw new IOException(var5 + " " + var3.index);
- }
-
- var1.serverPacket0 = var4[var5];
- var1.serverPacket0Length = var1.serverPacket0.length;
- }
-
- if(var1.serverPacket0Length == -1) {
- if(!var2.isAvailable(1)) {
- return false;
- }
-
- var1.getSocket().read(var3.array, 0, 1);
- var1.serverPacket0Length = var3.array[0] & 255;
- }
-
- if(var1.serverPacket0Length == -2) {
- if(!var2.isAvailable(2)) {
- return false;
- }
-
- var1.getSocket().read(var3.array, 0, 2);
- var3.index = 0;
- var1.serverPacket0Length = var3.__ag_302();
- }
-
- if(!var2.isAvailable(var1.serverPacket0Length)) {
- return false;
- }
-
- var3.index = 0;
- var2.read(var3.array, 0, var1.serverPacket0Length);
- var1.__x = 0;
- timer.__m_453();
- var1.__i = var1.__n;
- var1.__n = var1.__k;
- var1.__k = var1.serverPacket0;
- if(ServerPacket.__ge_ax == var1.serverPacket0) {
- class16.method189(class190.field2344);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_be == var1.serverPacket0) {
- isCameraLocked = true;
- class3.__w_qs = var3.readUnsignedByte();
- MusicPatchPcmStream.__hq_qg = var3.readUnsignedByte();
- AbstractWorldMapIcon.__ak_qj = var3.__ag_302();
- ClientPacket.__gs_qh = var3.readUnsignedByte();
- class30.__ar_qw = var3.readUnsignedByte();
- if(class30.__ar_qw >= 100) {
- WorldMapSection1.cameraX = class3.__w_qs * 128 + 64;
- class11.cameraZ = MusicPatchPcmStream.__hq_qg * 128 + 64;
- GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection1.cameraX, class11.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.__ak_qj;
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- int var16;
- if(ServerPacket.__ge_aj == var1.serverPacket0) {
- for(var16 = 0; var16 < players.length; ++var16) {
- if(players[var16] != null) {
- players[var16].sequence = -1;
- }
- }
-
- for(var16 = 0; var16 < npcs.length; ++var16) {
- if(npcs[var16] != null) {
- npcs[var16].sequence = -1;
- }
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_s == var1.serverPacket0) {
- Canvas.__ao_gk = var3.__bq_318();
- WorldMapSection3.__p_go = var3.readUnsignedByteNegate();
-
- while(var3.index < var1.serverPacket0Length) {
- var16 = var3.readUnsignedByte();
- class190 var56 = RunException.method3430()[var16];
- class16.method189(var56);
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- Widget var41;
- if(ServerPacket.__ge_bx == var1.serverPacket0) {
- var16 = var3.__aq_303();
- var5 = var3.__bf_332();
- var41 = Huffman.getWidget(var5);
- if(var16 != var41.sequenceId || var16 == -1) {
- var41.sequenceId = var16;
- var41.modelFrame = 0;
- var41.modelFrameCycle = 0;
- class22.method295(var41);
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- Widget var52;
- if(ServerPacket.__ge_ar == var1.serverPacket0) {
- var16 = var3.__bf_332();
- var52 = Huffman.getWidget(var16);
- var52.modelType = 3;
- var52.modelId = Canvas.localPlayer.appearance.getChatHeadId();
- class22.method295(var52);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_f == var1.serverPacket0) {
- TextureProvider.method2773();
- var1.serverPacket0 = null;
- return false;
- }
-
- if(ServerPacket.__ge_l == var1.serverPacket0) {
- var16 = var3.__bp_331();
- var52 = Huffman.getWidget(var16);
-
- for(var18 = 0; var18 < var52.itemIds.length; ++var18) {
- var52.itemIds[var18] = -1;
- var52.itemIds[var18] = 0;
- }
-
- class22.method295(var52);
- var1.serverPacket0 = null;
- return true;
- }
-
- int var7;
- int var8;
- int var9;
- int var10;
- if(ServerPacket.__ge_bg == var1.serverPacket0) {
- var16 = var3.readInt();
- var5 = var3.__ag_302();
- if(var16 < -70000) {
- var5 += 32768;
- }
-
- if(var16 >= 0) {
- var41 = Huffman.getWidget(var16);
- } else {
- var41 = null;
- }
-
- if(var41 != null) {
- for(var7 = 0; var7 < var41.itemIds.length; ++var7) {
- var41.itemIds[var7] = 0;
- var41.itemQuantities[var7] = 0;
- }
- }
-
- PlayerType.method4547(var5);
- var7 = var3.__ag_302();
-
- for(var8 = 0; var8 < var7; ++var8) {
- var9 = var3.__ag_302();
- var10 = var3.readUnsignedByte();
- if(var10 == 255) {
- var10 = var3.__bf_332();
- }
-
- if(var41 != null && var8 < var41.itemIds.length) {
- var41.itemIds[var8] = var9;
- var41.itemQuantities[var8] = var10;
- }
-
- WorldMapManager.itemContainerSetItem(var5, var8, var9 - 1, var10);
- }
-
- if(var41 != null) {
- class22.method295(var41);
- }
-
- class12.method159();
- __client_nz[++__client_ns - 1 & 31] = var5 & 32767;
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_e == var1.serverPacket0) {
- class16.method189(class190.field2341);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bb == var1.serverPacket0) {
- UserComparator7.method3360(var3, var1.serverPacket0Length);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bm == var1.serverPacket0) {
- WorldMapSection3.__p_go = var3.readUnsignedByteNegate();
- Canvas.__ao_gk = var3.__bq_318();
- var1.serverPacket0 = null;
- return true;
- }
-
- boolean var47;
- if(ServerPacket.__ge_b == var1.serverPacket0) {
- var16 = var3.readInt();
- var47 = var3.readUnsignedByte() == 1;
- var41 = Huffman.getWidget(var16);
- if(var47 != var41.isHidden) {
- var41.isHidden = var47;
- class22.method295(var41);
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bu == var1.serverPacket0) {
- byte var60 = var3.__bn_319();
- var5 = var3.__bu_325();
- Varps.Varps_temp[var5] = var60;
- if(Varps.Varps_main[var5] != var60) {
- Varps.Varps_main[var5] = var60;
- }
-
- IndexCache.method4703(var5);
- __client_nr[++__client_nd - 1 & 31] = var5;
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_a == var1.serverPacket0) {
- class16.method189(class190.field2347);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bq == var1.serverPacket0) {
- var16 = var3.readUnsignedByte();
- if(var3.readUnsignedByte() == 0) {
- grandExchangeOffers[var16] = new GrandExchangeOffer();
- var3.index += 18;
- } else {
- --var3.index;
- grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false);
- }
-
- __client_nv = cycleCntr;
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_cj == var1.serverPacket0) {
- var16 = var3.__bm_326();
- rootWidgetGroup = var16;
- this.__iu_141(false);
- DevicePcmPlayerProvider.method845(var16);
- WorldMapSection3.runWidgetOnLoadListener(rootWidgetGroup);
-
- for(var5 = 0; var5 < 100; ++var5) {
- __client_od[var5] = true;
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bo == var1.serverPacket0) {
- class12.method159();
- runEnergy = var3.readUnsignedByte();
- __client_ni = cycleCntr;
- var1.serverPacket0 = null;
- return true;
- }
-
- Widget var19;
- if(ServerPacket.__ge_af == var1.serverPacket0) {
- var16 = var3.__bm_326();
- var5 = var3.__bm_326();
- var18 = var3.__bm_326();
- var7 = var3.__bf_332();
- var19 = Huffman.getWidget(var7);
- if(var16 != var19.modelAngleX || var18 != var19.modelAngleY || var5 != var19.modelZoom) {
- var19.modelAngleX = var16;
- var19.modelAngleY = var18;
- var19.modelZoom = var5;
- class22.method295(var19);
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_al == var1.serverPacket0) {
- hintArrowType = var3.readUnsignedByte();
- if(hintArrowType == 1) {
- hintArrowNpcIndex = var3.__ag_302();
- }
-
- if(hintArrowType >= 2 && hintArrowType <= 6) {
- if(hintArrowType == 2) {
- hintArrowSubX = 64;
- hintArrowSubY = 64;
- }
-
- if(hintArrowType == 3) {
- hintArrowSubX = 0;
- hintArrowSubY = 64;
- }
-
- if(hintArrowType == 4) {
- hintArrowSubX = 128;
- hintArrowSubY = 64;
- }
-
- if(hintArrowType == 5) {
- hintArrowSubX = 64;
- hintArrowSubY = 0;
- }
-
- if(hintArrowType == 6) {
- hintArrowSubX = 64;
- hintArrowSubY = 128;
- }
-
- hintArrowType = 2;
- hintArrowX = var3.__ag_302();
- hintArrowY = var3.__ag_302();
- hintArrowHeight = var3.readUnsignedByte();
- }
-
- if(hintArrowType == 10) {
- hintArrowPlayerIndex = var3.__ag_302();
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_cv == var1.serverPacket0) {
- Skeleton.method3062(var3, var1.serverPacket0Length);
- ScriptFrame.method1138();
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_m == var1.serverPacket0) {
- class50.loadRegions(false, var1.packetBuffer);
- var1.serverPacket0 = null;
- return true;
- }
-
- Widget var58;
- if(ServerPacket.__ge_ap == var1.serverPacket0) {
- var16 = var3.__bu_325();
- var5 = var3.__by_324();
- var18 = var3.__bp_331();
- var58 = Huffman.getWidget(var18);
- var58.__bh = var16 + (var5 << 16);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_ba == var1.serverPacket0) {
- if(rootWidgetGroup != -1) {
- GrandExchangeEvents.method74(rootWidgetGroup, 0);
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_h == var1.serverPacket0) {
- var16 = var3.readInt();
- var5 = var3.__ag_302();
- if(var5 == 65535) {
- var5 = -1;
- }
-
- var18 = var3.__bf_332();
- var58 = Huffman.getWidget(var16);
- ItemDefinition var54;
- if(!var58.isIf3) {
- if(var5 == -1) {
- var58.modelType = 0;
- var1.serverPacket0 = null;
- return true;
- }
-
- var54 = Skills.getItemDefinition(var5);
- var58.modelType = 4;
- var58.modelId = var5;
- var58.modelAngleX = var54.xan2d;
- var58.modelAngleY = var54.yan2d;
- var58.modelZoom = var54.zoom2d * 100 / var18;
- class22.method295(var58);
- } else {
- var58.itemId = var5;
- var58.itemQuantity = var18;
- var54 = Skills.getItemDefinition(var5);
- var58.modelAngleX = var54.xan2d;
- var58.modelAngleY = var54.yan2d;
- var58.modelAngleZ = var54.zan2d;
- var58.modelOffsetX = var54.offsetX2d;
- var58.modelOffsetY = var54.offsetY2d;
- var58.modelZoom = var54.zoom2d;
- if(var54.isStackable == 1) {
- var58.itemQuantityMode = 1;
- } else {
- var58.itemQuantityMode = 2;
- }
-
- if(var58.__bf > 0) {
- var58.modelZoom = var58.modelZoom * 32 / var58.__bf;
- } else if(var58.rawWidth > 0) {
- var58.modelZoom = var58.modelZoom * 32 / var58.rawWidth;
- }
-
- class22.method295(var58);
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- String var6;
- if(ServerPacket.__ge_w == var1.serverPacket0) {
- var16 = var3.__ae_307();
- var47 = var3.readUnsignedByte() == 1;
- var6 = "";
- boolean var44 = false;
- if(var47) {
- var6 = var3.readStringCp1252NullTerminated();
- if(WorldMapArea.friendSystem.isIgnored(new Username(var6, KeyHandler.loginType))) {
- var44 = true;
- }
- }
-
- String var53 = var3.readStringCp1252NullTerminated();
- if(!var44) {
- WorldMapIcon1.method219(var16, var6, var53);
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bi == var1.serverPacket0) {
- IndexCacheLoader.field512 = WorldMapElement.method4783(var3.readUnsignedByte());
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_n == var1.serverPacket0) {
- class16.method189(class190.field2345);
- var1.serverPacket0 = null;
- return true;
- }
-
- boolean var55;
- if(ServerPacket.__ge_j == var1.serverPacket0) {
- var55 = var3.readBoolean();
- if(var55) {
- if(ClientParameter.field3645 == null) {
- ClientParameter.field3645 = new class248();
- }
- } else {
- ClientParameter.field3645 = null;
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- long var21;
- if(ServerPacket.__ge_aa == var1.serverPacket0) {
- var16 = var3.__bt_330();
- var5 = var3.__bu_325();
- if(var5 == 65535) {
- var5 = -1;
- }
-
- var18 = var3.__bf_332();
- var7 = var3.__ag_302();
- if(var7 == 65535) {
- var7 = -1;
- }
-
- for(var8 = var7; var8 <= var5; ++var8) {
- var21 = (long)var8 + ((long)var18 << 32);
- Node var45 = widgetClickMasks.get(var21);
- if(var45 != null) {
- var45.remove();
- }
-
- widgetClickMasks.put(new IntegerNode(var16), var21);
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_cy == var1.serverPacket0) {
- class3.updateNpcs(true, var3);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_az == var1.serverPacket0) {
- if(PacketWriter.clanChat != null) {
- PacketWriter.clanChat.__a_474(var3);
- }
-
- UserComparator8.method3349();
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_z == var1.serverPacket0) {
- class16.method189(class190.field2346);
- var1.serverPacket0 = null;
- return true;
- }
-
- String var37;
- if(ServerPacket.__ge_by == var1.serverPacket0) {
- var37 = var3.readStringCp1252NullTerminated();
- Object[] var51 = new Object[var37.length() + 1];
-
- for(var18 = var37.length() - 1; var18 >= 0; --var18) {
- if(var37.charAt(var18) == 's') {
- var51[var18 + 1] = var3.readStringCp1252NullTerminated();
- } else {
- var51[var18 + 1] = new Integer(var3.readInt());
- }
- }
-
- var51[0] = new Integer(var3.readInt());
- ScriptEvent var43 = new ScriptEvent();
- var43.args0 = var51;
- AbstractIndexCache.runScript(var43);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_ag == var1.serverPacket0) {
- class16.method189(class190.field2343);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_i == var1.serverPacket0) {
- class16.method189(class190.field2350);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bj == var1.serverPacket0) {
- destinationX = var3.readUnsignedByte();
- if(destinationX == 255) {
- destinationX = 0;
- }
-
- destinationY = var3.readUnsignedByte();
- if(destinationY == 255) {
- destinationY = 0;
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_cr == var1.serverPacket0) {
- for(var16 = 0; var16 < VarpDefinition.__ix_f; ++var16) {
- VarpDefinition var50 = SecureRandomCallable.method1140(var16);
- if(var50 != null) {
- Varps.Varps_temp[var16] = 0;
- Varps.Varps_main[var16] = 0;
- }
- }
-
- class12.method159();
- __client_nd += 32;
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_an == var1.serverPacket0) {
- var16 = var3.readInt();
- var5 = var3.__ag_302();
- if(var16 < -70000) {
- var5 += 32768;
- }
-
- if(var16 >= 0) {
- var41 = Huffman.getWidget(var16);
- } else {
- var41 = null;
- }
-
- for(; var3.index < var1.serverPacket0Length; WorldMapManager.itemContainerSetItem(var5, var7, var8 - 1, var9)) {
- var7 = var3.__ae_307();
- var8 = var3.__ag_302();
- var9 = 0;
- if(var8 != 0) {
- var9 = var3.readUnsignedByte();
- if(var9 == 255) {
- var9 = var3.readInt();
- }
- }
-
- if(var41 != null && var7 >= 0 && var7 < var41.itemIds.length) {
- var41.itemIds[var7] = var8;
- var41.itemQuantities[var7] = var9;
- }
- }
-
- if(var41 != null) {
- class22.method295(var41);
- }
-
- class12.method159();
- __client_nz[++__client_ns - 1 & 31] = var5 & 32767;
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bl == var1.serverPacket0) {
- var16 = var3.__ag_302();
- var5 = var3.readUnsignedByte();
- var18 = var3.__ag_302();
- Ignored.queueSoundEffect(var16, var5, var18);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bc == var1.serverPacket0) {
- var16 = var3.__bp_331();
- var5 = var3.__br_328();
- var18 = var3.__bl_327();
- var58 = Huffman.getWidget(var16);
- if(var18 != var58.rawX || var5 != var58.rawY || var58.xAlignment != 0 || var58.yAlignment != 0) {
- var58.rawX = var18;
- var58.rawY = var5;
- var58.xAlignment = 0;
- var58.yAlignment = 0;
- class22.method295(var58);
- this.alignWidget(var58);
- if(var58.type == 0) {
- class39.revalidateWidgetScroll(Widget.widgets[var16 >> 16], var58, false);
- }
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_aw == var1.serverPacket0) {
- var16 = var3.__bm_326();
- var5 = var3.__bf_332();
- var41 = Huffman.getWidget(var5);
- if(var41.modelType != 2 || var16 != var41.modelId) {
- var41.modelType = 2;
- var41.modelId = var16;
- class22.method295(var41);
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_ao == var1.serverPacket0) {
- World var40 = new World();
- var40.host = var3.readStringCp1252NullTerminated();
- var40.id = var3.__ag_302();
- var5 = var3.readInt();
- var40.properties = var5;
- GameShell.updateGameState(45);
- var2.close();
- var2 = null;
- class31.changeWorld(var40);
- var1.serverPacket0 = null;
- return false;
- }
-
- if(ServerPacket.__ge_ay == var1.serverPacket0) {
- WorldMapArea.friendSystem.ignoreList.read(var3, var1.serverPacket0Length);
- class229.method4512();
- __client_na = cycleCntr;
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_ah == var1.serverPacket0) {
- class3.updateNpcs(false, var3);
- var1.serverPacket0 = null;
- return true;
- }
-
- WidgetGroupParent var20;
- if(ServerPacket.__ge_cs == var1.serverPacket0) {
- var16 = var3.readInt();
- var5 = var3.readInt();
- WidgetGroupParent var42 = (WidgetGroupParent)widgetGroupParents.get((long)var5);
- var20 = (WidgetGroupParent)widgetGroupParents.get((long)var16);
- if(var20 != null) {
- MenuAction.closeWidgetGroup(var20, var42 == null || var42.group != var20.group);
- }
-
- if(var42 != null) {
- var42.remove();
- widgetGroupParents.put(var42, (long)var16);
- }
-
- var19 = Huffman.getWidget(var5);
- if(var19 != null) {
- class22.method295(var19);
- }
-
- var19 = Huffman.getWidget(var16);
- if(var19 != null) {
- class22.method295(var19);
- class39.revalidateWidgetScroll(Widget.widgets[var19.id >>> 16], var19, true);
- }
-
- if(rootWidgetGroup != -1) {
- GrandExchangeEvents.method74(rootWidgetGroup, 1);
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_p == var1.serverPacket0) {
- var16 = var3.__bp_331();
- var5 = var3.__bu_325();
- var18 = var5 >> 10 & 31;
- var7 = var5 >> 5 & 31;
- var8 = var5 & 31;
- var9 = (var7 << 11) + (var18 << 19) + (var8 << 3);
- Widget var59 = Huffman.getWidget(var16);
- if(var9 != var59.color) {
- var59.color = var9;
- class22.method295(var59);
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_at == var1.serverPacket0) {
- var16 = var3.readUnsignedByte();
- var5 = var3.readUnsignedByte();
- var18 = var3.readUnsignedByte();
- var7 = var3.readUnsignedByte();
- __client_rh[var16] = true;
- __client_rd[var16] = var5;
- __client_rl[var16] = var18;
- __client_rj[var16] = var7;
- __client_rk[var16] = 0;
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_ce == var1.serverPacket0) {
- __client_pl = var3.readUnsignedByteNegate();
- publicChatMode = var3.readUnsignedByteNegate();
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bp == var1.serverPacket0) {
- rebootTimer = var3.__ag_302() * 30;
- __client_ni = cycleCntr;
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_v == var1.serverPacket0) {
- Canvas.__ao_gk = var3.readUnsignedByteNegate();
- WorldMapSection3.__p_go = var3.readUnsignedByte();
-
- for(var16 = WorldMapSection3.__p_go; var16 < WorldMapSection3.__p_go + 8; ++var16) {
- for(var5 = Canvas.__ao_gk; var5 < Canvas.__ao_gk + 8; ++var5) {
- if(groundItems[SoundSystem.plane][var16][var5] != null) {
- groundItems[SoundSystem.plane][var16][var5] = null;
- TilePaint.method3061(var16, var5);
- }
- }
- }
-
- for(class68 var39 = (class68)__client_kh.last(); var39 != null; var39 = (class68)__client_kh.previous()) {
- if(var39.field913 >= WorldMapSection3.__p_go && var39.field913 < WorldMapSection3.__p_go + 8 && var39.field901 >= Canvas.__ao_gk && var39.field901 < Canvas.__ao_gk + 8 && var39.field911 == SoundSystem.plane) {
- var39.field910 = 0;
- }
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_ac == var1.serverPacket0) {
- var16 = var3.__bf_332();
- var5 = var3.__bm_326();
- var41 = Huffman.getWidget(var16);
- if(var41.modelType != 1 || var5 != var41.modelId) {
- var41.modelType = 1;
- var41.modelId = var5;
- class22.method295(var41);
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_ak == var1.serverPacket0) {
- var16 = var3.readUnsignedByte();
- BufferedNetSocket.method3500(var16);
- var1.serverPacket0 = null;
- return true;
- }
-
- long var12;
- long var24;
- long var26;
- if(ServerPacket.__ge_bs == var1.serverPacket0) {
- var37 = var3.readStringCp1252NullTerminated();
- var24 = var3.readLong();
- var26 = (long)var3.__ag_302();
- var21 = (long)var3.readMedium();
- PlayerType var11 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte());
- var12 = (var26 << 32) + var21;
- boolean var46 = false;
-
- for(int var15 = 0; var15 < 100; ++var15) {
- if(__client_pu[var15] == var12) {
- var46 = true;
- break;
- }
- }
-
- if(var11.isUser && WorldMapArea.friendSystem.isIgnored(new Username(var37, KeyHandler.loginType))) {
- var46 = true;
- }
-
- if(!var46 && __client_jc == 0) {
- __client_pu[__client_pb] = var12;
- __client_pb = (__client_pb + 1) % 100;
- String var28 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
- if(var11.modIcon != -1) {
- GrandExchangeEvents.addChatMessage(9, ItemContainer.method1170(var11.modIcon) + var37, var28, Clock.method3534(var24));
- } else {
- GrandExchangeEvents.addChatMessage(9, var37, var28, Clock.method3534(var24));
- }
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_as == var1.serverPacket0) {
- class16.method189(class190.field2342);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_y == var1.serverPacket0) {
- var16 = var3.readInt();
- var17 = var3.readStringCp1252NullTerminated();
- var41 = Huffman.getWidget(var16);
- if(!var17.equals(var41.text)) {
- var41.text = var17;
- class22.method295(var41);
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_ai == var1.serverPacket0) {
- class50.loadRegions(true, var1.packetBuffer);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_q == var1.serverPacket0) {
- isCameraLocked = false;
-
- for(var16 = 0; var16 < 5; ++var16) {
- __client_rh[var16] = false;
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_cm == var1.serverPacket0) {
- isCameraLocked = true;
- GrandExchangeOffer.__x_rg = var3.readUnsignedByte();
- KeyHandler.__an_ra = var3.readUnsignedByte();
- IndexStoreAction.__ik_rt = var3.__ag_302();
- VertexNormal.__dq_rq = var3.readUnsignedByte();
- class171.__fo_ro = var3.readUnsignedByte();
- if(class171.__fo_ro >= 100) {
- var16 = GrandExchangeOffer.__x_rg * 128 + 64;
- var5 = KeyHandler.__an_ra * 128 + 64;
- var18 = class32.getTileHeight(var16, var5, SoundSystem.plane) - IndexStoreAction.__ik_rt;
- var7 = var16 - WorldMapSection1.cameraX;
- var8 = var18 - GrandExchangeEvents.cameraY;
- var9 = var5 - class11.cameraZ;
- var10 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7));
- WorldMapIcon1.cameraPitch = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047;
- MusicPatchNode.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047;
- if(WorldMapIcon1.cameraPitch < 128) {
- WorldMapIcon1.cameraPitch = 128;
- }
-
- if(WorldMapIcon1.cameraPitch > 383) {
- WorldMapIcon1.cameraPitch = 383;
- }
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bv == var1.serverPacket0) {
- var16 = var3.__bf_332();
- var5 = var3.__bm_326();
- var41 = Huffman.getWidget(var16);
- if(var41 != null && var41.type == 0) {
- if(var5 > var41.scrollHeight - var41.height) {
- var5 = var41.scrollHeight - var41.height;
- }
-
- if(var5 < 0) {
- var5 = 0;
- }
-
- if(var5 != var41.scrollY) {
- var41.scrollY = var5;
- class22.method295(var41);
- }
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_au == var1.serverPacket0) {
- var16 = var3.__by_324();
- Script.method2216(var16);
- __client_nz[++__client_ns - 1 & 31] = var16 & 32767;
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bk == var1.serverPacket0) {
- var3.index += 28;
- if(var3.__ax_313()) {
- class234.method4535(var3, var3.index - 28);
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_c == var1.serverPacket0) {
- class12.method159();
- var16 = var3.__bt_330();
- var5 = var3.readUnsignedByteNegate();
- var18 = var3.readUnsignedByte();
- experience[var5] = var16;
- currentLevels[var5] = var18;
- levels[var5] = 1;
-
- for(var7 = 0; var7 < 98; ++var7) {
- if(var16 >= Skills.Skills_experienceTable[var7]) {
- levels[var5] = var7 + 2;
- }
- }
-
- changedSkills[++changedSkillsCount - 1 & 31] = var5;
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bz == var1.serverPacket0) {
- var16 = var3.readInt();
- var5 = var3.readInt();
- var18 = DynamicObject.method2222();
- PacketBufferNode var57 = Interpreter.method1915(ClientPacket.__gs_k, packetWriter.isaacCipher);
- var57.packetBuffer.__ai_315(var18);
- var57.packetBuffer.writeByte(GameShell.fps);
- var57.packetBuffer.writeIntME(var16);
- var57.packetBuffer.writeIntLE(var5);
- packetWriter.__q_167(var57);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bt == var1.serverPacket0) {
- class12.method159();
- weight = var3.__aq_303();
- __client_ni = cycleCntr;
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_aq == var1.serverPacket0) {
- var55 = var3.readUnsignedByte() == 1;
- if(var55) {
- class15.__z_si = class203.currentTimeMs() - var3.readLong();
- FloorDecoration.grandExchangeEvents = new GrandExchangeEvents(var3, true);
- } else {
- FloorDecoration.grandExchangeEvents = null;
- }
-
- __client_nc = cycleCntr;
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_av == var1.serverPacket0) {
- WorldMapArea.friendSystem.__f_152();
- __client_na = cycleCntr;
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_t == var1.serverPacket0) {
- byte[] var38 = new byte[var1.serverPacket0Length];
- var3.__jb_335(var38, 0, var38.length);
- Buffer var49 = new Buffer(var38);
- var6 = var49.readStringCp1252NullTerminated();
- WorldMapCacheName.method635(var6, true, false);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_k == var1.serverPacket0) {
- class16.method189(class190.field2352);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bn == var1.serverPacket0) {
- var16 = var3.index + var1.serverPacket0Length;
- var5 = var3.__ag_302();
- var18 = var3.__ag_302();
- if(var5 != rootWidgetGroup) {
- rootWidgetGroup = var5;
- this.__iu_141(false);
- DevicePcmPlayerProvider.method845(rootWidgetGroup);
- WorldMapSection3.runWidgetOnLoadListener(rootWidgetGroup);
-
- for(var7 = 0; var7 < 100; ++var7) {
- __client_od[var7] = true;
- }
- }
-
- WidgetGroupParent var23;
- for(; var18-- > 0; var23.keep = true) {
- var7 = var3.readInt();
- var8 = var3.__ag_302();
- var9 = var3.readUnsignedByte();
- var23 = (WidgetGroupParent)widgetGroupParents.get((long)var7);
- if(var23 != null && var8 != var23.group) {
- MenuAction.closeWidgetGroup(var23, true);
- var23 = null;
- }
-
- if(var23 == null) {
- var23 = SecureRandomCallable.method1143(var7, var8, var9);
- }
- }
-
- for(var20 = (WidgetGroupParent)widgetGroupParents.first(); var20 != null; var20 = (WidgetGroupParent)widgetGroupParents.next()) {
- if(var20.keep) {
- var20.keep = false;
- } else {
- MenuAction.closeWidgetGroup(var20, true);
- }
- }
-
- widgetClickMasks = new NodeHashTable(512);
-
- while(var3.index < var16) {
- var7 = var3.readInt();
- var8 = var3.__ag_302();
- var9 = var3.__ag_302();
- var10 = var3.readInt();
-
- for(int var29 = var8; var29 <= var9; ++var29) {
- var12 = (long)var29 + ((long)var7 << 32);
- widgetClickMasks.put(new IntegerNode(var10), var12);
- }
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_br == var1.serverPacket0) {
- var16 = var3.__bb_317();
- var5 = var3.__bb_317();
- var6 = var3.readStringCp1252NullTerminated();
- if(var5 >= 1 && var5 <= 8) {
- if(var6.equalsIgnoreCase("null")) {
- var6 = null;
- }
-
- playerMenuActions[var5 - 1] = var6;
- playerOptionsPriorities[var5 - 1] = var16 == 0;
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_ab == var1.serverPacket0) {
- Clock.method3533(var3.readStringCp1252NullTerminated());
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_am == var1.serverPacket0) {
- if(var1.serverPacket0Length == 0) {
- PacketWriter.clanChat = null;
- } else {
- if(PacketWriter.clanChat == null) {
- PacketWriter.clanChat = new ClanChat(KeyHandler.loginType, TextureProvider.client);
- }
-
- PacketWriter.clanChat.readUpdate(var3);
- }
-
- UserComparator8.method3349();
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_o == var1.serverPacket0) {
- var16 = var3.__ag_302();
- var5 = var3.readInt();
- Varps.Varps_temp[var16] = var5;
- if(Varps.Varps_main[var16] != var5) {
- Varps.Varps_main[var16] = var5;
- }
-
- IndexCache.method4703(var16);
- __client_nr[++__client_nd - 1 & 31] = var16;
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_g == var1.serverPacket0) {
- class16.method189(class190.field2349);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_x == var1.serverPacket0) {
- var16 = var3.readInt();
- WidgetGroupParent var48 = (WidgetGroupParent)widgetGroupParents.get((long)var16);
- if(var48 != null) {
- MenuAction.closeWidgetGroup(var48, true);
- }
-
- if(__client_mo != null) {
- class22.method295(__client_mo);
- __client_mo = null;
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bf == var1.serverPacket0) {
- for(var16 = 0; var16 < Varps.Varps_main.length; ++var16) {
- if(Varps.Varps_temp[var16] != Varps.Varps_main[var16]) {
- Varps.Varps_main[var16] = Varps.Varps_temp[var16];
- IndexCache.method4703(var16);
- __client_nr[++__client_nd - 1 & 31] = var16;
- }
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bd == var1.serverPacket0) {
- WorldMapArea.friendSystem.__q_153(var3, var1.serverPacket0Length);
- __client_na = cycleCntr;
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_r == var1.serverPacket0) {
- var16 = var3.__bm_326();
- if(var16 == 65535) {
- var16 = -1;
- }
-
- AbstractUserComparator.method5437(var16);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_ad == var1.serverPacket0) {
- var16 = var3.__bj_329();
- var5 = var3.__bu_325();
- if(var5 == 65535) {
- var5 = -1;
- }
-
- HealthBar.method1994(var5, var16);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bw == var1.serverPacket0) {
- var16 = var3.__bb_317();
- var5 = var3.__bp_331();
- var18 = var3.__bm_326();
- var20 = (WidgetGroupParent)widgetGroupParents.get((long)var5);
- if(var20 != null) {
- MenuAction.closeWidgetGroup(var20, var18 != var20.group);
- }
-
- SecureRandomCallable.method1143(var5, var18, var16);
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_d == var1.serverPacket0) {
- var37 = var3.readStringCp1252NullTerminated();
- var24 = (long)var3.__ag_302();
- var26 = (long)var3.readMedium();
- PlayerType var30 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte());
- long var31 = (var24 << 32) + var26;
- boolean var33 = false;
-
- for(int var13 = 0; var13 < 100; ++var13) {
- if(var31 == __client_pu[var13]) {
- var33 = true;
- break;
- }
- }
-
- if(WorldMapArea.friendSystem.isIgnored(new Username(var37, KeyHandler.loginType))) {
- var33 = true;
- }
-
- if(!var33 && __client_jc == 0) {
- __client_pu[__client_pb] = var31;
- __client_pb = (__client_pb + 1) % 100;
- String var34 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
- byte var14;
- if(var30.isPrivileged) {
- var14 = 7;
- } else {
- var14 = 3;
- }
-
- if(var30.modIcon != -1) {
- WorldMapIcon1.method219(var14, ItemContainer.method1170(var30.modIcon) + var37, var34);
- } else {
- WorldMapIcon1.method219(var14, var37, var34);
- }
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_u == var1.serverPacket0) {
- var16 = var3.readInt();
- if(var16 != __client_il) {
- __client_il = var16;
- WorldMapArea.method428();
- }
-
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_bh == var1.serverPacket0) {
- minimapState = var3.readUnsignedByte();
- var1.serverPacket0 = null;
- return true;
- }
-
- if(ServerPacket.__ge_ae == var1.serverPacket0) {
- var37 = var3.readStringCp1252NullTerminated();
- var17 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
- WorldMapIcon1.method219(6, var37, var17);
- var1.serverPacket0 = null;
- return true;
- }
-
- NpcDefinition.sendStackTrace("" + (var1.serverPacket0 != null?var1.serverPacket0.id:-1) + "," + (var1.__n != null?var1.__n.id:-1) + "," + (var1.__i != null?var1.__i.id:-1) + "," + var1.serverPacket0Length, (Throwable)null);
- TextureProvider.method2773();
- } catch (IOException var35) {
- class48.method868();
- } catch (Exception var36) {
- var17 = "" + (var1.serverPacket0 != null?var1.serverPacket0.id:-1) + "," + (var1.__n != null?var1.__n.id:-1) + "," + (var1.__i != null?var1.__i.id:-1) + "," + var1.serverPacket0Length + "," + (Canvas.localPlayer.pathX[0] + class50.baseX) + "," + (Canvas.localPlayer.pathY[0] + GraphicsObject.baseY) + ",";
-
- for(var18 = 0; var18 < var1.serverPacket0Length && var18 < 50; ++var18) {
- var17 = var17 + var3.array[var18] + ",";
- }
-
- NpcDefinition.sendStackTrace(var17, var36);
- TextureProvider.method2773();
- }
-
- return true;
- }
- }
-
- @ObfuscatedName("hi")
- @ObfuscatedSignature(
- signature = "(I)V",
- garbageValue = "-387903382"
- )
- @Export("__hi_139")
- final void __hi_139() {
- boolean var1 = false;
-
- int var2;
- int var5;
- while(!var1) {
- var1 = true;
-
- for(var2 = 0; var2 < menuOptionsCount - 1; ++var2) {
- if(menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) {
- String var3 = menuTargetNames[var2];
- menuTargetNames[var2] = menuTargetNames[var2 + 1];
- menuTargetNames[var2 + 1] = var3;
- String var4 = menuActions[var2];
- menuActions[var2] = menuActions[var2 + 1];
- menuActions[var2 + 1] = var4;
- var5 = menuOpcodes[var2];
- menuOpcodes[var2] = menuOpcodes[var2 + 1];
- menuOpcodes[var2 + 1] = var5;
- var5 = menuArguments1[var2];
- menuArguments1[var2] = menuArguments1[var2 + 1];
- menuArguments1[var2 + 1] = var5;
- var5 = menuArguments2[var2];
- menuArguments2[var2] = menuArguments2[var2 + 1];
- menuArguments2[var2 + 1] = var5;
- var5 = menuArguments0[var2];
- menuArguments0[var2] = menuArguments0[var2 + 1];
- menuArguments0[var2 + 1] = var5;
- boolean var6 = menuShiftClick[var2];
- menuShiftClick[var2] = menuShiftClick[var2 + 1];
- menuShiftClick[var2 + 1] = var6;
- var1 = false;
- }
- }
- }
-
- if(DevicePcmPlayerProvider.dragInventoryWidget == null) {
- if(clickedWidget == null) {
- int var16;
- label279: {
- int var15 = MouseHandler.MouseHandler_lastButton;
- int var9;
- int var13;
- if(isMenuOpen) {
- int var12;
- if(var15 != 1 && (AbstractRasterProvider.__lp_ca || var15 != 4)) {
- var2 = MouseHandler.MouseHandler_x;
- var12 = MouseHandler.MouseHandler_y;
- if(var2 < class25.menuX - 10 || var2 > class25.menuX + class214.menuWidth + 10 || var12 < GameShell.menuY - 10 || var12 > AbstractWorldMapIcon.menuHeight + GameShell.menuY + 10) {
- isMenuOpen = false;
- Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight);
- }
- }
-
- if(var15 == 1 || !AbstractRasterProvider.__lp_ca && var15 == 4) {
- var2 = class25.menuX;
- var12 = GameShell.menuY;
- var13 = class214.menuWidth;
- var5 = MouseHandler.MouseHandler_lastPressedX;
- var16 = MouseHandler.MouseHandler_lastPressedY;
- int var7 = -1;
-
- for(int var17 = 0; var17 < menuOptionsCount; ++var17) {
- var9 = (menuOptionsCount - 1 - var17) * 15 + var12 + 31;
- if(var5 > var2 && var5 < var13 + var2 && var16 > var9 - 13 && var16 < var9 + 3) {
- var7 = var17;
- }
- }
-
- if(var7 != -1) {
- WorldMapSection0.method245(var7);
- }
-
- isMenuOpen = false;
- Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight);
- }
- } else {
- var2 = menuOptionsCount - 1;
- if((var15 == 1 || !AbstractRasterProvider.__lp_ca && var15 == 4) && var2 >= 0) {
- var13 = menuOpcodes[var2];
- if(var13 == 39 || var13 == 40 || var13 == 41 || var13 == 42 || var13 == 43 || var13 == 33 || var13 == 34 || var13 == 35 || var13 == 36 || var13 == 37 || var13 == 38 || var13 == 1005) {
- var5 = menuArguments1[var2];
- var16 = menuArguments2[var2];
- Widget var14 = Huffman.getWidget(var16);
- var9 = class1.getWidgetClickMask(var14);
- boolean var8 = (var9 >> 28 & 1) != 0;
- if(var8) {
- break label279;
- }
-
- Object var10000 = null;
- if(class168.method3461(class1.getWidgetClickMask(var14))) {
- break label279;
- }
- }
- }
-
- if((var15 == 1 || !AbstractRasterProvider.__lp_ca && var15 == 4) && this.shouldLeftClickOpenMenu()) {
- var15 = 2;
- }
-
- if((var15 == 1 || !AbstractRasterProvider.__lp_ca && var15 == 4) && menuOptionsCount > 0) {
- WorldMapSection0.method245(var2);
- }
-
- if(var15 == 2 && menuOptionsCount > 0) {
- this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
- }
- }
-
- return;
- }
-
- if(DevicePcmPlayerProvider.dragInventoryWidget != null && !__client_jl && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) {
- int var10 = __client_ja;
- int var11 = __client_je;
- class231.method4520(UnitPriceComparator.tempMenuAction, var10, var11);
- UnitPriceComparator.tempMenuAction = null;
- }
-
- __client_jl = false;
- itemDragDuration = 0;
- if(DevicePcmPlayerProvider.dragInventoryWidget != null) {
- class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
- }
-
- DevicePcmPlayerProvider.dragInventoryWidget = Huffman.getWidget(var16);
- dragItemSlotSource = var5;
- __client_ja = MouseHandler.MouseHandler_lastPressedX;
- __client_je = MouseHandler.MouseHandler_lastPressedY;
- if(var2 >= 0) {
- UnitPriceComparator.tempMenuAction = new MenuAction();
- UnitPriceComparator.tempMenuAction.argument1 = menuArguments1[var2];
- UnitPriceComparator.tempMenuAction.argument2 = menuArguments2[var2];
- UnitPriceComparator.tempMenuAction.opcode = menuOpcodes[var2];
- UnitPriceComparator.tempMenuAction.argument0 = menuArguments0[var2];
- UnitPriceComparator.tempMenuAction.action = menuActions[var2];
- }
-
- class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
- }
- }
- }
-
- @ObfuscatedName("ht")
- @ObfuscatedSignature(
- signature = "(B)Z",
- garbageValue = "109"
- )
- @Export("shouldLeftClickOpenMenu")
- final boolean shouldLeftClickOpenMenu() {
- int var1 = menuOptionsCount - 1;
- return (__client_ku == 1 && menuOptionsCount > 2 || UserComparator7.method3364(var1)) && !menuShiftClick[var1];
- }
-
- @ObfuscatedName("hj")
- @ObfuscatedSignature(
- signature = "(IIB)V",
- garbageValue = "1"
- )
- @Export("openMenu")
- final void openMenu(int var1, int var2) {
- int var3 = class2.fontBold12.stringWidth("Choose Option");
-
- int var4;
- for(var4 = 0; var4 < menuOptionsCount; ++var4) {
- Font var5 = class2.fontBold12;
- String var6;
- if(var4 < 0) {
- var6 = "";
- } else if(menuTargetNames[var4].length() > 0) {
- var6 = menuActions[var4] + " " + menuTargetNames[var4];
- } else {
- var6 = menuActions[var4];
- }
-
- int var7 = var5.stringWidth(var6);
- if(var7 > var3) {
- var3 = var7;
- }
- }
-
- var3 += 8;
- var4 = menuOptionsCount * 15 + 22;
- int var8 = var1 - var3 / 2;
- if(var3 + var8 > SoundCache.canvasWidth) {
- var8 = SoundCache.canvasWidth - var3;
- }
-
- if(var8 < 0) {
- var8 = 0;
- }
-
- int var9 = var2;
- if(var4 + var2 > Huffman.canvasHeight) {
- var9 = Huffman.canvasHeight - var4;
- }
-
- if(var9 < 0) {
- var9 = 0;
- }
-
- class25.menuX = var8;
- GameShell.menuY = var9;
- class214.menuWidth = var3;
- AbstractWorldMapIcon.menuHeight = menuOptionsCount * 15 + 22;
- class65.scene.menuOpen(SoundSystem.plane, var1, var2, false);
- isMenuOpen = true;
- }
-
- @ObfuscatedName("iu")
- @ObfuscatedSignature(
- signature = "(ZI)V",
- garbageValue = "-271438207"
- )
- @Export("__iu_141")
- final void __iu_141(boolean var1) {
- int var2 = rootWidgetGroup;
- int var3 = SoundCache.canvasWidth;
- int var4 = Huffman.canvasHeight;
- if(GroundItemPile.loadWidgetGroup(var2)) {
- WorldMapRegion.notRevalidateWidgetScroll(Widget.widgets[var2], -1, var3, var4, var1);
- }
-
- }
-
- @ObfuscatedName("ip")
- @ObfuscatedSignature(
- signature = "(Lho;B)V",
- garbageValue = "0"
- )
- @Export("alignWidget")
- void alignWidget(Widget var1) {
- Widget var2 = var1.parentId == -1?null:Huffman.getWidget(var1.parentId);
- int var3;
- int var4;
- if(var2 == null) {
- var3 = SoundCache.canvasWidth;
- var4 = Huffman.canvasHeight;
- } else {
- var3 = var2.width;
- var4 = var2.height;
- }
-
- WorldMapSection3.alignWidgetSize(var1, var3, var4, false);
- OverlayDefinition.alignWidgetPosition(var1, var3, var4);
- }
-
- @ObfuscatedName("jh")
- @ObfuscatedSignature(
- signature = "(I)V",
- garbageValue = "715978124"
- )
- @Export("__jh_142")
- final void __jh_142() {
- class22.method295(clickedWidget);
- ++MouseRecorder.widgetDragDuration;
- if(__client_nt && __client_nn) {
- int var1 = MouseHandler.MouseHandler_x;
- int var2 = MouseHandler.MouseHandler_y;
- var1 -= widgetClickX;
- var2 -= widgetClickY;
- if(var1 < __client_nw) {
- var1 = __client_nw;
- }
-
- if(var1 + clickedWidget.width > __client_nw + clickedWidgetParent.width) {
- var1 = __client_nw + clickedWidgetParent.width - clickedWidget.width;
- }
-
- if(var2 < __client_nl) {
- var2 = __client_nl;
- }
-
- if(var2 + clickedWidget.height > __client_nl + clickedWidgetParent.height) {
- var2 = __client_nl + clickedWidgetParent.height - clickedWidget.height;
- }
-
- int var3 = var1 - __client_nk;
- int var4 = var2 - __client_np;
- int var5 = clickedWidget.dragZoneSize;
- if(MouseRecorder.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) {
- isDraggingWidget = true;
- }
-
- int var6 = var1 - __client_nw + clickedWidgetParent.scrollX;
- int var7 = var2 - __client_nl + clickedWidgetParent.scrollY;
- ScriptEvent var8;
- if(clickedWidget.onDrag != null && isDraggingWidget) {
- var8 = new ScriptEvent();
- var8.widget = clickedWidget;
- var8.mouseX = var6;
- var8.mouseY = var7;
- var8.args0 = clickedWidget.onDrag;
- AbstractIndexCache.runScript(var8);
- }
-
- if(MouseHandler.MouseHandler_currentButton == 0) {
- if(isDraggingWidget) {
- if(clickedWidget.onDragComplete != null) {
- var8 = new ScriptEvent();
- var8.widget = clickedWidget;
- var8.mouseX = var6;
- var8.mouseY = var7;
- var8.dragTarget = draggedOnWidget;
- var8.args0 = clickedWidget.onDragComplete;
- AbstractIndexCache.runScript(var8);
- }
-
- if(draggedOnWidget != null) {
- Widget var9 = clickedWidget;
- int var10 = WorldMapRegion.method568(class1.getWidgetClickMask(var9));
- Widget var15;
- if(var10 == 0) {
- var15 = null;
- } else {
- int var11 = 0;
-
- while(true) {
- if(var11 >= var10) {
- var15 = var9;
- break;
- }
-
- var9 = Huffman.getWidget(var9.parentId);
- if(var9 == null) {
- var15 = null;
- break;
- }
-
- ++var11;
- }
- }
-
- if(var15 != null) {
- PacketBufferNode var12 = Interpreter.method1915(ClientPacket.__gs_bk, packetWriter.isaacCipher);
- var12.packetBuffer.__bo_322(clickedWidget.childIndex);
- var12.packetBuffer.__bo_322(draggedOnWidget.itemId);
- var12.packetBuffer.writeShort(draggedOnWidget.childIndex);
- var12.packetBuffer.writeIntLE(clickedWidget.id);
- var12.packetBuffer.writeIntME(draggedOnWidget.id);
- var12.packetBuffer.writeShort(clickedWidget.itemId);
- packetWriter.__q_167(var12);
- }
- }
- } else if(this.shouldLeftClickOpenMenu()) {
- this.openMenu(__client_nk + widgetClickX, __client_np + widgetClickY);
- } else if(menuOptionsCount > 0) {
- int var13 = widgetClickX + __client_nk;
- int var14 = widgetClickY + __client_np;
- class231.method4520(UnitPriceComparator.tempMenuAction, var13, var14);
- UnitPriceComparator.tempMenuAction = null;
- }
-
- clickedWidget = null;
- }
-
- } else {
- if(MouseRecorder.widgetDragDuration > 1) {
- clickedWidget = null;
- }
-
- }
- }
-
- @ObfuscatedName("kr")
- @ObfuscatedSignature(
- signature = "(B)Lkp;",
- garbageValue = "-87"
- )
- public Username username() {
- return Canvas.localPlayer != null?Canvas.localPlayer.username:null;
- }
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- signature = "(Ljava/lang/CharSequence;I)I",
- garbageValue = "-1464358697"
- )
- @Export("hashString")
- public static int hashString(CharSequence var0) {
- int var1 = var0.length();
- int var2 = 0;
-
- for(int var3 = 0; var3 < var1; ++var3) {
- var2 = (var2 << 5) - var2 + HealthBar.charToByteCp1252(var0.charAt(var3));
- }
-
- return var2;
- }
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- signature = "(Ljava/lang/String;B)I",
- garbageValue = "0"
- )
- public static int method1692(String var0) {
- return var0.length() + 2;
- }
}
diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java
index 7745a7e89c..28c2169c7d 100644
--- a/runescape-client/src/main/java/ClientPacket.java
+++ b/runescape-client/src/main/java/ClientPacket.java
@@ -626,6 +626,29 @@ public class ClientPacket implements ClientPacketMarker {
@Export("length")
final int length;
+ ClientPacket(int var1, int var2) {
+ this.id = var1;
+ this.length = var2;
+ }
+
+ @ObfuscatedName("m")
+ @ObfuscatedSignature(
+ signature = "(B)[Lis;",
+ garbageValue = "-26"
+ )
+ public static StudioGame[] method3664() {
+ return new StudioGame[]{StudioGame.__is_q, StudioGame.__is_m, StudioGame.__is_o, StudioGame.__is_u, StudioGame.__is_f, StudioGame.__is_w};
+ }
+
+ @ObfuscatedName("m")
+ @ObfuscatedSignature(
+ signature = "(B)[Lcj;",
+ garbageValue = "-43"
+ )
+ static AttackOption[] method3665() {
+ return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels};
+ }
+
static {
__gs_m = new ClientPacket(0, 8);
__gs_f = new ClientPacket(1, 3);
@@ -728,27 +751,4 @@ public class ClientPacket implements ClientPacketMarker {
__gs_cc = new ClientPacket(98, 8);
__gs_ci = new ClientPacket(99, 7);
}
-
- ClientPacket(int var1, int var2) {
- this.id = var1;
- this.length = var2;
- }
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- signature = "(B)[Lis;",
- garbageValue = "-26"
- )
- public static StudioGame[] method3664() {
- return new StudioGame[]{StudioGame.__is_q, StudioGame.__is_m, StudioGame.__is_o, StudioGame.__is_u, StudioGame.__is_f, StudioGame.__is_w};
- }
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- signature = "(B)[Lcj;",
- garbageValue = "-43"
- )
- static AttackOption[] method3665() {
- return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels};
- }
}
diff --git a/runescape-client/src/main/java/ClientParameter.java b/runescape-client/src/main/java/ClientParameter.java
index 2023de1536..8f38a6baf3 100644
--- a/runescape-client/src/main/java/ClientParameter.java
+++ b/runescape-client/src/main/java/ClientParameter.java
@@ -136,28 +136,6 @@ public class ClientParameter {
@Export("id")
public final String id;
- static {
- __ji_m = new ClientParameter("8", "8");
- __ji_f = new ClientParameter("15", "15");
- __ji_q = new ClientParameter("7", "7");
- __ji_w = new ClientParameter("10", "10");
- __ji_o = new ClientParameter("16", "16");
- __ji_u = new ClientParameter("12", "12");
- __ji_g = new ClientParameter("3", "3");
- __ji_l = new ClientParameter("6", "6");
- __ji_e = new ClientParameter("17", "17");
- __ji_x = new ClientParameter("5", "5");
- __ji_d = new ClientParameter("9", "9");
- __ji_k = new ClientParameter("14", "14");
- __ji_n = new ClientParameter("18", "18");
- __ji_i = new ClientParameter("13", "13");
- __ji_a = new ClientParameter("4", "4");
- __ji_z = new ClientParameter("1", "1");
- __ji_j = new ClientParameter("11", "11");
- __ji_s = new ClientParameter("2", "2");
- __ji_t = new ClientParameter("19", "19");
- }
-
ClientParameter(String var1, String var2) {
this.id = var2;
}
@@ -179,15 +157,15 @@ public class ClientParameter {
World.worldsCount = var1.__ag_302();
ItemContainer.worlds = new World[World.worldsCount];
- World var3;
- for(int var2 = 0; var2 < World.worldsCount; var3.index = var2++) {
- var3 = ItemContainer.worlds[var2] = new World();
- var3.id = var1.__ag_302();
- var3.properties = var1.readInt();
- var3.host = var1.readStringCp1252NullTerminated();
- var3.activity = var1.readStringCp1252NullTerminated();
- var3.location = var1.readUnsignedByte();
- var3.population = var1.__aq_303();
+ World var2;
+ for(int var3 = 0; var3 < World.worldsCount; var2.index = var3++) {
+ var2 = ItemContainer.worlds[var3] = new World();
+ var2.id = var1.__ag_302();
+ var2.properties = var1.readInt();
+ var2.host = var1.readStringCp1252NullTerminated();
+ var2.activity = var1.readStringCp1252NullTerminated();
+ var2.location = var1.readUnsignedByte();
+ var2.population = var1.__aq_303();
}
MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.__bt_e, World.__bt_l);
@@ -201,4 +179,26 @@ public class ClientParameter {
return false;
}
+
+ static {
+ __ji_m = new ClientParameter("8", "8");
+ __ji_f = new ClientParameter("15", "15");
+ __ji_q = new ClientParameter("7", "7");
+ __ji_w = new ClientParameter("10", "10");
+ __ji_o = new ClientParameter("16", "16");
+ __ji_u = new ClientParameter("12", "12");
+ __ji_g = new ClientParameter("3", "3");
+ __ji_l = new ClientParameter("6", "6");
+ __ji_e = new ClientParameter("17", "17");
+ __ji_x = new ClientParameter("5", "5");
+ __ji_d = new ClientParameter("9", "9");
+ __ji_k = new ClientParameter("14", "14");
+ __ji_n = new ClientParameter("18", "18");
+ __ji_i = new ClientParameter("13", "13");
+ __ji_a = new ClientParameter("4", "4");
+ __ji_z = new ClientParameter("1", "1");
+ __ji_j = new ClientParameter("11", "11");
+ __ji_s = new ClientParameter("2", "2");
+ __ji_t = new ClientParameter("19", "19");
+ }
}
diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java
index fdde50a4f3..edc4703e32 100644
--- a/runescape-client/src/main/java/ClientPreferences.java
+++ b/runescape-client/src/main/java/ClientPreferences.java
@@ -44,10 +44,6 @@ public class ClientPreferences {
@Export("parameters")
LinkedHashMap parameters;
- static {
- __bf_m = 6;
- }
-
ClientPreferences() {
this.windowMode = 1;
this.rememberedUsername = null;
@@ -158,5 +154,10 @@ public class ClientPreferences {
if(GroundItemPile.loadWidgetGroup(var0)) {
NetFileRequest.method4555(Widget.widgets[var0], -1);
}
+
+ }
+
+ static {
+ __bf_m = 6;
}
}
diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java
index b814aa2d99..9dc9a7d8d2 100644
--- a/runescape-client/src/main/java/Clock.java
+++ b/runescape-client/src/main/java/Clock.java
@@ -41,22 +41,22 @@ public abstract class Clock {
++var2;
}
- StringBuilder var5;
- char var8;
- for(var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) {
- long var6 = var0;
+ char var4;
+ StringBuilder var8;
+ for(var8 = new StringBuilder(var2); var0 != 0L; var8.append(var4)) {
+ long var5 = var0;
var0 /= 37L;
- var8 = class306.base37Table[(int)(var6 - 37L * var0)];
- if(var8 == '_') {
- int var9 = var5.length() - 1;
- var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9)));
- var8 = 160;
+ var4 = class306.base37Table[(int)(var5 - 37L * var0)];
+ if(var4 == '_') {
+ int var7 = var8.length() - 1;
+ var8.setCharAt(var7, Character.toUpperCase(var8.charAt(var7)));
+ var4 = 160;
}
}
- var5.reverse();
- var5.setCharAt(0, Character.toUpperCase(var5.charAt(0)));
- return var5.toString();
+ var8.reverse();
+ var8.setCharAt(0, Character.toUpperCase(var8.charAt(0)));
+ return var8.toString();
}
} else {
return null;
diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java
index 339f08741d..7e5ccea675 100644
--- a/runescape-client/src/main/java/Decimator.java
+++ b/runescape-client/src/main/java/Decimator.java
@@ -25,51 +25,52 @@ public class Decimator {
public Decimator(int var1, int var2) {
if(var2 != var1) {
- int var4 = var1;
- int var5 = var2;
+ int var3 = var1;
+ int var4 = var2;
if(var2 > var1) {
- var4 = var2;
- var5 = var1;
+ var3 = var2;
+ var4 = var1;
}
- while(var5 != 0) {
- int var6 = var4 % var5;
+ int var5;
+ while(var4 != 0) {
+ var5 = var3 % var4;
+ var3 = var4;
var4 = var5;
- var5 = var6;
}
- var1 /= var4;
- var2 /= var4;
+ var1 /= var3;
+ var2 /= var3;
this.inputRate = var1;
this.outputRate = var2;
this.table = new int[var1][14];
- for(int var7 = 0; var7 < var1; ++var7) {
- int[] var8 = this.table[var7];
- double var9 = (double)var7 / (double)var1 + 6.0D;
- int var11 = (int)Math.floor(var9 - 7.0D + 1.0D);
- if(var11 < 0) {
- var11 = 0;
+ for(var5 = 0; var5 < var1; ++var5) {
+ int[] var6 = this.table[var5];
+ double var7 = (double)var5 / (double)var1 + 6.0D;
+ int var9 = (int)Math.floor(var7 - 7.0D + 1.0D);
+ if(var9 < 0) {
+ var9 = 0;
}
- int var12 = (int)Math.ceil(var9 + 7.0D);
- if(var12 > 14) {
- var12 = 14;
+ int var10 = (int)Math.ceil(var7 + 7.0D);
+ if(var10 > 14) {
+ var10 = 14;
}
- for(double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) {
- double var15 = ((double)var11 - var9) * 3.141592653589793D;
- double var17 = var13;
- if(var15 < -1.0E-4D || var15 > 1.0E-4D) {
- var17 = var13 * (Math.sin(var15) / var15);
+ for(double var11 = (double)var2 / (double)var1; var9 < var10; ++var9) {
+ double var13 = ((double)var9 - var7) * 3.141592653589793D;
+ double var15 = var11;
+ if(var13 < -1.0E-4D || var13 > 1.0E-4D) {
+ var15 = var11 * (Math.sin(var13) / var13);
}
- var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D);
- var8[var11] = (int)Math.floor(0.5D + var17 * 65536.0D);
+ var15 *= 0.54D + 0.46D * Math.cos(((double)var9 - var7) * 0.2243994752564138D);
+ var6[var9] = (int)Math.floor(0.5D + var15 * 65536.0D);
}
}
-
}
+
}
@ObfuscatedName("m")
@@ -153,6 +154,7 @@ public class Decimator {
)
public static final boolean method2490() {
KeyHandler var0 = KeyHandler.KeyHandler_instance;
+ KeyHandler var1 = KeyHandler.KeyHandler_instance;
synchronized(KeyHandler.KeyHandler_instance) {
if(KeyHandler.__an_ct == KeyHandler.__an_cc) {
return false;
@@ -179,39 +181,39 @@ public class Decimator {
int var6;
int var7;
int var8;
+ int var9;
+ int var10;
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.method3007(var12, var9, var6, var5);
- var16 = Rasterizer3D.method3008(var12, var9, var6, var5);
- var12 = var15;
- var15 = Rasterizer3D.method3007(var14, var10, var6, var5);
- var17 = Rasterizer3D.method3008(var14, var10, var6, var5);
- var14 = var15;
- var15 = Rasterizer3D.method3005(var11, var16, var8, var7);
- var16 = Rasterizer3D.method3006(var11, var16, var8, var7);
- var11 = var15;
- var15 = Rasterizer3D.method3005(var13, var17, var8, var7);
- var17 = Rasterizer3D.method3006(var13, var17, var8, var7);
- AccessFile.__dk_o = (var11 + var15) / 2;
- ViewportMouse.__dm_u = (var14 + var12) / 2;
- ViewportMouse.__dm_g = (var17 + var16) / 2;
- ViewportMouse.__dm_l = (var15 - var11) / 2;
- class311.__ka_e = (var14 - var12) / 2;
- Skeleton.__ek_x = (var17 - var16) / 2;
+ byte var14 = 50;
+ short var15 = 3500;
+ var9 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var14 / Rasterizer3D.Rasterizer3D_zoom;
+ var10 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var14 / Rasterizer3D.Rasterizer3D_zoom;
+ var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var15 / Rasterizer3D.Rasterizer3D_zoom;
+ int var16 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var15 / Rasterizer3D.Rasterizer3D_zoom;
+ int var17 = Rasterizer3D.method3007(var10, var14, var6, var5);
+ var12 = Rasterizer3D.method3008(var10, var14, var6, var5);
+ var10 = var17;
+ var17 = Rasterizer3D.method3007(var16, var15, var6, var5);
+ var13 = Rasterizer3D.method3008(var16, var15, var6, var5);
+ var16 = var17;
+ var17 = Rasterizer3D.method3005(var9, var12, var8, var7);
+ var12 = Rasterizer3D.method3006(var9, var12, var8, var7);
+ var9 = var17;
+ var17 = Rasterizer3D.method3005(var11, var13, var8, var7);
+ var13 = Rasterizer3D.method3006(var11, var13, var8, var7);
+ AccessFile.__dk_o = (var9 + var17) / 2;
+ ViewportMouse.__dm_u = (var16 + var10) / 2;
+ ViewportMouse.__dm_g = (var13 + var12) / 2;
+ ViewportMouse.__dm_l = (var17 - var9) / 2;
+ class311.__ka_e = (var16 - var10) / 2;
+ Skeleton.__ek_x = (var13 - var12) / 2;
GraphicsObject.__bw_d = Math.abs(ViewportMouse.__dm_l);
ViewportMouse.__dm_k = Math.abs(class311.__ka_e);
class248.__iu_n = Math.abs(Skeleton.__ek_x);
@@ -221,12 +223,12 @@ public class Decimator {
var6 = var2 + var0.yMid;
var7 = var3 + var0.zMid;
var8 = var0.xMidOffset;
- var16 = var0.yMidOffset;
- var17 = var0.zMidOffset;
- var11 = AccessFile.__dk_o - var5;
- var12 = ViewportMouse.__dm_u - var6;
- var13 = ViewportMouse.__dm_g - var7;
- return Math.abs(var11) > var8 + GraphicsObject.__bw_d?false:(Math.abs(var12) > var16 + ViewportMouse.__dm_k?false:(Math.abs(var13) > var17 + class248.__iu_n?false:(Math.abs(var13 * class311.__ka_e - var12 * Skeleton.__ek_x) > var17 * ViewportMouse.__dm_k + var16 * class248.__iu_n?false:(Math.abs(var11 * Skeleton.__ek_x - var13 * ViewportMouse.__dm_l) > var8 * class248.__iu_n + var17 * GraphicsObject.__bw_d?false:Math.abs(var12 * ViewportMouse.__dm_l - var11 * class311.__ka_e) <= var8 * ViewportMouse.__dm_k + var16 * GraphicsObject.__bw_d))));
+ var12 = var0.yMidOffset;
+ var13 = var0.zMidOffset;
+ var9 = AccessFile.__dk_o - var5;
+ var10 = ViewportMouse.__dm_u - var6;
+ var11 = ViewportMouse.__dm_g - var7;
+ return Math.abs(var9) > var8 + GraphicsObject.__bw_d?false:(Math.abs(var10) > var12 + ViewportMouse.__dm_k?false:(Math.abs(var11) > var13 + class248.__iu_n?false:(Math.abs(var11 * class311.__ka_e - var10 * Skeleton.__ek_x) > var13 * ViewportMouse.__dm_k + var12 * class248.__iu_n?false:(Math.abs(var9 * Skeleton.__ek_x - var11 * ViewportMouse.__dm_l) > var8 * class248.__iu_n + var13 * GraphicsObject.__bw_d?false:Math.abs(var10 * ViewportMouse.__dm_l - var9 * class311.__ka_e) <= var8 * ViewportMouse.__dm_k + var12 * GraphicsObject.__bw_d))));
}
}
diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
index c99809fbaf..9838c35789 100644
--- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
+++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
@@ -26,14 +26,14 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
String var2;
try {
var2 = System.getProperty("os.arch").toLowerCase();
- } catch (Exception var35) {
+ } catch (Exception var25) {
var2 = "";
}
String var3;
try {
var3 = System.getProperty("os.version").toLowerCase();
- } catch (Exception var34) {
+ } catch (Exception var24) {
var3 = "";
}
@@ -43,15 +43,15 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
try {
var4 = System.getProperty("java.vendor");
var5 = System.getProperty("java.version");
- } catch (Exception var33) {
+ } catch (Exception var23) {
;
}
- boolean var29;
+ boolean var6;
if(!var2.startsWith("amd64") && !var2.startsWith("x86_64")) {
- var29 = false;
+ var6 = false;
} else {
- var29 = true;
+ var6 = true;
}
byte var7 = 0;
@@ -129,11 +129,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
var10 = var10 * 10 + (var11 - '0');
++var9;
}
- } catch (Exception var38) {
+ } catch (Exception var28) {
;
}
- int var39 = var10;
+ int var29 = var10;
var9 = var5.indexOf(46, 2) + 1;
var10 = 0;
@@ -147,11 +147,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
var10 = var12 - '0' + var10 * 10;
++var9;
}
- } catch (Exception var37) {
+ } catch (Exception var27) {
;
}
- int var40 = var10;
+ int var30 = var10;
var9 = var5.indexOf(95, 4) + 1;
var10 = 0;
@@ -165,27 +165,27 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
var10 = var13 - '0' + var10 * 10;
++var9;
}
- } catch (Exception var36) {
+ } catch (Exception var26) {
;
}
Runtime.getRuntime();
- int var15 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1;
- int var16;
- if(var39 > 3) {
- var16 = Runtime.getRuntime().availableProcessors();
+ int var31 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1;
+ int var14;
+ if(var29 > 3) {
+ var14 = Runtime.getRuntime().availableProcessors();
} else {
- var16 = 0;
+ var14 = 0;
}
- byte var17 = 0;
+ byte var15 = 0;
+ String var16 = "";
+ String var17 = "";
String var18 = "";
String var19 = "";
String var20 = "";
String var21 = "";
- String var22 = "";
- String var23 = "";
- int[] var28 = new int[3];
- return new PlatformInfo(var1, var29, var7, var8, var39, var40, var10, false, var15, var16, var17, 0, var18, var19, var20, var21, 0, 0, 0, 0, var22, var23, var28, 0, "");
+ int[] var22 = new int[3];
+ return new PlatformInfo(var1, var6, var7, var8, var29, var30, var10, false, var31, var14, var15, 0, var16, var17, var18, var19, 0, 0, 0, 0, var20, var21, var22, 0, "");
}
}
diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java
index b76b322285..0a6cd00959 100644
--- a/runescape-client/src/main/java/DevicePcmPlayer.java
+++ b/runescape-client/src/main/java/DevicePcmPlayer.java
@@ -1,8 +1,8 @@
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.DataLine.Info;
import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.SourceDataLine;
+import javax.sound.sampled.DataLine.Info;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
@@ -53,19 +53,20 @@ public class DevicePcmPlayer extends PcmPlayer {
this.line.start();
this.capacity2 = var1;
} catch (LineUnavailableException var5) {
- int var4 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765);
- var4 = (var4 >>> 2 & 858993459) + (var4 & 858993459);
- var4 = (var4 >>> 4) + var4 & 252645135;
- var4 += var4 >>> 8;
- var4 += var4 >>> 16;
- int var3 = var4 & 255;
- if(var3 != 1) {
- this.open(World.method1759(var1));
- } else {
+ int var3 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765);
+ var3 = (var3 >>> 2 & 858993459) + (var3 & 858993459);
+ var3 = (var3 >>> 4) + var3 & 252645135;
+ var3 += var3 >>> 8;
+ var3 += var3 >>> 16;
+ int var4 = var3 & 255;
+ if(var4 == 1) {
this.line = null;
throw var5;
}
+
+ this.open(World.method1759(var1));
}
+
}
@ObfuscatedName("q")
diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java
index dd7a71cf5d..5cebaa492b 100644
--- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java
+++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java
@@ -219,43 +219,43 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
int var17;
int var18;
+ int var19;
int var20;
int var21;
int var22;
- int var30;
if(var10.type == 2) {
var15 = var2;
var16 = var3;
var17 = var4;
var18 = var5;
} else if(var10.type == 9) {
- var30 = var12;
- var20 = var13;
- var21 = var12 + var10.width;
- var22 = var13 + var10.height;
- if(var21 < var12) {
- var30 = var21;
- var21 = var12;
+ var22 = var12;
+ var19 = var13;
+ var20 = var12 + var10.width;
+ var21 = var13 + var10.height;
+ if(var20 < var12) {
+ var22 = var20;
+ var20 = var12;
}
- if(var22 < var13) {
- var20 = var22;
- var22 = var13;
+ if(var21 < var13) {
+ var19 = var21;
+ var21 = var13;
}
+ ++var20;
++var21;
- ++var22;
- var15 = var30 > var2?var30:var2;
- var16 = var20 > var3?var20:var3;
- var17 = var21 < var4?var21:var4;
- var18 = var22 < var5?var22:var5;
+ var15 = var22 > var2?var22:var2;
+ var16 = var19 > var3?var19:var3;
+ var17 = var20 < var4?var20:var4;
+ var18 = var21 < var5?var21:var5;
} else {
- var30 = var12 + var10.width;
- var20 = var13 + var10.height;
+ var22 = var12 + var10.width;
+ var19 = var13 + var10.height;
var15 = var12 > var2?var12:var2;
var16 = var13 > var3?var13:var3;
- var17 = var30 < var4?var30:var4;
- var18 = var20 < var5?var20:var5;
+ var17 = var22 < var4?var22:var4;
+ var18 = var19 < var5?var19:var5;
}
if(!var10.isIf3 || var15 < var17 && var16 < var18) {
@@ -265,14 +265,14 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var13 += 15;
fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1);
var13 += 15;
- Runtime var38 = Runtime.getRuntime();
- var20 = (int)((var38.totalMemory() - var38.freeMemory()) / 1024L);
- var21 = 16776960;
- if(var20 > 327680 && !Client.isLowDetail) {
- var21 = 16711680;
+ Runtime var34 = Runtime.getRuntime();
+ var19 = (int)((var34.totalMemory() - var34.freeMemory()) / 1024L);
+ var20 = 16776960;
+ if(var19 > 327680 && !Client.isLowDetail) {
+ var20 = 16711680;
}
- fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1);
+ fontPlain12.drawRightAligned("Mem:" + var19 + "k", var12 + var10.width, var13, var20, -1);
var13 += 15;
}
continue;
@@ -332,9 +332,9 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
drawWidgetGroup(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
}
- WidgetGroupParent var19 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var10.id);
- if(var19 != null) {
- Interpreter.drawWidgets(var19.group, var15, var16, var17, var18, var12, var13, var11);
+ WidgetGroupParent var23 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var10.id);
+ if(var23 != null) {
+ Interpreter.drawWidgets(var23.group, var15, var16, var17, var18, var12, var13, var11);
}
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
@@ -347,45 +347,45 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
}
if(var10.type != 1) {
- int var23;
int var24;
int var25;
int var26;
+ int var33;
if(var10.type == 2) {
- var30 = 0;
+ var22 = 0;
- for(var20 = 0; var20 < var10.rawHeight; ++var20) {
- for(var21 = 0; var21 < var10.rawWidth; ++var21) {
- var22 = var12 + var21 * (var10.paddingX + 32);
- var23 = var13 + var20 * (var10.paddingY + 32);
- if(var30 < 20) {
- var22 += var10.inventoryXOffsets[var30];
- var23 += var10.inventoryYOffsets[var30];
+ for(var19 = 0; var19 < var10.rawHeight; ++var19) {
+ for(var20 = 0; var20 < var10.rawWidth; ++var20) {
+ var21 = var12 + var20 * (var10.paddingX + 32);
+ var33 = var13 + var19 * (var10.paddingY + 32);
+ if(var22 < 20) {
+ var21 += var10.inventoryXOffsets[var22];
+ var33 += var10.inventoryYOffsets[var22];
}
- if(var10.itemIds[var30] <= 0) {
- if(var10.inventorySprites != null && var30 < 20) {
- Sprite var42 = var10.getInventorySprite(var30);
- if(var42 != null) {
- var42.drawAt2(var22, var23);
+ if(var10.itemIds[var22] <= 0) {
+ if(var10.inventorySprites != null && var22 < 20) {
+ Sprite var36 = var10.getInventorySprite(var22);
+ if(var36 != null) {
+ var36.drawAt2(var21, var33);
} else if(Widget.__ho_j) {
class22.method295(var10);
}
}
} else {
- boolean var39 = false;
- boolean var40 = false;
- var26 = var10.itemIds[var30] - 1;
- if(var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == dragInventoryWidget && var30 == Client.dragItemSlotSource) {
- Sprite var27;
- if(Client.isItemSelected == 1 && var30 == HealthBarDefinition.selectedItemSlot && var10.id == ServerPacket.selectedItemWidget) {
- var27 = class226.getItemSprite(var26, var10.itemQuantities[var30], 2, 0, 2, false);
+ boolean var35 = false;
+ boolean var46 = false;
+ var26 = var10.itemIds[var22] - 1;
+ if(var21 + 32 > var2 && var21 < var4 && var33 + 32 > var3 && var33 < var5 || var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) {
+ Sprite var42;
+ if(Client.isItemSelected == 1 && var22 == HealthBarDefinition.selectedItemSlot && var10.id == ServerPacket.selectedItemWidget) {
+ var42 = class226.getItemSprite(var26, var10.itemQuantities[var22], 2, 0, 2, false);
} else {
- var27 = class226.getItemSprite(var26, var10.itemQuantities[var30], 1, 3153952, 2, false);
+ var42 = class226.getItemSprite(var26, var10.itemQuantities[var22], 1, 3153952, 2, false);
}
- if(var27 != null) {
- if(var10 == dragInventoryWidget && var30 == Client.dragItemSlotSource) {
+ if(var42 != null) {
+ if(var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) {
var24 = MouseHandler.MouseHandler_x - Client.__client_ja;
var25 = MouseHandler.MouseHandler_y - Client.__client_je;
if(var24 < 5 && var24 > -5) {
@@ -401,44 +401,44 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var25 = 0;
}
- var27.__h_508(var22 + var24, var23 + var25, 128);
+ var42.__h_508(var21 + var24, var33 + var25, 128);
if(var1 != -1) {
- Widget var28 = var0[var1 & 65535];
- int var29;
- if(var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) {
- var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.__client_gy / 3;
- if(var29 > Client.__client_gy * 10) {
- var29 = Client.__client_gy * 10;
+ Widget var47 = var0[var1 & 65535];
+ int var45;
+ if(var33 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var47.scrollY > 0) {
+ var45 = (Rasterizer2D.Rasterizer2D_yClipStart - var33 - var25) * Client.__client_gy / 3;
+ if(var45 > Client.__client_gy * 10) {
+ var45 = Client.__client_gy * 10;
}
- if(var29 > var28.scrollY) {
- var29 = var28.scrollY;
+ if(var45 > var47.scrollY) {
+ var45 = var47.scrollY;
}
- var28.scrollY -= var29;
- Client.__client_je += var29;
- class22.method295(var28);
+ var47.scrollY -= var45;
+ Client.__client_je += var45;
+ class22.method295(var47);
}
- if(var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) {
- var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.__client_gy / 3;
- if(var29 > Client.__client_gy * 10) {
- var29 = Client.__client_gy * 10;
+ if(var25 + var33 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var47.scrollY < var47.scrollHeight - var47.height) {
+ var45 = (var33 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.__client_gy / 3;
+ if(var45 > Client.__client_gy * 10) {
+ var45 = Client.__client_gy * 10;
}
- if(var29 > var28.scrollHeight - var28.height - var28.scrollY) {
- var29 = var28.scrollHeight - var28.height - var28.scrollY;
+ if(var45 > var47.scrollHeight - var47.height - var47.scrollY) {
+ var45 = var47.scrollHeight - var47.height - var47.scrollY;
}
- var28.scrollY += var29;
- Client.__client_je -= var29;
- class22.method295(var28);
+ var47.scrollY += var45;
+ Client.__client_je -= var45;
+ class22.method295(var47);
}
}
- } else if(var10 == BoundaryObject.__ej_jv && var30 == Client.__client_jz) {
- var27.__h_508(var22, var23, 128);
+ } else if(var10 == BoundaryObject.__ej_jv && var22 == Client.__client_jz) {
+ var42.__h_508(var21, var33, 128);
} else {
- var27.drawAt2(var22, var23);
+ var42.drawAt2(var21, var33);
}
} else {
class22.method295(var10);
@@ -446,19 +446,19 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
}
}
- ++var30;
+ ++var22;
}
}
} else if(var10.type == 3) {
if(class238.runCs1(var10)) {
- var30 = var10.color2;
+ var22 = var10.color2;
if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
- var30 = var10.mouseOverColor2;
+ var22 = var10.mouseOverColor2;
}
} else {
- var30 = var10.color;
+ var22 = var10.color;
if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
- var30 = var10.mouseOverColor;
+ var22 = var10.mouseOverColor;
}
}
@@ -472,64 +472,64 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
break;
default:
if(var14 == 0) {
- Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var30);
+ Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var22);
} else {
- Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255));
+ Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var22, 256 - (var14 & 255));
}
}
} else if(var14 == 0) {
- Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var30);
+ Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var22);
} else {
- Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255));
+ Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var22, 256 - (var14 & 255));
}
} else {
- Font var36;
+ Font var27;
if(var10.type == 4) {
- var36 = var10.getFont();
- if(var36 == null) {
+ var27 = var10.getFont();
+ if(var27 == null) {
if(Widget.__ho_j) {
class22.method295(var10);
}
} else {
- String var45 = var10.text;
+ String var38 = var10.text;
if(class238.runCs1(var10)) {
- var20 = var10.color2;
+ var19 = var10.color2;
if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
- var20 = var10.mouseOverColor2;
+ var19 = var10.mouseOverColor2;
}
if(var10.text2.length() > 0) {
- var45 = var10.text2;
+ var38 = var10.text2;
}
} else {
- var20 = var10.color;
+ var19 = var10.color;
if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
- var20 = var10.mouseOverColor;
+ var19 = var10.mouseOverColor;
}
}
if(var10.isIf3 && var10.itemId != -1) {
- ItemDefinition var46 = Skills.getItemDefinition(var10.itemId);
- var45 = var46.name;
- if(var45 == null) {
- var45 = "null";
+ ItemDefinition var41 = Skills.getItemDefinition(var10.itemId);
+ var38 = var41.name;
+ if(var38 == null) {
+ var38 = "null";
}
- if((var46.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) {
- var45 = BufferedFile.colorStartTag(16748608) + var45 + "" + " " + 'x' + GrandExchangeEvent.method88(var10.itemQuantity);
+ if((var41.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) {
+ var38 = BufferedFile.colorStartTag(16748608) + var38 + " " + 'x' + GrandExchangeEvent.method88(var10.itemQuantity);
}
}
if(var10 == Client.__client_mo) {
- var45 = "Please wait...";
- var20 = var10.color;
+ var38 = "Please wait...";
+ var19 = var10.color;
}
if(!var10.isIf3) {
- var45 = MouseRecorder.method1194(var45, var10);
+ var38 = MouseRecorder.method1194(var38, var10);
}
- var36.drawLines(var45, var12, var13, var10.width, var10.height, var20, var10.textShadowed?0:-1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight);
+ var27.drawLines(var38, var12, var13, var10.width, var10.height, var19, var10.textShadowed?0:-1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight);
}
} else if(var10.type == 5) {
Sprite var37;
@@ -552,32 +552,32 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
class22.method295(var10);
}
} else {
- var20 = var37.width;
- var21 = var37.height;
+ var19 = var37.width;
+ var20 = var37.height;
if(!var10.spriteTiling) {
- var22 = var10.width * 4096 / var20;
+ var21 = var10.width * 4096 / var19;
if(var10.spriteAngle != 0) {
- var37.__ak_515(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22);
+ var37.__ak_515(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var21);
} else if(var14 != 0) {
var37.__c_509(var12, var13, var10.width, var10.height, 256 - (var14 & 255));
- } else if(var20 == var10.width && var21 == var10.height) {
+ } else if(var19 == var10.width && var20 == var10.height) {
var37.drawAt2(var12, var13);
} else {
var37.__j_506(var12, var13, var10.width, var10.height);
}
} else {
Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height);
- var22 = (var20 - 1 + var10.width) / var20;
- var23 = (var21 - 1 + var10.height) / var21;
+ var21 = (var19 - 1 + var10.width) / var19;
+ var33 = (var20 - 1 + var10.height) / var20;
- for(var24 = 0; var24 < var22; ++var24) {
- for(var25 = 0; var25 < var23; ++var25) {
+ for(var24 = 0; var24 < var21; ++var24) {
+ for(var25 = 0; var25 < var33; ++var25) {
if(var10.spriteAngle != 0) {
- var37.__ak_515(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096);
+ var37.__ak_515(var19 / 2 + var12 + var19 * var24, var20 / 2 + var13 + var25 * var20, var10.spriteAngle, 4096);
} else if(var14 != 0) {
- var37.__h_508(var12 + var20 * var24, var13 + var21 * var25, 256 - (var14 & 255));
+ var37.__h_508(var12 + var19 * var24, var13 + var20 * var25, 256 - (var14 & 255));
} else {
- var37.drawAt2(var12 + var20 * var24, var13 + var25 * var21);
+ var37.drawAt2(var12 + var19 * var24, var13 + var25 * var20);
}
}
}
@@ -587,60 +587,60 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
}
}
} else {
- ItemDefinition var34;
+ ItemDefinition var28;
if(var10.type == 6) {
- boolean var43 = class238.runCs1(var10);
- if(var43) {
- var20 = var10.sequenceId2;
+ boolean var40 = class238.runCs1(var10);
+ if(var40) {
+ var19 = var10.sequenceId2;
} else {
- var20 = var10.sequenceId;
+ var19 = var10.sequenceId;
}
- Model var41 = null;
- var22 = 0;
+ Model var43 = null;
+ var21 = 0;
if(var10.itemId != -1) {
- var34 = Skills.getItemDefinition(var10.itemId);
- if(var34 != null) {
- var34 = var34.__x_430(var10.itemQuantity);
- var41 = var34.getModel(1);
- if(var41 != null) {
- var41.calculateBoundsCylinder();
- var22 = var41.height / 2;
+ var28 = Skills.getItemDefinition(var10.itemId);
+ if(var28 != null) {
+ var28 = var28.__x_430(var10.itemQuantity);
+ var43 = var28.getModel(1);
+ if(var43 != null) {
+ var43.calculateBoundsCylinder();
+ var21 = var43.height / 2;
} else {
class22.method295(var10);
}
}
} else if(var10.modelType == 5) {
if(var10.modelId == 0) {
- var41 = Client.__client_ru.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
+ var43 = Client.__client_ru.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
} else {
- var41 = Canvas.localPlayer.getModel();
+ var43 = Canvas.localPlayer.getModel();
}
- } else if(var20 == -1) {
- var41 = var10.getModel((SequenceDefinition)null, -1, var43, Canvas.localPlayer.appearance);
- if(var41 == null && Widget.__ho_j) {
+ } else if(var19 == -1) {
+ var43 = var10.getModel((SequenceDefinition)null, -1, var40, Canvas.localPlayer.appearance);
+ if(var43 == null && Widget.__ho_j) {
class22.method295(var10);
}
} else {
- SequenceDefinition var47 = WorldMapAreaData.getSequenceDefinition(var20);
- var41 = var10.getModel(var47, var10.modelFrame, var43, Canvas.localPlayer.appearance);
- if(var41 == null && Widget.__ho_j) {
+ SequenceDefinition var44 = WorldMapAreaData.getSequenceDefinition(var19);
+ var43 = var10.getModel(var44, var10.modelFrame, var40, Canvas.localPlayer.appearance);
+ if(var43 == null && Widget.__ho_j) {
class22.method295(var10);
}
}
Rasterizer3D.method2989(var10.width / 2 + var12, var10.height / 2 + var13);
- var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16;
+ var33 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16;
var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16;
- if(var41 != null) {
+ if(var43 != null) {
if(!var10.isIf3) {
- var41.__c_234(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24);
+ var43.__c_234(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var33, var24);
} else {
- var41.calculateBoundsCylinder();
+ var43.calculateBoundsCylinder();
if(var10.modelOrthog) {
- var41.__p_235(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom);
+ var43.__p_235(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var21 + var33 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom);
} else {
- var41.__c_234(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY);
+ var43.__c_234(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var33 + var21 + var10.modelOffsetY, var24 + var10.modelOffsetY);
}
}
}
@@ -648,118 +648,118 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
Rasterizer3D.Rasterizer3D_method3();
} else {
if(var10.type == 7) {
- var36 = var10.getFont();
- if(var36 == null) {
+ var27 = var10.getFont();
+ if(var27 == null) {
if(Widget.__ho_j) {
class22.method295(var10);
}
continue;
}
- var20 = 0;
+ var19 = 0;
- for(var21 = 0; var21 < var10.rawHeight; ++var21) {
- for(var22 = 0; var22 < var10.rawWidth; ++var22) {
- if(var10.itemIds[var20] > 0) {
- var34 = Skills.getItemDefinition(var10.itemIds[var20] - 1);
- String var31;
- if(var34.isStackable != 1 && var10.itemQuantities[var20] == 1) {
- var31 = BufferedFile.colorStartTag(16748608) + var34.name + "";
+ for(var20 = 0; var20 < var10.rawHeight; ++var20) {
+ for(var21 = 0; var21 < var10.rawWidth; ++var21) {
+ if(var10.itemIds[var19] > 0) {
+ var28 = Skills.getItemDefinition(var10.itemIds[var19] - 1);
+ String var29;
+ if(var28.isStackable != 1 && var10.itemQuantities[var19] == 1) {
+ var29 = BufferedFile.colorStartTag(16748608) + var28.name + "";
} else {
- var31 = BufferedFile.colorStartTag(16748608) + var34.name + "" + " " + 'x' + GrandExchangeEvent.method88(var10.itemQuantities[var20]);
+ var29 = BufferedFile.colorStartTag(16748608) + var28.name + " " + 'x' + GrandExchangeEvent.method88(var10.itemQuantities[var19]);
}
- var25 = var22 * (var10.paddingX + 115) + var12;
- var26 = var21 * (var10.paddingY + 12) + var13;
+ var25 = var21 * (var10.paddingX + 115) + var12;
+ var26 = var20 * (var10.paddingY + 12) + var13;
if(var10.textXAlignment == 0) {
- var36.draw(var31, var25, var26, var10.color, var10.textShadowed?0:-1);
+ var27.draw(var29, var25, var26, var10.color, var10.textShadowed?0:-1);
} else if(var10.textXAlignment == 1) {
- var36.drawCentered(var31, var10.width / 2 + var25, var26, var10.color, var10.textShadowed?0:-1);
+ var27.drawCentered(var29, var10.width / 2 + var25, var26, var10.color, var10.textShadowed?0:-1);
} else {
- var36.drawRightAligned(var31, var25 + var10.width - 1, var26, var10.color, var10.textShadowed?0:-1);
+ var27.drawRightAligned(var29, var25 + var10.width - 1, var26, var10.color, var10.textShadowed?0:-1);
}
}
- ++var20;
+ ++var19;
}
}
}
if(var10.type == 8 && var10 == AccessFile.__dk_lm && Client.__client_ls == Client.__client_lb) {
- var30 = 0;
- var20 = 0;
- Font var32 = fontPlain12;
- String var33 = var10.text;
+ var22 = 0;
+ var19 = 0;
+ Font var39 = fontPlain12;
+ String var30 = var10.text;
- String var44;
- for(var33 = MouseRecorder.method1194(var33, var10); var33.length() > 0; var20 = var20 + var32.ascent + 1) {
- var24 = var33.indexOf("
");
+ String var31;
+ for(var30 = MouseRecorder.method1194(var30, var10); var30.length() > 0; var19 = var19 + var39.ascent + 1) {
+ var24 = var30.indexOf("
");
if(var24 != -1) {
- var44 = var33.substring(0, var24);
- var33 = var33.substring(var24 + 4);
+ var31 = var30.substring(0, var24);
+ var30 = var30.substring(var24 + 4);
} else {
- var44 = var33;
- var33 = "";
+ var31 = var30;
+ var30 = "";
}
- var25 = var32.stringWidth(var44);
- if(var25 > var30) {
- var30 = var25;
+ var25 = var39.stringWidth(var31);
+ if(var25 > var22) {
+ var22 = var25;
}
}
- var30 += 6;
- var20 += 7;
- var24 = var12 + var10.width - 5 - var30;
+ var22 += 6;
+ var19 += 7;
+ var24 = var12 + var10.width - 5 - var22;
var25 = var13 + var10.height + 5;
if(var24 < var12 + 5) {
var24 = var12 + 5;
}
- if(var30 + var24 > var4) {
- var24 = var4 - var30;
+ if(var22 + var24 > var4) {
+ var24 = var4 - var22;
}
- if(var25 + var20 > var5) {
- var25 = var5 - var20;
+ if(var25 + var19 > var5) {
+ var25 = var5 - var19;
}
- Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var30, var20, 16777120);
- Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var30, var20, 0);
- var33 = var10.text;
- var26 = var25 + var32.ascent + 2;
+ Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var22, var19, 16777120);
+ Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var22, var19, 0);
+ var30 = var10.text;
+ var26 = var25 + var39.ascent + 2;
- for(var33 = MouseRecorder.method1194(var33, var10); var33.length() > 0; var26 = var26 + var32.ascent + 1) {
- int var35 = var33.indexOf("
");
- if(var35 != -1) {
- var44 = var33.substring(0, var35);
- var33 = var33.substring(var35 + 4);
+ for(var30 = MouseRecorder.method1194(var30, var10); var30.length() > 0; var26 = var26 + var39.ascent + 1) {
+ int var32 = var30.indexOf("
");
+ if(var32 != -1) {
+ var31 = var30.substring(0, var32);
+ var30 = var30.substring(var32 + 4);
} else {
- var44 = var33;
- var33 = "";
+ var31 = var30;
+ var30 = "";
}
- var32.draw(var44, var24 + 3, var26, 0, -1);
+ var39.draw(var31, var24 + 3, var26, 0, -1);
}
}
if(var10.type == 9) {
if(var10.__ba) {
- var30 = var12;
- var20 = var13 + var10.height;
- var21 = var12 + var10.width;
- var22 = var13;
+ var22 = var12;
+ var19 = var13 + var10.height;
+ var20 = var12 + var10.width;
+ var21 = var13;
} else {
- var30 = var12;
- var20 = var13;
- var21 = var12 + var10.width;
- var22 = var13 + var10.height;
+ var22 = var12;
+ var19 = var13;
+ var20 = var12 + var10.width;
+ var21 = var13 + var10.height;
}
if(var10.lineWid == 1) {
- Rasterizer2D.Rasterizer2D_drawLine(var30, var20, var21, var22, var10.color);
+ Rasterizer2D.Rasterizer2D_drawLine(var22, var19, var20, var21, var10.color);
} else {
- class190.method3669(var30, var20, var21, var22, var10.color, var10.lineWid);
+ class190.method3669(var22, var19, var20, var21, var10.color, var10.lineWid);
}
}
}
@@ -790,7 +790,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var3.modelFrameCycle = 0;
}
}
-
}
+
}
}
diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java
index 434d68ecff..dc500885aa 100644
--- a/runescape-client/src/main/java/DualNode.java
+++ b/runescape-client/src/main/java/DualNode.java
@@ -31,5 +31,6 @@ public class DualNode extends Node {
this.previousDual = null;
this.nextDual = null;
}
+
}
}
diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java
index 891cc10b79..af1408cef8 100644
--- a/runescape-client/src/main/java/DynamicObject.java
+++ b/runescape-client/src/main/java/DynamicObject.java
@@ -114,11 +114,11 @@ public class DynamicObject extends Entity {
var1 = 100;
}
- label55: {
+ label47: {
do {
do {
if(var1 <= this.sequenceDefinition.frameLengths[this.frame]) {
- break label55;
+ break label47;
}
var1 -= this.sequenceDefinition.frameLengths[this.frame];
@@ -219,41 +219,42 @@ public class DynamicObject extends Entity {
}
Client.__client_pl = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
- PacketBufferNode var18 = Interpreter.method1915(ClientPacket.__gs_z, Client.packetWriter.isaacCipher);
- var18.packetBuffer.writeByte(Client.publicChatMode);
- var18.packetBuffer.writeByte(IndexCacheLoader.field512.field3804);
- var18.packetBuffer.writeByte(Client.__client_pl);
- Client.packetWriter.__q_167(var18);
+ PacketBufferNode var15 = Interpreter.method1915(ClientPacket.__gs_z, Client.packetWriter.isaacCipher);
+ var15.packetBuffer.writeByte(Client.publicChatMode);
+ var15.packetBuffer.writeByte(IndexCacheLoader.field512.field3804);
+ var15.packetBuffer.writeByte(Client.__client_pl);
+ Client.packetWriter.__q_167(var15);
return 1;
} else {
String var3;
int var4;
+ int var5;
if(var0 == 5002) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
class179.Interpreter_intStackSize -= 2;
var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- int var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- PacketBufferNode var6 = Interpreter.method1915(ClientPacket.__gs_ae, Client.packetWriter.isaacCipher);
- var6.packetBuffer.writeByte(WorldMapRegion.method550(var3) + 2);
- var6.packetBuffer.writeStringCp1252NullTerminated(var3);
- var6.packetBuffer.writeByte(var4 - 1);
- var6.packetBuffer.writeByte(var5);
- Client.packetWriter.__q_167(var6);
+ var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
+ PacketBufferNode var13 = Interpreter.method1915(ClientPacket.__gs_ae, Client.packetWriter.isaacCipher);
+ var13.packetBuffer.writeByte(WorldMapRegion.method550(var3) + 2);
+ var13.packetBuffer.writeStringCp1252NullTerminated(var3);
+ var13.packetBuffer.writeByte(var4 - 1);
+ var13.packetBuffer.writeByte(var5);
+ Client.packetWriter.__q_167(var13);
return 1;
} else {
- int var10;
+ Message var11;
if(var0 == 5003) {
class179.Interpreter_intStackSize -= 2;
- var10 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
+ var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- Message var15 = Message.method1226(var10, var4);
- if(var15 != null) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var15.count;
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var15.cycle;
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.sender != null?var15.sender:"";
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.prefix != null?var15.prefix:"";
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.text != null?var15.text:"";
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var15.isFromFriend()?1:(var15.isFromIgnored()?2:0);
+ var11 = Message.method1226(var5, var4);
+ if(var11 != null) {
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.count;
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.cycle;
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.sender != null?var11.sender:"";
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.prefix != null?var11.prefix:"";
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.text != null?var11.text:"";
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.isFromFriend()?1:(var11.isFromIgnored()?2:0);
} else {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
@@ -265,15 +266,15 @@ public class DynamicObject extends Entity {
return 1;
} else if(var0 == 5004) {
- var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- Message var16 = NetCache.method4708(var10);
- if(var16 != null) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var16.type;
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var16.cycle;
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.sender != null?var16.sender:"";
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.prefix != null?var16.prefix:"";
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.text != null?var16.text:"";
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var16.isFromFriend()?1:(var16.isFromIgnored()?2:0);
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ var11 = NetCache.method4708(var5);
+ if(var11 != null) {
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.type;
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.cycle;
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.sender != null?var11.sender:"";
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.prefix != null?var11.prefix:"";
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.text != null?var11.text:"";
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.isFromFriend()?1:(var11.isFromIgnored()?2:0);
} else {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
@@ -292,187 +293,190 @@ public class DynamicObject extends Entity {
}
return 1;
- } else if(var0 == 5008) {
- var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- var4 = Interpreter.Interpreter_intStack[--class179.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(Client.language != 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());
- }
- }
-
- 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(Client.language != 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());
- }
- }
-
- PacketBufferNode var8 = Interpreter.method1915(ClientPacket.__gs_cz, Client.packetWriter.isaacCipher);
- var8.packetBuffer.writeByte(0);
- int var9 = var8.packetBuffer.index;
- var8.packetBuffer.writeByte(var4);
- var8.packetBuffer.writeByte(var17);
- var8.packetBuffer.writeByte(var7);
- TextureProvider.method2777(var8.packetBuffer, var3);
- var8.packetBuffer.__h_300(var8.packetBuffer.index - var9);
- Client.packetWriter.__q_167(var8);
- return 1;
- } else if(var0 == 5009) {
- Interpreter.Interpreter_stringStackSize -= 2;
- var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
- String var12 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
- PacketBufferNode var11 = Interpreter.method1915(ClientPacket.__gs_v, Client.packetWriter.isaacCipher);
- var11.packetBuffer.writeShort(0);
- int var13 = var11.packetBuffer.index;
- var11.packetBuffer.writeStringCp1252NullTerminated(var3);
- TextureProvider.method2777(var11.packetBuffer, var12);
- var11.packetBuffer.__y_299(var11.packetBuffer.index - var13);
- Client.packetWriter.__q_167(var11);
- return 1;
- } else if(var0 != 5015) {
- if(var0 == 5016) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.__client_pl;
- return 1;
- } else if(var0 == 5017) {
- var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WidgetGroupParent.method1174(var10);
- return 1;
- } else if(var0 == 5018) {
- var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class12.method161(var10);
- return 1;
- } else if(var0 == 5019) {
- var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = SpriteMask.method4391(var10);
- return 1;
- } else if(var0 == 5020) {
- var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- BoundaryObject.method3235(var3);
- return 1;
- } else if(var0 == 5021) {
- Client.__client_pz = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim();
- return 1;
- } else if(var0 == 5022) {
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.__client_pz;
- return 1;
- } else if(var0 == 5023) {
- var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- System.out.println(var3);
- return 1;
- } else {
- return 2;
- }
} else {
- if(Canvas.localPlayer != null && Canvas.localPlayer.username != null) {
- var3 = Canvas.localPlayer.username.getName();
- } else {
- var3 = "";
- }
+ String var6;
+ if(var0 == 5008) {
+ var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ var4 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ var6 = var3.toLowerCase();
+ byte var12 = 0;
+ if(var6.startsWith("yellow:")) {
+ var12 = 0;
+ var3 = var3.substring("yellow:".length());
+ } else if(var6.startsWith("red:")) {
+ var12 = 1;
+ var3 = var3.substring("red:".length());
+ } else if(var6.startsWith("green:")) {
+ var12 = 2;
+ var3 = var3.substring("green:".length());
+ } else if(var6.startsWith("cyan:")) {
+ var12 = 3;
+ var3 = var3.substring("cyan:".length());
+ } else if(var6.startsWith("purple:")) {
+ var12 = 4;
+ var3 = var3.substring("purple:".length());
+ } else if(var6.startsWith("white:")) {
+ var12 = 5;
+ var3 = var3.substring("white:".length());
+ } else if(var6.startsWith("flash1:")) {
+ var12 = 6;
+ var3 = var3.substring("flash1:".length());
+ } else if(var6.startsWith("flash2:")) {
+ var12 = 7;
+ var3 = var3.substring("flash2:".length());
+ } else if(var6.startsWith("flash3:")) {
+ var12 = 8;
+ var3 = var3.substring("flash3:".length());
+ } else if(var6.startsWith("glow1:")) {
+ var12 = 9;
+ var3 = var3.substring("glow1:".length());
+ } else if(var6.startsWith("glow2:")) {
+ var12 = 10;
+ var3 = var3.substring("glow2:".length());
+ } else if(var6.startsWith("glow3:")) {
+ var12 = 11;
+ var3 = var3.substring("glow3:".length());
+ } else if(Client.language != 0) {
+ if(var6.startsWith("yellow:")) {
+ var12 = 0;
+ var3 = var3.substring("yellow:".length());
+ } else if(var6.startsWith("red:")) {
+ var12 = 1;
+ var3 = var3.substring("red:".length());
+ } else if(var6.startsWith("green:")) {
+ var12 = 2;
+ var3 = var3.substring("green:".length());
+ } else if(var6.startsWith("cyan:")) {
+ var12 = 3;
+ var3 = var3.substring("cyan:".length());
+ } else if(var6.startsWith("purple:")) {
+ var12 = 4;
+ var3 = var3.substring("purple:".length());
+ } else if(var6.startsWith("white:")) {
+ var12 = 5;
+ var3 = var3.substring("white:".length());
+ } else if(var6.startsWith("flash1:")) {
+ var12 = 6;
+ var3 = var3.substring("flash1:".length());
+ } else if(var6.startsWith("flash2:")) {
+ var12 = 7;
+ var3 = var3.substring("flash2:".length());
+ } else if(var6.startsWith("flash3:")) {
+ var12 = 8;
+ var3 = var3.substring("flash3:".length());
+ } else if(var6.startsWith("glow1:")) {
+ var12 = 9;
+ var3 = var3.substring("glow1:".length());
+ } else if(var6.startsWith("glow2:")) {
+ var12 = 10;
+ var3 = var3.substring("glow2:".length());
+ } else if(var6.startsWith("glow3:")) {
+ var12 = 11;
+ var3 = var3.substring("glow3:".length());
+ }
+ }
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
- return 1;
+ var6 = var3.toLowerCase();
+ byte var14 = 0;
+ if(var6.startsWith("wave:")) {
+ var14 = 1;
+ var3 = var3.substring("wave:".length());
+ } else if(var6.startsWith("wave2:")) {
+ var14 = 2;
+ var3 = var3.substring("wave2:".length());
+ } else if(var6.startsWith("shake:")) {
+ var14 = 3;
+ var3 = var3.substring("shake:".length());
+ } else if(var6.startsWith("scroll:")) {
+ var14 = 4;
+ var3 = var3.substring("scroll:".length());
+ } else if(var6.startsWith("slide:")) {
+ var14 = 5;
+ var3 = var3.substring("slide:".length());
+ } else if(Client.language != 0) {
+ if(var6.startsWith("wave:")) {
+ var14 = 1;
+ var3 = var3.substring("wave:".length());
+ } else if(var6.startsWith("wave2:")) {
+ var14 = 2;
+ var3 = var3.substring("wave2:".length());
+ } else if(var6.startsWith("shake:")) {
+ var14 = 3;
+ var3 = var3.substring("shake:".length());
+ } else if(var6.startsWith("scroll:")) {
+ var14 = 4;
+ var3 = var3.substring("scroll:".length());
+ } else if(var6.startsWith("slide:")) {
+ var14 = 5;
+ var3 = var3.substring("slide:".length());
+ }
+ }
+
+ PacketBufferNode var9 = Interpreter.method1915(ClientPacket.__gs_cz, Client.packetWriter.isaacCipher);
+ var9.packetBuffer.writeByte(0);
+ int var10 = var9.packetBuffer.index;
+ var9.packetBuffer.writeByte(var4);
+ var9.packetBuffer.writeByte(var12);
+ var9.packetBuffer.writeByte(var14);
+ TextureProvider.method2777(var9.packetBuffer, var3);
+ var9.packetBuffer.__h_300(var9.packetBuffer.index - var10);
+ Client.packetWriter.__q_167(var9);
+ return 1;
+ } else if(var0 == 5009) {
+ Interpreter.Interpreter_stringStackSize -= 2;
+ var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
+ var6 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+ PacketBufferNode var7 = Interpreter.method1915(ClientPacket.__gs_v, Client.packetWriter.isaacCipher);
+ var7.packetBuffer.writeShort(0);
+ int var8 = var7.packetBuffer.index;
+ var7.packetBuffer.writeStringCp1252NullTerminated(var3);
+ TextureProvider.method2777(var7.packetBuffer, var6);
+ var7.packetBuffer.__y_299(var7.packetBuffer.index - var8);
+ Client.packetWriter.__q_167(var7);
+ return 1;
+ } else if(var0 != 5015) {
+ if(var0 == 5016) {
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.__client_pl;
+ return 1;
+ } else if(var0 == 5017) {
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WidgetGroupParent.method1174(var5);
+ return 1;
+ } else if(var0 == 5018) {
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class12.method161(var5);
+ return 1;
+ } else if(var0 == 5019) {
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = SpriteMask.method4391(var5);
+ return 1;
+ } else if(var0 == 5020) {
+ var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ BoundaryObject.method3235(var3);
+ return 1;
+ } else if(var0 == 5021) {
+ Client.__client_pz = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim();
+ return 1;
+ } else if(var0 == 5022) {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.__client_pz;
+ return 1;
+ } else if(var0 == 5023) {
+ var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ System.out.println(var3);
+ return 1;
+ } else {
+ return 2;
+ }
+ } else {
+ if(Canvas.localPlayer != null && Canvas.localPlayer.username != null) {
+ var3 = Canvas.localPlayer.username.getName();
+ } else {
+ var3 = "";
+ }
+
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
+ return 1;
+ }
}
}
}
@@ -497,24 +501,24 @@ public class DynamicObject extends Entity {
GameShell.garbageCollectorLastCollectionTime = -1L;
}
}
- } catch (Throwable var11) {
+ } catch (Throwable var9) {
;
}
}
if(AbstractIndexCache.garbageCollector != null) {
- long var9 = class203.currentTimeMs();
+ long var10 = class203.currentTimeMs();
long var3 = AbstractIndexCache.garbageCollector.getCollectionTime();
if(GameShell.garbageCollectorLastCollectionTime != -1L) {
long var5 = var3 - GameShell.garbageCollectorLastCollectionTime;
- long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs;
+ long var7 = var10 - GameShell.garbageCollectorLastCheckTimeMs;
if(0L != var7) {
var0 = (int)(var5 * 100L / var7);
}
}
GameShell.garbageCollectorLastCollectionTime = var3;
- GameShell.garbageCollectorLastCheckTimeMs = var9;
+ GameShell.garbageCollectorLastCheckTimeMs = var10;
}
return var0;
@@ -541,72 +545,72 @@ public class DynamicObject extends Entity {
var4 = GraphicsObject.baseY;
int var7;
- int var9;
+ int var8;
for(var7 = 0; var7 < 32768; ++var7) {
- Npc var8 = Client.npcs[var7];
- if(var8 != null) {
- for(var9 = 0; var9 < 10; ++var9) {
- var8.pathX[var9] -= var5;
- var8.pathY[var9] -= var6;
+ NPC var9 = Client.npcs[var7];
+ if(var9 != null) {
+ for(var8 = 0; var8 < 10; ++var8) {
+ var9.pathX[var8] -= var5;
+ var9.pathY[var8] -= var6;
}
- var8.x -= var5 * 128;
- var8.y -= var6 * 128;
+ var9.x -= var5 * 128;
+ var9.y -= var6 * 128;
}
}
for(var7 = 0; var7 < 2048; ++var7) {
- Player var21 = Client.players[var7];
- if(var21 != null) {
- for(var9 = 0; var9 < 10; ++var9) {
- var21.pathX[var9] -= var5;
- var21.pathY[var9] -= var6;
+ Player var20 = Client.players[var7];
+ if(var20 != null) {
+ for(var8 = 0; var8 < 10; ++var8) {
+ var20.pathX[var8] -= var5;
+ var20.pathY[var8] -= var6;
}
- var21.x -= var5 * 128;
- var21.y -= var6 * 128;
+ var20.x -= var5 * 128;
+ var20.y -= var6 * 128;
}
}
- byte var20 = 0;
- byte var18 = 104;
- byte var22 = 1;
+ byte var21 = 0;
+ byte var10 = 104;
+ byte var11 = 1;
if(var5 < 0) {
- var20 = 103;
- var18 = -1;
- var22 = -1;
- }
-
- byte var10 = 0;
- byte var11 = 104;
- byte var12 = 1;
- if(var6 < 0) {
- var10 = 103;
+ var21 = 103;
+ var10 = -1;
var11 = -1;
- var12 = -1;
}
- int var14;
- for(int var13 = var20; var13 != var18; var13 += var22) {
- for(var14 = var10; var11 != var14; var14 += var12) {
- int var15 = var13 + var5;
- int var16 = var14 + var6;
+ byte var12 = 0;
+ byte var13 = 104;
+ byte var14 = 1;
+ if(var6 < 0) {
+ var12 = 103;
+ var13 = -1;
+ var14 = -1;
+ }
- for(int var17 = 0; var17 < 4; ++var17) {
- if(var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) {
- Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16];
+ int var15;
+ for(int var16 = var21; var16 != var10; var16 += var11) {
+ for(var15 = var12; var13 != var15; var15 += var14) {
+ int var17 = var16 + var5;
+ int var18 = var15 + var6;
+
+ for(int var19 = 0; var19 < 4; ++var19) {
+ if(var17 >= 0 && var18 >= 0 && var17 < 104 && var18 < 104) {
+ Client.groundItems[var19][var16][var15] = Client.groundItems[var19][var17][var18];
} else {
- Client.groundItems[var17][var13][var14] = null;
+ Client.groundItems[var19][var16][var15] = null;
}
}
}
}
- for(class68 var19 = (class68)Client.__client_kh.last(); var19 != null; var19 = (class68)Client.__client_kh.previous()) {
- var19.field913 -= var5;
- var19.field901 -= var6;
- if(var19.field913 < 0 || var19.field901 < 0 || var19.field913 >= 104 || var19.field901 >= 104) {
- var19.remove();
+ for(class68 var22 = (class68)Client.__client_kh.last(); var22 != null; var22 = (class68)Client.__client_kh.previous()) {
+ var22.field913 -= var5;
+ var22.field901 -= var6;
+ if(var22.field913 < 0 || var22.field901 < 0 || var22.field913 >= 104 || var22.field901 >= 104) {
+ var22.remove();
}
}
@@ -625,10 +629,10 @@ public class DynamicObject extends Entity {
Client.graphicsObjects.clear();
Client.projectiles.clear();
- for(var14 = 0; var14 < 4; ++var14) {
- Client.collisionMaps[var14].clear();
+ for(var15 = 0; var15 < 4; ++var15) {
+ Client.collisionMaps[var15].clear();
}
-
}
+
}
}
diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java
index 28d6576ba4..245641404d 100644
--- a/runescape-client/src/main/java/EnumDefinition.java
+++ b/runescape-client/src/main/java/EnumDefinition.java
@@ -50,10 +50,6 @@ public class EnumDefinition extends DualNode {
@Export("stringVals")
public String[] stringVals;
- static {
- EnumDefinition_cached = new EvictingDualNodeHashTable(64);
- }
-
EnumDefinition() {
this.defaultString = "null";
this.size0 = 0;
@@ -125,4 +121,8 @@ public class EnumDefinition extends DualNode {
public int size() {
return this.size0;
}
+
+ static {
+ EnumDefinition_cached = new EvictingDualNodeHashTable(64);
+ }
}
diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java
index 9667cfd0d9..5af3caeea2 100644
--- a/runescape-client/src/main/java/Enumerated.java
+++ b/runescape-client/src/main/java/Enumerated.java
@@ -10,5 +10,5 @@ public interface Enumerated {
signature = "(B)I",
garbageValue = "83"
)
- int rsOrdinal();
+ int ordinal();
}
diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java
index c301844a78..697a90a3f2 100644
--- a/runescape-client/src/main/java/FaceNormal.java
+++ b/runescape-client/src/main/java/FaceNormal.java
@@ -71,10 +71,10 @@ public class FaceNormal {
} else if(!var0.startsWith("http://") && !var0.startsWith("https://")) {
throw new Exception();
} else {
- String var13 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*";
+ String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*";
- for(int var4 = 0; var4 < var0.length(); ++var4) {
- if(var13.indexOf(var0.charAt(var4)) == -1) {
+ for(int var12 = 0; var12 < var0.length(); ++var12) {
+ if(var11.indexOf(var0.charAt(var12)) == -1) {
throw new Exception();
}
}
@@ -82,36 +82,36 @@ public class FaceNormal {
Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\"");
return true;
}
- } catch (Throwable var8) {
+ } catch (Throwable var6) {
return false;
}
} else if(var1 == 1) {
try {
- Applet var7 = class50.__af_m;
- Object[] var5 = new Object[]{(new URL(class50.__af_m.getCodeBase(), var0)).toString()};
- Object var3 = JSObject.getWindow(var7).call(var2, var5);
- return var3 != null;
- } catch (Throwable var9) {
+ Applet var3 = class50.__af_m;
+ Object[] var4 = new Object[]{(new URL(class50.__af_m.getCodeBase(), var0)).toString()};
+ Object var5 = JSObject.getWindow(var3).call(var2, var4);
+ return var5 != null;
+ } catch (Throwable var7) {
return false;
}
} else if(var1 == 2) {
try {
class50.__af_m.getAppletContext().showDocument(new URL(class50.__af_m.getCodeBase(), var0), "_blank");
return true;
- } catch (Exception var10) {
+ } catch (Exception var8) {
return false;
}
} else if(var1 == 3) {
try {
class46.method851(class50.__af_m, "loggedout");
- } catch (Throwable var12) {
+ } catch (Throwable var10) {
;
}
try {
class50.__af_m.getAppletContext().showDocument(new URL(class50.__af_m.getCodeBase(), var0), "_top");
return true;
- } catch (Exception var11) {
+ } catch (Exception var9) {
return false;
}
} else {
diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java
index 57d955d98c..99ebb2cf9e 100644
--- a/runescape-client/src/main/java/Font.java
+++ b/runescape-client/src/main/java/Font.java
@@ -51,6 +51,7 @@ public final class Font extends AbstractFont {
if(var4 > 0 && var5 > 0) {
AbstractFont.AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var10, var7, var4, var5, var8, var9);
}
+
}
@ObfuscatedName("f")
@@ -92,5 +93,6 @@ public final class Font extends AbstractFont {
if(var4 > 0 && var5 > 0) {
AbstractFont.AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var11, var8, var4, var5, var9, var10, var7);
}
+
}
}
diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java
index 749e57c1b8..d6f002357d 100644
--- a/runescape-client/src/main/java/FontName.java
+++ b/runescape-client/src/main/java/FontName.java
@@ -46,15 +46,6 @@ public class FontName {
@Export("__g")
String __g;
- static {
- FontName_plain11 = new FontName("p11_full");
- FontName_plain12 = new FontName("p12_full");
- FontName_bold12 = new FontName("b12_full");
- FontName_verdana11 = new FontName("verdana_11pt_regular");
- FontName_verdana13 = new FontName("verdana_13pt_regular");
- FontName_verdana15 = new FontName("verdana_15pt_regular");
- }
-
FontName(String var1) {
this.__g = var1;
}
@@ -119,9 +110,9 @@ public class FontName {
if(var0 == 3601) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) {
- Friend var8 = (Friend)WorldMapArea.friendSystem.friendsList.get(var3);
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.name();
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.previousName();
+ Friend var6 = (Friend)WorldMapArea.friendSystem.friendsList.get(var3);
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.name();
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.previousName();
} else {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
@@ -147,32 +138,32 @@ public class FontName {
return 1;
} else {
- String var5;
+ String var4;
if(var0 == 3604) {
- var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- int var6 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- method5638(var5, var6);
+ var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ int var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ method5638(var4, var8);
return 1;
} else if(var0 == 3605) {
- var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- WorldMapArea.friendSystem.__l_157(var5);
+ var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ WorldMapArea.friendSystem.__l_157(var4);
return 1;
} else if(var0 == 3606) {
- var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- WorldMapArea.friendSystem.removeFriend(var5);
+ var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ WorldMapArea.friendSystem.removeFriend(var4);
return 1;
} else if(var0 == 3607) {
- var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- WorldMapArea.friendSystem.__x_159(var5);
+ var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ WorldMapArea.friendSystem.__x_159(var4);
return 1;
} else if(var0 == 3608) {
- var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- WorldMapArea.friendSystem.removeIgnore(var5);
+ var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ WorldMapArea.friendSystem.removeIgnore(var4);
return 1;
} else if(var0 == 3609) {
- var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- var5 = NpcDefinition.method5161(var5);
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isFriended(new Username(var5, KeyHandler.loginType), false)?1:0;
+ var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ var4 = NPCDefinition.method5161(var4);
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isFriended(new Username(var4, KeyHandler.loginType), false)?1:0;
return 1;
} else if(var0 == 3611) {
if(PacketWriter.clanChat != null) {
@@ -221,15 +212,15 @@ public class FontName {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null?PacketWriter.clanChat.__k:0;
return 1;
} else if(var0 == 3617) {
- var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- IndexStoreActionHandler.method4655(var5);
+ var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ IndexStoreActionHandler.method4655(var4);
return 1;
} else if(var0 == 3618) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null?PacketWriter.clanChat.rank:0;
return 1;
} else if(var0 == 3619) {
- var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- class31.method574(var5);
+ var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ class31.method574(var4);
return 1;
} else if(var0 == 3620) {
class12.method158();
@@ -245,9 +236,9 @@ public class FontName {
} else if(var0 == 3622) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.ignoreList.size()) {
- Ignored var4 = (Ignored)WorldMapArea.friendSystem.ignoreList.get(var3);
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.name();
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.previousName();
+ Ignored var7 = (Ignored)WorldMapArea.friendSystem.ignoreList.get(var3);
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.name();
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.previousName();
} else {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
@@ -255,9 +246,9 @@ public class FontName {
return 1;
} else if(var0 == 3623) {
- var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- var5 = NpcDefinition.method5161(var5);
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isIgnored(new Username(var5, KeyHandler.loginType))?1:0;
+ var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ var4 = NPCDefinition.method5161(var4);
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isIgnored(new Username(var4, KeyHandler.loginType))?1:0;
return 1;
} else if(var0 == 3624) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
@@ -290,46 +281,46 @@ public class FontName {
WorldMapArea.friendSystem.friendsList.removeComparator();
return 1;
} else {
- boolean var7;
+ boolean var5;
if(var0 == 3629) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator1(var7));
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator1(var5));
return 1;
} else if(var0 == 3630) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator2(var7));
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator2(var5));
return 1;
} else if(var0 == 3631) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator3(var7));
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator3(var5));
return 1;
} else if(var0 == 3632) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator4(var7));
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator4(var5));
return 1;
} else if(var0 == 3633) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator5(var7));
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator5(var5));
return 1;
} else if(var0 == 3634) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator6(var7));
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator6(var5));
return 1;
} else if(var0 == 3635) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator7(var7));
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator7(var5));
return 1;
} else if(var0 == 3636) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator8(var7));
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator8(var5));
return 1;
} else if(var0 == 3637) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator9(var7));
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator9(var5));
return 1;
} else if(var0 == 3638) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator10(var7));
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator10(var5));
return 1;
} else if(var0 == 3639) {
WorldMapArea.friendSystem.friendsList.sort();
@@ -338,12 +329,12 @@ public class FontName {
WorldMapArea.friendSystem.ignoreList.removeComparator();
return 1;
} else if(var0 == 3641) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator1(var7));
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator1(var5));
return 1;
} else if(var0 == 3642) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator2(var7));
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator2(var5));
return 1;
} else if(var0 == 3643) {
WorldMapArea.friendSystem.ignoreList.sort();
@@ -355,72 +346,72 @@ public class FontName {
return 1;
} else if(var0 == 3645) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) {
- PacketWriter.clanChat.addComparator(new UserComparator1(var7));
+ PacketWriter.clanChat.addComparator(new UserComparator1(var5));
}
return 1;
} else if(var0 == 3646) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) {
- PacketWriter.clanChat.addComparator(new UserComparator2(var7));
+ PacketWriter.clanChat.addComparator(new UserComparator2(var5));
}
return 1;
} else if(var0 == 3647) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) {
- PacketWriter.clanChat.addComparator(new UserComparator3(var7));
+ PacketWriter.clanChat.addComparator(new UserComparator3(var5));
}
return 1;
} else if(var0 == 3648) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) {
- PacketWriter.clanChat.addComparator(new UserComparator4(var7));
+ PacketWriter.clanChat.addComparator(new UserComparator4(var5));
}
return 1;
} else if(var0 == 3649) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) {
- PacketWriter.clanChat.addComparator(new UserComparator5(var7));
+ PacketWriter.clanChat.addComparator(new UserComparator5(var5));
}
return 1;
} else if(var0 == 3650) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) {
- PacketWriter.clanChat.addComparator(new UserComparator6(var7));
+ PacketWriter.clanChat.addComparator(new UserComparator6(var5));
}
return 1;
} else if(var0 == 3651) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) {
- PacketWriter.clanChat.addComparator(new UserComparator7(var7));
+ PacketWriter.clanChat.addComparator(new UserComparator7(var5));
}
return 1;
} else if(var0 == 3652) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) {
- PacketWriter.clanChat.addComparator(new UserComparator8(var7));
+ PacketWriter.clanChat.addComparator(new UserComparator8(var5));
}
return 1;
} else if(var0 == 3653) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) {
- PacketWriter.clanChat.addComparator(new UserComparator9(var7));
+ PacketWriter.clanChat.addComparator(new UserComparator9(var5));
}
return 1;
} else if(var0 == 3654) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) {
- PacketWriter.clanChat.addComparator(new UserComparator10(var7));
+ PacketWriter.clanChat.addComparator(new UserComparator10(var5));
}
return 1;
@@ -431,13 +422,13 @@ public class FontName {
return 1;
} else if(var0 == 3656) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- WorldMapArea.friendSystem.friendsList.addComparator(new class157(var7));
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ WorldMapArea.friendSystem.friendsList.addComparator(new class157(var5));
return 1;
} else if(var0 == 3657) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) {
- PacketWriter.clanChat.addComparator(new class157(var7));
+ PacketWriter.clanChat.addComparator(new class157(var5));
}
return 1;
@@ -585,4 +576,13 @@ public class FontName {
}
}
+
+ static {
+ FontName_plain11 = new FontName("p11_full");
+ FontName_plain12 = new FontName("p12_full");
+ FontName_bold12 = new FontName("b12_full");
+ FontName_verdana11 = new FontName("verdana_11pt_regular");
+ FontName_verdana13 = new FontName("verdana_13pt_regular");
+ FontName_verdana15 = new FontName("verdana_15pt_regular");
+ }
}
diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java
index 0da8788136..1783e4458e 100644
--- a/runescape-client/src/main/java/Fonts.java
+++ b/runescape-client/src/main/java/Fonts.java
@@ -62,15 +62,15 @@ public class Fonts {
if(this.map.containsKey(var5)) {
var2.put(var5, this.map.get(var5));
} else {
- AbstractIndexCache var7 = this.__m;
- AbstractIndexCache var8 = this.__f;
- String var9 = var5.__g;
- int var10 = var7.getArchiveId(var9);
- int var11 = var7.getRecordId(var10, "");
- Font var6 = SpriteIds.method5823(var7, var8, var10, var11);
- if(var6 != null) {
- this.map.put(var5, var6);
- var2.put(var5, var6);
+ AbstractIndexCache var6 = this.__m;
+ AbstractIndexCache var7 = this.__f;
+ String var8 = var5.__g;
+ int var9 = var6.getArchiveId(var8);
+ int var10 = var6.getRecordId(var9, "");
+ Font var11 = SpriteIds.method5823(var6, var7, var9, var10);
+ if(var11 != null) {
+ this.map.put(var5, var11);
+ var2.put(var5, var11);
}
}
}
diff --git a/runescape-client/src/main/java/Formatting.java b/runescape-client/src/main/java/Formatting.java
index 7c021f1425..c43da14b32 100644
--- a/runescape-client/src/main/java/Formatting.java
+++ b/runescape-client/src/main/java/Formatting.java
@@ -50,34 +50,35 @@ public class Formatting {
static int method2022(int var0, Script var1, boolean var2) {
int var3;
int var4;
- int var6;
+ int var5;
+ EnumDefinition var9;
if(var0 == 3400) {
class179.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- EnumDefinition var5 = Interpreter.getEnum(var3);
- if(var5.valType != 's') {
+ var9 = Interpreter.getEnum(var3);
+ if(var9.valType != 's') {
;
}
- for(var6 = 0; var6 < var5.size0; ++var6) {
- if(var4 == var5.keys[var6]) {
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.stringVals[var6];
- var5 = null;
+ for(var5 = 0; var5 < var9.size0; ++var5) {
+ if(var4 == var9.keys[var5]) {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.stringVals[var5];
+ var9 = null;
break;
}
}
- if(var5 != null) {
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.defaultString;
+ if(var9 != null) {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.defaultString;
}
return 1;
} else if(var0 != 3408) {
if(var0 == 3411) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- EnumDefinition var10 = Interpreter.getEnum(var3);
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var10.size();
+ var9 = Interpreter.getEnum(var3);
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var9.size();
return 1;
} else {
return 2;
@@ -86,12 +87,12 @@ public class Formatting {
class179.Interpreter_intStackSize -= 4;
var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- int var9 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
- var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3];
- EnumDefinition var7 = Interpreter.getEnum(var9);
+ int var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
+ var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3];
+ EnumDefinition var7 = Interpreter.getEnum(var6);
if(var3 == var7.keyType && var4 == var7.valType) {
for(int var8 = 0; var8 < var7.size0; ++var8) {
- if(var6 == var7.keys[var8]) {
+ if(var5 == var7.keys[var8]) {
if(var4 == 115) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.stringVals[var8];
} else {
diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java
index 00d9abd408..0aa9943f65 100644
--- a/runescape-client/src/main/java/FriendSystem.java
+++ b/runescape-client/src/main/java/FriendSystem.java
@@ -139,39 +139,40 @@ public class FriendSystem {
if(var1 != null) {
Username var2 = new Username(var1, this.loginType);
if(var2.hasCleanName()) {
- StringBuilder var10000;
+ StringBuilder var3;
String var4;
if(this.__e_158()) {
- var10000 = null;
+ var3 = null;
var4 = "Your friend list is full. Max of 200 for free users, and 400 for members";
WorldMapIcon1.method219(30, "", var4);
} else if(Canvas.localPlayer.username.__equals_466(var2)) {
- var10000 = null;
+ var3 = null;
var4 = "You can\'t add yourself to your own friend list";
WorldMapIcon1.method219(30, "", var4);
} else {
- Object var10001;
+ Object var5;
if(this.isFriended(var2, false)) {
- var10000 = (new StringBuilder()).append(var1);
- var10001 = null;
- var4 = var10000.append(" is already on your friend list").toString();
+ var3 = (new StringBuilder()).append(var1);
+ var5 = null;
+ var4 = var3.append(" is already on your friend list").toString();
WorldMapIcon1.method219(30, "", var4);
} else if(this.isIgnored(var2)) {
- var10000 = new StringBuilder();
- var10001 = null;
- var10000 = var10000.append("Please remove ").append(var1);
- var10001 = null;
- var4 = var10000.append(" from your ignore list first").toString();
+ var3 = new StringBuilder();
+ var5 = null;
+ var3 = var3.append("Please remove ").append(var1);
+ var5 = null;
+ var4 = var3.append(" from your ignore list first").toString();
WorldMapIcon1.method219(30, "", var4);
} else {
- PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_cn, Client.packetWriter.isaacCipher);
- var3.packetBuffer.writeByte(WorldMapRegion.method550(var1));
- var3.packetBuffer.writeStringCp1252NullTerminated(var1);
- Client.packetWriter.__q_167(var3);
+ PacketBufferNode var6 = Interpreter.method1915(ClientPacket.__gs_cn, Client.packetWriter.isaacCipher);
+ var6.packetBuffer.writeByte(WorldMapRegion.method550(var1));
+ var6.packetBuffer.writeStringCp1252NullTerminated(var1);
+ Client.packetWriter.__q_167(var6);
}
}
}
}
+
}
@ObfuscatedName("e")
@@ -194,33 +195,37 @@ public class FriendSystem {
if(var1 != null) {
Username var2 = new Username(var1, this.loginType);
if(var2.hasCleanName()) {
- StringBuilder var10000;
+ StringBuilder var3;
String var4;
if(this.__a_160()) {
- var10000 = null;
+ var3 = null;
var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members";
WorldMapIcon1.method219(30, "", var4);
} else if(Canvas.localPlayer.username.__equals_466(var2)) {
- var10000 = null;
+ var3 = null;
var4 = "You can\'t add yourself to your own ignore list";
WorldMapIcon1.method219(30, "", var4);
} else if(this.isIgnored(var2)) {
class22.method294(var1);
- } else if(this.isFriended(var2, false)) {
- var10000 = new StringBuilder();
- Object var10001 = null;
- var10000 = var10000.append("Please remove ").append(var1);
- var10001 = null;
- var4 = var10000.append(" from your friend list first").toString();
- WorldMapIcon1.method219(30, "", var4);
} else {
- PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_ch, Client.packetWriter.isaacCipher);
- var3.packetBuffer.writeByte(WorldMapRegion.method550(var1));
- var3.packetBuffer.writeStringCp1252NullTerminated(var1);
- Client.packetWriter.__q_167(var3);
+ PacketBufferNode var5;
+ if(this.isFriended(var2, false)) {
+ var3 = new StringBuilder();
+ var5 = null;
+ var3 = var3.append("Please remove ").append(var1);
+ var5 = null;
+ var4 = var3.append(" from your friend list first").toString();
+ WorldMapIcon1.method219(30, "", var4);
+ } else {
+ var5 = Interpreter.method1915(ClientPacket.__gs_ch, Client.packetWriter.isaacCipher);
+ var5.packetBuffer.writeByte(WorldMapRegion.method550(var1));
+ var5.packetBuffer.writeStringCp1252NullTerminated(var1);
+ Client.packetWriter.__q_167(var5);
+ }
}
}
}
+
}
@ObfuscatedName("a")
@@ -254,6 +259,7 @@ public class FriendSystem {
GrandExchangeOffer.method121();
}
}
+
}
@ObfuscatedName("j")
@@ -277,6 +283,7 @@ public class FriendSystem {
class229.method4512();
}
}
+
}
@ObfuscatedName("t")
diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java
index 0fb0767d13..244332d437 100644
--- a/runescape-client/src/main/java/GameShell.java
+++ b/runescape-client/src/main/java/GameShell.java
@@ -202,22 +202,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
@Export("eventQueue")
final EventQueue eventQueue;
- static {
- gameShell = null;
- __ba_q = 0;
- stopTimeMs = 0L;
- isKilled = false;
- __ba_e = 20;
- __ba_d = 1;
- fps = 0;
- __ba_a = new long[32];
- __ba_j = new long[32];
- __ba_aw = 500;
- hasFocus = true;
- garbageCollectorLastCollectionTime = -1L;
- garbageCollectorLastCheckTimeMs = -1L;
- }
-
protected GameShell() {
this.hasErrored = false;
this.canvasX = 0;
@@ -269,8 +253,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
if(var1 != null) {
this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy"));
}
-
}
+
}
@ObfuscatedName("l")
@@ -398,6 +382,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
this.__ah = true;
this.__j_113();
}
+
}
@ObfuscatedName("j")
@@ -520,7 +505,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
taskHandler.newThreadTask(this, 1);
} catch (Exception var5) {
- NpcDefinition.sendStackTrace((String)null, var5);
+ NPCDefinition.sendStackTrace((String)null, var5);
this.error("crash");
}
@@ -738,6 +723,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
this.__au_110();
}
+
}
@ObfuscatedName("aw")
@@ -856,8 +842,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
} catch (Exception var3) {
;
}
-
}
+
}
@ObfuscatedName("as")
@@ -915,6 +901,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
class203.method4010(5000L);
this.kill();
}
+
}
@Export("paint")
@@ -928,8 +915,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
this.isCanvasInvalid = true;
}
}
-
}
+
}
@Export("run")
@@ -966,27 +953,27 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
this.addCanvas();
this.setUp();
- Object var8;
+ Object var7;
try {
- var8 = new NanoClock();
- } catch (Throwable var6) {
- var8 = new MilliClock();
+ var7 = new NanoClock();
+ } catch (Throwable var5) {
+ var7 = new MilliClock();
}
- UserComparator6.clock = (Clock)var8;
+ UserComparator6.clock = (Clock)var7;
while(0L == stopTimeMs || class203.currentTimeMs() < stopTimeMs) {
__ba_l = UserComparator6.clock.wait(__ba_e, __ba_d);
- for(int var5 = 0; var5 < __ba_l; ++var5) {
+ for(int var8 = 0; var8 < __ba_l; ++var8) {
this.__av_93();
}
this.__ar_94();
this.post(this.canvas);
}
- } catch (Exception var7) {
- NpcDefinition.sendStackTrace((String)null, var7);
+ } catch (Exception var6) {
+ NPCDefinition.sendStackTrace((String)null, var6);
this.error("crash");
}
@@ -999,6 +986,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
if(this == gameShell && !isKilled) {
stopTimeMs = 0L;
}
+
}
@Export("update")
@@ -1050,6 +1038,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
if(this == gameShell && !isKilled) {
stopTimeMs = class203.currentTimeMs() + 4000L;
}
+
}
@Export("windowIconified")
@@ -1117,6 +1106,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
Client.gameState = var0;
}
+
}
@ObfuscatedName("kv")
@@ -1125,8 +1115,24 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
garbageValue = "2016931356"
)
static String method1060(Widget var0, int var1) {
- int var3 = class1.getWidgetClickMask(var0);
- boolean var2 = (var3 >> var1 + 1 & 1) != 0;
- return !var2 && var0.onOp == null?null:(var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0?var0.actions[var1]:null);
+ int var2 = class1.getWidgetClickMask(var0);
+ boolean var3 = (var2 >> var1 + 1 & 1) != 0;
+ return !var3 && var0.onOp == null?null:(var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0?var0.actions[var1]:null);
+ }
+
+ static {
+ gameShell = null;
+ __ba_q = 0;
+ stopTimeMs = 0L;
+ isKilled = false;
+ __ba_e = 20;
+ __ba_d = 1;
+ fps = 0;
+ __ba_a = new long[32];
+ __ba_j = new long[32];
+ __ba_aw = 500;
+ hasFocus = true;
+ garbageCollectorLastCollectionTime = -1L;
+ garbageCollectorLastCheckTimeMs = -1L;
}
}
diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java
index 77af9c38ae..e1abd7f77f 100644
--- a/runescape-client/src/main/java/GrandExchangeEvent.java
+++ b/runescape-client/src/main/java/GrandExchangeEvent.java
@@ -81,39 +81,39 @@ public class GrandExchangeEvent {
static void runScript0(ScriptEvent var0, int var1) {
Object[] var2 = var0.args0;
Script var3;
- int var17;
+ int var4;
if(class12.method162(var0.type0)) {
class15.worldMapEvent = (WorldMapEvent)var2[0];
- WorldMapElement var4 = ViewportMouse.getWorldMapElement(class15.worldMapEvent.mapElement);
- var3 = FaceNormal.method3236(var0.type0, var4.__o, var4.category);
+ WorldMapElement var5 = ViewportMouse.getWorldMapElement(class15.worldMapEvent.mapElement);
+ var3 = FaceNormal.method3236(var0.type0, var5.__o, var5.category);
} else {
- var17 = ((Integer)var2[0]).intValue();
- var3 = SoundSystem.method2451(var17);
+ var4 = ((Integer)var2[0]).intValue();
+ var3 = SoundSystem.method2451(var4);
}
if(var3 != null) {
class179.Interpreter_intStackSize = 0;
Interpreter.Interpreter_stringStackSize = 0;
- var17 = -1;
- int[] var5 = var3.opcodes;
+ var4 = -1;
+ int[] var25 = var3.opcodes;
int[] var6 = var3.intOperands;
byte var7 = -1;
Interpreter.Interpreter_frameDepth = 0;
Interpreter.__bv_s = false;
try {
- int var10;
+ int var8;
try {
Username.Interpreter_intLocals = new int[var3.localIntCount];
- int var8 = 0;
- Interpreter.Interpreter_stringLocals = new String[var3.localStringCount];
int var9 = 0;
+ Interpreter.Interpreter_stringLocals = new String[var3.localStringCount];
+ int var26 = 0;
int var11;
- String var18;
- for(var10 = 1; var10 < var2.length; ++var10) {
- if(var2[var10] instanceof Integer) {
- var11 = ((Integer)var2[var10]).intValue();
+ String var12;
+ for(var8 = 1; var8 < var2.length; ++var8) {
+ if(var2[var8] instanceof Integer) {
+ var11 = ((Integer)var2[var8]).intValue();
if(var11 == -2147483647) {
var11 = var0.mouseX;
}
@@ -150,39 +150,39 @@ public class GrandExchangeEvent {
var11 = var0.keyPressed;
}
- Username.Interpreter_intLocals[var8++] = var11;
- } else if(var2[var10] instanceof String) {
- var18 = (String)var2[var10];
- if(var18.equals("event_opbase")) {
- var18 = var0.targetName;
+ Username.Interpreter_intLocals[var9++] = var11;
+ } else if(var2[var8] instanceof String) {
+ var12 = (String)var2[var8];
+ if(var12.equals("event_opbase")) {
+ var12 = var0.targetName;
}
- Interpreter.Interpreter_stringLocals[var9++] = var18;
+ Interpreter.Interpreter_stringLocals[var26++] = var12;
}
}
- var10 = 0;
+ var8 = 0;
Interpreter.__bv_y = var0.__d;
while(true) {
- ++var10;
- if(var10 > var1) {
+ ++var8;
+ if(var8 > var1) {
throw new RuntimeException();
}
- ++var17;
- int var29 = var5[var17];
- int var20;
- if(var29 >= 100) {
+ ++var4;
+ int var13 = var25[var4];
+ int var14;
+ if(var13 >= 100) {
boolean var32;
- if(var3.intOperands[var17] == 1) {
+ if(var3.intOperands[var4] == 1) {
var32 = true;
} else {
var32 = false;
}
- var20 = class196.method3736(var29, var3, var32);
- switch(var20) {
+ var14 = class196.method3736(var13, var3, var32);
+ switch(var14) {
case 0:
return;
case 1:
@@ -191,191 +191,191 @@ public class GrandExchangeEvent {
case 2:
throw new IllegalStateException();
}
- } else if(var29 == 0) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6[var17];
- } else if(var29 == 1) {
- var11 = var6[var17];
+ } else if(var13 == 0) {
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6[var4];
+ } else if(var13 == 1) {
+ var11 = var6[var4];
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Varps.Varps_main[var11];
- } else if(var29 == 2) {
- var11 = var6[var17];
+ } else if(var13 == 2) {
+ var11 = var6[var4];
Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
IndexCache.method4703(var11);
- } else if(var29 == 3) {
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var17];
- } else if(var29 == 6) {
- var17 += var6[var17];
- } else if(var29 == 7) {
+ } else if(var13 == 3) {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var4];
+ } else if(var13 == 6) {
+ var4 += var6[var4];
+ } else if(var13 == 7) {
class179.Interpreter_intStackSize -= 2;
if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) {
- var17 += var6[var17];
+ var4 += var6[var4];
}
- } else if(var29 == 8) {
+ } else if(var13 == 8) {
class179.Interpreter_intStackSize -= 2;
if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) {
- var17 += var6[var17];
+ var4 += var6[var4];
}
- } else if(var29 == 9) {
+ } else if(var13 == 9) {
class179.Interpreter_intStackSize -= 2;
if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) {
- var17 += var6[var17];
+ var4 += var6[var4];
}
- } else if(var29 == 10) {
+ } else if(var13 == 10) {
class179.Interpreter_intStackSize -= 2;
if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) {
- var17 += var6[var17];
+ var4 += var6[var4];
}
- } else if(var29 == 21) {
+ } else if(var13 == 21) {
if(Interpreter.Interpreter_frameDepth == 0) {
return;
}
- ScriptFrame var34 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth];
- var3 = var34.script;
- var5 = var3.opcodes;
+ ScriptFrame var30 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth];
+ var3 = var30.script;
+ var25 = var3.opcodes;
var6 = var3.intOperands;
- var17 = var34.pc;
- Username.Interpreter_intLocals = var34.intLocals;
- Interpreter.Interpreter_stringLocals = var34.stringLocals;
- } else if(var29 == 25) {
- var11 = var6[var17];
+ var4 = var30.pc;
+ Username.Interpreter_intLocals = var30.intLocals;
+ Interpreter.Interpreter_stringLocals = var30.stringLocals;
+ } else if(var13 == 25) {
+ var11 = var6[var4];
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapSection2.getVarbit(var11);
- } else if(var29 == 27) {
- var11 = var6[var17];
+ } else if(var13 == 27) {
+ var11 = var6[var4];
class68.method1695(var11, Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
- } else if(var29 == 31) {
+ } else if(var13 == 31) {
class179.Interpreter_intStackSize -= 2;
if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) {
- var17 += var6[var17];
+ var4 += var6[var4];
}
- } else if(var29 == 32) {
+ } else if(var13 == 32) {
class179.Interpreter_intStackSize -= 2;
if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) {
- var17 += var6[var17];
+ var4 += var6[var4];
}
- } else if(var29 == 33) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Username.Interpreter_intLocals[var6[var17]];
- } else if(var29 == 34) {
- Username.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- } else if(var29 == 35) {
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var17]];
- } else if(var29 == 36) {
- Interpreter.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- } else if(var29 == 37) {
- var11 = var6[var17];
+ } else if(var13 == 33) {
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Username.Interpreter_intLocals[var6[var4]];
+ } else if(var13 == 34) {
+ Username.Interpreter_intLocals[var6[var4]] = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ } else if(var13 == 35) {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var4]];
+ } else if(var13 == 36) {
+ Interpreter.Interpreter_stringLocals[var6[var4]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ } else if(var13 == 37) {
+ var11 = var6[var4];
Interpreter.Interpreter_stringStackSize -= var11;
- String var31 = class277.method5356(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11);
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var31;
- } else if(var29 == 38) {
+ String var29 = class277.method5356(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11);
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var29;
+ } else if(var13 == 38) {
--class179.Interpreter_intStackSize;
- } else if(var29 == 39) {
+ } else if(var13 == 39) {
--Interpreter.Interpreter_stringStackSize;
} else {
int var15;
- if(var29 != 40) {
- if(var29 == 42) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class196.varcs.getInt(var6[var17]);
- } else if(var29 == 43) {
- class196.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
- } else if(var29 == 44) {
- var11 = var6[var17] >> 16;
- var20 = var6[var17] & 65535;
- int var21 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- if(var21 < 0 || var21 > 5000) {
+ if(var13 != 40) {
+ if(var13 == 42) {
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class196.varcs.getInt(var6[var4]);
+ } else if(var13 == 43) {
+ class196.varcs.setInt(var6[var4], Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
+ } else if(var13 == 44) {
+ var11 = var6[var4] >> 16;
+ var14 = var6[var4] & 65535;
+ int var28 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ if(var28 < 0 || var28 > 5000) {
throw new RuntimeException();
}
- Interpreter.Interpreter_arrayLengths[var11] = var21;
- byte var22 = -1;
- if(var20 == 105) {
- var22 = 0;
+ Interpreter.Interpreter_arrayLengths[var11] = var28;
+ byte var33 = -1;
+ if(var14 == 105) {
+ var33 = 0;
}
- for(var15 = 0; var15 < var21; ++var15) {
- Interpreter.Interpreter_arrays[var11][var15] = var22;
+ for(var15 = 0; var15 < var28; ++var15) {
+ Interpreter.Interpreter_arrays[var11][var15] = var33;
}
- } else if(var29 == 45) {
- var11 = var6[var17];
- var20 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- if(var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) {
+ } else if(var13 == 45) {
+ var11 = var6[var4];
+ var14 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ if(var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var11]) {
throw new RuntimeException();
}
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20];
- } else if(var29 == 46) {
- var11 = var6[var17];
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var14];
+ } else if(var13 == 46) {
+ var11 = var6[var4];
class179.Interpreter_intStackSize -= 2;
- var20 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- if(var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) {
+ var14 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
+ if(var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var11]) {
throw new RuntimeException();
}
- Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- } else if(var29 == 47) {
- var18 = class196.varcs.getStringOld(var6[var17]);
- if(var18 == null) {
- var18 = "null";
+ Interpreter.Interpreter_arrays[var11][var14] = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
+ } else if(var13 == 47) {
+ var12 = class196.varcs.getStringOld(var6[var4]);
+ if(var12 == null) {
+ var12 = "null";
}
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18;
- } else if(var29 == 48) {
- class196.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
- } else if(var29 == 49) {
- var18 = class196.varcs.getString(var6[var17]);
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18;
- } else if(var29 == 50) {
- class196.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12;
+ } else if(var13 == 48) {
+ class196.varcs.setStringOld(var6[var4], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
+ } else if(var13 == 49) {
+ var12 = class196.varcs.getString(var6[var4]);
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12;
+ } else if(var13 == 50) {
+ class196.varcs.setString(var6[var4], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
} else {
- if(var29 != 60) {
+ if(var13 != 60) {
throw new IllegalStateException();
}
- IterableNodeHashTable var33 = var3.switches[var6[var17]];
- IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
- if(var30 != null) {
- var17 += var30.integer;
+ IterableNodeHashTable var27 = var3.switches[var6[var4]];
+ IntegerNode var31 = (IntegerNode)var27.get((long)Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
+ if(var31 != null) {
+ var4 += var31.integer;
}
}
} else {
- var11 = var6[var17];
- Script var12 = SoundSystem.method2451(var11);
- int[] var13 = new int[var12.localIntCount];
- String[] var14 = new String[var12.localStringCount];
+ var11 = var6[var4];
+ Script var16 = SoundSystem.method2451(var11);
+ int[] var17 = new int[var16.localIntCount];
+ String[] var18 = new String[var16.localStringCount];
- for(var15 = 0; var15 < var12.intArgumentCount; ++var15) {
- var13[var15] = Interpreter.Interpreter_intStack[var15 + (class179.Interpreter_intStackSize - var12.intArgumentCount)];
+ for(var15 = 0; var15 < var16.intArgumentCount; ++var15) {
+ var17[var15] = Interpreter.Interpreter_intStack[var15 + (class179.Interpreter_intStackSize - var16.intArgumentCount)];
}
- for(var15 = 0; var15 < var12.stringArgumentCount; ++var15) {
- var14[var15] = Interpreter.Interpreter_stringStack[var15 + (Interpreter.Interpreter_stringStackSize - var12.stringArgumentCount)];
+ for(var15 = 0; var15 < var16.stringArgumentCount; ++var15) {
+ var18[var15] = Interpreter.Interpreter_stringStack[var15 + (Interpreter.Interpreter_stringStackSize - var16.stringArgumentCount)];
}
- class179.Interpreter_intStackSize -= var12.intArgumentCount;
- Interpreter.Interpreter_stringStackSize -= var12.stringArgumentCount;
+ class179.Interpreter_intStackSize -= var16.intArgumentCount;
+ Interpreter.Interpreter_stringStackSize -= var16.stringArgumentCount;
ScriptFrame var19 = new ScriptFrame();
var19.script = var3;
- var19.pc = var17;
+ var19.pc = var4;
var19.intLocals = Username.Interpreter_intLocals;
var19.stringLocals = Interpreter.Interpreter_stringLocals;
Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19;
- var3 = var12;
- var5 = var12.opcodes;
- var6 = var12.intOperands;
- var17 = -1;
- Username.Interpreter_intLocals = var13;
- Interpreter.Interpreter_stringLocals = var14;
+ var3 = var16;
+ var25 = var16.opcodes;
+ var6 = var16.intOperands;
+ var4 = -1;
+ Username.Interpreter_intLocals = var17;
+ Interpreter.Interpreter_stringLocals = var18;
}
}
}
- } catch (Exception var27) {
- StringBuilder var24 = new StringBuilder(30);
- var24.append("").append(var3.key).append(" ");
+ } catch (Exception var23) {
+ StringBuilder var10 = new StringBuilder(30);
+ var10.append("").append(var3.key).append(" ");
- for(var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) {
- var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" ");
+ for(var8 = Interpreter.Interpreter_frameDepth - 1; var8 >= 0; --var8) {
+ var10.append("").append(Interpreter.Interpreter_frames[var8].script.key).append(" ");
}
- var24.append("").append(var7);
- NpcDefinition.sendStackTrace(var24.toString(), var27);
+ var10.append("").append(var7);
+ NPCDefinition.sendStackTrace(var10.toString(), var23);
}
} finally {
if(Interpreter.__bv_s) {
@@ -395,9 +395,9 @@ public class GrandExchangeEvent {
garbageValue = "1404"
)
public static int method80(int var0) {
- long var2 = ViewportMouse.ViewportMouse_entityTags[var0];
- int var1 = (int)(var2 >>> 14 & 3L);
- return var1;
+ long var1 = ViewportMouse.ViewportMouse_entityTags[var0];
+ int var3 = (int)(var1 >>> 14 & 3L);
+ return var3;
}
@ObfuscatedName("w")
@@ -427,6 +427,6 @@ public class GrandExchangeEvent {
var1 = var1.substring(0, var2) + "," + var1.substring(var2);
}
- return var1.length() > 9?" " + BufferedFile.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + "":(var1.length() > 6?" " + BufferedFile.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "":" " + BufferedFile.colorStartTag(16776960) + var1 + "");
+ return var1.length() > 9?" " + BufferedFile.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M (" + var1 + ")":(var1.length() > 6?" " + BufferedFile.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K (" + var1 + ")":" " + BufferedFile.colorStartTag(16776960) + var1 + "");
}
}
diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java
index f23a12fa99..7dbcda6074 100644
--- a/runescape-client/src/main/java/GrandExchangeEvents.java
+++ b/runescape-client/src/main/java/GrandExchangeEvents.java
@@ -39,14 +39,6 @@ public class GrandExchangeEvents {
@Export("events")
public final List events;
- static {
- __g_f = new class12();
- new WorldComparator();
- __g_q = new UnitPriceComparator();
- __g_w = new class11();
- __g_o = new TotalQuantityComparator();
- }
-
@ObfuscatedSignature(
signature = "(Lgr;Z)V",
garbageValue = "1"
@@ -162,7 +154,7 @@ public class GrandExchangeEvents {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.color2;
return 1;
} else if(var0 == 2613) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal();
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.rectangleMode.ordinal();
return 1;
} else if(var0 == 2614) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.__bv?1:0;
@@ -181,5 +173,14 @@ public class GrandExchangeEvents {
if(GroundItemPile.loadWidgetGroup(var0)) {
class30.method570(Widget.widgets[var0], var1);
}
+
+ }
+
+ static {
+ __g_f = new class12();
+ new WorldComparator();
+ __g_q = new UnitPriceComparator();
+ __g_w = new class11();
+ __g_o = new TotalQuantityComparator();
}
}
diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java
index a9152aa015..4008eb8494 100644
--- a/runescape-client/src/main/java/GraphicsObject.java
+++ b/runescape-client/src/main/java/GraphicsObject.java
@@ -121,8 +121,8 @@ public final class GraphicsObject extends Entity {
break;
}
}
-
}
+
}
@ObfuscatedName("e")
diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java
index 5e59f095ee..4ae08e726d 100644
--- a/runescape-client/src/main/java/HealthBar.java
+++ b/runescape-client/src/main/java/HealthBar.java
@@ -53,14 +53,13 @@ public class HealthBar extends Node {
if(var6 < 4) {
this.updates.addLast(new HealthBarUpdate(var1, var2, var3, var4));
}
-
} else {
IterableNodeDeque.IterableNodeDeque_addBefore(new HealthBarUpdate(var1, var2, var3, var4), var5);
if(var6 >= 4) {
this.updates.last().remove();
}
-
}
+
}
@ObfuscatedName("f")
@@ -106,64 +105,66 @@ public class HealthBar extends Node {
@Export("charToByteCp1252")
public static byte charToByteCp1252(char var0) {
byte var1;
- if(var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) {
- var1 = (byte)var0;
- } else if(var0 == 8364) {
- var1 = -128;
- } else if(var0 == 8218) {
- var1 = -126;
- } else if(var0 == 402) {
- var1 = -125;
- } else if(var0 == 8222) {
- var1 = -124;
- } else if(var0 == 8230) {
- var1 = -123;
- } else if(var0 == 8224) {
- var1 = -122;
- } else if(var0 == 8225) {
- var1 = -121;
- } else if(var0 == 710) {
- var1 = -120;
- } else if(var0 == 8240) {
- var1 = -119;
- } else if(var0 == 352) {
- var1 = -118;
- } else if(var0 == 8249) {
- var1 = -117;
- } else if(var0 == 338) {
- var1 = -116;
- } else if(var0 == 381) {
- var1 = -114;
- } else if(var0 == 8216) {
- var1 = -111;
- } else if(var0 == 8217) {
- var1 = -110;
- } else if(var0 == 8220) {
- var1 = -109;
- } else if(var0 == 8221) {
- var1 = -108;
- } else if(var0 == 8226) {
- var1 = -107;
- } else if(var0 == 8211) {
- var1 = -106;
- } else if(var0 == 8212) {
- var1 = -105;
- } else if(var0 == 732) {
- var1 = -104;
- } else if(var0 == 8482) {
- var1 = -103;
- } else if(var0 == 353) {
- var1 = -102;
- } else if(var0 == 8250) {
- var1 = -101;
- } else if(var0 == 339) {
- var1 = -100;
- } else if(var0 == 382) {
- var1 = -98;
- } else if(var0 == 376) {
- var1 = -97;
+ if((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) {
+ if(var0 == 8364) {
+ var1 = -128;
+ } else if(var0 == 8218) {
+ var1 = -126;
+ } else if(var0 == 402) {
+ var1 = -125;
+ } else if(var0 == 8222) {
+ var1 = -124;
+ } else if(var0 == 8230) {
+ var1 = -123;
+ } else if(var0 == 8224) {
+ var1 = -122;
+ } else if(var0 == 8225) {
+ var1 = -121;
+ } else if(var0 == 710) {
+ var1 = -120;
+ } else if(var0 == 8240) {
+ var1 = -119;
+ } else if(var0 == 352) {
+ var1 = -118;
+ } else if(var0 == 8249) {
+ var1 = -117;
+ } else if(var0 == 338) {
+ var1 = -116;
+ } else if(var0 == 381) {
+ var1 = -114;
+ } else if(var0 == 8216) {
+ var1 = -111;
+ } else if(var0 == 8217) {
+ var1 = -110;
+ } else if(var0 == 8220) {
+ var1 = -109;
+ } else if(var0 == 8221) {
+ var1 = -108;
+ } else if(var0 == 8226) {
+ var1 = -107;
+ } else if(var0 == 8211) {
+ var1 = -106;
+ } else if(var0 == 8212) {
+ var1 = -105;
+ } else if(var0 == 732) {
+ var1 = -104;
+ } else if(var0 == 8482) {
+ var1 = -103;
+ } else if(var0 == 353) {
+ var1 = -102;
+ } else if(var0 == 8250) {
+ var1 = -101;
+ } else if(var0 == 339) {
+ var1 = -100;
+ } else if(var0 == 382) {
+ var1 = -98;
+ } else if(var0 == 376) {
+ var1 = -97;
+ } else {
+ var1 = 63;
+ }
} else {
- var1 = 63;
+ var1 = (byte)var0;
}
return var1;
diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java
index 80128ffc07..acad832c2a 100644
--- a/runescape-client/src/main/java/HealthBarDefinition.java
+++ b/runescape-client/src/main/java/HealthBarDefinition.java
@@ -98,11 +98,6 @@ public class HealthBarDefinition extends DualNode {
@Export("widthPadding")
public int widthPadding;
- static {
- HealthBarDefinition_cached = new EvictingDualNodeHashTable(64);
- HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64);
- }
-
public HealthBarDefinition() {
this.int1 = 255;
this.int2 = 255;
@@ -212,4 +207,9 @@ public class HealthBarDefinition extends DualNode {
}
}
}
+
+ static {
+ HealthBarDefinition_cached = new EvictingDualNodeHashTable(64);
+ HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64);
+ }
}
diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java
index 4970ba4bd4..cac9bbd096 100644
--- a/runescape-client/src/main/java/HealthBarUpdate.java
+++ b/runescape-client/src/main/java/HealthBarUpdate.java
@@ -61,34 +61,34 @@ public class HealthBarUpdate extends Node {
garbageValue = "342552136"
)
public static String method1722(CharSequence var0) {
- long var3 = 0L;
- int var5 = var0.length();
+ long var1 = 0L;
+ int var3 = var0.length();
- for(int var6 = 0; var6 < var5; ++var6) {
- var3 *= 37L;
- char var7 = var0.charAt(var6);
- if(var7 >= 'A' && var7 <= 'Z') {
- var3 += (long)(var7 + 1 - 65);
- } else if(var7 >= 'a' && var7 <= 'z') {
- var3 += (long)(var7 + 1 - 97);
- } else if(var7 >= '0' && var7 <= '9') {
- var3 += (long)(var7 + 27 - 48);
+ for(int var4 = 0; var4 < var3; ++var4) {
+ var1 *= 37L;
+ char var5 = var0.charAt(var4);
+ if(var5 >= 'A' && var5 <= 'Z') {
+ var1 += (long)(var5 + 1 - 65);
+ } else if(var5 >= 'a' && var5 <= 'z') {
+ var1 += (long)(var5 + 1 - 97);
+ } else if(var5 >= '0' && var5 <= '9') {
+ var1 += (long)(var5 + 27 - 48);
}
- if(var3 >= 177917621779460413L) {
+ if(var1 >= 177917621779460413L) {
break;
}
}
- while(0L == var3 % 37L && var3 != 0L) {
- var3 /= 37L;
+ while(0L == var1 % 37L && var1 != 0L) {
+ var1 /= 37L;
}
- String var8 = Clock.method3534(var3);
- if(var8 == null) {
- var8 = "";
+ String var6 = Clock.method3534(var1);
+ if(var6 == null) {
+ var6 = "";
}
- return var8;
+ return var6;
}
}
diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java
index 80ade46bc1..143e19efe7 100644
--- a/runescape-client/src/main/java/HitSplatDefinition.java
+++ b/runescape-client/src/main/java/HitSplatDefinition.java
@@ -54,7 +54,7 @@ public class HitSplatDefinition extends DualNode {
intValue = -1151968735
)
@Export("surfaceOffsetY")
- public int __n;
+ public int surfaceOffsetY;
@ObfuscatedName("i")
@ObfuscatedGetter(
intValue = -102270561
@@ -134,15 +134,9 @@ public class HitSplatDefinition extends DualNode {
@Export("transformVarp")
int transformVarp;
- static {
- HitSplatDefinition_cached = new EvictingDualNodeHashTable(64);
- __jm_o = new EvictingDualNodeHashTable(64);
- HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20);
- }
-
HitSplatDefinition() {
this.fontId = -1;
- this.__n = 16777215;
+ this.surfaceOffsetY = 16777215;
this.__i = 70;
this.__a = -1;
this.__z = -1;
@@ -185,7 +179,7 @@ public class HitSplatDefinition extends DualNode {
if(var2 == 1) {
this.fontId = var1.__ap_310();
} else if(var2 == 2) {
- this.__n = var1.readMedium();
+ this.surfaceOffsetY = var1.readMedium();
} else if(var2 == 3) {
this.__a = var1.__ap_310();
} else if(var2 == 4) {
@@ -411,4 +405,10 @@ public class HitSplatDefinition extends DualNode {
public static int method4972(long var0) {
return (int)(var0 >>> 17 & 4294967295L);
}
+
+ static {
+ HitSplatDefinition_cached = new EvictingDualNodeHashTable(64);
+ __jm_o = new EvictingDualNodeHashTable(64);
+ HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20);
+ }
}
diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java
index 17bef395e7..42901141c5 100644
--- a/runescape-client/src/main/java/IgnoreList.java
+++ b/runescape-client/src/main/java/IgnoreList.java
@@ -111,33 +111,33 @@ public class IgnoreList extends UserList {
}
}
- int var10;
+ int var9;
if(var8 >= '0' && var8 <= '9') {
- var10 = var8 - '0';
+ var9 = var8 - '0';
} else if(var8 >= 'A' && var8 <= 'Z') {
- var10 = var8 - '7';
+ var9 = var8 - '7';
} else {
if(var8 < 'a' || var8 > 'z') {
throw new NumberFormatException();
}
- var10 = var8 - 'W';
+ var9 = var8 - 'W';
}
- if(var10 >= var1) {
+ if(var9 >= var1) {
throw new NumberFormatException();
}
if(var3) {
- var10 = -var10;
+ var9 = -var9;
}
- int var9 = var10 + var5 * var1;
- if(var9 / var1 != var5) {
+ int var10 = var9 + var5 * var1;
+ if(var10 / var1 != var5) {
throw new NumberFormatException();
}
- var5 = var9;
+ var5 = var10;
var4 = true;
}
diff --git a/runescape-client/src/main/java/IndexCache.java b/runescape-client/src/main/java/IndexCache.java
index e10c660ead..904be4abb1 100644
--- a/runescape-client/src/main/java/IndexCache.java
+++ b/runescape-client/src/main/java/IndexCache.java
@@ -340,7 +340,7 @@ public class IndexCache extends AbstractIndexCache {
for(var1 = 0; var1 < this.validArchives.length; ++var1) {
if(super.recordCounts[var1] > 0) {
- Npc.method2009(var1, this.indexStore, this);
+ NPC.method2009(var1, this.indexStore, this);
this.__ac = var1;
}
}
diff --git a/runescape-client/src/main/java/IndexCacheLoader.java b/runescape-client/src/main/java/IndexCacheLoader.java
index d623810bfd..04b9b9d129 100644
--- a/runescape-client/src/main/java/IndexCacheLoader.java
+++ b/runescape-client/src/main/java/IndexCacheLoader.java
@@ -86,60 +86,61 @@ public class IndexCacheLoader {
Login.__cu_q = (SoundCache.canvasWidth - 765) / 2;
Login.__cu_y = Login.__cu_q + 202;
Varps.__hv_h = Login.__cu_y + 180;
+ int var3;
+ int var4;
+ int var5;
+ byte var6;
+ int var7;
+ int var8;
int var9;
- int var11;
- int var19;
- byte var23;
- int var24;
- int var27;
- int var28;
- int var48;
+ int var10;
+ boolean var20;
if(Login.__cu_bk) {
if(class30.__ar_bd == null) {
class30.__ar_bd = class2.method20(WorldMapSection3.indexCache8, "sl_back", "");
}
- IndexCache var36;
- int var37;
- int var39;
- IndexedSprite[] var40;
+ IndexCache var11;
+ int var12;
+ int var13;
+ IndexedSprite[] var14;
if(Frames.__en_bc == null) {
- var36 = WorldMapSection3.indexCache8;
- var39 = var36.getArchiveId("sl_flags");
- var37 = var36.getRecordId(var39, "");
- if(!SpriteMask.method4392(var36, var39, var37)) {
- var40 = null;
+ var11 = WorldMapSection3.indexCache8;
+ var13 = var11.getArchiveId("sl_flags");
+ var12 = var11.getRecordId(var13, "");
+ if(!SpriteMask.method4392(var11, var13, var12)) {
+ var14 = null;
} else {
- var40 = WorldMapLabel.method444();
+ var14 = WorldMapLabel.method444();
}
- Frames.__en_bc = var40;
+ Frames.__en_bc = var14;
}
if(AttackOption.__cj_bo == null) {
- var36 = WorldMapSection3.indexCache8;
- var39 = var36.getArchiveId("sl_arrows");
- var37 = var36.getRecordId(var39, "");
- if(!SpriteMask.method4392(var36, var39, var37)) {
- var40 = null;
+ var11 = WorldMapSection3.indexCache8;
+ var13 = var11.getArchiveId("sl_arrows");
+ var12 = var11.getRecordId(var13, "");
+ if(!SpriteMask.method4392(var11, var13, var12)) {
+ var14 = null;
} else {
- var40 = WorldMapLabel.method444();
+ var14 = WorldMapLabel.method444();
}
- AttackOption.__cj_bo = var40;
+ AttackOption.__cj_bo = var14;
}
if(UrlRequest.__ey_bx == null) {
- var36 = WorldMapSection3.indexCache8;
- var39 = var36.getArchiveId("sl_stars");
- var37 = var36.getRecordId(var39, "");
- if(!SpriteMask.method4392(var36, var39, var37)) {
- var40 = null;
+ var11 = WorldMapSection3.indexCache8;
+ var13 = var11.getArchiveId("sl_stars");
+ var12 = var11.getRecordId(var13, "");
+ if(!SpriteMask.method4392(var11, var13, var12)) {
+ var14 = null;
} else {
- var40 = WorldMapLabel.method444();
+ var14 = WorldMapLabel.method444();
}
- UrlRequest.__ey_bx = var40;
+ UrlRequest.__ey_bx = var14;
}
if(SecureRandomFuture.__cn_bu == null) {
@@ -162,192 +163,195 @@ public class IndexCacheLoader {
}
if(AttackOption.__cj_bo != null) {
- var48 = Login.__cu_q + 280;
+ var10 = Login.__cu_q + 280;
if(World.__bt_e[0] == 0 && World.__bt_l[0] == 0) {
- AttackOption.__cj_bo[2].__q_496(var48, 4);
+ AttackOption.__cj_bo[2].__q_496(var10, 4);
} else {
- AttackOption.__cj_bo[0].__q_496(var48, 4);
+ AttackOption.__cj_bo[0].__q_496(var10, 4);
}
if(World.__bt_e[0] == 0 && World.__bt_l[0] == 1) {
- AttackOption.__cj_bo[3].__q_496(var48 + 15, 4);
+ AttackOption.__cj_bo[3].__q_496(var10 + 15, 4);
} else {
- AttackOption.__cj_bo[1].__q_496(var48 + 15, 4);
+ AttackOption.__cj_bo[1].__q_496(var10 + 15, 4);
}
- var0.draw("World", var48 + 32, 17, 16777215, -1);
- var24 = Login.__cu_q + 390;
+ var0.draw("World", var10 + 32, 17, 16777215, -1);
+ var7 = Login.__cu_q + 390;
if(World.__bt_e[0] == 1 && World.__bt_l[0] == 0) {
- AttackOption.__cj_bo[2].__q_496(var24, 4);
+ AttackOption.__cj_bo[2].__q_496(var7, 4);
} else {
- AttackOption.__cj_bo[0].__q_496(var24, 4);
+ AttackOption.__cj_bo[0].__q_496(var7, 4);
}
if(World.__bt_e[0] == 1 && World.__bt_l[0] == 1) {
- AttackOption.__cj_bo[3].__q_496(var24 + 15, 4);
+ AttackOption.__cj_bo[3].__q_496(var7 + 15, 4);
} else {
- AttackOption.__cj_bo[1].__q_496(var24 + 15, 4);
+ AttackOption.__cj_bo[1].__q_496(var7 + 15, 4);
}
- var0.draw("Players", var24 + 32, 17, 16777215, -1);
- var39 = Login.__cu_q + 500;
+ var0.draw("Players", var7 + 32, 17, 16777215, -1);
+ var13 = Login.__cu_q + 500;
if(World.__bt_e[0] == 2 && World.__bt_l[0] == 0) {
- AttackOption.__cj_bo[2].__q_496(var39, 4);
+ AttackOption.__cj_bo[2].__q_496(var13, 4);
} else {
- AttackOption.__cj_bo[0].__q_496(var39, 4);
+ AttackOption.__cj_bo[0].__q_496(var13, 4);
}
if(World.__bt_e[0] == 2 && World.__bt_l[0] == 1) {
- AttackOption.__cj_bo[3].__q_496(var39 + 15, 4);
+ AttackOption.__cj_bo[3].__q_496(var13 + 15, 4);
} else {
- AttackOption.__cj_bo[1].__q_496(var39 + 15, 4);
+ AttackOption.__cj_bo[1].__q_496(var13 + 15, 4);
}
- var0.draw("Location", var39 + 32, 17, 16777215, -1);
- var37 = Login.__cu_q + 610;
+ var0.draw("Location", var13 + 32, 17, 16777215, -1);
+ var12 = Login.__cu_q + 610;
if(World.__bt_e[0] == 3 && World.__bt_l[0] == 0) {
- AttackOption.__cj_bo[2].__q_496(var37, 4);
+ AttackOption.__cj_bo[2].__q_496(var12, 4);
} else {
- AttackOption.__cj_bo[0].__q_496(var37, 4);
+ AttackOption.__cj_bo[0].__q_496(var12, 4);
}
if(World.__bt_e[0] == 3 && World.__bt_l[0] == 1) {
- AttackOption.__cj_bo[3].__q_496(var37 + 15, 4);
+ AttackOption.__cj_bo[3].__q_496(var12 + 15, 4);
} else {
- AttackOption.__cj_bo[1].__q_496(var37 + 15, 4);
+ AttackOption.__cj_bo[1].__q_496(var12 + 15, 4);
}
- var0.draw("Type", var37 + 32, 17, 16777215, -1);
+ var0.draw("Type", var12 + 32, 17, 16777215, -1);
}
Rasterizer2D.Rasterizer2D_fillRectangle(Login.__cu_q + 708, 4, 50, 16, 0);
var1.drawCentered("Cancel", Login.__cu_q + 708 + 25, 16, 16777215, -1);
Login.__cu_bl = -1;
if(class30.__ar_bd != null) {
- var23 = 88;
- byte var51 = 19;
- var39 = 765 / (var23 + 1) - 1;
- var37 = 480 / (var51 + 1);
+ var6 = 88;
+ byte var15 = 19;
+ var13 = 765 / (var6 + 1) - 1;
+ var12 = 480 / (var15 + 1);
- do {
- var27 = var37;
- var28 = var39;
- if(var37 * (var39 - 1) >= World.worldsCount) {
- --var39;
+ while(true) {
+ var8 = var12;
+ var9 = var13;
+ if(var12 * (var13 - 1) >= World.worldsCount) {
+ --var13;
}
- if(var39 * (var37 - 1) >= World.worldsCount) {
- --var37;
+ if(var13 * (var12 - 1) >= World.worldsCount) {
+ --var12;
}
- if(var39 * (var37 - 1) >= World.worldsCount) {
- --var37;
- }
- } while(var37 != var27 || var39 != var28);
-
- var27 = (765 - var23 * var39) / (var39 + 1);
- if(var27 > 5) {
- var27 = 5;
- }
-
- var28 = (480 - var51 * var37) / (var37 + 1);
- if(var28 > 5) {
- var28 = 5;
- }
-
- var9 = (765 - var39 * var23 - var27 * (var39 - 1)) / 2;
- int var10 = (480 - var37 * var51 - var28 * (var37 - 1)) / 2;
- var11 = (var37 + World.worldsCount - 1) / var37;
- Login.__cu_bj = var11 - var39;
- if(SecureRandomFuture.__cn_bu != null && Login.__cu_br > 0) {
- SecureRandomFuture.__cn_bu.__q_496(8, Huffman.canvasHeight / 2 - SecureRandomFuture.__cn_bu.subHeight / 2);
- }
-
- if(NetSocket.__fb_bm != null && Login.__cu_br < Login.__cu_bj) {
- NetSocket.__fb_bm.__q_496(SoundCache.canvasWidth - NetSocket.__fb_bm.subWidth - 8, Huffman.canvasHeight / 2 - NetSocket.__fb_bm.subHeight / 2);
- }
-
- int var41 = var10 + 23;
- int var42 = var9 + Login.__cu_q;
- int var43 = 0;
- boolean var15 = false;
- int var16 = Login.__cu_br;
-
- int var44;
- for(var44 = var37 * var16; var44 < World.worldsCount && var16 - Login.__cu_br < var39; ++var44) {
- World var29 = ItemContainer.worlds[var44];
- boolean var46 = true;
- String var20 = Integer.toString(var29.population);
- if(var29.population == -1) {
- var20 = "OFF";
- var46 = false;
- } else if(var29.population > 1980) {
- var20 = "FULL";
- var46 = false;
+ if(var13 * (var12 - 1) >= World.worldsCount) {
+ --var12;
}
- int var22 = 0;
- byte var21;
- if(var29.__j_149()) {
- if(var29.__e_144()) {
- var21 = 7;
- } else {
- var21 = 6;
+ if(var12 == var8 && var13 == var9) {
+ var8 = (765 - var6 * var13) / (var13 + 1);
+ if(var8 > 5) {
+ var8 = 5;
}
- } else if(var29.__z_148()) {
- var22 = 16711680;
- if(var29.__e_144()) {
- var21 = 5;
- } else {
- var21 = 4;
+
+ var9 = (480 - var15 * var12) / (var12 + 1);
+ if(var9 > 5) {
+ var9 = 5;
}
- } else if(var29.__d_146()) {
- if(var29.__e_144()) {
- var21 = 3;
- } else {
- var21 = 2;
+
+ var3 = (765 - var13 * var6 - var8 * (var13 - 1)) / 2;
+ int var16 = (480 - var12 * var15 - var9 * (var12 - 1)) / 2;
+ var4 = (var12 + World.worldsCount - 1) / var12;
+ Login.__cu_bj = var4 - var13;
+ if(SecureRandomFuture.__cn_bu != null && Login.__cu_br > 0) {
+ SecureRandomFuture.__cn_bu.__q_496(8, Huffman.canvasHeight / 2 - SecureRandomFuture.__cn_bu.subHeight / 2);
}
- } else if(var29.__e_144()) {
- var21 = 1;
- } else {
- var21 = 0;
- }
- if(MouseHandler.MouseHandler_x >= var42 && MouseHandler.MouseHandler_y >= var41 && MouseHandler.MouseHandler_x < var42 + var23 && MouseHandler.MouseHandler_y < var51 + var41 && var46) {
- Login.__cu_bl = var44;
- class30.__ar_bd[var21].__t_507(var42, var41, 128, 16777215);
- var15 = true;
- } else {
- class30.__ar_bd[var21].drawAt(var42, var41);
- }
+ if(NetSocket.__fb_bm != null && Login.__cu_br < Login.__cu_bj) {
+ NetSocket.__fb_bm.__q_496(SoundCache.canvasWidth - NetSocket.__fb_bm.subWidth - 8, Huffman.canvasHeight / 2 - NetSocket.__fb_bm.subHeight / 2);
+ }
- if(Frames.__en_bc != null) {
- Frames.__en_bc[(var29.__e_144()?8:0) + var29.location].__q_496(var42 + 29, var41);
- }
+ int var17 = var16 + 23;
+ int var18 = var3 + Login.__cu_q;
+ int var19 = 0;
+ var20 = false;
+ int var21 = Login.__cu_br;
- var0.drawCentered(Integer.toString(var29.id), var42 + 15, var51 / 2 + var41 + 5, var22, -1);
- var1.drawCentered(var20, var42 + 60, var51 / 2 + var41 + 5, 268435455, -1);
- var41 = var41 + var28 + var51;
- ++var43;
- if(var43 >= var37) {
- var41 = var10 + 23;
- var42 = var42 + var23 + var27;
- var43 = 0;
- ++var16;
- }
- }
+ int var22;
+ for(var22 = var12 * var21; var22 < World.worldsCount && var21 - Login.__cu_br < var13; ++var22) {
+ World var23 = ItemContainer.worlds[var22];
+ boolean var24 = true;
+ String var25 = Integer.toString(var23.population);
+ if(var23.population == -1) {
+ var25 = "OFF";
+ var24 = false;
+ } else if(var23.population > 1980) {
+ var25 = "FULL";
+ var24 = false;
+ }
- if(var15) {
- var44 = var1.stringWidth(ItemContainer.worlds[Login.__cu_bl].activity) + 6;
- int var45 = var1.ascent + 8;
- var19 = MouseHandler.MouseHandler_y + 25;
- if(var45 + var19 > 480) {
- var19 = MouseHandler.MouseHandler_y - 25 - var45;
- }
+ int var26 = 0;
+ byte var27;
+ if(var23.__j_149()) {
+ if(var23.__e_144()) {
+ var27 = 7;
+ } else {
+ var27 = 6;
+ }
+ } else if(var23.__z_148()) {
+ var26 = 16711680;
+ if(var23.__e_144()) {
+ var27 = 5;
+ } else {
+ var27 = 4;
+ }
+ } else if(var23.__d_146()) {
+ if(var23.__e_144()) {
+ var27 = 3;
+ } else {
+ var27 = 2;
+ }
+ } else if(var23.__e_144()) {
+ var27 = 1;
+ } else {
+ var27 = 0;
+ }
- Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var44 / 2, var19, var44, var45, 16777120);
- Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var44 / 2, var19, var44, var45, 0);
- var1.drawCentered(ItemContainer.worlds[Login.__cu_bl].activity, MouseHandler.MouseHandler_x, var19 + var1.ascent + 4, 0, -1);
+ if(MouseHandler.MouseHandler_x >= var18 && MouseHandler.MouseHandler_y >= var17 && MouseHandler.MouseHandler_x < var18 + var6 && MouseHandler.MouseHandler_y < var15 + var17 && var24) {
+ Login.__cu_bl = var22;
+ class30.__ar_bd[var27].__t_507(var18, var17, 128, 16777215);
+ var20 = true;
+ } else {
+ class30.__ar_bd[var27].drawAt(var18, var17);
+ }
+
+ if(Frames.__en_bc != null) {
+ Frames.__en_bc[(var23.__e_144()?8:0) + var23.location].__q_496(var18 + 29, var17);
+ }
+
+ var0.drawCentered(Integer.toString(var23.id), var18 + 15, var15 / 2 + var17 + 5, var26, -1);
+ var1.drawCentered(var25, var18 + 60, var15 / 2 + var17 + 5, 268435455, -1);
+ var17 = var17 + var9 + var15;
+ ++var19;
+ if(var19 >= var12) {
+ var17 = var16 + 23;
+ var18 = var18 + var6 + var8;
+ var19 = 0;
+ ++var21;
+ }
+ }
+
+ if(var20) {
+ var22 = var1.stringWidth(ItemContainer.worlds[Login.__cu_bl].activity) + 6;
+ int var47 = var1.ascent + 8;
+ var5 = MouseHandler.MouseHandler_y + 25;
+ if(var47 + var5 > 480) {
+ var5 = MouseHandler.MouseHandler_y - 25 - var47;
+ }
+
+ Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var22 / 2, var5, var22, var47, 16777120);
+ Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var22 / 2, var5, var22, var47, 0);
+ var1.drawCentered(ItemContainer.worlds[Login.__cu_bl].activity, MouseHandler.MouseHandler_x, var5 + var1.ascent + 4, 0, -1);
+ }
+ break;
+ }
}
}
@@ -357,142 +361,142 @@ public class IndexCacheLoader {
Fonts.__kz_l.drawAt(Login.__cu_q + 382, 0);
WorldMapSectionType.__h_e.__q_496(Login.__cu_q + 382 - WorldMapSectionType.__h_e.subWidth / 2, 18);
if(Client.gameState == 0 || Client.gameState == 5) {
- var23 = 20;
- var0.drawCentered("RuneScape is loading - please wait...", Login.__cu_y + 180, 245 - var23, 16777215, -1);
- var24 = 253 - var23;
- Rasterizer2D.Rasterizer2D_drawRectangle(Login.__cu_y + 180 - 152, var24, 304, 34, 9179409);
- Rasterizer2D.Rasterizer2D_drawRectangle(Login.__cu_y + 180 - 151, var24 + 1, 302, 32, 0);
- Rasterizer2D.Rasterizer2D_fillRectangle(Login.__cu_y + 180 - 150, var24 + 2, Login.Login_loadingPercent * 3, 30, 9179409);
- Rasterizer2D.Rasterizer2D_fillRectangle(Login.__cu_y + 180 - 150 + Login.Login_loadingPercent * 3, var24 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0);
- var0.drawCentered(Login.Login_loadingText, Login.__cu_y + 180, 276 - var23, 16777215, -1);
+ var6 = 20;
+ var0.drawCentered("RuneScape is loading - please wait...", Login.__cu_y + 180, 245 - var6, 16777215, -1);
+ var7 = 253 - var6;
+ Rasterizer2D.Rasterizer2D_drawRectangle(Login.__cu_y + 180 - 152, var7, 304, 34, 9179409);
+ Rasterizer2D.Rasterizer2D_drawRectangle(Login.__cu_y + 180 - 151, var7 + 1, 302, 32, 0);
+ Rasterizer2D.Rasterizer2D_fillRectangle(Login.__cu_y + 180 - 150, var7 + 2, Login.Login_loadingPercent * 3, 30, 9179409);
+ Rasterizer2D.Rasterizer2D_fillRectangle(Login.__cu_y + 180 - 150 + Login.Login_loadingPercent * 3, var7 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0);
+ var0.drawCentered(Login.Login_loadingText, Login.__cu_y + 180, 276 - var6, 16777215, -1);
}
- String var7;
- String var8;
- String var25;
+ String var28;
+ String var29;
String var30;
String var31;
- short var47;
- short var49;
+ short var32;
+ String var33;
+ short var34;
if(Client.gameState == 20) {
Login.__cu_o.__q_496(Login.__cu_y + 180 - Login.__cu_o.subWidth / 2, 271 - Login.__cu_o.subHeight / 2);
- var47 = 201;
- var0.drawCentered(Login.Login_response1, Login.__cu_y + 180, var47, 16776960, 0);
- var48 = var47 + 15;
- var0.drawCentered(Login.Login_response2, Login.__cu_y + 180, var48, 16776960, 0);
- var48 += 15;
- var0.drawCentered(Login.Login_response3, Login.__cu_y + 180, var48, 16776960, 0);
- var48 += 15;
- var48 += 7;
+ var32 = 201;
+ var0.drawCentered(Login.Login_response1, Login.__cu_y + 180, var32, 16776960, 0);
+ var10 = var32 + 15;
+ var0.drawCentered(Login.Login_response2, Login.__cu_y + 180, var10, 16776960, 0);
+ var10 += 15;
+ var0.drawCentered(Login.Login_response3, Login.__cu_y + 180, var10, 16776960, 0);
+ var10 += 15;
+ var10 += 7;
if(Login.loginIndex != 4) {
- var0.draw("Login: ", Login.__cu_y + 180 - 110, var48, 16777215, 0);
- var49 = 200;
+ var0.draw("Login: ", Login.__cu_y + 180 - 110, var10, 16777215, 0);
+ var34 = 200;
if(ReflectionCheck.clientPreferences.hideUsername) {
- var8 = Login.Login_username;
- var7 = class168.method3450('*', var8.length());
- var25 = var7;
+ var29 = Login.Login_username;
+ var28 = class168.method3450('*', var29.length());
+ var30 = var28;
} else {
- var25 = Login.Login_username;
+ var30 = Login.Login_username;
}
- for(var25 = var25; var0.stringWidth(var25) > var49; var25 = var25.substring(0, var25.length() - 1)) {
+ for(var30 = var30; var0.stringWidth(var30) > var34; var30 = var30.substring(0, var30.length() - 1)) {
;
}
- var0.draw(AbstractFont.escapeBrackets(var25), Login.__cu_y + 180 - 70, var48, 16777215, 0);
- var48 += 15;
- var8 = "Password: ";
- var30 = Login.Login_password;
- var31 = class168.method3450('*', var30.length());
- var0.draw(var8 + var31, Login.__cu_y + 180 - 108, var48, 16777215, 0);
- var48 += 15;
+ var0.draw(AbstractFont.escapeBrackets(var30), Login.__cu_y + 180 - 70, var10, 16777215, 0);
+ var10 += 15;
+ var29 = "Password: ";
+ var33 = Login.Login_password;
+ var31 = class168.method3450('*', var33.length());
+ var0.draw(var29 + var31, Login.__cu_y + 180 - 108, var10, 16777215, 0);
+ var10 += 15;
}
}
if(Client.gameState == 10 || Client.gameState == 11) {
Login.__cu_o.__q_496(Login.__cu_y, 171);
- short var5;
+ short var35;
if(Login.loginIndex == 0) {
- var47 = 251;
- var0.drawCentered("Welcome to RuneScape", Login.__cu_y + 180, var47, 16776960, 0);
- var48 = var47 + 30;
- var24 = Login.__cu_y + 180 - 80;
- var5 = 291;
- __bd_u.__q_496(var24 - 73, var5 - 20);
- var0.drawLines("New User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0);
- var24 = Login.__cu_y + 180 + 80;
- __bd_u.__q_496(var24 - 73, var5 - 20);
- var0.drawLines("Existing User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0);
+ var32 = 251;
+ var0.drawCentered("Welcome to RuneScape", Login.__cu_y + 180, var32, 16776960, 0);
+ var10 = var32 + 30;
+ var7 = Login.__cu_y + 180 - 80;
+ var35 = 291;
+ __bd_u.__q_496(var7 - 73, var35 - 20);
+ var0.drawLines("New User", var7 - 73, var35 - 20, 144, 40, 16777215, 0, 1, 1, 0);
+ var7 = Login.__cu_y + 180 + 80;
+ __bd_u.__q_496(var7 - 73, var35 - 20);
+ var0.drawLines("Existing User", var7 - 73, var35 - 20, 144, 40, 16777215, 0, 1, 1, 0);
} else if(Login.loginIndex == 1) {
var0.drawCentered(Login.Login_response0, Login.__cu_y + 180, 201, 16776960, 0);
- var47 = 236;
- var0.drawCentered(Login.Login_response1, Login.__cu_y + 180, var47, 16777215, 0);
- var48 = var47 + 15;
- var0.drawCentered(Login.Login_response2, Login.__cu_y + 180, var48, 16777215, 0);
- var48 += 15;
- var0.drawCentered(Login.Login_response3, Login.__cu_y + 180, var48, 16777215, 0);
- var48 += 15;
- var24 = Login.__cu_y + 180 - 80;
- var5 = 321;
- __bd_u.__q_496(var24 - 73, var5 - 20);
- var0.drawCentered("Continue", var24, var5 + 5, 16777215, 0);
- var24 = Login.__cu_y + 180 + 80;
- __bd_u.__q_496(var24 - 73, var5 - 20);
- var0.drawCentered("Cancel", var24, var5 + 5, 16777215, 0);
+ var32 = 236;
+ var0.drawCentered(Login.Login_response1, Login.__cu_y + 180, var32, 16777215, 0);
+ var10 = var32 + 15;
+ var0.drawCentered(Login.Login_response2, Login.__cu_y + 180, var10, 16777215, 0);
+ var10 += 15;
+ var0.drawCentered(Login.Login_response3, Login.__cu_y + 180, var10, 16777215, 0);
+ var10 += 15;
+ var7 = Login.__cu_y + 180 - 80;
+ var35 = 321;
+ __bd_u.__q_496(var7 - 73, var35 - 20);
+ var0.drawCentered("Continue", var7, var35 + 5, 16777215, 0);
+ var7 = Login.__cu_y + 180 + 80;
+ __bd_u.__q_496(var7 - 73, var35 - 20);
+ var0.drawCentered("Cancel", var7, var35 + 5, 16777215, 0);
} else if(Login.loginIndex == 2) {
- var47 = 201;
- var0.drawCentered(Login.Login_response1, Varps.__hv_h, var47, 16776960, 0);
- var48 = var47 + 15;
- var0.drawCentered(Login.Login_response2, Varps.__hv_h, var48, 16776960, 0);
- var48 += 15;
- var0.drawCentered(Login.Login_response3, Varps.__hv_h, var48, 16776960, 0);
- var48 += 15;
- var48 += 7;
- var0.draw("Login: ", Varps.__hv_h - 110, var48, 16777215, 0);
- var49 = 200;
+ var32 = 201;
+ var0.drawCentered(Login.Login_response1, Varps.__hv_h, var32, 16776960, 0);
+ var10 = var32 + 15;
+ var0.drawCentered(Login.Login_response2, Varps.__hv_h, var10, 16776960, 0);
+ var10 += 15;
+ var0.drawCentered(Login.Login_response3, Varps.__hv_h, var10, 16776960, 0);
+ var10 += 15;
+ var10 += 7;
+ var0.draw("Login: ", Varps.__hv_h - 110, var10, 16777215, 0);
+ var34 = 200;
if(ReflectionCheck.clientPreferences.hideUsername) {
- var8 = Login.Login_username;
- var7 = class168.method3450('*', var8.length());
- var25 = var7;
+ var29 = Login.Login_username;
+ var28 = class168.method3450('*', var29.length());
+ var30 = var28;
} else {
- var25 = Login.Login_username;
+ var30 = Login.Login_username;
}
- for(var25 = var25; var0.stringWidth(var25) > var49; var25 = var25.substring(1)) {
+ for(var30 = var30; var0.stringWidth(var30) > var34; var30 = var30.substring(1)) {
;
}
- var0.draw(AbstractFont.escapeBrackets(var25) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Varps.__hv_h - 70, var48, 16777215, 0);
- var48 += 15;
- var8 = "Password: ";
- var30 = Login.Login_password;
- var31 = class168.method3450('*', var30.length());
- var0.draw(var8 + var31 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Varps.__hv_h - 108, var48, 16777215, 0);
- var48 += 15;
- var47 = 277;
- var11 = Varps.__hv_h + -117;
- boolean var13 = Client.Login_isUsernameRemembered;
- boolean var14 = Login.__cu_aa;
- IndexedSprite var32 = var13?(var14?KeyHandler.__an_i:class308.__kw_n):(var14?GraphicsObject.__bw_k:Login.__cu_d);
- var32.__q_496(var11, var47);
- var11 = var11 + var32.subWidth + 5;
- var1.draw("Remember username", var11, var47 + 13, 16776960, 0);
- var11 = Varps.__hv_h + 24;
- boolean var17 = ReflectionCheck.clientPreferences.hideUsername;
- boolean var18 = Login.__cu_ax;
- IndexedSprite var34 = var17?(var18?KeyHandler.__an_i:class308.__kw_n):(var18?GraphicsObject.__bw_k:Login.__cu_d);
- var34.__q_496(var11, var47);
- var11 = var11 + var34.subWidth + 5;
- var1.draw("Hide username", var11, var47 + 13, 16776960, 0);
- var48 = var47 + 15;
- var19 = Varps.__hv_h - 80;
- short var35 = 321;
- __bd_u.__q_496(var19 - 73, var35 - 20);
- var0.drawCentered("Login", var19, var35 + 5, 16777215, 0);
- var19 = Varps.__hv_h + 80;
- __bd_u.__q_496(var19 - 73, var35 - 20);
- var0.drawCentered("Cancel", var19, var35 + 5, 16777215, 0);
- var47 = 357;
+ var0.draw(AbstractFont.escapeBrackets(var30) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Varps.__hv_h - 70, var10, 16777215, 0);
+ var10 += 15;
+ var29 = "Password: ";
+ var33 = Login.Login_password;
+ var31 = class168.method3450('*', var33.length());
+ var0.draw(var29 + var31 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Varps.__hv_h - 108, var10, 16777215, 0);
+ var10 += 15;
+ var32 = 277;
+ var4 = Varps.__hv_h + -117;
+ boolean var40 = Client.Login_isUsernameRemembered;
+ var20 = Login.__cu_aa;
+ IndexedSprite var46 = var40?(var20?KeyHandler.__an_i:class308.__kw_n):(var20?GraphicsObject.__bw_k:Login.__cu_d);
+ var46.__q_496(var4, var32);
+ var4 = var4 + var46.subWidth + 5;
+ var1.draw("Remember username", var4, var32 + 13, 16776960, 0);
+ var4 = Varps.__hv_h + 24;
+ boolean var44 = ReflectionCheck.clientPreferences.hideUsername;
+ boolean var48 = Login.__cu_ax;
+ IndexedSprite var49 = var44?(var48?KeyHandler.__an_i:class308.__kw_n):(var48?GraphicsObject.__bw_k:Login.__cu_d);
+ var49.__q_496(var4, var32);
+ var4 = var4 + var49.subWidth + 5;
+ var1.draw("Hide username", var4, var32 + 13, 16776960, 0);
+ var10 = var32 + 15;
+ var5 = Varps.__hv_h - 80;
+ short var50 = 321;
+ __bd_u.__q_496(var5 - 73, var50 - 20);
+ var0.drawCentered("Login", var5, var50 + 5, 16777215, 0);
+ var5 = Varps.__hv_h + 80;
+ __bd_u.__q_496(var5 - 73, var50 - 20);
+ var0.drawCentered("Cancel", var5, var50 + 5, 16777215, 0);
+ var32 = 357;
switch(Login.__cu_ac) {
case 2:
AttackOption.__cj_ay = "Having trouble logging in?";
@@ -501,209 +505,211 @@ public class IndexCacheLoader {
AttackOption.__cj_ay = "Can\'t login? Click here.";
}
- TilePaint.__eb_ah = new Bounds(Varps.__hv_h, var47, var1.stringWidth(AttackOption.__cj_ay), 11);
- UrlRequester.__eo_ak = new Bounds(Varps.__hv_h, var47, var1.stringWidth("Still having trouble logging in?"), 11);
- var1.drawCentered(AttackOption.__cj_ay, Varps.__hv_h, var47, 16777215, 0);
+ TilePaint.__eb_ah = new Bounds(Varps.__hv_h, var32, var1.stringWidth(AttackOption.__cj_ay), 11);
+ UrlRequester.__eo_ak = new Bounds(Varps.__hv_h, var32, var1.stringWidth("Still having trouble logging in?"), 11);
+ var1.drawCentered(AttackOption.__cj_ay, Varps.__hv_h, var32, 16777215, 0);
} else if(Login.loginIndex == 3) {
- var47 = 201;
- var0.drawCentered("Invalid credentials.", Login.__cu_y + 180, var47, 16776960, 0);
- var48 = var47 + 20;
- var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.__cu_y + 180, var48, 16776960, 0);
- var48 += 15;
- var1.drawCentered("email address to login. Otherwise please login with your username.", Login.__cu_y + 180, var48, 16776960, 0);
- var48 += 15;
- var24 = Login.__cu_y + 180;
- var5 = 276;
- __bd_u.__q_496(var24 - 73, var5 - 20);
- var2.drawCentered("Try again", var24, var5 + 5, 16777215, 0);
- var24 = Login.__cu_y + 180;
- var5 = 326;
- __bd_u.__q_496(var24 - 73, var5 - 20);
- var2.drawCentered("Forgotten password?", var24, var5 + 5, 16777215, 0);
+ var32 = 201;
+ var0.drawCentered("Invalid credentials.", Login.__cu_y + 180, var32, 16776960, 0);
+ var10 = var32 + 20;
+ var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.__cu_y + 180, var10, 16776960, 0);
+ var10 += 15;
+ var1.drawCentered("email address to login. Otherwise please login with your username.", Login.__cu_y + 180, var10, 16776960, 0);
+ var10 += 15;
+ var7 = Login.__cu_y + 180;
+ var35 = 276;
+ __bd_u.__q_496(var7 - 73, var35 - 20);
+ var2.drawCentered("Try again", var7, var35 + 5, 16777215, 0);
+ var7 = Login.__cu_y + 180;
+ var35 = 326;
+ __bd_u.__q_496(var7 - 73, var35 - 20);
+ var2.drawCentered("Forgotten password?", var7, var35 + 5, 16777215, 0);
} else {
- String var26;
+ String var36;
if(Login.loginIndex == 4) {
var0.drawCentered("Authenticator", Login.__cu_y + 180, 201, 16776960, 0);
- var47 = 236;
- var0.drawCentered(Login.Login_response1, Login.__cu_y + 180, var47, 16777215, 0);
- var48 = var47 + 15;
- var0.drawCentered(Login.Login_response2, Login.__cu_y + 180, var48, 16777215, 0);
- var48 += 15;
- var0.drawCentered(Login.Login_response3, Login.__cu_y + 180, var48, 16777215, 0);
- var48 += 15;
- var26 = "PIN: ";
- var7 = Login.otp;
- var25 = class168.method3450('*', var7.length());
- var0.draw(var26 + var25 + (Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Login.__cu_y + 180 - 108, var48, 16777215, 0);
- var48 -= 8;
- var0.draw("Trust this computer", Login.__cu_y + 180 - 9, var48, 16776960, 0);
- var48 += 15;
- var0.draw("for 30 days: ", Login.__cu_y + 180 - 9, var48, 16776960, 0);
- var28 = Login.__cu_y + 180 - 9 + var0.stringWidth("for 30 days: ") + 15;
- var9 = var48 - var0.ascent;
- IndexedSprite var52;
+ var32 = 236;
+ var0.drawCentered(Login.Login_response1, Login.__cu_y + 180, var32, 16777215, 0);
+ var10 = var32 + 15;
+ var0.drawCentered(Login.Login_response2, Login.__cu_y + 180, var10, 16777215, 0);
+ var10 += 15;
+ var0.drawCentered(Login.Login_response3, Login.__cu_y + 180, var10, 16777215, 0);
+ var10 += 15;
+ var36 = "PIN: ";
+ var28 = Login.otp;
+ var30 = class168.method3450('*', var28.length());
+ var0.draw(var36 + var30 + (Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Login.__cu_y + 180 - 108, var10, 16777215, 0);
+ var10 -= 8;
+ var0.draw("Trust this computer", Login.__cu_y + 180 - 9, var10, 16776960, 0);
+ var10 += 15;
+ var0.draw("for 30 days: ", Login.__cu_y + 180 - 9, var10, 16776960, 0);
+ var9 = Login.__cu_y + 180 - 9 + var0.stringWidth("for 30 days: ") + 15;
+ var3 = var10 - var0.ascent;
+ IndexedSprite var43;
if(Login.__cu_ba) {
- var52 = class308.__kw_n;
+ var43 = class308.__kw_n;
} else {
- var52 = Login.__cu_d;
+ var43 = Login.__cu_d;
}
- var52.__q_496(var28, var9);
- var48 += 15;
- var11 = Login.__cu_y + 180 - 80;
- short var12 = 321;
- __bd_u.__q_496(var11 - 73, var12 - 20);
- var0.drawCentered("Continue", var11, var12 + 5, 16777215, 0);
- var11 = Login.__cu_y + 180 + 80;
- __bd_u.__q_496(var11 - 73, var12 - 20);
- var0.drawCentered("Cancel", var11, var12 + 5, 16777215, 0);
- var1.drawCentered("Can\'t Log In?", Login.__cu_y + 180, var12 + 36, 255, 0);
+ var43.__q_496(var9, var3);
+ var10 += 15;
+ var4 = Login.__cu_y + 180 - 80;
+ short var45 = 321;
+ __bd_u.__q_496(var4 - 73, var45 - 20);
+ var0.drawCentered("Continue", var4, var45 + 5, 16777215, 0);
+ var4 = Login.__cu_y + 180 + 80;
+ __bd_u.__q_496(var4 - 73, var45 - 20);
+ var0.drawCentered("Cancel", var4, var45 + 5, 16777215, 0);
+ var1.drawCentered("Can\'t Log In?", Login.__cu_y + 180, var45 + 36, 255, 0);
} else {
- short var50;
- if(Login.loginIndex == 5) {
+ short var37;
+ if(Login.loginIndex != 5) {
+ if(Login.loginIndex == 6) {
+ var32 = 201;
+ var0.drawCentered(Login.Login_response1, Login.__cu_y + 180, var32, 16776960, 0);
+ var10 = var32 + 15;
+ var0.drawCentered(Login.Login_response2, Login.__cu_y + 180, var10, 16776960, 0);
+ var10 += 15;
+ var0.drawCentered(Login.Login_response3, Login.__cu_y + 180, var10, 16776960, 0);
+ var10 += 15;
+ var7 = Login.__cu_y + 180;
+ var35 = 321;
+ __bd_u.__q_496(var7 - 73, var35 - 20);
+ var0.drawCentered("Back", var7, var35 + 5, 16777215, 0);
+ } else if(Login.loginIndex == 7) {
+ var32 = 216;
+ var0.drawCentered("Your date of birth isn\'t set.", Login.__cu_y + 180, var32, 16776960, 0);
+ var10 = var32 + 15;
+ var2.drawCentered("Please verify your account status by", Login.__cu_y + 180, var10, 16776960, 0);
+ var10 += 15;
+ var2.drawCentered("setting your date of birth.", Login.__cu_y + 180, var10, 16776960, 0);
+ var10 += 15;
+ var7 = Login.__cu_y + 180 - 80;
+ var35 = 321;
+ __bd_u.__q_496(var7 - 73, var35 - 20);
+ var0.drawCentered("Set Date of Birth", var7, var35 + 5, 16777215, 0);
+ var7 = Login.__cu_y + 180 + 80;
+ __bd_u.__q_496(var7 - 73, var35 - 20);
+ var0.drawCentered("Back", var7, var35 + 5, 16777215, 0);
+ } else if(Login.loginIndex == 8) {
+ var32 = 216;
+ var0.drawCentered("Sorry, but your account is not eligible to play.", Login.__cu_y + 180, var32, 16776960, 0);
+ var10 = var32 + 15;
+ var2.drawCentered("For more information, please take a look at", Login.__cu_y + 180, var10, 16776960, 0);
+ var10 += 15;
+ var2.drawCentered("our privacy policy.", Login.__cu_y + 180, var10, 16776960, 0);
+ var10 += 15;
+ var7 = Login.__cu_y + 180 - 80;
+ var35 = 321;
+ __bd_u.__q_496(var7 - 73, var35 - 20);
+ var0.drawCentered("Privacy Policy", var7, var35 + 5, 16777215, 0);
+ var7 = Login.__cu_y + 180 + 80;
+ __bd_u.__q_496(var7 - 73, var35 - 20);
+ var0.drawCentered("Back", var7, var35 + 5, 16777215, 0);
+ } else if(Login.loginIndex == 12) {
+ var32 = 201;
+ String var41 = "";
+ var36 = "";
+ var30 = "";
+ switch(Login.__cu_aj) {
+ case 0:
+ var41 = "Your account has been disabled.";
+ var36 = Strings.__id_bq;
+ var30 = "";
+ break;
+ case 1:
+ var41 = "Account locked as we suspect it has been stolen.";
+ var36 = Strings.__id_cp;
+ var30 = "";
+ break;
+ default:
+ MouseHandler.method1084(false);
+ }
+
+ var0.drawCentered(var41, Login.__cu_y + 180, var32, 16776960, 0);
+ var10 = var32 + 15;
+ var2.drawCentered(var36, Login.__cu_y + 180, var10, 16776960, 0);
+ var10 += 15;
+ var2.drawCentered(var30, Login.__cu_y + 180, var10, 16776960, 0);
+ var10 += 15;
+ var8 = Login.__cu_y + 180;
+ var37 = 276;
+ __bd_u.__q_496(var8 - 73, var37 - 20);
+ var0.drawCentered("Support Page", var8, var37 + 5, 16777215, 0);
+ var8 = Login.__cu_y + 180;
+ var37 = 326;
+ __bd_u.__q_496(var8 - 73, var37 - 20);
+ var0.drawCentered("Back", var8, var37 + 5, 16777215, 0);
+ }
+ } else {
var0.drawCentered("Forgotten your password?", Login.__cu_y + 180, 201, 16776960, 0);
- var47 = 221;
- var2.drawCentered(Login.Login_response1, Login.__cu_y + 180, var47, 16776960, 0);
- var48 = var47 + 15;
- var2.drawCentered(Login.Login_response2, Login.__cu_y + 180, var48, 16776960, 0);
- var48 += 15;
- var2.drawCentered(Login.Login_response3, Login.__cu_y + 180, var48, 16776960, 0);
- var48 += 15;
- var48 += 14;
- var0.draw("Username/email: ", Login.__cu_y + 180 - 145, var48, 16777215, 0);
- var49 = 174;
+ var32 = 221;
+ var2.drawCentered(Login.Login_response1, Login.__cu_y + 180, var32, 16776960, 0);
+ var10 = var32 + 15;
+ var2.drawCentered(Login.Login_response2, Login.__cu_y + 180, var10, 16776960, 0);
+ var10 += 15;
+ var2.drawCentered(Login.Login_response3, Login.__cu_y + 180, var10, 16776960, 0);
+ var10 += 15;
+ var10 += 14;
+ var0.draw("Username/email: ", Login.__cu_y + 180 - 145, var10, 16777215, 0);
+ var34 = 174;
if(ReflectionCheck.clientPreferences.hideUsername) {
- var8 = Login.Login_username;
- var7 = class168.method3450('*', var8.length());
- var25 = var7;
+ var29 = Login.Login_username;
+ var28 = class168.method3450('*', var29.length());
+ var30 = var28;
} else {
- var25 = Login.Login_username;
+ var30 = Login.Login_username;
}
- for(var25 = var25; var0.stringWidth(var25) > var49; var25 = var25.substring(1)) {
+ for(var30 = var30; var0.stringWidth(var30) > var34; var30 = var30.substring(1)) {
;
}
- var0.draw(AbstractFont.escapeBrackets(var25) + (Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Login.__cu_y + 180 - 34, var48, 16777215, 0);
- var48 += 15;
- var27 = Login.__cu_y + 180 - 80;
- var50 = 321;
- __bd_u.__q_496(var27 - 73, var50 - 20);
- var0.drawCentered("Recover", var27, var50 + 5, 16777215, 0);
- var27 = Login.__cu_y + 180 + 80;
- __bd_u.__q_496(var27 - 73, var50 - 20);
- var0.drawCentered("Back", var27, var50 + 5, 16777215, 0);
- var50 = 356;
- var1.drawCentered("Still having trouble logging in?", Varps.__hv_h, var50, 268435455, 0);
- } else if(Login.loginIndex == 6) {
- var47 = 201;
- var0.drawCentered(Login.Login_response1, Login.__cu_y + 180, var47, 16776960, 0);
- var48 = var47 + 15;
- var0.drawCentered(Login.Login_response2, Login.__cu_y + 180, var48, 16776960, 0);
- var48 += 15;
- var0.drawCentered(Login.Login_response3, Login.__cu_y + 180, var48, 16776960, 0);
- var48 += 15;
- var24 = Login.__cu_y + 180;
- var5 = 321;
- __bd_u.__q_496(var24 - 73, var5 - 20);
- var0.drawCentered("Back", var24, var5 + 5, 16777215, 0);
- } else if(Login.loginIndex == 7) {
- var47 = 216;
- var0.drawCentered("Your date of birth isn\'t set.", Login.__cu_y + 180, var47, 16776960, 0);
- var48 = var47 + 15;
- var2.drawCentered("Please verify your account status by", Login.__cu_y + 180, var48, 16776960, 0);
- var48 += 15;
- var2.drawCentered("setting your date of birth.", Login.__cu_y + 180, var48, 16776960, 0);
- var48 += 15;
- var24 = Login.__cu_y + 180 - 80;
- var5 = 321;
- __bd_u.__q_496(var24 - 73, var5 - 20);
- var0.drawCentered("Set Date of Birth", var24, var5 + 5, 16777215, 0);
- var24 = Login.__cu_y + 180 + 80;
- __bd_u.__q_496(var24 - 73, var5 - 20);
- var0.drawCentered("Back", var24, var5 + 5, 16777215, 0);
- } else if(Login.loginIndex == 8) {
- var47 = 216;
- var0.drawCentered("Sorry, but your account is not eligible to play.", Login.__cu_y + 180, var47, 16776960, 0);
- var48 = var47 + 15;
- var2.drawCentered("For more information, please take a look at", Login.__cu_y + 180, var48, 16776960, 0);
- var48 += 15;
- var2.drawCentered("our privacy policy.", Login.__cu_y + 180, var48, 16776960, 0);
- var48 += 15;
- var24 = Login.__cu_y + 180 - 80;
- var5 = 321;
- __bd_u.__q_496(var24 - 73, var5 - 20);
- var0.drawCentered("Privacy Policy", var24, var5 + 5, 16777215, 0);
- var24 = Login.__cu_y + 180 + 80;
- __bd_u.__q_496(var24 - 73, var5 - 20);
- var0.drawCentered("Back", var24, var5 + 5, 16777215, 0);
- } else if(Login.loginIndex == 12) {
- var47 = 201;
- String var4 = "";
- var26 = "";
- var25 = "";
- switch(Login.__cu_aj) {
- case 0:
- var4 = "Your account has been disabled.";
- var26 = Strings.__id_bq;
- var25 = "";
- break;
- case 1:
- var4 = "Account locked as we suspect it has been stolen.";
- var26 = Strings.__id_cp;
- var25 = "";
- break;
- default:
- MouseHandler.method1084(false);
- }
-
- var0.drawCentered(var4, Login.__cu_y + 180, var47, 16776960, 0);
- var48 = var47 + 15;
- var2.drawCentered(var26, Login.__cu_y + 180, var48, 16776960, 0);
- var48 += 15;
- var2.drawCentered(var25, Login.__cu_y + 180, var48, 16776960, 0);
- var48 += 15;
- var27 = Login.__cu_y + 180;
- var50 = 276;
- __bd_u.__q_496(var27 - 73, var50 - 20);
- var0.drawCentered("Support Page", var27, var50 + 5, 16777215, 0);
- var27 = Login.__cu_y + 180;
- var50 = 326;
- __bd_u.__q_496(var27 - 73, var50 - 20);
- var0.drawCentered("Back", var27, var50 + 5, 16777215, 0);
+ var0.draw(AbstractFont.escapeBrackets(var30) + (Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Login.__cu_y + 180 - 34, var10, 16777215, 0);
+ var10 += 15;
+ var8 = Login.__cu_y + 180 - 80;
+ var37 = 321;
+ __bd_u.__q_496(var8 - 73, var37 - 20);
+ var0.drawCentered("Recover", var8, var37 + 5, 16777215, 0);
+ var8 = Login.__cu_y + 180 + 80;
+ __bd_u.__q_496(var8 - 73, var37 - 20);
+ var0.drawCentered("Back", var8, var37 + 5, 16777215, 0);
+ var37 = 356;
+ var1.drawCentered("Still having trouble logging in?", Varps.__hv_h, var37, 268435455, 0);
}
}
}
}
if(Client.gameState >= 10) {
- int[] var3 = new int[4];
- Rasterizer2D.Rasterizer2D_getClipArray(var3);
+ int[] var38 = new int[4];
+ Rasterizer2D.Rasterizer2D_getClipArray(var38);
Rasterizer2D.Rasterizer2D_setClip(Login.__cu_q, 0, Login.__cu_q + 765, Huffman.canvasHeight);
class16.field85.method1782(Login.__cu_q - 22, Client.cycle);
class16.field85.method1782(Login.__cu_q + 22 + 765 - 128, Client.cycle);
- Rasterizer2D.Rasterizer2D_setClipArray(var3);
+ Rasterizer2D.Rasterizer2D_setClipArray(var38);
}
KeyHandler.__an_x[ReflectionCheck.clientPreferences.titleMusicDisabled?1:0].__q_496(Login.__cu_q + 765 - 40, 463);
if(Client.gameState > 5 && Client.language == 0) {
if(class277.__jn_by != null) {
- var48 = Login.__cu_q + 5;
- var49 = 463;
- byte var38 = 100;
- byte var6 = 35;
- class277.__jn_by.__q_496(var48, var49);
- var0.drawCentered("World" + " " + Client.worldId, var38 / 2 + var48, var6 / 2 + var49 - 2, 16777215, 0);
+ var10 = Login.__cu_q + 5;
+ var34 = 463;
+ byte var39 = 100;
+ byte var42 = 35;
+ class277.__jn_by.__q_496(var10, var34);
+ var0.drawCentered("World " + Client.worldId, var39 / 2 + var10, var42 / 2 + var34 - 2, 16777215, 0);
if(FriendLoginUpdate.__kn_x != null) {
- var1.drawCentered("Loading...", var38 / 2 + var48, var6 / 2 + var49 + 12, 16777215, 0);
+ var1.drawCentered("Loading...", var39 / 2 + var10, var42 / 2 + var34 + 12, 16777215, 0);
} else {
- var1.drawCentered("Click to switch", var38 / 2 + var48, var6 / 2 + var49 + 12, 16777215, 0);
+ var1.drawCentered("Click to switch", var39 / 2 + var10, var42 / 2 + var34 + 12, 16777215, 0);
}
} else {
class277.__jn_by = MenuAction.method2025(WorldMapSection3.indexCache8, "sl_button", "");
}
}
-
}
+
}
}
diff --git a/runescape-client/src/main/java/IndexStore.java b/runescape-client/src/main/java/IndexStore.java
index ab9552b2f2..d5c4890447 100644
--- a/runescape-client/src/main/java/IndexStore.java
+++ b/runescape-client/src/main/java/IndexStore.java
@@ -37,10 +37,6 @@ public final class IndexStore {
@Export("maxEntrySize")
int maxEntrySize;
- static {
- IndexStore_buffer = new byte[520];
- }
-
@ObfuscatedSignature(
signature = "(ILdy;Ldy;I)V"
)
@@ -62,71 +58,82 @@ public final class IndexStore {
@Export("read")
public byte[] read(int var1) {
BufferedFile var2 = this.dataFile;
+ BufferedFile var3 = this.dataFile;
synchronized(this.dataFile) {
+ byte[] var10000;
try {
- Object var10000;
+ Object var4;
if(this.indexFile.length() < (long)(var1 * 6 + 6)) {
- var10000 = null;
- return (byte[])var10000;
- } else {
- this.indexFile.seek((long)(var1 * 6));
- this.indexFile.read(IndexStore_buffer, 0, 6);
- int var3 = ((IndexStore_buffer[0] & 255) << 16) + (IndexStore_buffer[2] & 255) + ((IndexStore_buffer[1] & 255) << 8);
- int var4 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8);
- if(var3 < 0 || var3 > this.maxEntrySize) {
- var10000 = null;
- return (byte[])var10000;
- } else if(var4 <= 0 || (long)var4 > this.dataFile.length() / 520L) {
- var10000 = null;
- return (byte[])var10000;
- } else {
- byte[] var5 = new byte[var3];
- int var6 = 0;
- int var7 = 0;
+ var4 = null;
+ var10000 = (byte[])((byte[])var4);
+ return var10000;
+ }
- while(var6 < var3) {
- if(var4 == 0) {
- var10000 = null;
- return (byte[])var10000;
- }
+ this.indexFile.seek((long)(var1 * 6));
+ this.indexFile.read(IndexStore_buffer, 0, 6);
+ int var5 = ((IndexStore_buffer[0] & 255) << 16) + (IndexStore_buffer[2] & 255) + ((IndexStore_buffer[1] & 255) << 8);
+ int var6 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8);
+ if(var5 < 0 || var5 > this.maxEntrySize) {
+ var4 = null;
+ var10000 = (byte[])((byte[])var4);
+ return var10000;
+ }
- this.dataFile.seek((long)(var4 * 520));
- int var8 = var3 - var6;
- if(var8 > 512) {
- var8 = 512;
- }
+ if(var6 > 0 && (long)var6 <= this.dataFile.length() / 520L) {
+ byte[] var7 = new byte[var5];
+ int var8 = 0;
+ int var9 = 0;
- this.dataFile.read(IndexStore_buffer, 0, var8 + 8);
- int var9 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8);
- int var10 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8);
- int var11 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255);
- int var12 = IndexStore_buffer[7] & 255;
- if(var9 == var1 && var7 == var10 && var12 == this.index) {
- if(var11 >= 0 && (long)var11 <= this.dataFile.length() / 520L) {
- for(int var13 = 0; var13 < var8; ++var13) {
- var5[var6++] = IndexStore_buffer[var13 + 8];
- }
-
- var4 = var11;
- ++var7;
- continue;
- }
-
- var10000 = null;
- return (byte[])var10000;
- }
-
- var10000 = null;
- return (byte[])var10000;
+ while(var8 < var5) {
+ if(var6 == 0) {
+ var4 = null;
+ var10000 = (byte[])((byte[])var4);
+ return var10000;
}
- byte[] var18 = var5;
- return var18;
+ this.dataFile.seek((long)(var6 * 520));
+ int var10 = var5 - var8;
+ if(var10 > 512) {
+ var10 = 512;
+ }
+
+ this.dataFile.read(IndexStore_buffer, 0, var10 + 8);
+ int var11 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8);
+ int var12 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8);
+ int var13 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255);
+ int var14 = IndexStore_buffer[7] & 255;
+ if(var11 == var1 && var9 == var12 && var14 == this.index) {
+ if(var13 >= 0 && (long)var13 <= this.dataFile.length() / 520L) {
+ for(int var15 = 0; var15 < var10; ++var15) {
+ var7[var8++] = IndexStore_buffer[var15 + 8];
+ }
+
+ var6 = var13;
+ ++var9;
+ continue;
+ }
+
+ var4 = null;
+ var10000 = (byte[])((byte[])var4);
+ return var10000;
+ }
+
+ var4 = null;
+ var10000 = (byte[])((byte[])var4);
+ return var10000;
}
+
+ var10000 = var7;
+ return var10000;
}
- } catch (IOException var16) {
+
+ var4 = null;
+ var10000 = (byte[])((byte[])var4);
+ } catch (IOException var17) {
return null;
}
+
+ return var10000;
}
}
@@ -138,14 +145,15 @@ public final class IndexStore {
@Export("write")
public boolean write(int var1, byte[] var2, int var3) {
BufferedFile var4 = this.dataFile;
+ BufferedFile var5 = this.dataFile;
synchronized(this.dataFile) {
if(var3 >= 0 && var3 <= this.maxEntrySize) {
- boolean var5 = this.write0(var1, var2, var3, true);
- if(!var5) {
- var5 = this.write0(var1, var2, var3, false);
+ boolean var6 = this.write0(var1, var2, var3, true);
+ if(!var6) {
+ var6 = this.write0(var1, var2, var3, false);
}
- return var5;
+ return var6;
} else {
throw new IllegalArgumentException();
}
@@ -160,110 +168,117 @@ public final class IndexStore {
@Export("write0")
boolean write0(int var1, byte[] var2, int var3, boolean var4) {
BufferedFile var5 = this.dataFile;
+ BufferedFile var6 = this.dataFile;
synchronized(this.dataFile) {
try {
- int var6;
+ int var7;
+ boolean var8;
boolean var10000;
if(var4) {
if(this.indexFile.length() < (long)(var1 * 6 + 6)) {
- var10000 = false;
+ var8 = false;
+ var10000 = var8;
return var10000;
}
this.indexFile.seek((long)(var1 * 6));
this.indexFile.read(IndexStore_buffer, 0, 6);
- var6 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8);
- if(var6 <= 0 || (long)var6 > this.dataFile.length() / 520L) {
- var10000 = false;
+ var7 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8);
+ if(var7 <= 0 || (long)var7 > this.dataFile.length() / 520L) {
+ var8 = false;
+ var10000 = var8;
return var10000;
}
} else {
- var6 = (int)((this.dataFile.length() + 519L) / 520L);
- if(var6 == 0) {
- var6 = 1;
+ var7 = (int)((this.dataFile.length() + 519L) / 520L);
+ if(var7 == 0) {
+ var7 = 1;
}
}
IndexStore_buffer[0] = (byte)(var3 >> 16);
IndexStore_buffer[1] = (byte)(var3 >> 8);
IndexStore_buffer[2] = (byte)var3;
- IndexStore_buffer[3] = (byte)(var6 >> 16);
- IndexStore_buffer[4] = (byte)(var6 >> 8);
- IndexStore_buffer[5] = (byte)var6;
+ IndexStore_buffer[3] = (byte)(var7 >> 16);
+ IndexStore_buffer[4] = (byte)(var7 >> 8);
+ IndexStore_buffer[5] = (byte)var7;
this.indexFile.seek((long)(var1 * 6));
this.indexFile.write(IndexStore_buffer, 0, 6);
- int var7 = 0;
- int var8 = 0;
+ int var9 = 0;
+ int var10 = 0;
while(true) {
- if(var7 < var3) {
- label142: {
- int var9 = 0;
- int var14;
+ if(var9 < var3) {
+ label129: {
+ int var11 = 0;
+ int var12;
if(var4) {
- this.dataFile.seek((long)(var6 * 520));
+ this.dataFile.seek((long)(var7 * 520));
try {
this.dataFile.read(IndexStore_buffer, 0, 8);
} catch (EOFException var16) {
- break label142;
+ break label129;
}
- var14 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8);
- int var11 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8);
- var9 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255);
- int var12 = IndexStore_buffer[7] & 255;
- if(var14 != var1 || var11 != var8 || var12 != this.index) {
- var10000 = false;
+ var12 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8);
+ int var13 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8);
+ var11 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255);
+ int var14 = IndexStore_buffer[7] & 255;
+ if(var12 != var1 || var13 != var10 || var14 != this.index) {
+ var8 = false;
+ var10000 = var8;
return var10000;
}
- if(var9 < 0 || (long)var9 > this.dataFile.length() / 520L) {
- var10000 = false;
+ if(var11 < 0 || (long)var11 > this.dataFile.length() / 520L) {
+ var8 = false;
+ var10000 = var8;
return var10000;
}
}
- if(var9 == 0) {
+ if(var11 == 0) {
var4 = false;
- var9 = (int)((this.dataFile.length() + 519L) / 520L);
- if(var9 == 0) {
- ++var9;
+ var11 = (int)((this.dataFile.length() + 519L) / 520L);
+ if(var11 == 0) {
+ ++var11;
}
- if(var6 == var9) {
- ++var9;
+ if(var7 == var11) {
+ ++var11;
}
}
- if(var3 - var7 <= 512) {
- var9 = 0;
+ if(var3 - var9 <= 512) {
+ var11 = 0;
}
IndexStore_buffer[0] = (byte)(var1 >> 8);
IndexStore_buffer[1] = (byte)var1;
- IndexStore_buffer[2] = (byte)(var8 >> 8);
- IndexStore_buffer[3] = (byte)var8;
- IndexStore_buffer[4] = (byte)(var9 >> 16);
- IndexStore_buffer[5] = (byte)(var9 >> 8);
- IndexStore_buffer[6] = (byte)var9;
+ IndexStore_buffer[2] = (byte)(var10 >> 8);
+ IndexStore_buffer[3] = (byte)var10;
+ IndexStore_buffer[4] = (byte)(var11 >> 16);
+ IndexStore_buffer[5] = (byte)(var11 >> 8);
+ IndexStore_buffer[6] = (byte)var11;
IndexStore_buffer[7] = (byte)this.index;
- this.dataFile.seek((long)(var6 * 520));
+ this.dataFile.seek((long)(var7 * 520));
this.dataFile.write(IndexStore_buffer, 0, 8);
- var14 = var3 - var7;
- if(var14 > 512) {
- var14 = 512;
+ var12 = var3 - var9;
+ if(var12 > 512) {
+ var12 = 512;
}
- this.dataFile.write(var2, var7, var14);
- var7 += var14;
- var6 = var9;
- ++var8;
+ this.dataFile.write(var2, var9, var12);
+ var9 += var12;
+ var7 = var11;
+ ++var10;
continue;
}
}
- var10000 = true;
+ var8 = true;
+ var10000 = var8;
return var10000;
}
} catch (IOException var17) {
@@ -289,200 +304,195 @@ public final class IndexStore {
byte var11 = 0;
int var12 = 0;
class178.__fi_l[var11] = var0;
- int var20 = var11 + 1;
+ int var13 = var11 + 1;
class178.__fi_e[var11] = var1;
- int[][] var13 = var4.flags;
+ int[][] var14 = var4.flags;
- while(true) {
- label300:
- while(true) {
- int var14;
- int var15;
- int var16;
- int var17;
- int var18;
- int var19;
- do {
- do {
- do {
- label277:
- do {
- if(var20 == var12) {
- WidgetGroupParent.__bx_o = var5;
- UrlRequester.__eo_u = var6;
- return false;
- }
+ label204:
+ while(var13 != var12) {
+ var5 = class178.__fi_l[var12];
+ var6 = class178.__fi_e[var12];
+ var12 = var12 + 1 & 4095;
+ int var19 = var5 - var9;
+ int var20 = var6 - var10;
+ int var15 = var5 - var4.xInset;
+ int var16 = var6 - var4.yInset;
+ if(var3.vmethod3644(var2, var5, var6, var4)) {
+ WidgetGroupParent.__bx_o = var5;
+ UrlRequester.__eo_u = var6;
+ return true;
+ }
- var5 = class178.__fi_l[var12];
- var6 = class178.__fi_e[var12];
- var12 = var12 + 1 & 4095;
- var18 = var5 - var9;
- var19 = var6 - var10;
- var14 = var5 - var4.xInset;
- var15 = var6 - var4.yInset;
- if(var3.vmethod3644(var2, var5, var6, var4)) {
- WidgetGroupParent.__bx_o = var5;
- UrlRequester.__eo_u = var6;
- return true;
- }
+ int var17 = class178.__fi_w[var19][var20] + 1;
+ int var18;
+ if(var19 > 0 && class178.__fi_q[var19 - 1][var20] == 0 && (var14[var15 - 1][var16] & 19136782) == 0 && (var14[var15 - 1][var16 + var2 - 1] & 19136824) == 0) {
+ var18 = 1;
- var16 = class178.__fi_w[var18][var19] + 1;
- if(var18 > 0 && class178.__fi_q[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) {
- var17 = 1;
+ while(true) {
+ if(var18 >= var2 - 1) {
+ class178.__fi_l[var13] = var5 - 1;
+ class178.__fi_e[var13] = var6;
+ var13 = var13 + 1 & 4095;
+ class178.__fi_q[var19 - 1][var20] = 2;
+ class178.__fi_w[var19 - 1][var20] = var17;
+ break;
+ }
- while(true) {
- if(var17 >= var2 - 1) {
- class178.__fi_l[var20] = var5 - 1;
- class178.__fi_e[var20] = var6;
- var20 = var20 + 1 & 4095;
- class178.__fi_q[var18 - 1][var19] = 2;
- class178.__fi_w[var18 - 1][var19] = var16;
- break;
- }
+ if((var14[var15 - 1][var18 + var16] & 19136830) != 0) {
+ break;
+ }
- if((var13[var14 - 1][var17 + var15] & 19136830) != 0) {
- break;
- }
+ ++var18;
+ }
+ }
- ++var17;
- }
- }
+ if(var19 < 128 - var2 && class178.__fi_q[var19 + 1][var20] == 0 && (var14[var15 + var2][var16] & 19136899) == 0 && (var14[var15 + var2][var16 + var2 - 1] & 19136992) == 0) {
+ var18 = 1;
- if(var18 < 128 - var2 && class178.__fi_q[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) {
- var17 = 1;
+ while(true) {
+ if(var18 >= var2 - 1) {
+ class178.__fi_l[var13] = var5 + 1;
+ class178.__fi_e[var13] = var6;
+ var13 = var13 + 1 & 4095;
+ class178.__fi_q[var19 + 1][var20] = 8;
+ class178.__fi_w[var19 + 1][var20] = var17;
+ break;
+ }
- while(true) {
- if(var17 >= var2 - 1) {
- class178.__fi_l[var20] = var5 + 1;
- class178.__fi_e[var20] = var6;
- var20 = var20 + 1 & 4095;
- class178.__fi_q[var18 + 1][var19] = 8;
- class178.__fi_w[var18 + 1][var19] = var16;
- break;
- }
+ if((var14[var15 + var2][var16 + var18] & 19136995) != 0) {
+ break;
+ }
- if((var13[var14 + var2][var15 + var17] & 19136995) != 0) {
- break;
- }
+ ++var18;
+ }
+ }
- ++var17;
- }
- }
+ if(var20 > 0 && class178.__fi_q[var19][var20 - 1] == 0 && (var14[var15][var16 - 1] & 19136782) == 0 && (var14[var15 + var2 - 1][var16 - 1] & 19136899) == 0) {
+ var18 = 1;
- if(var19 > 0 && class178.__fi_q[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) {
- var17 = 1;
+ while(true) {
+ if(var18 >= var2 - 1) {
+ class178.__fi_l[var13] = var5;
+ class178.__fi_e[var13] = var6 - 1;
+ var13 = var13 + 1 & 4095;
+ class178.__fi_q[var19][var20 - 1] = 1;
+ class178.__fi_w[var19][var20 - 1] = var17;
+ break;
+ }
- while(true) {
- if(var17 >= var2 - 1) {
- class178.__fi_l[var20] = var5;
- class178.__fi_e[var20] = var6 - 1;
- var20 = var20 + 1 & 4095;
- class178.__fi_q[var18][var19 - 1] = 1;
- class178.__fi_w[var18][var19 - 1] = var16;
- break;
- }
+ if((var14[var18 + var15][var16 - 1] & 19136911) != 0) {
+ break;
+ }
- if((var13[var17 + var14][var15 - 1] & 19136911) != 0) {
- break;
- }
+ ++var18;
+ }
+ }
- ++var17;
- }
- }
+ if(var20 < 128 - var2 && class178.__fi_q[var19][var20 + 1] == 0 && (var14[var15][var16 + var2] & 19136824) == 0 && (var14[var15 + var2 - 1][var16 + var2] & 19136992) == 0) {
+ var18 = 1;
- if(var19 < 128 - var2 && class178.__fi_q[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) {
- var17 = 1;
+ while(true) {
+ if(var18 >= var2 - 1) {
+ class178.__fi_l[var13] = var5;
+ class178.__fi_e[var13] = var6 + 1;
+ var13 = var13 + 1 & 4095;
+ class178.__fi_q[var19][var20 + 1] = 4;
+ class178.__fi_w[var19][var20 + 1] = var17;
+ break;
+ }
- while(true) {
- if(var17 >= var2 - 1) {
- class178.__fi_l[var20] = var5;
- class178.__fi_e[var20] = var6 + 1;
- var20 = var20 + 1 & 4095;
- class178.__fi_q[var18][var19 + 1] = 4;
- class178.__fi_w[var18][var19 + 1] = var16;
- break;
- }
+ if((var14[var18 + var15][var16 + var2] & 19137016) != 0) {
+ break;
+ }
- if((var13[var17 + var14][var15 + var2] & 19137016) != 0) {
- break;
- }
+ ++var18;
+ }
+ }
- ++var17;
- }
- }
+ if(var19 > 0 && var20 > 0 && class178.__fi_q[var19 - 1][var20 - 1] == 0 && (var14[var15 - 1][var16 - 1] & 19136782) == 0) {
+ var18 = 1;
- if(var18 > 0 && var19 > 0 && class178.__fi_q[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) {
- var17 = 1;
+ while(true) {
+ if(var18 >= var2) {
+ class178.__fi_l[var13] = var5 - 1;
+ class178.__fi_e[var13] = var6 - 1;
+ var13 = var13 + 1 & 4095;
+ class178.__fi_q[var19 - 1][var20 - 1] = 3;
+ class178.__fi_w[var19 - 1][var20 - 1] = var17;
+ break;
+ }
- while(true) {
- if(var17 >= var2) {
- class178.__fi_l[var20] = var5 - 1;
- class178.__fi_e[var20] = var6 - 1;
- var20 = var20 + 1 & 4095;
- class178.__fi_q[var18 - 1][var19 - 1] = 3;
- class178.__fi_w[var18 - 1][var19 - 1] = var16;
- break;
- }
+ if((var14[var15 - 1][var18 + (var16 - 1)] & 19136830) != 0 || (var14[var18 + (var15 - 1)][var16 - 1] & 19136911) != 0) {
+ break;
+ }
- if((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) {
- break;
- }
+ ++var18;
+ }
+ }
- ++var17;
- }
- }
+ if(var19 < 128 - var2 && var20 > 0 && class178.__fi_q[var19 + 1][var20 - 1] == 0 && (var14[var15 + var2][var16 - 1] & 19136899) == 0) {
+ var18 = 1;
- if(var18 < 128 - var2 && var19 > 0 && class178.__fi_q[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) {
- var17 = 1;
+ while(true) {
+ if(var18 >= var2) {
+ class178.__fi_l[var13] = var5 + 1;
+ class178.__fi_e[var13] = var6 - 1;
+ var13 = var13 + 1 & 4095;
+ class178.__fi_q[var19 + 1][var20 - 1] = 9;
+ class178.__fi_w[var19 + 1][var20 - 1] = var17;
+ break;
+ }
- while(true) {
- if(var17 >= var2) {
- class178.__fi_l[var20] = var5 + 1;
- class178.__fi_e[var20] = var6 - 1;
- var20 = var20 + 1 & 4095;
- class178.__fi_q[var18 + 1][var19 - 1] = 9;
- class178.__fi_w[var18 + 1][var19 - 1] = var16;
- break;
- }
+ if((var14[var15 + var2][var18 + (var16 - 1)] & 19136995) != 0 || (var14[var18 + var15][var16 - 1] & 19136911) != 0) {
+ break;
+ }
- if((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var17 + var14][var15 - 1] & 19136911) != 0) {
- break;
- }
+ ++var18;
+ }
+ }
- ++var17;
- }
- }
+ if(var19 > 0 && var20 < 128 - var2 && class178.__fi_q[var19 - 1][var20 + 1] == 0 && (var14[var15 - 1][var16 + var2] & 19136824) == 0) {
+ var18 = 1;
- if(var18 > 0 && var19 < 128 - var2 && class178.__fi_q[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) {
- for(var17 = 1; var17 < var2; ++var17) {
- if((var13[var14 - 1][var15 + var17] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) {
- continue label277;
- }
- }
+ while(true) {
+ if(var18 >= var2) {
+ class178.__fi_l[var13] = var5 - 1;
+ class178.__fi_e[var13] = var6 + 1;
+ var13 = var13 + 1 & 4095;
+ class178.__fi_q[var19 - 1][var20 + 1] = 6;
+ class178.__fi_w[var19 - 1][var20 + 1] = var17;
+ break;
+ }
- class178.__fi_l[var20] = var5 - 1;
- class178.__fi_e[var20] = var6 + 1;
- var20 = var20 + 1 & 4095;
- class178.__fi_q[var18 - 1][var19 + 1] = 6;
- class178.__fi_w[var18 - 1][var19 + 1] = var16;
- }
- } while(var18 >= 128 - var2);
- } while(var19 >= 128 - var2);
- } while(class178.__fi_q[var18 + 1][var19 + 1] != 0);
- } while((var13[var14 + var2][var15 + var2] & 19136992) != 0);
+ if((var14[var15 - 1][var16 + var18] & 19136830) != 0 || (var14[var18 + (var15 - 1)][var16 + var2] & 19137016) != 0) {
+ break;
+ }
- for(var17 = 1; var17 < var2; ++var17) {
- if((var13[var14 + var17][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) {
- continue label300;
+ ++var18;
+ }
+ }
+
+ if(var19 < 128 - var2 && var20 < 128 - var2 && class178.__fi_q[var19 + 1][var20 + 1] == 0 && (var14[var15 + var2][var16 + var2] & 19136992) == 0) {
+ for(var18 = 1; var18 < var2; ++var18) {
+ if((var14[var15 + var18][var16 + var2] & 19137016) != 0 || (var14[var15 + var2][var18 + var16] & 19136995) != 0) {
+ continue label204;
}
}
- class178.__fi_l[var20] = var5 + 1;
- class178.__fi_e[var20] = var6 + 1;
- var20 = var20 + 1 & 4095;
- class178.__fi_q[var18 + 1][var19 + 1] = 12;
- class178.__fi_w[var18 + 1][var19 + 1] = var16;
+ class178.__fi_l[var13] = var5 + 1;
+ class178.__fi_e[var13] = var6 + 1;
+ var13 = var13 + 1 & 4095;
+ class178.__fi_q[var19 + 1][var20 + 1] = 12;
+ class178.__fi_w[var19 + 1][var20 + 1] = var17;
}
}
+
+ WidgetGroupParent.__bx_o = var5;
+ UrlRequester.__eo_u = var6;
+ return false;
+ }
+
+ static {
+ IndexStore_buffer = new byte[520];
}
}
diff --git a/runescape-client/src/main/java/IndexStoreAction.java b/runescape-client/src/main/java/IndexStoreAction.java
index db7bb30f1e..4ddacfab0e 100644
--- a/runescape-client/src/main/java/IndexStoreAction.java
+++ b/runescape-client/src/main/java/IndexStoreAction.java
@@ -87,16 +87,16 @@ public class IndexStoreAction extends Node {
if(var4 != 0) {
++var0.__cm;
- boolean var6;
+ boolean var5;
if(var4 > 1024) {
var0.__ac -= var0.__cj;
- var6 = true;
+ var5 = true;
if(var4 < var0.__cj || var4 > 2048 - var0.__cj) {
var0.__ac = var0.orientation;
- var6 = false;
+ var5 = false;
}
- if(var0.movementSequence == var0.idleSequence && (var0.__cm > 25 || var6)) {
+ if(var0.movementSequence == var0.idleSequence && (var0.__cm > 25 || var5)) {
if(var0.turnLeftSequence != -1) {
var0.movementSequence = var0.turnLeftSequence;
} else {
@@ -105,13 +105,13 @@ public class IndexStoreAction extends Node {
}
} else {
var0.__ac += var0.__cj;
- var6 = true;
+ var5 = true;
if(var4 < var0.__cj || var4 > 2048 - var0.__cj) {
var0.__ac = var0.orientation;
- var6 = false;
+ var5 = false;
}
- if(var0.movementSequence == var0.idleSequence && (var0.__cm > 25 || var6)) {
+ if(var0.movementSequence == var0.idleSequence && (var0.__cm > 25 || var5)) {
if(var0.turnRightSequence != -1) {
var0.movementSequence = var0.turnRightSequence;
} else {
@@ -124,7 +124,7 @@ public class IndexStoreAction extends Node {
} else {
var0.__cm = 0;
}
-
}
+
}
}
diff --git a/runescape-client/src/main/java/IndexStoreActionHandler.java b/runescape-client/src/main/java/IndexStoreActionHandler.java
index 3df9d6688d..5b08f80fa7 100644
--- a/runescape-client/src/main/java/IndexStoreActionHandler.java
+++ b/runescape-client/src/main/java/IndexStoreActionHandler.java
@@ -29,41 +29,40 @@ public class IndexStoreActionHandler implements Runnable {
@Export("IndexStoreActionHandler_lock")
static Object IndexStoreActionHandler_lock;
- static {
- IndexStoreActionHandler_requestQueue = new NodeDeque();
- IndexStoreActionHandler_responseQueue = new NodeDeque();
- __iv_q = 0;
- IndexStoreActionHandler_lock = new Object();
- }
-
@Export("run")
@ObfuscatedName("run")
public void run() {
try {
while(true) {
- NodeDeque var2 = IndexStoreActionHandler_requestQueue;
- IndexStoreAction var1;
+ NodeDeque var1 = IndexStoreActionHandler_requestQueue;
+ NodeDeque var3 = IndexStoreActionHandler_requestQueue;
+ IndexStoreAction var2;
synchronized(IndexStoreActionHandler_requestQueue) {
- var1 = (IndexStoreAction)IndexStoreActionHandler_requestQueue.last();
+ var2 = (IndexStoreAction)IndexStoreActionHandler_requestQueue.last();
}
- Object var14;
- if(var1 != null) {
- if(var1.type == 0) {
- var1.indexStore.write((int)var1.key, var1.data, var1.data.length);
- var2 = IndexStoreActionHandler_requestQueue;
+ Object var4;
+ Object var15;
+ if(var2 != null) {
+ NodeDeque var16;
+ if(var2.type == 0) {
+ var2.indexStore.write((int)var2.key, var2.data, var2.data.length);
+ var1 = IndexStoreActionHandler_requestQueue;
+ var16 = IndexStoreActionHandler_requestQueue;
synchronized(IndexStoreActionHandler_requestQueue) {
- var1.remove();
+ var2.remove();
}
- } else if(var1.type == 1) {
- var1.data = var1.indexStore.read((int)var1.key);
- var2 = IndexStoreActionHandler_requestQueue;
+ } else if(var2.type == 1) {
+ var2.data = var2.indexStore.read((int)var2.key);
+ var1 = IndexStoreActionHandler_requestQueue;
+ var16 = IndexStoreActionHandler_requestQueue;
synchronized(IndexStoreActionHandler_requestQueue) {
- IndexStoreActionHandler_responseQueue.addFirst(var1);
+ IndexStoreActionHandler_responseQueue.addFirst(var2);
}
}
- var14 = IndexStoreActionHandler_lock;
+ var15 = IndexStoreActionHandler_lock;
+ var4 = IndexStoreActionHandler_lock;
synchronized(IndexStoreActionHandler_lock) {
if(__iv_q <= 1) {
__iv_q = 0;
@@ -75,7 +74,8 @@ public class IndexStoreActionHandler implements Runnable {
}
} else {
class203.method4010(100L);
- var14 = IndexStoreActionHandler_lock;
+ var15 = IndexStoreActionHandler_lock;
+ var4 = IndexStoreActionHandler_lock;
synchronized(IndexStoreActionHandler_lock) {
if(__iv_q <= 1) {
__iv_q = 0;
@@ -87,8 +87,8 @@ public class IndexStoreActionHandler implements Runnable {
}
}
}
- } catch (Exception var13) {
- NpcDefinition.sendStackTrace((String)null, var13);
+ } catch (Exception var14) {
+ NPCDefinition.sendStackTrace((String)null, var14);
}
}
@@ -104,5 +104,13 @@ public class IndexStoreActionHandler implements Runnable {
var1.packetBuffer.writeStringCp1252NullTerminated(var0);
Client.packetWriter.__q_167(var1);
}
+
+ }
+
+ static {
+ IndexStoreActionHandler_requestQueue = new NodeDeque();
+ IndexStoreActionHandler_responseQueue = new NodeDeque();
+ __iv_q = 0;
+ IndexStoreActionHandler_lock = new Object();
}
}
diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java
index e85171962f..a95f08ddcc 100644
--- a/runescape-client/src/main/java/IndexedSprite.java
+++ b/runescape-client/src/main/java/IndexedSprite.java
@@ -49,6 +49,7 @@ public final class IndexedSprite extends Rasterizer2D {
this.xOffset = 0;
this.yOffset = 0;
}
+
}
@ObfuscatedName("f")
@@ -128,6 +129,7 @@ public final class IndexedSprite extends Rasterizer2D {
if(var6 > 0 && var5 > 0) {
IndexedSprite_two(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var4, var3, var6, var5, var7, var8);
}
+
}
@ObfuscatedName("o")
diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java
index f12708ef4a..26d24a95cf 100644
--- a/runescape-client/src/main/java/Instrument.java
+++ b/runescape-client/src/main/java/Instrument.java
@@ -113,29 +113,6 @@ public class Instrument {
@Export("offset")
int offset;
- static {
- Instrument_noise = new int['耀'];
- Random var0 = new Random(0L);
-
- int var1;
- for(var1 = 0; var1 < 32768; ++var1) {
- Instrument_noise[var1] = (var0.nextInt() & 2) - 1;
- }
-
- Instrument_sine = new int['耀'];
-
- for(var1 = 0; var1 < 32768; ++var1) {
- Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D);
- }
-
- Instrument_samples = new int[220500];
- Instrument_phases = new int[5];
- Instrument_delays = new int[5];
- Instrument_volumeSteps = new int[5];
- Instrument_pitchSteps = new int[5];
- Instrument_pitchBaseSteps = new int[5];
- }
-
Instrument() {
this.oscillatorVolume = new int[]{0, 0, 0, 0, 0};
this.oscillatorPitch = new int[]{0, 0, 0, 0, 0};
@@ -224,13 +201,13 @@ public class Instrument {
this.__g.reset();
this.__l.reset();
var11 = 0;
- boolean var19 = false;
- boolean var20 = true;
+ boolean var17 = false;
+ boolean var18 = true;
for(var14 = 0; var14 < var1; ++var14) {
var15 = this.__g.doStep(var1);
var16 = this.__l.doStep(var1);
- if(var20) {
+ if(var18) {
var12 = (var15 * (this.__g.end - this.__g.start) >> 8) + this.__g.start;
} else {
var12 = (var16 * (this.__g.end - this.__g.start) >> 8) + this.__g.start;
@@ -239,10 +216,10 @@ public class Instrument {
var11 += 256;
if(var11 >= var12) {
var11 = 0;
- var20 = !var20;
+ var18 = !var18;
}
- if(var20) {
+ if(var18) {
Instrument_samples[var14] = 0;
}
}
@@ -268,16 +245,16 @@ public class Instrument {
var15 = var1 - var12;
}
- int var17;
+ int var19;
while(var14 < var15) {
var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.__di_e >> 16);
- for(var17 = 0; var17 < var12; ++var17) {
- var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var17] * (long)AudioFilter.__di_g[0][var17] >> 16);
+ for(var19 = 0; var19 < var12; ++var19) {
+ var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var19] * (long)AudioFilter.__di_g[0][var19] >> 16);
}
- for(var17 = 0; var17 < var14; ++var17) {
- var16 -= (int)((long)Instrument_samples[var14 - 1 - var17] * (long)AudioFilter.__di_g[1][var17] >> 16);
+ for(var19 = 0; var19 < var14; ++var19) {
+ var16 -= (int)((long)Instrument_samples[var14 - 1 - var19] * (long)AudioFilter.__di_g[1][var19] >> 16);
}
Instrument_samples[var14] = var16;
@@ -292,36 +269,36 @@ public class Instrument {
var15 = var1 - var12;
}
- int var18;
+ int var20;
while(var14 < var15) {
- var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.__di_e >> 16);
+ var19 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.__di_e >> 16);
- for(var18 = 0; var18 < var12; ++var18) {
- var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.__di_g[0][var18] >> 16);
+ for(var20 = 0; var20 < var12; ++var20) {
+ var19 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.__di_g[0][var20] >> 16);
}
- for(var18 = 0; var18 < var13; ++var18) {
- var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.__di_g[1][var18] >> 16);
+ for(var20 = 0; var20 < var13; ++var20) {
+ var19 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.__di_g[1][var20] >> 16);
}
- Instrument_samples[var14] = var17;
+ Instrument_samples[var14] = var19;
var11 = this.__a.doStep(var1 + 1);
++var14;
}
if(var14 >= var1 - var12) {
while(var14 < var1) {
- var17 = 0;
+ var19 = 0;
- for(var18 = var14 + var12 - var1; var18 < var12; ++var18) {
- var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.__di_g[0][var18] >> 16);
+ for(var20 = var14 + var12 - var1; var20 < var12; ++var20) {
+ var19 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.__di_g[0][var20] >> 16);
}
- for(var18 = 0; var18 < var13; ++var18) {
- var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.__di_g[1][var18] >> 16);
+ for(var20 = 0; var20 < var13; ++var20) {
+ var19 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.__di_g[1][var20] >> 16);
}
- Instrument_samples[var14] = var17;
+ Instrument_samples[var14] = var19;
this.__a.doStep(var1 + 1);
++var14;
}
@@ -411,4 +388,27 @@ public class Instrument {
this.__a = new SoundEnvelope();
this.filter.__o_208(var1, this.__a);
}
+
+ static {
+ Instrument_noise = new int[32768];
+ Random var0 = new Random(0L);
+
+ int var1;
+ for(var1 = 0; var1 < 32768; ++var1) {
+ Instrument_noise[var1] = (var0.nextInt() & 2) - 1;
+ }
+
+ Instrument_sine = new int[32768];
+
+ for(var1 = 0; var1 < 32768; ++var1) {
+ Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D);
+ }
+
+ Instrument_samples = new int[220500];
+ Instrument_phases = new int[5];
+ Instrument_delays = new int[5];
+ Instrument_volumeSteps = new int[5];
+ Instrument_pitchSteps = new int[5];
+ Instrument_pitchBaseSteps = new int[5];
+ }
}
diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java
index 126aba22f8..e7ffec57b8 100644
--- a/runescape-client/src/main/java/Interpreter.java
+++ b/runescape-client/src/main/java/Interpreter.java
@@ -66,21 +66,6 @@ public class Interpreter {
@Export("__bv_r")
static final double __bv_r;
- static {
- Interpreter_arrayLengths = new int[5];
- Interpreter_arrays = new int[5][5000];
- Interpreter_intStack = new int[1000];
- Interpreter_stringStack = new String[1000];
- Interpreter_frameDepth = 0;
- Interpreter_frames = new ScriptFrame[50];
- Interpreter_calendar = Calendar.getInstance();
- __bv_z = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
- __bv_s = false;
- __bv_t = false;
- __bv_y = 0;
- __bv_r = Math.log(2.0D);
- }
-
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(Lgs;Lhn;I)Lgg;",
@@ -169,32 +154,32 @@ public class Interpreter {
public static void method1976() {
try {
File var0 = new File(WorldMapSection1.userHomeDirectory, "random.dat");
- int var2;
+ int var1;
if(var0.exists()) {
class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0);
} else {
- label38:
- for(int var1 = 0; var1 < Canvas.__ao_s.length; ++var1) {
- for(var2 = 0; var2 < WorldMapSection2.cacheDirectoryLocations.length; ++var2) {
- File var3 = new File(WorldMapSection2.cacheDirectoryLocations[var2] + Canvas.__ao_s[var1] + File.separatorChar + "random.dat");
+ label34:
+ for(int var2 = 0; var2 < Canvas.__ao_s.length; ++var2) {
+ for(var1 = 0; var1 < WorldMapSection2.cacheDirectoryLocations.length; ++var1) {
+ File var3 = new File(WorldMapSection2.cacheDirectoryLocations[var1] + Canvas.__ao_s[var2] + File.separatorChar + "random.dat");
if(var3.exists()) {
class168.randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0);
- break label38;
+ break label34;
}
}
}
}
if(class168.randomDat == null) {
- RandomAccessFile var4 = new RandomAccessFile(var0, "rw");
- var2 = var4.read();
- var4.seek(0L);
- var4.write(var2);
- var4.seek(0L);
- var4.close();
+ RandomAccessFile var5 = new RandomAccessFile(var0, "rw");
+ var1 = var5.read();
+ var5.seek(0L);
+ var5.write(var1);
+ var5.seek(0L);
+ var5.close();
class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0);
}
- } catch (IOException var5) {
+ } catch (IOException var4) {
;
}
@@ -214,16 +199,28 @@ public class Interpreter {
DevicePcmPlayerProvider.drawWidgetGroup(class279.__jx_ne, -1412584499, var1, var2, var3, var4, class54.__bs_nb, class157.__fw_nm, var7);
class279.__jx_ne = null;
}
-
+ } else if(var7 != -1) {
+ Client.__client_od[var7] = true;
} else {
- if(var7 != -1) {
- Client.__client_od[var7] = true;
- } else {
- for(int var8 = 0; var8 < 100; ++var8) {
- Client.__client_od[var8] = true;
- }
+ for(int var8 = 0; var8 < 100; ++var8) {
+ Client.__client_od[var8] = true;
}
-
}
+
+ }
+
+ static {
+ Interpreter_arrayLengths = new int[5];
+ Interpreter_arrays = new int[5][5000];
+ Interpreter_intStack = new int[1000];
+ Interpreter_stringStack = new String[1000];
+ Interpreter_frameDepth = 0;
+ Interpreter_frames = new ScriptFrame[50];
+ Interpreter_calendar = Calendar.getInstance();
+ __bv_z = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+ __bv_s = false;
+ __bv_t = false;
+ __bv_y = 0;
+ __bv_r = Math.log(2.0D);
}
}
diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java
index 241df58b96..23379f27e7 100644
--- a/runescape-client/src/main/java/InvDefinition.java
+++ b/runescape-client/src/main/java/InvDefinition.java
@@ -20,10 +20,6 @@ public class InvDefinition extends DualNode {
@Export("size")
public int size;
- static {
- __ib_f = new EvictingDualNodeHashTable(64);
- }
-
InvDefinition() {
this.size = 0;
}
@@ -66,4 +62,8 @@ public class InvDefinition extends DualNode {
public static void method4754() {
ParamKeyDefinition.ParamKeyDefinition_cached.clear();
}
+
+ static {
+ __ib_f = new EvictingDualNodeHashTable(64);
+ }
}
diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java
index d6005e0f59..562cdf2888 100644
--- a/runescape-client/src/main/java/IsaacCipher.java
+++ b/runescape-client/src/main/java/IsaacCipher.java
@@ -117,127 +117,127 @@ public final class IsaacCipher {
)
@Export("__w_339")
final void __w_339() {
- int var9 = -1640531527;
- int var8 = -1640531527;
- int var7 = -1640531527;
- int var6 = -1640531527;
- int var5 = -1640531527;
- int var4 = -1640531527;
- int var3 = -1640531527;
+ int var1 = -1640531527;
int var2 = -1640531527;
+ int var3 = -1640531527;
+ int var4 = -1640531527;
+ int var5 = -1640531527;
+ int var6 = -1640531527;
+ int var7 = -1640531527;
+ int var8 = -1640531527;
- int var1;
- for(var1 = 0; var1 < 4; ++var1) {
- var2 ^= var3 << 11;
- var5 += var2;
- var3 += var4;
- var3 ^= var4 >>> 2;
- var6 += var3;
- var4 += var5;
- var4 ^= var5 << 8;
- var7 += var4;
- var5 += var6;
- var5 ^= var6 >>> 16;
- var8 += var5;
- var6 += var7;
- var6 ^= var7 << 10;
- var9 += var6;
- var7 += var8;
- var7 ^= var8 >>> 4;
- var2 += var7;
- var8 += var9;
- var8 ^= var9 << 8;
- var3 += var8;
- var9 += var2;
- var9 ^= var2 >>> 9;
- var4 += var9;
- var2 += var3;
+ int var9;
+ for(var9 = 0; var9 < 4; ++var9) {
+ var8 ^= var7 << 11;
+ var5 += var8;
+ var7 += var6;
+ var7 ^= var6 >>> 2;
+ var4 += var7;
+ var6 += var5;
+ var6 ^= var5 << 8;
+ var3 += var6;
+ var5 += var4;
+ var5 ^= var4 >>> 16;
+ var2 += var5;
+ var4 += var3;
+ var4 ^= var3 << 10;
+ var1 += var4;
+ var3 += var2;
+ var3 ^= var2 >>> 4;
+ var8 += var3;
+ var2 += var1;
+ var2 ^= var1 << 8;
+ var7 += var2;
+ var1 += var8;
+ var1 ^= var8 >>> 9;
+ var6 += var1;
+ var8 += var7;
}
- for(var1 = 0; var1 < 256; var1 += 8) {
- var2 += this.__o[var1];
- var3 += this.__o[var1 + 1];
- var4 += this.__o[var1 + 2];
- var5 += this.__o[var1 + 3];
- var6 += this.__o[var1 + 4];
- var7 += this.__o[var1 + 5];
- var8 += this.__o[var1 + 6];
- var9 += this.__o[var1 + 7];
- var2 ^= var3 << 11;
- var5 += var2;
- var3 += var4;
- var3 ^= var4 >>> 2;
- var6 += var3;
- var4 += var5;
- var4 ^= var5 << 8;
- var7 += var4;
- var5 += var6;
- var5 ^= var6 >>> 16;
- var8 += var5;
- var6 += var7;
- var6 ^= var7 << 10;
- var9 += var6;
- var7 += var8;
- var7 ^= var8 >>> 4;
- var2 += var7;
- var8 += var9;
- var8 ^= var9 << 8;
- var3 += var8;
- var9 += var2;
- var9 ^= var2 >>> 9;
- var4 += var9;
- var2 += var3;
- this.__u[var1] = var2;
- this.__u[var1 + 1] = var3;
- this.__u[var1 + 2] = var4;
- this.__u[var1 + 3] = var5;
- this.__u[var1 + 4] = var6;
- this.__u[var1 + 5] = var7;
- this.__u[var1 + 6] = var8;
- this.__u[var1 + 7] = var9;
+ for(var9 = 0; var9 < 256; var9 += 8) {
+ var8 += this.__o[var9];
+ var7 += this.__o[var9 + 1];
+ var6 += this.__o[var9 + 2];
+ var5 += this.__o[var9 + 3];
+ var4 += this.__o[var9 + 4];
+ var3 += this.__o[var9 + 5];
+ var2 += this.__o[var9 + 6];
+ var1 += this.__o[var9 + 7];
+ var8 ^= var7 << 11;
+ var5 += var8;
+ var7 += var6;
+ var7 ^= var6 >>> 2;
+ var4 += var7;
+ var6 += var5;
+ var6 ^= var5 << 8;
+ var3 += var6;
+ var5 += var4;
+ var5 ^= var4 >>> 16;
+ var2 += var5;
+ var4 += var3;
+ var4 ^= var3 << 10;
+ var1 += var4;
+ var3 += var2;
+ var3 ^= var2 >>> 4;
+ var8 += var3;
+ var2 += var1;
+ var2 ^= var1 << 8;
+ var7 += var2;
+ var1 += var8;
+ var1 ^= var8 >>> 9;
+ var6 += var1;
+ var8 += var7;
+ this.__u[var9] = var8;
+ this.__u[var9 + 1] = var7;
+ this.__u[var9 + 2] = var6;
+ this.__u[var9 + 3] = var5;
+ this.__u[var9 + 4] = var4;
+ this.__u[var9 + 5] = var3;
+ this.__u[var9 + 6] = var2;
+ this.__u[var9 + 7] = var1;
}
- for(var1 = 0; var1 < 256; var1 += 8) {
- var2 += this.__u[var1];
- var3 += this.__u[var1 + 1];
- var4 += this.__u[var1 + 2];
- var5 += this.__u[var1 + 3];
- var6 += this.__u[var1 + 4];
- var7 += this.__u[var1 + 5];
- var8 += this.__u[var1 + 6];
- var9 += this.__u[var1 + 7];
- var2 ^= var3 << 11;
- var5 += var2;
- var3 += var4;
- var3 ^= var4 >>> 2;
- var6 += var3;
- var4 += var5;
- var4 ^= var5 << 8;
- var7 += var4;
- var5 += var6;
- var5 ^= var6 >>> 16;
- var8 += var5;
- var6 += var7;
- var6 ^= var7 << 10;
- var9 += var6;
- var7 += var8;
- var7 ^= var8 >>> 4;
- var2 += var7;
- var8 += var9;
- var8 ^= var9 << 8;
- var3 += var8;
- var9 += var2;
- var9 ^= var2 >>> 9;
- var4 += var9;
- var2 += var3;
- this.__u[var1] = var2;
- this.__u[var1 + 1] = var3;
- this.__u[var1 + 2] = var4;
- this.__u[var1 + 3] = var5;
- this.__u[var1 + 4] = var6;
- this.__u[var1 + 5] = var7;
- this.__u[var1 + 6] = var8;
- this.__u[var1 + 7] = var9;
+ for(var9 = 0; var9 < 256; var9 += 8) {
+ var8 += this.__u[var9];
+ var7 += this.__u[var9 + 1];
+ var6 += this.__u[var9 + 2];
+ var5 += this.__u[var9 + 3];
+ var4 += this.__u[var9 + 4];
+ var3 += this.__u[var9 + 5];
+ var2 += this.__u[var9 + 6];
+ var1 += this.__u[var9 + 7];
+ var8 ^= var7 << 11;
+ var5 += var8;
+ var7 += var6;
+ var7 ^= var6 >>> 2;
+ var4 += var7;
+ var6 += var5;
+ var6 ^= var5 << 8;
+ var3 += var6;
+ var5 += var4;
+ var5 ^= var4 >>> 16;
+ var2 += var5;
+ var4 += var3;
+ var4 ^= var3 << 10;
+ var1 += var4;
+ var3 += var2;
+ var3 ^= var2 >>> 4;
+ var8 += var3;
+ var2 += var1;
+ var2 ^= var1 << 8;
+ var7 += var2;
+ var1 += var8;
+ var1 ^= var8 >>> 9;
+ var6 += var1;
+ var8 += var7;
+ this.__u[var9] = var8;
+ this.__u[var9 + 1] = var7;
+ this.__u[var9 + 2] = var6;
+ this.__u[var9 + 3] = var5;
+ this.__u[var9 + 4] = var4;
+ this.__u[var9 + 5] = var3;
+ this.__u[var9 + 6] = var2;
+ this.__u[var9 + 7] = var1;
}
this.__q_338();
@@ -250,8 +250,8 @@ public final class IsaacCipher {
garbageValue = "75867683"
)
public static void method4082(AbstractIndexCache var0, AbstractIndexCache var1) {
- NpcDefinition.NpcDefinition_indexCache = var0;
- NpcDefinition.NpcDefinition_modelIndexCache = var1;
+ NPCDefinition.NpcDefinition_indexCache = var0;
+ NPCDefinition.NpcDefinition_modelIndexCache = var1;
}
@ObfuscatedName("fl")
diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java
index 577023f80e..5a0518a84a 100644
--- a/runescape-client/src/main/java/ItemContainer.java
+++ b/runescape-client/src/main/java/ItemContainer.java
@@ -31,10 +31,6 @@ public class ItemContainer extends Node {
@Export("quantities")
int[] quantities;
- static {
- itemContainers = new NodeHashTable(32);
- }
-
ItemContainer() {
this.ids = new int[]{-1};
this.quantities = new int[]{0};
@@ -60,40 +56,44 @@ public class ItemContainer extends Node {
if(var1 != null) {
return var1;
} else {
- AbstractIndexCache var3 = SequenceDefinition.__jh_f;
- AbstractIndexCache var4 = SequenceDefinition.__jh_q;
- boolean var5 = true;
- int[] var6 = var3.__j_395(var0);
+ AbstractIndexCache var2 = SequenceDefinition.__jh_f;
+ AbstractIndexCache var3 = SequenceDefinition.__jh_q;
+ boolean var4 = true;
+ int[] var5 = var2.__j_395(var0);
- for(int var7 = 0; var7 < var6.length; ++var7) {
- byte[] var8 = var3.getRecord(var0, var6[var7]);
- if(var8 == null) {
- var5 = false;
+ for(int var6 = 0; var6 < var5.length; ++var6) {
+ byte[] var7 = var2.getRecord(var0, var5[var6]);
+ if(var7 == null) {
+ var4 = false;
} else {
- int var9 = (var8[0] & 255) << 8 | var8[1] & 255;
- byte[] var10 = var4.getRecord(var9, 0);
- if(var10 == null) {
- var5 = false;
+ int var8 = (var7[0] & 255) << 8 | var7[1] & 255;
+ byte[] var9 = var3.getRecord(var8, 0);
+ if(var9 == null) {
+ var4 = false;
}
}
}
- Frames var2;
- if(!var5) {
- var2 = null;
+ Frames var11;
+ if(!var4) {
+ var11 = null;
} else {
try {
- var2 = new Frames(var3, var4, var0, false);
- } catch (Exception var12) {
- var2 = null;
+ var11 = new Frames(var2, var3, var0, false);
+ } catch (Exception var10) {
+ var11 = null;
}
}
- if(var2 != null) {
- SequenceDefinition.__jh_o.put(var2, (long)var0);
+ if(var11 != null) {
+ SequenceDefinition.__jh_o.put(var11, (long)var0);
}
- return var2;
+ return var11;
}
}
+
+ static {
+ itemContainers = new NodeHashTable(32);
+ }
}
diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java
index 14304761f6..984a5b956c 100644
--- a/runescape-client/src/main/java/ItemDefinition.java
+++ b/runescape-client/src/main/java/ItemDefinition.java
@@ -287,12 +287,6 @@ public class ItemDefinition extends DualNode {
@Export("placeholderTemplate")
public int placeholderTemplate;
- static {
- ItemDefinition_cached = new EvictingDualNodeHashTable(64);
- ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50);
- Sprite_cached = new EvictingDualNodeHashTable(200);
- }
-
ItemDefinition() {
this.name = "null";
this.zoom2d = 2000;
@@ -588,18 +582,18 @@ public class ItemDefinition extends DualNode {
)
@Export("__l_429")
public final ModelData __l_429(int var1) {
- int var3;
+ int var2;
if(this.__az != null && var1 > 1) {
- int var2 = -1;
+ int var3 = -1;
- for(var3 = 0; var3 < 10; ++var3) {
- if(var1 >= this.__au[var3] && this.__au[var3] != 0) {
- var2 = this.__az[var3];
+ for(var2 = 0; var2 < 10; ++var2) {
+ if(var1 >= this.__au[var2] && this.__au[var2] != 0) {
+ var3 = this.__az[var2];
}
}
- if(var2 != -1) {
- return Skills.getItemDefinition(var2).__l_429(1);
+ if(var3 != -1) {
+ return Skills.getItemDefinition(var3).__l_429(1);
}
}
@@ -612,14 +606,14 @@ public class ItemDefinition extends DualNode {
}
if(this.recolorFrom != null) {
- for(var3 = 0; var3 < this.recolorFrom.length; ++var3) {
- var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]);
+ for(var2 = 0; var2 < this.recolorFrom.length; ++var2) {
+ var4.recolor(this.recolorFrom[var2], this.recolorTo[var2]);
}
}
if(this.retextureFrom != null) {
- for(var3 = 0; var3 < this.retextureFrom.length; ++var3) {
- var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]);
+ for(var2 = 0; var2 < this.retextureFrom.length; ++var2) {
+ var4.retexture(this.retextureFrom[var2], this.retextureTo[var2]);
}
}
@@ -876,20 +870,20 @@ public class ItemDefinition extends DualNode {
)
@Export("getIntParam")
public int getIntParam(int var1, int var2) {
- IterableNodeHashTable var4 = this.params;
- int var3;
- if(var4 == null) {
- var3 = var2;
+ IterableNodeHashTable var3 = this.params;
+ int var4;
+ if(var3 == null) {
+ var4 = var2;
} else {
- IntegerNode var5 = (IntegerNode)var4.get((long)var1);
+ IntegerNode var5 = (IntegerNode)var3.get((long)var1);
if(var5 == null) {
- var3 = var2;
+ var4 = var2;
} else {
- var3 = var5.integer;
+ var4 = var5.integer;
}
}
- return var3;
+ return var4;
}
@ObfuscatedName("h")
@@ -911,4 +905,10 @@ public class ItemDefinition extends DualNode {
public int getShiftClickIndex() {
return this.shiftClickIndex0 != -1 && this.inventoryActions != null?(this.shiftClickIndex0 >= 0?(this.inventoryActions[this.shiftClickIndex0] != null?this.shiftClickIndex0:-1):("Drop".equalsIgnoreCase(this.inventoryActions[4])?4:-1)):-1;
}
+
+ static {
+ ItemDefinition_cached = new EvictingDualNodeHashTable(64);
+ ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50);
+ Sprite_cached = new EvictingDualNodeHashTable(200);
+ }
}
diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java
index a3404858e8..a1738289fb 100644
--- a/runescape-client/src/main/java/IterableNodeHashTable.java
+++ b/runescape-client/src/main/java/IterableNodeHashTable.java
@@ -125,16 +125,15 @@ public final class IterableNodeHashTable implements Iterable {
this.current = var1.previous;
return var1;
} else {
- do {
- if(this.index >= this.size) {
- return null;
- }
-
+ while(this.index < this.size) {
var1 = this.buckets[this.index++].previous;
- } while(var1 == this.buckets[this.index - 1]);
+ if(var1 != this.buckets[this.index - 1]) {
+ this.current = var1.previous;
+ return var1;
+ }
+ }
- this.current = var1.previous;
- return var1;
+ return null;
}
}
diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java
index f6ac847231..1f016d8863 100644
--- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java
+++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java
@@ -56,17 +56,16 @@ public class IterableNodeHashTableIterator implements Iterator {
this.__w = var1;
return var1;
} else {
- do {
- if(this.__q >= this.hashTable.size) {
- return null;
- }
-
+ while(this.__q < this.hashTable.size) {
var1 = this.hashTable.buckets[this.__q++].previous;
- } while(var1 == this.hashTable.buckets[this.__q - 1]);
+ if(var1 != this.hashTable.buckets[this.__q - 1]) {
+ this.__f = var1.previous;
+ this.__w = var1;
+ return var1;
+ }
+ }
- this.__f = var1.previous;
- this.__w = var1;
- return var1;
+ return null;
}
}
diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java
index e7322e5206..00543f1cdb 100644
--- a/runescape-client/src/main/java/KeyHandler.java
+++ b/runescape-client/src/main/java/KeyHandler.java
@@ -109,23 +109,6 @@ public final class KeyHandler implements KeyListener, FocusListener {
@Export("crossSprites")
static Sprite[] crossSprites;
- static {
- KeyHandler_instance = new KeyHandler();
- KeyHandler_pressedKeys = new boolean[112];
- __an_cq = new int[128];
- __an_ch = 0;
- __an_cw = 0;
- __an_cg = new char[128];
- __an_cf = new int[128];
- __an_cp = new int[128];
- __an_cl = 0;
- __an_ct = 0;
- __an_cz = 0;
- __an_cc = 0;
- KeyHandler_idleCycles = 0;
- KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
- }
-
@Export("keyPressed")
@ObfuscatedName("keyPressed")
public final synchronized void keyPressed(KeyEvent var1) {
@@ -213,15 +196,15 @@ public final class KeyHandler implements KeyListener, FocusListener {
if(var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) {
var3 = true;
} else {
- label63: {
+ label56: {
if(var2 != 0) {
- char[] var7 = class304.cp1252AsciiExtension;
+ char[] var4 = class304.cp1252AsciiExtension;
- for(int var5 = 0; var5 < var7.length; ++var5) {
- char var6 = var7[var5];
+ for(int var5 = 0; var5 < var4.length; ++var5) {
+ char var6 = var4[var5];
if(var2 == var6) {
var3 = true;
- break label63;
+ break label56;
}
}
}
@@ -231,11 +214,11 @@ public final class KeyHandler implements KeyListener, FocusListener {
}
if(var3) {
- int var4 = __an_cz + 1 & 127;
- if(var4 != __an_ct) {
+ int var7 = __an_cz + 1 & 127;
+ if(var7 != __an_ct) {
__an_cf[__an_cz] = -1;
__an_cg[__an_cz] = var2;
- __an_cz = var4;
+ __an_cz = var7;
}
}
}
@@ -252,11 +235,28 @@ public final class KeyHandler implements KeyListener, FocusListener {
static String method839() {
String var0 = "";
- Message var2;
- for(Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') {
- var2 = (Message)var1.next();
+ Message var1;
+ for(Iterator var2 = Messages.Messages_hashTable.iterator(); var2.hasNext(); var0 = var0 + var1.sender + ':' + var1.text + '\n') {
+ var1 = (Message)var2.next();
}
return var0;
}
+
+ static {
+ KeyHandler_instance = new KeyHandler();
+ KeyHandler_pressedKeys = new boolean[112];
+ __an_cq = new int[128];
+ __an_ch = 0;
+ __an_cw = 0;
+ __an_cg = new char[128];
+ __an_cf = new int[128];
+ __an_cp = new int[128];
+ __an_cl = 0;
+ __an_ct = 0;
+ __an_cz = 0;
+ __an_cc = 0;
+ KeyHandler_idleCycles = 0;
+ KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+ }
}
diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java
index b6311ca8de..32a9368d94 100644
--- a/runescape-client/src/main/java/KitDefinition.java
+++ b/runescape-client/src/main/java/KitDefinition.java
@@ -59,10 +59,6 @@ public class KitDefinition extends DualNode {
@Export("__k")
public boolean __k;
- static {
- KitDefinition_cached = new EvictingDualNodeHashTable(64);
- }
-
KitDefinition() {
this.__o = -1;
this.archives = new int[]{-1, -1, -1, -1, -1};
@@ -262,10 +258,14 @@ public class KitDefinition extends DualNode {
var0.index += class303.huffman.__f_294(var0.array, var0.index, var3, 0, var2);
String var4 = WidgetGroupParent.decodeStringCp1252(var3, 0, var2);
var1 = var4;
- } catch (Exception var6) {
+ } catch (Exception var5) {
var1 = "Cabbage";
}
return var1;
}
+
+ static {
+ KitDefinition_cached = new EvictingDualNodeHashTable(64);
+ }
}
diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java
index 45229494f1..3aa0ad0863 100644
--- a/runescape-client/src/main/java/Link.java
+++ b/runescape-client/src/main/java/Link.java
@@ -28,5 +28,6 @@ public class Link {
this.__m = null;
this.__f = null;
}
+
}
}
diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java
index ea3111c177..628a1280f9 100644
--- a/runescape-client/src/main/java/Login.java
+++ b/runescape-client/src/main/java/Login.java
@@ -150,34 +150,6 @@ public class Login {
@Export("indexCache11")
static IndexCache indexCache11;
- static {
- __cu_q = 0;
- __cu_y = __cu_q + 202;
- Login_loadingPercent = 10;
- Login_loadingText = "";
- __cu_aj = -1;
- __cu_ac = 1;
- loginIndex = 0;
- Login_response0 = "";
- Login_response1 = "";
- Login_response2 = "";
- Login_response3 = "";
- Login_username = "";
- Login_password = "";
- __cu_aa = false;
- __cu_ax = false;
- __cu_ba = true;
- currentLoginField = 0;
- __cu_bk = false;
- __cu_bl = -1;
- __cu_br = 0;
- __cu_bj = 0;
- new DecimalFormat("##0.00");
- new class161();
- __cu_bi = -1L;
- __cu_bz = -1L;
- }
-
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(Lir;II)Lhl;",
@@ -198,19 +170,19 @@ public class Login {
int var0 = 0;
int var1 = 240;
- int var3;
- for(byte var2 = 12; var0 < 16; var1 -= var2) {
- var3 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F));
- class248.__iu_e[var0] = var3;
+ int var2;
+ for(byte var3 = 12; var0 < 16; var1 -= var3) {
+ var2 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F));
+ class248.__iu_e[var0] = var2;
++var0;
}
var1 = 48;
for(int var5 = var1 / 6; var0 < class248.__iu_e.length; var1 -= var5) {
- var3 = var0 * 2;
+ var2 = var0 * 2;
- for(int var4 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class248.__iu_e.length; ++var0) {
+ for(int var4 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var2 && var0 < class248.__iu_e.length; ++var0) {
class248.__iu_e[var0] = var4;
}
}
@@ -245,4 +217,32 @@ public class Login {
return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection1.cameraX >> 7][class11.cameraZ >> 7] & 4) != 0?SoundSystem.plane:3;
}
}
+
+ static {
+ __cu_q = 0;
+ __cu_y = __cu_q + 202;
+ Login_loadingPercent = 10;
+ Login_loadingText = "";
+ __cu_aj = -1;
+ __cu_ac = 1;
+ loginIndex = 0;
+ Login_response0 = "";
+ Login_response1 = "";
+ Login_response2 = "";
+ Login_response3 = "";
+ Login_username = "";
+ Login_password = "";
+ __cu_aa = false;
+ __cu_ax = false;
+ __cu_ba = true;
+ currentLoginField = 0;
+ __cu_bk = false;
+ __cu_bl = -1;
+ __cu_br = 0;
+ __cu_bj = 0;
+ new DecimalFormat("##0.00");
+ new class161();
+ __cu_bi = -1L;
+ __cu_bz = -1L;
+ }
}
diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java
index 3239d905c3..1ef660472a 100644
--- a/runescape-client/src/main/java/LoginPacket.java
+++ b/runescape-client/src/main/java/LoginPacket.java
@@ -52,21 +52,6 @@ public class LoginPacket implements ClientPacketMarker {
@Export("id")
public final int id;
- static {
- __gl_m = new LoginPacket(14, 0);
- __gl_f = new LoginPacket(15, 4);
- __gl_q = new LoginPacket(16, -2);
- __gl_w = new LoginPacket(18, -2);
- __gl_o = new LoginPacket(27, 0);
- __gl_g = new LoginPacket[32];
- LoginPacket[] var0 = WorldMapIcon2.method300();
-
- for(int var1 = 0; var1 < var0.length; ++var1) {
- __gl_g[var0[var1].id] = var0[var1];
- }
-
- }
-
@ObfuscatedSignature(
signature = "(II)V",
garbageValue = "0"
@@ -85,9 +70,9 @@ public class LoginPacket implements ClientPacketMarker {
File var3 = new File(class168.__fs_o, "preferences" + var0 + ".dat");
if(var3.exists()) {
try {
- AccessFile var10 = new AccessFile(var3, "rw", 10000L);
- return var10;
- } catch (IOException var9) {
+ AccessFile var11 = new AccessFile(var3, "rw", 10000L);
+ return var11;
+ } catch (IOException var10) {
;
}
}
@@ -105,7 +90,7 @@ public class LoginPacket implements ClientPacketMarker {
try {
var6 = new AccessFile(var5, "rw", 10000L);
return var6;
- } catch (IOException var8) {
+ } catch (IOException var9) {
;
}
}
@@ -113,8 +98,23 @@ public class LoginPacket implements ClientPacketMarker {
try {
var6 = new AccessFile(var3, "rw", 10000L);
return var6;
- } catch (IOException var7) {
+ } catch (IOException var8) {
throw new RuntimeException();
}
}
+
+ static {
+ __gl_m = new LoginPacket(14, 0);
+ __gl_f = new LoginPacket(15, 4);
+ __gl_q = new LoginPacket(16, -2);
+ __gl_w = new LoginPacket(18, -2);
+ __gl_o = new LoginPacket(27, 0);
+ __gl_g = new LoginPacket[32];
+ LoginPacket[] var0 = WorldMapIcon2.method300();
+
+ for(int var1 = 0; var1 < var0.length; ++var1) {
+ __gl_g[var0[var1].id] = var0[var1];
+ }
+
+ }
}
diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java
index 3f3dc2163a..774df1a7d1 100644
--- a/runescape-client/src/main/java/LoginType.java
+++ b/runescape-client/src/main/java/LoginType.java
@@ -71,18 +71,6 @@ public class LoginType {
@Export("__d")
final String __d;
- static {
- __lx_m = new LoginType(8, 0, "", "");
- __lx_f = new LoginType(3, 1, "", "");
- __lx_q = new LoginType(2, 2, "", "");
- __lx_w = new LoginType(6, 3, "", "");
- __lx_o = new LoginType(4, 4, "", "");
- __lx_u = new LoginType(7, 5, "", "");
- __lx_g = new LoginType(1, 6, "", "");
- __lx_l = new LoginType(5, 7, "", "");
- __lx_e = new LoginType(0, -1, "", "", true, new LoginType[]{__lx_m, __lx_f, __lx_q, __lx_o, __lx_w});
- }
-
LoginType(int var1, int var2, String var3, String var4) {
this.__x = var1;
this.__d = var4;
@@ -101,4 +89,16 @@ public class LoginType {
public String __toString_546() {
return this.__d;
}
+
+ static {
+ __lx_m = new LoginType(8, 0, "", "");
+ __lx_f = new LoginType(3, 1, "", "");
+ __lx_q = new LoginType(2, 2, "", "");
+ __lx_w = new LoginType(6, 3, "", "");
+ __lx_o = new LoginType(4, 4, "", "");
+ __lx_u = new LoginType(7, 5, "", "");
+ __lx_g = new LoginType(1, 6, "", "");
+ __lx_l = new LoginType(5, 7, "", "");
+ __lx_e = new LoginType(0, -1, "", "", true, new LoginType[]{__lx_m, __lx_f, __lx_q, __lx_o, __lx_w});
+ }
}
diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java
index 8ac8a24a9d..9956fd6faf 100644
--- a/runescape-client/src/main/java/MenuAction.java
+++ b/runescape-client/src/main/java/MenuAction.java
@@ -79,9 +79,9 @@ public class MenuAction {
}
}
- Widget var14 = Huffman.getWidget(var3);
- if(var14 != null) {
- class22.method295(var14);
+ Widget var12 = Huffman.getWidget(var3);
+ if(var12 != null) {
+ class22.method295(var12);
}
int var5;
@@ -129,26 +129,26 @@ public class MenuAction {
var7 += 8;
var8 = Client.menuOptionsCount * 15 + 22;
- int var12 = var5 - var7 / 2;
- if(var7 + var12 > SoundCache.canvasWidth) {
- var12 = SoundCache.canvasWidth - var7;
- }
-
- if(var12 < 0) {
- var12 = 0;
- }
-
- int var13 = var6;
- if(var6 + var8 > Huffman.canvasHeight) {
- var13 = Huffman.canvasHeight - var8;
+ int var13 = var5 - var7 / 2;
+ if(var7 + var13 > SoundCache.canvasWidth) {
+ var13 = SoundCache.canvasWidth - var7;
}
if(var13 < 0) {
var13 = 0;
}
- class25.menuX = var12;
- GameShell.menuY = var13;
+ int var14 = var6;
+ if(var6 + var8 > Huffman.canvasHeight) {
+ var14 = Huffman.canvasHeight - var8;
+ }
+
+ if(var14 < 0) {
+ var14 = 0;
+ }
+
+ class25.menuX = var13;
+ GameShell.menuY = var14;
class214.menuWidth = var7;
AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22;
if(Client.rootWidgetGroup != -1) {
diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java
index 5b875921da..7af646cbf9 100644
--- a/runescape-client/src/main/java/Message.java
+++ b/runescape-client/src/main/java/Message.java
@@ -157,7 +157,7 @@ public class Message extends DualNode {
@Export("fillSenderUsername")
final void fillSenderUsername() {
if(this.sender != null) {
- this.senderUsername = new Username(NpcDefinition.method5161(this.sender), KeyHandler.loginType);
+ this.senderUsername = new Username(NPCDefinition.method5161(this.sender), KeyHandler.loginType);
} else {
this.senderUsername = null;
}
@@ -196,76 +196,78 @@ public class Message extends DualNode {
--var3;
}
- int var14 = var3 - var2;
- if(var14 >= 1) {
- byte var6;
+ int var6 = var3 - var2;
+ if(var6 >= 1) {
+ byte var7;
if(var1 == null) {
- var6 = 12;
+ var7 = 12;
} else {
switch(var1.__x) {
case 7:
- var6 = 20;
+ var7 = 20;
break;
default:
- var6 = 12;
+ var7 = 12;
}
}
- if(var14 <= var6) {
- StringBuilder var12 = new StringBuilder(var14);
+ if(var6 <= var7) {
+ StringBuilder var8 = new StringBuilder(var6);
- for(int var15 = var2; var15 < var3; ++var15) {
- char var7 = var0.charAt(var15);
- boolean var8;
- if(Character.isISOControl(var7)) {
- var8 = false;
- } else if(VarcInt.method4807(var7)) {
- var8 = true;
+ for(int var9 = var2; var9 < var3; ++var9) {
+ char var10 = var0.charAt(var9);
+ boolean var11;
+ if(Character.isISOControl(var10)) {
+ var11 = false;
+ } else if(VarcInt.method4807(var10)) {
+ var11 = true;
} else {
- char[] var13 = class305.__kb_q;
- int var10 = 0;
+ label149: {
+ char[] var12 = class305.__kb_q;
- label118:
- while(true) {
- char var11;
- if(var10 >= var13.length) {
- var13 = class305.__kb_w;
+ int var13;
+ char var14;
+ for(var13 = 0; var13 < var12.length; ++var13) {
+ var14 = var12[var13];
+ if(var10 == var14) {
+ var11 = true;
+ break label149;
+ }
+ }
- for(var10 = 0; var10 < var13.length; ++var10) {
- var11 = var13[var10];
- if(var7 == var11) {
- var8 = true;
- break label118;
- }
+ var12 = class305.__kb_w;
+ var13 = 0;
+
+ while(true) {
+ if(var13 >= var12.length) {
+ var11 = false;
+ break;
}
- var8 = false;
- break;
- }
+ var14 = var12[var13];
+ if(var10 == var14) {
+ var11 = true;
+ break;
+ }
- var11 = var13[var10];
- if(var7 == var11) {
- var8 = true;
- break;
+ ++var13;
}
-
- ++var10;
}
}
- if(var8) {
- char var9;
- switch(var7) {
+ if(var11) {
+ char var15;
+ switch(var10) {
case ' ':
case '-':
case '_':
case ' ':
- var9 = '_';
+ var15 = '_';
break;
case '#':
case '[':
case ']':
- var9 = var7;
+ var15 = var10;
break;
case 'À':
case 'Á':
@@ -277,11 +279,11 @@ public class Message extends DualNode {
case 'â':
case 'ã':
case 'ä':
- var9 = 'a';
+ var15 = 'a';
break;
case 'Ç':
case 'ç':
- var9 = 'c';
+ var15 = 'c';
break;
case 'È':
case 'É':
@@ -291,7 +293,7 @@ public class Message extends DualNode {
case 'é':
case 'ê':
case 'ë':
- var9 = 'e';
+ var15 = 'e';
break;
case 'Í':
case 'Î':
@@ -299,11 +301,11 @@ public class Message extends DualNode {
case 'í':
case 'î':
case 'ï':
- var9 = 'i';
+ var15 = 'i';
break;
case 'Ñ':
case 'ñ':
- var9 = 'n';
+ var15 = 'n';
break;
case 'Ò':
case 'Ó':
@@ -315,7 +317,7 @@ public class Message extends DualNode {
case 'ô':
case 'õ':
case 'ö':
- var9 = 'o';
+ var15 = 'o';
break;
case 'Ù':
case 'Ú':
@@ -325,30 +327,30 @@ public class Message extends DualNode {
case 'ú':
case 'û':
case 'ü':
- var9 = 'u';
+ var15 = 'u';
break;
case 'ß':
- var9 = 'b';
+ var15 = 'b';
break;
case 'ÿ':
case 'Ÿ':
- var9 = 'y';
+ var15 = 'y';
break;
default:
- var9 = Character.toLowerCase(var7);
+ var15 = Character.toLowerCase(var10);
}
- if(var9 != 0) {
- var12.append(var9);
+ if(var15 != 0) {
+ var8.append(var15);
}
}
}
- if(var12.length() == 0) {
+ if(var8.length() == 0) {
return null;
}
- return var12.toString();
+ return var8.toString();
}
}
diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java
index 4c06de37c8..18cf6643fc 100644
--- a/runescape-client/src/main/java/Messages.java
+++ b/runescape-client/src/main/java/Messages.java
@@ -37,13 +37,6 @@ public class Messages {
@Export("soundSystem")
static SoundSystem soundSystem;
- static {
- Messages_channels = new HashMap();
- Messages_hashTable = new IterableNodeHashTable(1024);
- Messages_queue = new IterableDualNodeQueue();
- Messages_count = 0;
- }
-
@ObfuscatedName("w")
@ObfuscatedSignature(
signature = "(I)V",
@@ -57,7 +50,14 @@ public class Messages {
} else {
Client.Login_isUsernameRemembered = false;
}
-
}
+
+ }
+
+ static {
+ Messages_channels = new HashMap();
+ Messages_hashTable = new IterableNodeHashTable(1024);
+ Messages_queue = new IterableDualNodeQueue();
+ Messages_count = 0;
}
}
diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java
index d48f4363d2..d61e1a2616 100644
--- a/runescape-client/src/main/java/MidiFileReader.java
+++ b/runescape-client/src/main/java/MidiFileReader.java
@@ -37,10 +37,6 @@ public class MidiFileReader {
@Export("__e")
long __e;
- static {
- __hs_x = new byte[]{(byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)0, (byte)1, (byte)2, (byte)1, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0};
- }
-
MidiFileReader(byte[] var1) {
this.buffer = new Buffer((byte[])null);
this.parse(var1);
@@ -61,11 +57,11 @@ public class MidiFileReader {
this.trackStarts = new int[var2];
int var3;
- int var5;
- for(var3 = 0; var3 < var2; this.buffer.index += var5) {
- int var4 = this.buffer.readInt();
- var5 = this.buffer.readInt();
- if(var4 == 1297379947) {
+ int var4;
+ for(var3 = 0; var3 < var2; this.buffer.index += var4) {
+ int var5 = this.buffer.readInt();
+ var4 = this.buffer.readInt();
+ if(var5 == 1297379947) {
this.trackStarts[var3] = this.buffer.index;
++var3;
}
@@ -140,29 +136,29 @@ public class MidiFileReader {
@Export("readMessage0")
int readMessage0(int var1) {
byte var2 = this.buffer.array[this.buffer.index];
- int var5;
+ int var3;
if(var2 < 0) {
- var5 = var2 & 255;
- this.__u[var1] = var5;
+ var3 = var2 & 255;
+ this.__u[var1] = var3;
++this.buffer.index;
} else {
- var5 = this.__u[var1];
+ var3 = this.__u[var1];
}
- if(var5 != 240 && var5 != 247) {
- return this.__d_371(var1, var5);
+ if(var3 != 240 && var3 != 247) {
+ return this.__d_371(var1, var3);
} else {
- int var3 = this.buffer.__as_311();
- if(var5 == 247 && var3 > 0) {
- int var4 = this.buffer.array[this.buffer.index] & 255;
- if(var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) {
+ int var4 = this.buffer.__as_311();
+ if(var3 == 247 && var4 > 0) {
+ int var5 = this.buffer.array[this.buffer.index] & 255;
+ if(var5 >= 241 && var5 <= 243 || var5 == 246 || var5 == 248 || var5 >= 250 && var5 <= 252 || var5 == 254) {
++this.buffer.index;
- this.__u[var1] = var4;
- return this.__d_371(var1, var4);
+ this.__u[var1] = var5;
+ return this.__d_371(var1, var5);
}
}
- this.buffer.index += var3;
+ this.buffer.index += var4;
return 0;
}
}
@@ -170,37 +166,37 @@ public class MidiFileReader {
@ObfuscatedName("d")
@Export("__d_371")
int __d_371(int var1, int var2) {
- int var4;
+ int var3;
if(var2 == 255) {
int var7 = this.buffer.readUnsignedByte();
- var4 = this.buffer.__as_311();
+ var3 = this.buffer.__as_311();
if(var7 == 47) {
- this.buffer.index += var4;
+ this.buffer.index += var3;
return 1;
} else if(var7 == 81) {
int var5 = this.buffer.readMedium();
- var4 -= 3;
+ var3 -= 3;
int var6 = this.trackLengths[var1];
this.__e += (long)var6 * (long)(this.__g - var5);
this.__g = var5;
- this.buffer.index += var4;
+ this.buffer.index += var3;
return 2;
} else {
- this.buffer.index += var4;
+ this.buffer.index += var3;
return 3;
}
} else {
- byte var3 = __hs_x[var2 - 128];
- var4 = var2;
- if(var3 >= 1) {
- var4 = var2 | this.buffer.readUnsignedByte() << 8;
+ byte var4 = __hs_x[var2 - 128];
+ var3 = var2;
+ if(var4 >= 1) {
+ var3 = var2 | this.buffer.readUnsignedByte() << 8;
}
- if(var3 >= 2) {
- var4 |= this.buffer.readUnsignedByte() << 16;
+ if(var4 >= 2) {
+ var3 |= this.buffer.readUnsignedByte() << 16;
}
- return var4;
+ return var3;
}
}
@@ -256,4 +252,8 @@ public class MidiFileReader {
}
}
+
+ static {
+ __hs_x = new byte[]{(byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)0, (byte)1, (byte)2, (byte)1, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0};
+ }
}
diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java
index bdee97d7e1..c4d335bbda 100644
--- a/runescape-client/src/main/java/MidiPcmStream.java
+++ b/runescape-client/src/main/java/MidiPcmStream.java
@@ -423,7 +423,7 @@ public class MidiPcmStream extends PcmStream {
var6.__l = var9.__o[var2] & 255;
var6.__e = (var2 << 8) - (var9.__q[var2] & 32767);
var6.__k = 0;
- var6.__n = 0;
+ var6.__o = 0;
var6.__i = 0;
var6.__a = -1;
var6.__z = 0;
@@ -905,7 +905,7 @@ public class MidiPcmStream extends PcmStream {
int var6;
int var7;
if(var2.__m != null) {
- var4 = var1.__n;
+ var4 = var1.__o;
var5 = var2.__m[var1.__i + 1];
if(var1.__i < var2.__m.length - 2) {
var6 = (var2.__m[var1.__i] & 255) << 8;
@@ -1045,12 +1045,12 @@ public class MidiPcmStream extends PcmStream {
if(var6.__m != null) {
if(var6.__w > 0) {
- var1.__n += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.__w) + 0.5D);
+ var1.__o += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.__w) + 0.5D);
} else {
- var1.__n += 128;
+ var1.__o += 128;
}
- while(var1.__i < var6.__m.length - 2 && var1.__n > (var6.__m[var1.__i + 2] & 255) << 8) {
+ while(var1.__i < var6.__m.length - 2 && var1.__o > (var6.__m[var1.__i + 2] & 255) << 8) {
var1.__i += 2;
}
diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java
index 8ed74b9e96..99338d5cd7 100644
--- a/runescape-client/src/main/java/Model.java
+++ b/runescape-client/src/main/java/Model.java
@@ -205,36 +205,6 @@ public class Model extends Entity {
@Export("zMidOffset")
int zMidOffset;
- static {
- Model_sharedSequenceModel = new Model();
- Model_sharedSequenceModelFaceAlphas = new byte[1];
- Model_sharedSpotAnimationModel = new Model();
- Model_sharedSpotAnimationModelFaceAlphas = new byte[1];
- __du_at = new boolean[4700];
- __du_ad = new boolean[4700];
- modelViewportXs = new int[4700];
- modelViewportYs = new int[4700];
- __du_am = new int[4700];
- __du_an = new int[4700];
- __du_az = new int[4700];
- __du_au = new int[4700];
- __du_aa = new int[1600];
- __du_ax = new int[1600][512];
- __du_af = new int[12];
- __du_ai = new int[12][2000];
- __du_ba = new int[2000];
- __du_bb = new int[2000];
- __du_bs = new int[12];
- __du_bq = new int[10];
- __du_bn = new int[10];
- __du_bk = new int[10];
- __du_bx = true;
- Model_sine = Rasterizer3D.Rasterizer3D_sine;
- Model_cosine = Rasterizer3D.Rasterizer3D_cosine;
- __du_br = Rasterizer3D.Rasterizer3D_colorPalette;
- __du_bj = Rasterizer3D.__et_p;
- }
-
Model() {
this.verticesCount = 0;
this.indicesCount = 0;
@@ -629,8 +599,8 @@ public class Model extends Entity {
this.xMidOffset += 8;
this.zMidOffset += 8;
}
-
}
+
}
@ObfuscatedName("u")
@@ -664,6 +634,7 @@ public class Model extends Entity {
this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D);
this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D);
}
+
}
@ObfuscatedName("g")
@@ -687,6 +658,7 @@ public class Model extends Entity {
this.radius = this.xzRadius;
this.diameter = this.xzRadius + this.xzRadius;
}
+
}
@ObfuscatedName("l")
@@ -709,22 +681,21 @@ public class Model extends Entity {
)
@Export("animate")
public void animate(Frames var1, int var2) {
- if(this.vertexLabels != null) {
- if(var2 != -1) {
- Animation var3 = var1.frames[var2];
- Skeleton var4 = var3.skeleton;
- Model_transformTempX = 0;
- Model_transformTempY = 0;
- Model_transformTempZ = 0;
+ if(this.vertexLabels != null && var2 != -1) {
+ Animation var3 = var1.frames[var2];
+ Skeleton var4 = var3.skeleton;
+ Model_transformTempX = 0;
+ Model_transformTempY = 0;
+ Model_transformTempZ = 0;
- for(int var5 = 0; var5 < var3.transformCount; ++var5) {
- int var6 = var3.transformSkeletonLabels[var5];
- this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]);
- }
-
- this.resetBounds();
+ for(int var5 = 0; var5 < var3.transformCount; ++var5) {
+ int var6 = var3.transformSkeletonLabels[var5];
+ this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]);
}
+
+ this.resetBounds();
}
+
}
@ObfuscatedName("a")
@@ -742,18 +713,18 @@ public class Model extends Entity {
Model_transformTempY = 0;
Model_transformTempZ = 0;
byte var9 = 0;
- int var13 = var9 + 1;
- int var10 = var5[var9];
+ int var10 = var9 + 1;
+ int var11 = var5[var9];
- int var11;
int var12;
- for(var11 = 0; var11 < var6.transformCount; ++var11) {
- for(var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) {
+ int var13;
+ for(var12 = 0; var12 < var6.transformCount; ++var12) {
+ for(var13 = var6.transformSkeletonLabels[var12]; var13 > var11; var11 = var5[var10++]) {
;
}
- if(var12 != var10 || var8.transformTypes[var12] == 0) {
- this.transform(var8.transformTypes[var12], var8.labels[var12], var6.transformXs[var11], var6.transformYs[var11], var6.transformZs[var11]);
+ if(var13 != var11 || var8.transformTypes[var13] == 0) {
+ this.transform(var8.transformTypes[var13], var8.labels[var13], var6.transformXs[var12], var6.transformYs[var12], var6.transformZs[var12]);
}
}
@@ -761,16 +732,16 @@ public class Model extends Entity {
Model_transformTempY = 0;
Model_transformTempZ = 0;
var9 = 0;
- var13 = var9 + 1;
- var10 = var5[var9];
+ var10 = var9 + 1;
+ var11 = var5[var9];
- for(var11 = 0; var11 < var7.transformCount; ++var11) {
- for(var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) {
+ for(var12 = 0; var12 < var7.transformCount; ++var12) {
+ for(var13 = var7.transformSkeletonLabels[var12]; var13 > var11; var11 = var5[var10++]) {
;
}
- if(var12 == var10 || var8.transformTypes[var12] == 0) {
- this.transform(var8.transformTypes[var12], var8.labels[var12], var7.transformXs[var11], var7.transformYs[var11], var7.transformZs[var11]);
+ if(var13 == var11 || var8.transformTypes[var13] == 0) {
+ this.transform(var8.transformTypes[var13], var8.labels[var13], var7.transformXs[var12], var7.transformYs[var12], var7.transformZs[var12]);
}
}
@@ -779,6 +750,7 @@ public class Model extends Entity {
this.animate(var1, var2);
}
}
+
}
@ObfuscatedName("z")
@@ -787,8 +759,8 @@ public class Model extends Entity {
int var6 = var2.length;
int var7;
int var8;
- int var11;
- int var12;
+ int var9;
+ int var10;
if(var1 == 0) {
var7 = 0;
Model_transformTempX = 0;
@@ -796,15 +768,15 @@ public class Model extends Entity {
Model_transformTempZ = 0;
for(var8 = 0; var8 < var6; ++var8) {
- int var9 = var2[var8];
- if(var9 < this.vertexLabels.length) {
- int[] var10 = this.vertexLabels[var9];
+ int var11 = var2[var8];
+ if(var11 < this.vertexLabels.length) {
+ int[] var12 = this.vertexLabels[var11];
- for(var11 = 0; var11 < var10.length; ++var11) {
- var12 = var10[var11];
- Model_transformTempX += this.verticesX[var12];
- Model_transformTempY += this.verticesY[var12];
- Model_transformTempZ += this.verticesZ[var12];
+ for(var9 = 0; var9 < var12.length; ++var9) {
+ var10 = var12[var9];
+ Model_transformTempX += this.verticesX[var10];
+ Model_transformTempY += this.verticesY[var10];
+ Model_transformTempZ += this.verticesZ[var10];
++var7;
}
}
@@ -819,7 +791,6 @@ public class Model extends Entity {
Model_transformTempY = var4;
Model_transformTempZ = var5;
}
-
} else {
int[] var18;
int var19;
@@ -830,14 +801,13 @@ public class Model extends Entity {
var18 = this.vertexLabels[var8];
for(var19 = 0; var19 < var18.length; ++var19) {
- var11 = var18[var19];
- this.verticesX[var11] += var3;
- this.verticesY[var11] += var4;
- this.verticesZ[var11] += var5;
+ var9 = var18[var19];
+ this.verticesX[var9] += var3;
+ this.verticesY[var9] += var4;
+ this.verticesZ[var9] += var5;
}
}
}
-
} else if(var1 == 2) {
for(var7 = 0; var7 < var6; ++var7) {
var8 = var2[var7];
@@ -845,11 +815,11 @@ public class Model extends Entity {
var18 = this.vertexLabels[var8];
for(var19 = 0; var19 < var18.length; ++var19) {
- var11 = var18[var19];
- this.verticesX[var11] -= Model_transformTempX;
- this.verticesY[var11] -= Model_transformTempY;
- this.verticesZ[var11] -= Model_transformTempZ;
- var12 = (var3 & 255) * 8;
+ var9 = var18[var19];
+ this.verticesX[var9] -= Model_transformTempX;
+ this.verticesY[var9] -= Model_transformTempY;
+ this.verticesZ[var9] -= Model_transformTempZ;
+ var10 = (var3 & 255) * 8;
int var13 = (var4 & 255) * 8;
int var14 = (var5 & 255) * 8;
int var15;
@@ -858,34 +828,33 @@ public class Model extends Entity {
if(var14 != 0) {
var15 = Model_sine[var14];
var16 = Model_cosine[var14];
- var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16;
- this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16;
- this.verticesX[var11] = var17;
+ var17 = var15 * this.verticesY[var9] + var16 * this.verticesX[var9] >> 16;
+ this.verticesY[var9] = var16 * this.verticesY[var9] - var15 * this.verticesX[var9] >> 16;
+ this.verticesX[var9] = var17;
}
- if(var12 != 0) {
- var15 = Model_sine[var12];
- var16 = Model_cosine[var12];
- var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16;
- this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16;
- this.verticesY[var11] = var17;
+ if(var10 != 0) {
+ var15 = Model_sine[var10];
+ var16 = Model_cosine[var10];
+ var17 = var16 * this.verticesY[var9] - var15 * this.verticesZ[var9] >> 16;
+ this.verticesZ[var9] = var15 * this.verticesY[var9] + var16 * this.verticesZ[var9] >> 16;
+ this.verticesY[var9] = var17;
}
if(var13 != 0) {
var15 = Model_sine[var13];
var16 = Model_cosine[var13];
- var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16;
- this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16;
- this.verticesX[var11] = var17;
+ var17 = var15 * this.verticesZ[var9] + var16 * this.verticesX[var9] >> 16;
+ this.verticesZ[var9] = var16 * this.verticesZ[var9] - var15 * this.verticesX[var9] >> 16;
+ this.verticesX[var9] = var17;
}
- this.verticesX[var11] += Model_transformTempX;
- this.verticesY[var11] += Model_transformTempY;
- this.verticesZ[var11] += Model_transformTempZ;
+ this.verticesX[var9] += Model_transformTempX;
+ this.verticesY[var9] += Model_transformTempY;
+ this.verticesZ[var9] += Model_transformTempZ;
}
}
}
-
} else if(var1 == 3) {
for(var7 = 0; var7 < var6; ++var7) {
var8 = var2[var7];
@@ -893,44 +862,41 @@ public class Model extends Entity {
var18 = this.vertexLabels[var8];
for(var19 = 0; var19 < var18.length; ++var19) {
- var11 = var18[var19];
- this.verticesX[var11] -= Model_transformTempX;
- this.verticesY[var11] -= Model_transformTempY;
- this.verticesZ[var11] -= Model_transformTempZ;
- this.verticesX[var11] = var3 * this.verticesX[var11] / 128;
- this.verticesY[var11] = var4 * this.verticesY[var11] / 128;
- this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128;
- this.verticesX[var11] += Model_transformTempX;
- this.verticesY[var11] += Model_transformTempY;
- this.verticesZ[var11] += Model_transformTempZ;
+ var9 = var18[var19];
+ this.verticesX[var9] -= Model_transformTempX;
+ this.verticesY[var9] -= Model_transformTempY;
+ this.verticesZ[var9] -= Model_transformTempZ;
+ this.verticesX[var9] = var3 * this.verticesX[var9] / 128;
+ this.verticesY[var9] = var4 * this.verticesY[var9] / 128;
+ this.verticesZ[var9] = var5 * this.verticesZ[var9] / 128;
+ this.verticesX[var9] += Model_transformTempX;
+ this.verticesY[var9] += Model_transformTempY;
+ this.verticesZ[var9] += Model_transformTempZ;
}
}
}
+ } else if(var1 == 5 && this.faceLabelsAlpha != null && this.faceAlphas != null) {
+ for(var7 = 0; var7 < var6; ++var7) {
+ var8 = var2[var7];
+ if(var8 < this.faceLabelsAlpha.length) {
+ var18 = this.faceLabelsAlpha[var8];
- } else if(var1 == 5) {
- if(this.faceLabelsAlpha != null && this.faceAlphas != null) {
- for(var7 = 0; var7 < var6; ++var7) {
- var8 = var2[var7];
- if(var8 < this.faceLabelsAlpha.length) {
- var18 = this.faceLabelsAlpha[var8];
-
- for(var19 = 0; var19 < var18.length; ++var19) {
- var11 = var18[var19];
- var12 = (this.faceAlphas[var11] & 255) + var3 * 8;
- if(var12 < 0) {
- var12 = 0;
- } else if(var12 > 255) {
- var12 = 255;
- }
-
- this.faceAlphas[var11] = (byte)var12;
+ for(var19 = 0; var19 < var18.length; ++var19) {
+ var9 = var18[var19];
+ var10 = (this.faceAlphas[var9] & 255) + var3 * 8;
+ if(var10 < 0) {
+ var10 = 0;
+ } else if(var10 > 255) {
+ var10 = 255;
}
+
+ this.faceAlphas[var9] = (byte)var10;
}
}
}
-
}
}
+
}
@ObfuscatedName("j")
@@ -1067,7 +1033,7 @@ public class Model extends Entity {
try {
this.draw0(false, false, false, 0L);
- } catch (Exception var25) {
+ } catch (Exception var24) {
;
}
@@ -1133,7 +1099,7 @@ public class Model extends Entity {
try {
this.draw0(false, false, false, 0L);
- } catch (Exception var26) {
+ } catch (Exception var25) {
;
}
@@ -1152,81 +1118,80 @@ public class Model extends Entity {
int var7;
int var8;
+ int var9;
int var10;
int var11;
int var12;
int var13;
+ int var14;
int var15;
int var16;
- int var18;
- int var27;
for(var7 = 0; var7 < this.indicesCount; ++var7) {
if(this.faceColors3[var7] != -2) {
var8 = this.indices1[var7];
- var27 = this.indices2[var7];
- var10 = this.indices3[var7];
- var11 = modelViewportXs[var8];
- var12 = modelViewportXs[var27];
- var13 = modelViewportXs[var10];
- int var14;
- if(!var1 || var11 != -5000 && var12 != -5000 && var13 != -5000) {
- if(var2 && NpcDefinition.method5164(modelViewportYs[var8], modelViewportYs[var27], modelViewportYs[var10], var11, var12, var13, var6)) {
+ var16 = this.indices2[var7];
+ var9 = this.indices3[var7];
+ var10 = modelViewportXs[var8];
+ var11 = modelViewportXs[var16];
+ var12 = modelViewportXs[var9];
+ int var17;
+ if(!var1 || var10 != -5000 && var11 != -5000 && var12 != -5000) {
+ if(var2 && NPCDefinition.method5164(modelViewportYs[var8], modelViewportYs[var16], modelViewportYs[var9], var10, var11, var12, var6)) {
Projectile.method2081(var4);
var2 = false;
}
- if((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var27]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var27]) > 0) {
+ if((var10 - var11) * (modelViewportYs[var9] - modelViewportYs[var16]) - (var12 - var11) * (modelViewportYs[var8] - modelViewportYs[var16]) > 0) {
__du_ad[var7] = false;
- if(var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var13 <= Rasterizer3D.Rasterizer3D_clipWidth) {
+ if(var10 >= 0 && var11 >= 0 && var12 >= 0 && var10 <= Rasterizer3D.Rasterizer3D_clipWidth && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth) {
__du_at[var7] = false;
} else {
__du_at[var7] = true;
}
- var14 = (__du_am[var8] + __du_am[var27] + __du_am[var10]) / 3 + this.radius;
- __du_ax[var14][__du_aa[var14]++] = var7;
+ var17 = (__du_am[var8] + __du_am[var16] + __du_am[var9]) / 3 + this.radius;
+ __du_ax[var17][__du_aa[var17]++] = var7;
}
} else {
- var14 = __du_an[var8];
- var15 = __du_an[var27];
- var16 = __du_an[var10];
- int var17 = __du_az[var8];
- var18 = __du_az[var27];
- int var19 = __du_az[var10];
+ var17 = __du_an[var8];
+ var13 = __du_an[var16];
+ var14 = __du_an[var9];
+ int var18 = __du_az[var8];
+ var15 = __du_az[var16];
+ int var19 = __du_az[var9];
int var20 = __du_au[var8];
- int var21 = __du_au[var27];
- int var22 = __du_au[var10];
- var14 -= var15;
- var16 -= var15;
- var17 -= var18;
- var19 -= var18;
+ int var21 = __du_au[var16];
+ int var22 = __du_au[var9];
+ var17 -= var13;
+ var14 -= var13;
+ var18 -= var15;
+ var19 -= var15;
var20 -= var21;
var22 -= var21;
- int var23 = var17 * var22 - var20 * var19;
- int var24 = var20 * var16 - var14 * var22;
- int var25 = var14 * var19 - var17 * var16;
- if(var15 * var23 + var18 * var24 + var21 * var25 > 0) {
+ int var23 = var18 * var22 - var20 * var19;
+ int var24 = var20 * var14 - var17 * var22;
+ int var25 = var17 * var19 - var18 * var14;
+ if(var13 * var23 + var15 * var24 + var21 * var25 > 0) {
__du_ad[var7] = true;
- int var26 = (__du_am[var8] + __du_am[var27] + __du_am[var10]) / 3 + this.radius;
+ int var26 = (__du_am[var8] + __du_am[var16] + __du_am[var9]) / 3 + this.radius;
__du_ax[var26][__du_aa[var26]++] = var7;
}
}
}
}
- int[] var9;
+ int[] var27;
if(this.faceRenderPriorities == null) {
for(var7 = this.diameter - 1; var7 >= 0; --var7) {
var8 = __du_aa[var7];
if(var8 > 0) {
- var9 = __du_ax[var7];
+ var27 = __du_ax[var7];
- for(var10 = 0; var10 < var8; ++var10) {
- this.__ag_236(var9[var10]);
+ for(var9 = 0; var9 < var8; ++var9) {
+ this.__ag_236(var27[var9]);
}
}
}
-
} else {
for(var7 = 0; var7 < 12; ++var7) {
__du_af[var7] = 0;
@@ -1236,19 +1201,19 @@ public class Model extends Entity {
for(var7 = this.diameter - 1; var7 >= 0; --var7) {
var8 = __du_aa[var7];
if(var8 > 0) {
- var9 = __du_ax[var7];
+ var27 = __du_ax[var7];
- for(var10 = 0; var10 < var8; ++var10) {
- var11 = var9[var10];
- byte var31 = this.faceRenderPriorities[var11];
- var13 = __du_af[var31]++;
- __du_ai[var31][var13] = var11;
- if(var31 < 10) {
- __du_bs[var31] += var7;
- } else if(var31 == 10) {
- __du_ba[var13] = var7;
+ for(var9 = 0; var9 < var8; ++var9) {
+ var10 = var27[var9];
+ byte var28 = this.faceRenderPriorities[var10];
+ var12 = __du_af[var28]++;
+ __du_ai[var28][var12] = var10;
+ if(var28 < 10) {
+ __du_bs[var28] += var7;
+ } else if(var28 == 10) {
+ __du_ba[var12] = var7;
} else {
- __du_bb[var13] = var7;
+ __du_bb[var12] = var7;
}
}
}
@@ -1264,103 +1229,103 @@ public class Model extends Entity {
var8 = (__du_bs[3] + __du_bs[4]) / (__du_af[3] + __du_af[4]);
}
- var27 = 0;
+ var16 = 0;
if(__du_af[6] > 0 || __du_af[8] > 0) {
- var27 = (__du_bs[8] + __du_bs[6]) / (__du_af[8] + __du_af[6]);
+ var16 = (__du_bs[8] + __du_bs[6]) / (__du_af[8] + __du_af[6]);
}
- var11 = 0;
- var12 = __du_af[10];
- int[] var28 = __du_ai[10];
- int[] var29 = __du_ba;
- if(var11 == var12) {
- var11 = 0;
- var12 = __du_af[11];
- var28 = __du_ai[11];
- var29 = __du_bb;
+ var10 = 0;
+ var11 = __du_af[10];
+ int[] var29 = __du_ai[10];
+ int[] var30 = __du_ba;
+ if(var10 == var11) {
+ var10 = 0;
+ var11 = __du_af[11];
+ var29 = __du_ai[11];
+ var30 = __du_bb;
}
- if(var11 < var12) {
- var10 = var29[var11];
+ if(var10 < var11) {
+ var9 = var30[var10];
} else {
- var10 = -1000;
+ var9 = -1000;
}
- for(var15 = 0; var15 < 10; ++var15) {
- while(var15 == 0 && var10 > var7) {
- this.__ag_236(var28[var11++]);
- if(var11 == var12 && var28 != __du_ai[11]) {
- var11 = 0;
- var12 = __du_af[11];
- var28 = __du_ai[11];
- var29 = __du_bb;
+ for(var13 = 0; var13 < 10; ++var13) {
+ while(var13 == 0 && var9 > var7) {
+ this.__ag_236(var29[var10++]);
+ if(var10 == var11 && var29 != __du_ai[11]) {
+ var10 = 0;
+ var11 = __du_af[11];
+ var29 = __du_ai[11];
+ var30 = __du_bb;
}
- if(var11 < var12) {
- var10 = var29[var11];
+ if(var10 < var11) {
+ var9 = var30[var10];
} else {
- var10 = -1000;
+ var9 = -1000;
}
}
- while(var15 == 3 && var10 > var8) {
- this.__ag_236(var28[var11++]);
- if(var11 == var12 && var28 != __du_ai[11]) {
- var11 = 0;
- var12 = __du_af[11];
- var28 = __du_ai[11];
- var29 = __du_bb;
+ while(var13 == 3 && var9 > var8) {
+ this.__ag_236(var29[var10++]);
+ if(var10 == var11 && var29 != __du_ai[11]) {
+ var10 = 0;
+ var11 = __du_af[11];
+ var29 = __du_ai[11];
+ var30 = __du_bb;
}
- if(var11 < var12) {
- var10 = var29[var11];
+ if(var10 < var11) {
+ var9 = var30[var10];
} else {
- var10 = -1000;
+ var9 = -1000;
}
}
- while(var15 == 5 && var10 > var27) {
- this.__ag_236(var28[var11++]);
- if(var11 == var12 && var28 != __du_ai[11]) {
- var11 = 0;
- var12 = __du_af[11];
- var28 = __du_ai[11];
- var29 = __du_bb;
+ while(var13 == 5 && var9 > var16) {
+ this.__ag_236(var29[var10++]);
+ if(var10 == var11 && var29 != __du_ai[11]) {
+ var10 = 0;
+ var11 = __du_af[11];
+ var29 = __du_ai[11];
+ var30 = __du_bb;
}
- if(var11 < var12) {
- var10 = var29[var11];
+ if(var10 < var11) {
+ var9 = var30[var10];
} else {
- var10 = -1000;
+ var9 = -1000;
}
}
- var16 = __du_af[var15];
- int[] var30 = __du_ai[var15];
+ var14 = __du_af[var13];
+ int[] var31 = __du_ai[var13];
- for(var18 = 0; var18 < var16; ++var18) {
- this.__ag_236(var30[var18]);
+ for(var15 = 0; var15 < var14; ++var15) {
+ this.__ag_236(var31[var15]);
}
}
- while(var10 != -1000) {
- this.__ag_236(var28[var11++]);
- if(var11 == var12 && var28 != __du_ai[11]) {
- var11 = 0;
- var28 = __du_ai[11];
- var12 = __du_af[11];
- var29 = __du_bb;
+ while(var9 != -1000) {
+ this.__ag_236(var29[var10++]);
+ if(var10 == var11 && var29 != __du_ai[11]) {
+ var10 = 0;
+ var29 = __du_ai[11];
+ var11 = __du_af[11];
+ var30 = __du_bb;
}
- if(var11 < var12) {
- var10 = var29[var11];
+ if(var10 < var11) {
+ var9 = var30[var10];
} else {
- var10 = -1000;
+ var9 = -1000;
}
}
-
}
}
+
}
@ObfuscatedName("ag")
@@ -1404,8 +1369,8 @@ public class Model extends Entity {
} else {
Rasterizer3D.method3037(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]);
}
-
}
+
}
@ObfuscatedName("aq")
@@ -1610,115 +1575,145 @@ public class Model extends Entity {
boolean var26 = var25 || this.__h > 0;
int var27 = ViewportMouse.ViewportMouse_x;
- int var29 = ViewportMouse.ViewportMouse_y;
- boolean var31 = ViewportMouse.ViewportMouse_isInViewport;
- boolean var34 = 0L != var9;
- boolean var35;
- if(var34) {
- var35 = (int)(var9 >>> 16 & 1L) == 1;
- var34 = !var35;
+ int var28 = ViewportMouse.ViewportMouse_y;
+ boolean var29 = ViewportMouse.ViewportMouse_isInViewport;
+ boolean var30 = 0L != var9;
+ boolean var31;
+ if(var30) {
+ var31 = (int)(var9 >>> 16 & 1L) == 1;
+ var30 = !var31;
}
- var35 = false;
- int var37;
- int var38;
- int var39;
- if(var34 && var31) {
- boolean var36 = false;
+ var31 = false;
+ int var32;
+ int var33;
+ int var34;
+ if(var30 && var29) {
+ boolean var35 = false;
if(__du_bx) {
- var36 = Decimator.method2491(this, var6, var7, var8);
+ var35 = Decimator.method2491(this, var6, var7, var8);
} else {
- var37 = var12 - var13;
- if(var37 <= 50) {
- var37 = 50;
+ var32 = var12 - var13;
+ if(var32 <= 50) {
+ var32 = 50;
}
if(var15 > 0) {
var16 /= var14;
- var17 /= var37;
+ var17 /= var32;
} else {
var17 /= var14;
- var16 /= var37;
+ var16 /= var32;
}
if(var18 > 0) {
var22 /= var14;
- var20 /= var37;
+ var20 /= var32;
} else {
var20 /= var14;
- var22 /= var37;
+ var22 /= var32;
}
- var38 = var27 - Rasterizer3D.Rasterizer3D_clipMidX;
- var39 = var29 - Rasterizer3D.Rasterizer3D_clipMidY;
- if(var38 > var16 && var38 < var17 && var39 > var22 && var39 < var20) {
- var36 = true;
- }
- }
-
- if(var36) {
- if(this.isSingleTile) {
- Projectile.method2081(var9);
- } else {
+ var33 = var27 - Rasterizer3D.Rasterizer3D_clipMidX;
+ var34 = var28 - Rasterizer3D.Rasterizer3D_clipMidY;
+ if(var33 > var16 && var33 < var17 && var34 > var22 && var34 < var20) {
var35 = true;
}
}
+
+ if(var35) {
+ if(this.isSingleTile) {
+ Projectile.method2081(var9);
+ } else {
+ var31 = true;
+ }
+ }
}
- int var47 = Rasterizer3D.Rasterizer3D_clipMidX;
- var37 = Rasterizer3D.Rasterizer3D_clipMidY;
- var38 = 0;
- var39 = 0;
+ int var42 = Rasterizer3D.Rasterizer3D_clipMidX;
+ var32 = Rasterizer3D.Rasterizer3D_clipMidY;
+ var33 = 0;
+ var34 = 0;
if(var1 != 0) {
- var38 = Model_sine[var1];
- var39 = Model_cosine[var1];
+ var33 = Model_sine[var1];
+ var34 = Model_cosine[var1];
}
- for(int var40 = 0; var40 < this.verticesCount; ++var40) {
- int var41 = this.verticesX[var40];
- int var42 = this.verticesY[var40];
- int var43 = this.verticesZ[var40];
- int var44;
+ for(int var36 = 0; var36 < this.verticesCount; ++var36) {
+ int var37 = this.verticesX[var36];
+ int var38 = this.verticesY[var36];
+ int var39 = this.verticesZ[var36];
+ int var40;
if(var1 != 0) {
- var44 = var43 * var38 + var41 * var39 >> 16;
- var43 = var43 * var39 - var41 * var38 >> 16;
- var41 = var44;
+ var40 = var39 * var33 + var37 * var34 >> 16;
+ var39 = var39 * var34 - var37 * var33 >> 16;
+ var37 = var40;
}
- var41 += var6;
- var42 += var7;
- var43 += var8;
- var44 = var43 * var4 + var5 * var41 >> 16;
- var43 = var5 * var43 - var41 * var4 >> 16;
- var41 = var44;
- var44 = var3 * var42 - var43 * var2 >> 16;
- var43 = var42 * var2 + var3 * var43 >> 16;
- __du_am[var40] = var43 - var12;
- if(var43 >= 50) {
- modelViewportXs[var40] = var41 * Rasterizer3D.Rasterizer3D_zoom / var43 + var47;
- modelViewportYs[var40] = var44 * Rasterizer3D.Rasterizer3D_zoom / var43 + var37;
+ var37 += var6;
+ var38 += var7;
+ var39 += var8;
+ var40 = var39 * var4 + var5 * var37 >> 16;
+ var39 = var5 * var39 - var37 * var4 >> 16;
+ var37 = var40;
+ var40 = var3 * var38 - var39 * var2 >> 16;
+ var39 = var38 * var2 + var3 * var39 >> 16;
+ __du_am[var36] = var39 - var12;
+ if(var39 >= 50) {
+ modelViewportXs[var36] = var37 * Rasterizer3D.Rasterizer3D_zoom / var39 + var42;
+ modelViewportYs[var36] = var40 * Rasterizer3D.Rasterizer3D_zoom / var39 + var32;
} else {
- modelViewportXs[var40] = -5000;
+ modelViewportXs[var36] = -5000;
var24 = true;
}
if(var26) {
- __du_an[var40] = var41;
- __du_az[var40] = var44;
- __du_au[var40] = var43;
+ __du_an[var36] = var37;
+ __du_az[var36] = var40;
+ __du_au[var36] = var39;
}
}
try {
- this.draw0(var24, var35, this.isSingleTile, var9);
- } catch (Exception var46) {
+ this.draw0(var24, var31, this.isSingleTile, var9);
+ } catch (Exception var41) {
;
}
-
}
}
}
}
}
+
+ }
+
+ static {
+ Model_sharedSequenceModel = new Model();
+ Model_sharedSequenceModelFaceAlphas = new byte[1];
+ Model_sharedSpotAnimationModel = new Model();
+ Model_sharedSpotAnimationModelFaceAlphas = new byte[1];
+ __du_at = new boolean[4700];
+ __du_ad = new boolean[4700];
+ modelViewportXs = new int[4700];
+ modelViewportYs = new int[4700];
+ __du_am = new int[4700];
+ __du_an = new int[4700];
+ __du_az = new int[4700];
+ __du_au = new int[4700];
+ __du_aa = new int[1600];
+ __du_ax = new int[1600][512];
+ __du_af = new int[12];
+ __du_ai = new int[12][2000];
+ __du_ba = new int[2000];
+ __du_bb = new int[2000];
+ __du_bs = new int[12];
+ __du_bq = new int[10];
+ __du_bn = new int[10];
+ __du_bk = new int[10];
+ __du_bx = true;
+ Model_sine = Rasterizer3D.Rasterizer3D_sine;
+ Model_cosine = Rasterizer3D.Rasterizer3D_cosine;
+ __du_br = Rasterizer3D.Rasterizer3D_colorPalette;
+ __du_bj = Rasterizer3D.__et_p;
}
}
diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java
index 22bf1387c8..707824861c 100644
--- a/runescape-client/src/main/java/ModelData.java
+++ b/runescape-client/src/main/java/ModelData.java
@@ -136,14 +136,6 @@ public class ModelData extends Entity {
@Export("__ak")
int __ak;
- static {
- __dw_aw = new int[10000];
- __dw_al = new int[10000];
- __dw_ab = 0;
- ModelData_sine = Rasterizer3D.Rasterizer3D_sine;
- ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine;
- }
-
ModelData() {
this.verticesCount = 0;
this.faceCount = 0;
@@ -439,61 +431,61 @@ public class ModelData extends Entity {
}
var26 = var11 + var9;
- int var28 = var26;
+ int var56 = var26;
if(var12 == 1) {
var26 += var10;
}
- int var29 = var26;
+ int var28 = var26;
var26 += var10;
- int var30 = var26;
+ int var29 = var26;
if(var13 == 255) {
var26 += var10;
}
- int var31 = var26;
+ int var30 = var26;
if(var15 == 1) {
var26 += var10;
}
- int var32 = var26;
+ int var31 = var26;
if(var17 == 1) {
var26 += var9;
}
- int var33 = var26;
+ int var32 = var26;
if(var14 == 1) {
var26 += var10;
}
- int var34 = var26;
+ int var33 = var26;
var26 += var21;
- int var35 = var26;
+ int var34 = var26;
if(var16 == 1) {
var26 += var10 * 2;
}
- int var36 = var26;
+ int var35 = var26;
var26 += var22;
- int var37 = var26;
+ int var36 = var26;
var26 += var10 * 2;
- int var38 = var26;
+ int var37 = var26;
var26 += var18;
- int var39 = var26;
+ int var38 = var26;
var26 += var19;
- int var40 = var26;
+ int var39 = var26;
var26 += var20;
- int var41 = var26;
+ int var40 = var26;
var26 += var23 * 6;
+ int var41 = var26;
+ var26 += var24 * 6;
int var42 = var26;
var26 += var24 * 6;
int var43 = var26;
- var26 += var24 * 6;
- int var44 = var26;
var26 += var24 * 2;
- int var45 = var26;
+ int var44 = var26;
var26 += var24;
- int var46 = var26;
+ int var45 = var26;
var26 += var24 * 2 + var25 * 2;
this.verticesCount = var9;
this.faceCount = var10;
@@ -542,151 +534,151 @@ public class ModelData extends Entity {
}
var2.index = var11;
- var3.index = var38;
- var4.index = var39;
- var5.index = var40;
- var6.index = var32;
+ var3.index = var37;
+ var4.index = var38;
+ var5.index = var39;
+ var6.index = var31;
+ int var46 = 0;
+ int var47 = 0;
int var48 = 0;
- int var49 = 0;
- int var50 = 0;
+ int var49;
+ int var50;
int var51;
int var52;
int var53;
- int var54;
- int var55;
- for(var51 = 0; var51 < var9; ++var51) {
- var52 = var2.readUnsignedByte();
+ for(var49 = 0; var49 < var9; ++var49) {
+ var50 = var2.readUnsignedByte();
+ var51 = 0;
+ if((var50 & 1) != 0) {
+ var51 = var3.__ab_306();
+ }
+
+ var52 = 0;
+ if((var50 & 2) != 0) {
+ var52 = var4.__ab_306();
+ }
+
var53 = 0;
- if((var52 & 1) != 0) {
- var53 = var3.__ab_306();
+ if((var50 & 4) != 0) {
+ var53 = var5.__ab_306();
}
- var54 = 0;
- if((var52 & 2) != 0) {
- var54 = var4.__ab_306();
- }
-
- var55 = 0;
- if((var52 & 4) != 0) {
- var55 = var5.__ab_306();
- }
-
- this.verticesX[var51] = var48 + var53;
- this.verticesY[var51] = var49 + var54;
- this.verticesZ[var51] = var50 + var55;
- var48 = this.verticesX[var51];
- var49 = this.verticesY[var51];
- var50 = this.verticesZ[var51];
+ this.verticesX[var49] = var46 + var51;
+ this.verticesY[var49] = var47 + var52;
+ this.verticesZ[var49] = var48 + var53;
+ var46 = this.verticesX[var49];
+ var47 = this.verticesY[var49];
+ var48 = this.verticesZ[var49];
if(var17 == 1) {
- this.__h[var51] = var6.readUnsignedByte();
+ this.__h[var49] = var6.readUnsignedByte();
}
}
- var2.index = var37;
- var3.index = var28;
- var4.index = var30;
- var5.index = var33;
- var6.index = var31;
- var7.index = var35;
- var8.index = var36;
+ var2.index = var36;
+ var3.index = var56;
+ var4.index = var29;
+ var5.index = var32;
+ var6.index = var30;
+ var7.index = var34;
+ var8.index = var35;
- for(var51 = 0; var51 < var10; ++var51) {
- this.faceColors[var51] = (short)var2.__ag_302();
+ for(var49 = 0; var49 < var10; ++var49) {
+ this.faceColors[var49] = (short)var2.__ag_302();
if(var12 == 1) {
- this.__e[var51] = var3.readByte();
+ this.__e[var49] = var3.readByte();
}
if(var13 == 255) {
- this.__x[var51] = var4.readByte();
+ this.__x[var49] = var4.readByte();
}
if(var14 == 1) {
- this.faceAlphas[var51] = var5.readByte();
+ this.faceAlphas[var49] = var5.readByte();
}
if(var15 == 1) {
- this.__b[var51] = var6.readUnsignedByte();
+ this.__b[var49] = var6.readUnsignedByte();
}
if(var16 == 1) {
- this.faceTextures[var51] = (short)(var7.__ag_302() - 1);
+ this.faceTextures[var49] = (short)(var7.__ag_302() - 1);
}
- if(this.textureCoords != null && this.faceTextures[var51] != -1) {
- this.textureCoords[var51] = (byte)(var8.readUnsignedByte() - 1);
+ if(this.textureCoords != null && this.faceTextures[var49] != -1) {
+ this.textureCoords[var49] = (byte)(var8.readUnsignedByte() - 1);
}
}
- var2.index = var34;
- var3.index = var29;
+ var2.index = var33;
+ var3.index = var28;
+ var49 = 0;
+ var50 = 0;
var51 = 0;
var52 = 0;
- var53 = 0;
- var54 = 0;
- int var56;
- for(var55 = 0; var55 < var10; ++var55) {
- var56 = var3.readUnsignedByte();
- if(var56 == 1) {
- var51 = var2.__ab_306() + var54;
- var52 = var2.__ab_306() + var51;
- var53 = var2.__ab_306() + var52;
- var54 = var53;
- this.indices1[var55] = var51;
- this.indices2[var55] = var52;
- this.indices3[var55] = var53;
+ int var54;
+ for(var53 = 0; var53 < var10; ++var53) {
+ var54 = var3.readUnsignedByte();
+ if(var54 == 1) {
+ var49 = var2.__ab_306() + var52;
+ var50 = var2.__ab_306() + var49;
+ var51 = var2.__ab_306() + var50;
+ var52 = var51;
+ this.indices1[var53] = var49;
+ this.indices2[var53] = var50;
+ this.indices3[var53] = var51;
}
- if(var56 == 2) {
- var52 = var53;
- var53 = var2.__ab_306() + var54;
- var54 = var53;
- this.indices1[var55] = var51;
- this.indices2[var55] = var52;
- this.indices3[var55] = var53;
+ if(var54 == 2) {
+ var50 = var51;
+ var51 = var2.__ab_306() + var52;
+ var52 = var51;
+ this.indices1[var53] = var49;
+ this.indices2[var53] = var50;
+ this.indices3[var53] = var51;
}
- if(var56 == 3) {
- var51 = var53;
- var53 = var2.__ab_306() + var54;
- var54 = var53;
- this.indices1[var55] = var51;
- this.indices2[var55] = var52;
- this.indices3[var55] = var53;
+ if(var54 == 3) {
+ var49 = var51;
+ var51 = var2.__ab_306() + var52;
+ var52 = var51;
+ this.indices1[var53] = var49;
+ this.indices2[var53] = var50;
+ this.indices3[var53] = var51;
}
- if(var56 == 4) {
- int var57 = var51;
- var51 = var52;
- var52 = var57;
- var53 = var2.__ab_306() + var54;
- var54 = var53;
- this.indices1[var55] = var51;
- this.indices2[var55] = var57;
- this.indices3[var55] = var53;
+ if(var54 == 4) {
+ int var55 = var49;
+ var49 = var50;
+ var50 = var55;
+ var51 = var2.__ab_306() + var52;
+ var52 = var51;
+ this.indices1[var53] = var49;
+ this.indices2[var53] = var55;
+ this.indices3[var53] = var51;
}
}
- var2.index = var41;
- var3.index = var42;
- var4.index = var43;
- var5.index = var44;
- var6.index = var45;
- var7.index = var46;
+ var2.index = var40;
+ var3.index = var41;
+ var4.index = var42;
+ var5.index = var43;
+ var6.index = var44;
+ var7.index = var45;
- for(var55 = 0; var55 < var11; ++var55) {
- var56 = this.textureRenderTypes[var55] & 255;
- if(var56 == 0) {
- this.texTriangleX[var55] = (short)var2.__ag_302();
- this.texTriangleY[var55] = (short)var2.__ag_302();
- this.texTriangleZ[var55] = (short)var2.__ag_302();
+ for(var53 = 0; var53 < var11; ++var53) {
+ var54 = this.textureRenderTypes[var53] & 255;
+ if(var54 == 0) {
+ this.texTriangleX[var53] = (short)var2.__ag_302();
+ this.texTriangleY[var53] = (short)var2.__ag_302();
+ this.texTriangleZ[var53] = (short)var2.__ag_302();
}
}
var2.index = var26;
- var55 = var2.readUnsignedByte();
- if(var55 != 0) {
+ var53 = var2.readUnsignedByte();
+ if(var53 != 0) {
new ModelData0();
var2.__ag_302();
var2.__ag_302();
@@ -720,45 +712,45 @@ public class ModelData extends Entity {
int var19 = var4.__ag_302();
int var20 = var4.__ag_302();
byte var21 = 0;
- int var45 = var21 + var9;
- int var23 = var45;
- var45 += var10;
- int var24 = var45;
+ int var22 = var21 + var9;
+ int var23 = var22;
+ var22 += var10;
+ int var24 = var22;
if(var13 == 255) {
- var45 += var10;
+ var22 += var10;
}
- int var25 = var45;
+ int var25 = var22;
if(var15 == 1) {
- var45 += var10;
+ var22 += var10;
}
- int var26 = var45;
+ int var26 = var22;
if(var12 == 1) {
- var45 += var10;
+ var22 += var10;
}
- int var27 = var45;
+ int var27 = var22;
if(var16 == 1) {
- var45 += var9;
+ var22 += var9;
}
- int var28 = var45;
+ int var28 = var22;
if(var14 == 1) {
- var45 += var10;
+ var22 += var10;
}
- int var29 = var45;
- var45 += var20;
- int var30 = var45;
- var45 += var10 * 2;
- int var31 = var45;
- var45 += var11 * 6;
- int var32 = var45;
- var45 += var17;
- int var33 = var45;
- var45 += var18;
- int var10000 = var45 + var19;
+ int var29 = var22;
+ var22 += var20;
+ int var30 = var22;
+ var22 += var10 * 2;
+ int var31 = var22;
+ var22 += var11 * 6;
+ int var32 = var22;
+ var22 += var17;
+ int var33 = var22;
+ var22 += var18;
+ int var10000 = var22 + var19;
this.verticesCount = var9;
this.faceCount = var10;
this.__z = var11;
@@ -803,7 +795,7 @@ public class ModelData extends Entity {
var4.index = var21;
var5.index = var32;
var6.index = var33;
- var7.index = var45;
+ var7.index = var22;
var8.index = var27;
int var35 = 0;
int var36 = 0;
@@ -946,7 +938,7 @@ public class ModelData extends Entity {
}
if(this.textureCoords != null) {
- boolean var46 = false;
+ boolean var45 = false;
for(var43 = 0; var43 < var10; ++var43) {
var44 = this.textureCoords[var43] & 255;
@@ -954,12 +946,12 @@ public class ModelData extends Entity {
if(this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) {
this.textureCoords[var43] = -1;
} else {
- var46 = true;
+ var45 = true;
}
}
}
- if(!var46) {
+ if(!var45) {
this.textureCoords = null;
}
}
@@ -1289,8 +1281,8 @@ public class ModelData extends Entity {
this.faceTextures[var3] = var2;
}
}
-
}
+
}
@ObfuscatedName("t")
@@ -1394,8 +1386,8 @@ public class ModelData extends Entity {
var17.__q = var13;
}
}
-
}
+
}
@ObfuscatedName("b")
@@ -1449,6 +1441,7 @@ public class ModelData extends Entity {
this.isBoundsCalculated = true;
}
+
}
@ObfuscatedName("v")
@@ -1510,113 +1503,113 @@ public class ModelData extends Entity {
}
}
- for(int var16 = 0; var16 < this.faceCount; ++var16) {
- byte var17;
- if(this.__e == null) {
- var17 = 0;
- } else {
- var17 = this.__e[var16];
- }
-
+ for(int var17 = 0; var17 < this.faceCount; ++var17) {
byte var18;
- if(this.faceAlphas == null) {
+ if(this.__e == null) {
var18 = 0;
} else {
- var18 = this.faceAlphas[var16];
+ var18 = this.__e[var17];
+ }
+
+ byte var19;
+ if(this.faceAlphas == null) {
+ var19 = 0;
+ } else {
+ var19 = this.faceAlphas[var17];
}
short var12;
if(this.faceTextures == null) {
var12 = -1;
} else {
- var12 = this.faceTextures[var16];
+ var12 = this.faceTextures[var17];
}
- if(var18 == -2) {
- var17 = 3;
+ if(var19 == -2) {
+ var18 = 3;
}
- if(var18 == -1) {
- var17 = 2;
+ if(var19 == -1) {
+ var18 = 2;
}
VertexNormal var13;
int var14;
- FaceNormal var19;
+ FaceNormal var15;
if(var12 == -1) {
- if(var17 != 0) {
- if(var17 == 1) {
- var19 = this.faceNormals[var16];
- var14 = (var4 * var19.__f + var5 * var19.__q + var3 * var19.__m) / (var7 / 2 + var7) + var1;
- var8.faceColors1[var16] = method2802(this.faceColors[var16] & '\uffff', var14);
- var8.faceColors3[var16] = -1;
- } else if(var17 == 3) {
- var8.faceColors1[var16] = 128;
- var8.faceColors3[var16] = -1;
+ if(var18 != 0) {
+ if(var18 == 1) {
+ var15 = this.faceNormals[var17];
+ var14 = (var4 * var15.__f + var5 * var15.__q + var3 * var15.__m) / (var7 / 2 + var7) + var1;
+ var8.faceColors1[var17] = method2802(this.faceColors[var17] & '\uffff', var14);
+ var8.faceColors3[var17] = -1;
+ } else if(var18 == 3) {
+ var8.faceColors1[var17] = 128;
+ var8.faceColors3[var17] = -1;
} else {
- var8.faceColors3[var16] = -2;
+ var8.faceColors3[var17] = -2;
}
} else {
- int var15 = this.faceColors[var16] & '\uffff';
- if(this.__ag != null && this.__ag[this.indices1[var16]] != null) {
- var13 = this.__ag[this.indices1[var16]];
+ int var16 = this.faceColors[var17] & '\uffff';
+ if(this.__ag != null && this.__ag[this.indices1[var17]] != null) {
+ var13 = this.__ag[this.indices1[var17]];
} else {
- var13 = this.__v[this.indices1[var16]];
+ var13 = this.__v[this.indices1[var17]];
}
var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
- var8.faceColors1[var16] = method2802(var15, var14);
- if(this.__ag != null && this.__ag[this.indices2[var16]] != null) {
- var13 = this.__ag[this.indices2[var16]];
+ var8.faceColors1[var17] = method2802(var16, var14);
+ if(this.__ag != null && this.__ag[this.indices2[var17]] != null) {
+ var13 = this.__ag[this.indices2[var17]];
} else {
- var13 = this.__v[this.indices2[var16]];
+ var13 = this.__v[this.indices2[var17]];
}
var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
- var8.faceColors2[var16] = method2802(var15, var14);
- if(this.__ag != null && this.__ag[this.indices3[var16]] != null) {
- var13 = this.__ag[this.indices3[var16]];
+ var8.faceColors2[var17] = method2802(var16, var14);
+ if(this.__ag != null && this.__ag[this.indices3[var17]] != null) {
+ var13 = this.__ag[this.indices3[var17]];
} else {
- var13 = this.__v[this.indices3[var16]];
+ var13 = this.__v[this.indices3[var17]];
}
var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
- var8.faceColors3[var16] = method2802(var15, var14);
+ var8.faceColors3[var17] = method2802(var16, var14);
}
- } else if(var17 != 0) {
- if(var17 == 1) {
- var19 = this.faceNormals[var16];
- var14 = (var4 * var19.__f + var5 * var19.__q + var3 * var19.__m) / (var7 / 2 + var7) + var1;
- var8.faceColors1[var16] = method2803(var14);
- var8.faceColors3[var16] = -1;
+ } else if(var18 != 0) {
+ if(var18 == 1) {
+ var15 = this.faceNormals[var17];
+ var14 = (var4 * var15.__f + var5 * var15.__q + var3 * var15.__m) / (var7 / 2 + var7) + var1;
+ var8.faceColors1[var17] = method2803(var14);
+ var8.faceColors3[var17] = -1;
} else {
- var8.faceColors3[var16] = -2;
+ var8.faceColors3[var17] = -2;
}
} else {
- if(this.__ag != null && this.__ag[this.indices1[var16]] != null) {
- var13 = this.__ag[this.indices1[var16]];
+ if(this.__ag != null && this.__ag[this.indices1[var17]] != null) {
+ var13 = this.__ag[this.indices1[var17]];
} else {
- var13 = this.__v[this.indices1[var16]];
+ var13 = this.__v[this.indices1[var17]];
}
var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
- var8.faceColors1[var16] = method2803(var14);
- if(this.__ag != null && this.__ag[this.indices2[var16]] != null) {
- var13 = this.__ag[this.indices2[var16]];
+ var8.faceColors1[var17] = method2803(var14);
+ if(this.__ag != null && this.__ag[this.indices2[var17]] != null) {
+ var13 = this.__ag[this.indices2[var17]];
} else {
- var13 = this.__v[this.indices2[var16]];
+ var13 = this.__v[this.indices2[var17]];
}
var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
- var8.faceColors2[var16] = method2803(var14);
- if(this.__ag != null && this.__ag[this.indices3[var16]] != null) {
- var13 = this.__ag[this.indices3[var16]];
+ var8.faceColors2[var17] = method2803(var14);
+ if(this.__ag != null && this.__ag[this.indices3[var17]] != null) {
+ var13 = this.__ag[this.indices3[var17]];
} else {
- var13 = this.__v[this.indices3[var16]];
+ var13 = this.__v[this.indices3[var17]];
}
var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
- var8.faceColors3[var16] = method2803(var14);
+ var8.faceColors3[var17] = method2803(var14);
}
}
@@ -1731,8 +1724,8 @@ public class ModelData extends Entity {
var1.__e[var9] = 2;
}
}
-
}
+
}
@ObfuscatedName("ag")
@@ -1757,4 +1750,12 @@ public class ModelData extends Entity {
return var0;
}
+
+ static {
+ __dw_aw = new int[10000];
+ __dw_al = new int[10000];
+ __dw_ab = 0;
+ ModelData_sine = Rasterizer3D.Rasterizer3D_sine;
+ ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine;
+ }
}
diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java
index e43304e3e5..c1473ee44b 100644
--- a/runescape-client/src/main/java/MouseHandler.java
+++ b/runescape-client/src/main/java/MouseHandler.java
@@ -130,27 +130,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
@Export("oculusOrbFocalPointX")
static int oculusOrbFocalPointX;
- static {
- MouseHandler_instance = new MouseHandler();
- MouseHandler_idleCycles = 0;
- MouseHandler_currentButton0 = 0;
- MouseHandler_x0 = -1;
- MouseHandler_y0 = -1;
- MouseHandler_millis0 = -1L;
- MouseHandler_currentButton = 0;
- MouseHandler_x = 0;
- MouseHandler_y = 0;
- MouseHandler_millis = 0L;
- MouseHandler_lastButton0 = 0;
- MouseHandler_lastPressedX0 = 0;
- MouseHandler_lastPressedY0 = 0;
- MouseHandler_lastPressedTimeMillis0 = 0L;
- MouseHandler_lastButton = 0;
- MouseHandler_lastPressedX = 0;
- MouseHandler_lastPressedY = 0;
- MouseHandler_lastPressedTimeMillis = 0L;
- }
-
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "(Ljava/awt/event/MouseEvent;I)I",
@@ -290,4 +269,25 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
Messages.method2200();
class196.method3740();
}
+
+ static {
+ MouseHandler_instance = new MouseHandler();
+ MouseHandler_idleCycles = 0;
+ MouseHandler_currentButton0 = 0;
+ MouseHandler_x0 = -1;
+ MouseHandler_y0 = -1;
+ MouseHandler_millis0 = -1L;
+ MouseHandler_currentButton = 0;
+ MouseHandler_x = 0;
+ MouseHandler_y = 0;
+ MouseHandler_millis = 0L;
+ MouseHandler_lastButton0 = 0;
+ MouseHandler_lastPressedX0 = 0;
+ MouseHandler_lastPressedY0 = 0;
+ MouseHandler_lastPressedTimeMillis0 = 0L;
+ MouseHandler_lastButton = 0;
+ MouseHandler_lastPressedX = 0;
+ MouseHandler_lastPressedY = 0;
+ MouseHandler_lastPressedTimeMillis = 0L;
+ }
}
diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java
index 24c1743159..33c4b02b91 100644
--- a/runescape-client/src/main/java/MouseRecorder.java
+++ b/runescape-client/src/main/java/MouseRecorder.java
@@ -55,6 +55,7 @@ public class MouseRecorder implements Runnable {
public void run() {
for(; this.isRunning; class203.method4010(50L)) {
Object var1 = this.lock;
+ Object var2 = this.lock;
synchronized(this.lock) {
if(this.index < 500) {
this.xs[this.index] = MouseHandler.MouseHandler_x;
@@ -79,135 +80,138 @@ public class MouseRecorder implements Runnable {
int var8;
int var9;
int var10;
- int var14;
- int var26;
+ int var11;
+ int var12;
+ int var17;
if(var5 != 0L) {
var7 = class65.scene.getObjectFlags(var0, var1, var2, var5);
var8 = var7 >> 6 & 3;
var9 = var7 & 31;
var10 = var3;
- boolean var12 = var5 != 0L;
- if(var12) {
- boolean var13 = (int)(var5 >>> 16 & 1L) == 1;
- var12 = !var13;
+ boolean var13 = var5 != 0L;
+ if(var13) {
+ boolean var14 = (int)(var5 >>> 16 & 1L) == 1;
+ var13 = !var14;
}
- if(var12) {
+ if(var13) {
var10 = var4;
}
- int[] var19 = WidgetGroupParent.sceneMinimapSprite.pixels;
- var26 = var1 * 4 + (103 - var2) * 2048 + 24624;
- var14 = HitSplatDefinition.method4972(var5);
- ObjectDefinition var15 = class50.getObjectDefinition(var14);
+ int[] var20 = WidgetGroupParent.sceneMinimapSprite.pixels;
+ var12 = var1 * 4 + (103 - var2) * 2048 + 24624;
+ var11 = HitSplatDefinition.method4972(var5);
+ ObjectDefinition var15 = class50.getObjectDefinition(var11);
if(var15.mapSceneId != -1) {
IndexedSprite var16 = class192.mapSceneSprites[var15.mapSceneId];
if(var16 != null) {
- int var17 = (var15.sizeX * 4 - var16.subWidth) / 2;
+ var17 = (var15.sizeX * 4 - var16.subWidth) / 2;
int var18 = (var15.sizeY * 4 - var16.subHeight) / 2;
var16.__q_496(var1 * 4 + var17 + 48, (104 - var2 - var15.sizeY) * 4 + var18 + 48);
}
} else {
if(var9 == 0 || var9 == 2) {
if(var8 == 0) {
- var19[var26] = var10;
- var19[var26 + 512] = var10;
- var19[var26 + 1024] = var10;
- var19[var26 + 1536] = var10;
+ var20[var12] = var10;
+ var20[var12 + 512] = var10;
+ var20[var12 + 1024] = var10;
+ var20[var12 + 1536] = var10;
} else if(var8 == 1) {
- var19[var26] = var10;
- var19[var26 + 1] = var10;
- var19[var26 + 2] = var10;
- var19[var26 + 3] = var10;
+ var20[var12] = var10;
+ var20[var12 + 1] = var10;
+ var20[var12 + 2] = var10;
+ var20[var12 + 3] = var10;
} else if(var8 == 2) {
- var19[var26 + 3] = var10;
- var19[var26 + 512 + 3] = var10;
- var19[var26 + 1024 + 3] = var10;
- var19[var26 + 1536 + 3] = var10;
+ var20[var12 + 3] = var10;
+ var20[var12 + 512 + 3] = var10;
+ var20[var12 + 1024 + 3] = var10;
+ var20[var12 + 1536 + 3] = var10;
} else if(var8 == 3) {
- var19[var26 + 1536] = var10;
- var19[var26 + 1536 + 1] = var10;
- var19[var26 + 1536 + 2] = var10;
- var19[var26 + 1536 + 3] = var10;
+ var20[var12 + 1536] = var10;
+ var20[var12 + 1536 + 1] = var10;
+ var20[var12 + 1536 + 2] = var10;
+ var20[var12 + 1536 + 3] = var10;
}
}
if(var9 == 3) {
if(var8 == 0) {
- var19[var26] = var10;
+ var20[var12] = var10;
} else if(var8 == 1) {
- var19[var26 + 3] = var10;
+ var20[var12 + 3] = var10;
} else if(var8 == 2) {
- var19[var26 + 1536 + 3] = var10;
+ var20[var12 + 1536 + 3] = var10;
} else if(var8 == 3) {
- var19[var26 + 1536] = var10;
+ var20[var12 + 1536] = var10;
}
}
if(var9 == 2) {
if(var8 == 3) {
- var19[var26] = var10;
- var19[var26 + 512] = var10;
- var19[var26 + 1024] = var10;
- var19[var26 + 1536] = var10;
+ var20[var12] = var10;
+ var20[var12 + 512] = var10;
+ var20[var12 + 1024] = var10;
+ var20[var12 + 1536] = var10;
} else if(var8 == 0) {
- var19[var26] = var10;
- var19[var26 + 1] = var10;
- var19[var26 + 2] = var10;
- var19[var26 + 3] = var10;
+ var20[var12] = var10;
+ var20[var12 + 1] = var10;
+ var20[var12 + 2] = var10;
+ var20[var12 + 3] = var10;
} else if(var8 == 1) {
- var19[var26 + 3] = var10;
- var19[var26 + 512 + 3] = var10;
- var19[var26 + 1024 + 3] = var10;
- var19[var26 + 1536 + 3] = var10;
+ var20[var12 + 3] = var10;
+ var20[var12 + 512 + 3] = var10;
+ var20[var12 + 1024 + 3] = var10;
+ var20[var12 + 1536 + 3] = var10;
} else if(var8 == 2) {
- var19[var26 + 1536] = var10;
- var19[var26 + 1536 + 1] = var10;
- var19[var26 + 1536 + 2] = var10;
- var19[var26 + 1536 + 3] = var10;
+ var20[var12 + 1536] = var10;
+ var20[var12 + 1536 + 1] = var10;
+ var20[var12 + 1536 + 2] = var10;
+ var20[var12 + 1536 + 3] = var10;
}
}
}
}
var5 = class65.scene.__ay_246(var0, var1, var2);
+ ObjectDefinition var19;
+ IndexedSprite var21;
if(0L != var5) {
var7 = class65.scene.getObjectFlags(var0, var1, var2, var5);
var8 = var7 >> 6 & 3;
var9 = var7 & 31;
var10 = HitSplatDefinition.method4972(var5);
- ObjectDefinition var20 = class50.getObjectDefinition(var10);
- if(var20.mapSceneId != -1) {
- IndexedSprite var28 = class192.mapSceneSprites[var20.mapSceneId];
- if(var28 != null) {
- var26 = (var20.sizeX * 4 - var28.subWidth) / 2;
- var14 = (var20.sizeY * 4 - var28.subHeight) / 2;
- var28.__q_496(var26 + var1 * 4 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48);
+ var19 = class50.getObjectDefinition(var10);
+ if(var19.mapSceneId != -1) {
+ var21 = class192.mapSceneSprites[var19.mapSceneId];
+ if(var21 != null) {
+ var12 = (var19.sizeX * 4 - var21.subWidth) / 2;
+ var11 = (var19.sizeY * 4 - var21.subHeight) / 2;
+ var21.__q_496(var12 + var1 * 4 + 48, (104 - var2 - var19.sizeY) * 4 + var11 + 48);
}
} else if(var9 == 9) {
- int var25 = 15658734;
- boolean var27 = 0L != var5;
- if(var27) {
- boolean var23 = (int)(var5 >>> 16 & 1L) == 1;
- var27 = !var23;
+ int var22 = 15658734;
+ boolean var23 = 0L != var5;
+ if(var23) {
+ boolean var24 = (int)(var5 >>> 16 & 1L) == 1;
+ var23 = !var24;
}
- if(var27) {
- var25 = 15597568;
+ if(var23) {
+ var22 = 15597568;
}
- int[] var24 = WidgetGroupParent.sceneMinimapSprite.pixels;
- int var29 = var1 * 4 + (103 - var2) * 2048 + 24624;
+ int[] var26 = WidgetGroupParent.sceneMinimapSprite.pixels;
+ var17 = var1 * 4 + (103 - var2) * 2048 + 24624;
if(var8 != 0 && var8 != 2) {
- var24[var29] = var25;
- var24[var29 + 1 + 512] = var25;
- var24[var29 + 1024 + 2] = var25;
- var24[var29 + 1536 + 3] = var25;
+ var26[var17] = var22;
+ var26[var17 + 1 + 512] = var22;
+ var26[var17 + 1024 + 2] = var22;
+ var26[var17 + 1536 + 3] = var22;
} else {
- var24[var29 + 1536] = var25;
- var24[var29 + 1 + 1024] = var25;
- var24[var29 + 512 + 2] = var25;
- var24[var29 + 3] = var25;
+ var26[var17 + 1536] = var22;
+ var26[var17 + 1 + 1024] = var22;
+ var26[var17 + 512 + 2] = var22;
+ var26[var17 + 3] = var22;
}
}
}
@@ -215,13 +219,13 @@ public class MouseRecorder implements Runnable {
var5 = class65.scene.getFloorDecorationTag(var0, var1, var2);
if(var5 != 0L) {
var7 = HitSplatDefinition.method4972(var5);
- ObjectDefinition var21 = class50.getObjectDefinition(var7);
- if(var21.mapSceneId != -1) {
- IndexedSprite var22 = class192.mapSceneSprites[var21.mapSceneId];
- if(var22 != null) {
- var10 = (var21.sizeX * 4 - var22.subWidth) / 2;
- int var11 = (var21.sizeY * 4 - var22.subHeight) / 2;
- var22.__q_496(var10 + var1 * 4 + 48, var11 + (104 - var2 - var21.sizeY) * 4 + 48);
+ var19 = class50.getObjectDefinition(var7);
+ if(var19.mapSceneId != -1) {
+ var21 = class192.mapSceneSprites[var19.mapSceneId];
+ if(var21 != null) {
+ var10 = (var19.sizeX * 4 - var21.subWidth) / 2;
+ int var25 = (var19.sizeY * 4 - var21.subHeight) / 2;
+ var21.__q_496(var10 + var1 * 4 + 48, var25 + (104 - var2 - var19.sizeY) * 4 + 48);
}
}
}
@@ -243,15 +247,15 @@ public class MouseRecorder implements Runnable {
}
String var4 = var0.substring(0, var3);
- int var6 = class16.method187(var1, var2 - 1);
- String var5;
- if(var6 < 999999999) {
- var5 = Integer.toString(var6);
+ int var5 = class16.method187(var1, var2 - 1);
+ String var6;
+ if(var5 < 999999999) {
+ var6 = Integer.toString(var5);
} else {
- var5 = "*";
+ var6 = "*";
}
- var0 = var4 + var5 + var0.substring(var3 + 2);
+ var0 = var4 + var6 + var0.substring(var3 + 2);
}
}
}
@@ -284,94 +288,102 @@ public class MouseRecorder implements Runnable {
NetFileRequest.method4554(var1, var2, var9, var10, Client.mapIcons[var8], var4);
}
- int var11;
- int var12;
- for(var8 = 0; var8 < 104; ++var8) {
+ var8 = 0;
+
+ while(true) {
+ int var11;
+ int var12;
+ if(var8 >= 104) {
+ for(var8 = 0; var8 < Client.npcCount; ++var8) {
+ NPC var17 = Client.npcs[Client.npcIndices[var8]];
+ if(var17 != null && var17.isVisible()) {
+ NPCDefinition var14 = var17.definition;
+ if(var14 != null && var14.transforms != null) {
+ var14 = var14.transform();
+ }
+
+ if(var14 != null && var14.drawMapDot && var14.isInteractable) {
+ var11 = var17.x / 32 - Canvas.localPlayer.x / 32;
+ var12 = var17.y / 32 - Canvas.localPlayer.y / 32;
+ NetFileRequest.method4554(var1, var2, var11, var12, class39.mapDotSprites[1], var4);
+ }
+ }
+ }
+
+ var8 = Players.Players_count;
+ int[] var18 = Players.Players_indices;
+
+ Player var19;
+ for(var10 = 0; var10 < var8; ++var10) {
+ var19 = Client.players[var18[var10]];
+ if(var19 != null && var19.isVisible() && !var19.isHidden && var19 != Canvas.localPlayer) {
+ var12 = var19.x / 32 - Canvas.localPlayer.x / 32;
+ int var15 = var19.y / 32 - Canvas.localPlayer.y / 32;
+ boolean var16 = false;
+ if(Canvas.localPlayer.team != 0 && var19.team != 0 && var19.team == Canvas.localPlayer.team) {
+ var16 = true;
+ }
+
+ if(var19.isFriend()) {
+ NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[3], var4);
+ } else if(var16) {
+ NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[4], var4);
+ } else if(var19.isClanMember()) {
+ NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[5], var4);
+ } else {
+ NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[2], var4);
+ }
+ }
+ }
+
+ if(Client.hintArrowType != 0 && Client.cycle % 20 < 10) {
+ if(Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) {
+ NPC var20 = Client.npcs[Client.hintArrowNpcIndex];
+ if(var20 != null) {
+ var11 = var20.x / 32 - Canvas.localPlayer.x / 32;
+ var12 = var20.y / 32 - Canvas.localPlayer.y / 32;
+ UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4);
+ }
+ }
+
+ if(Client.hintArrowType == 2) {
+ var10 = Client.hintArrowX * 4 - class50.baseX * 4 + 2 - Canvas.localPlayer.x / 32;
+ var11 = Client.hintArrowY * 4 - GraphicsObject.baseY * 4 + 2 - Canvas.localPlayer.y / 32;
+ UserComparator5.worldToMinimap(var1, var2, var10, var11, class16.mapMarkerSprites[1], var4);
+ }
+
+ if(Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) {
+ var19 = Client.players[Client.hintArrowPlayerIndex];
+ if(var19 != null) {
+ var11 = var19.x / 32 - Canvas.localPlayer.x / 32;
+ var12 = var19.y / 32 - Canvas.localPlayer.y / 32;
+ UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4);
+ }
+ }
+ }
+
+ if(Client.destinationX != 0) {
+ var10 = Client.destinationX * 4 + 2 - Canvas.localPlayer.x / 32;
+ var11 = Client.destinationY * 4 + 2 - Canvas.localPlayer.y / 32;
+ NetFileRequest.method4554(var1, var2, var10, var11, class16.mapMarkerSprites[0], var4);
+ }
+
+ if(!Canvas.localPlayer.isHidden) {
+ Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215);
+ }
+ break;
+ }
+
for(var9 = 0; var9 < 104; ++var9) {
- NodeDeque var15 = Client.groundItems[SoundSystem.plane][var8][var9];
- if(var15 != null) {
+ NodeDeque var13 = Client.groundItems[SoundSystem.plane][var8][var9];
+ if(var13 != null) {
var11 = var8 * 4 + 2 - Canvas.localPlayer.x / 32;
var12 = var9 * 4 + 2 - Canvas.localPlayer.y / 32;
NetFileRequest.method4554(var1, var2, var11, var12, class39.mapDotSprites[0], var4);
}
}
- }
- for(var8 = 0; var8 < Client.npcCount; ++var8) {
- Npc var16 = Client.npcs[Client.npcIndices[var8]];
- if(var16 != null && var16.isVisible()) {
- NpcDefinition var18 = var16.definition;
- if(var18 != null && var18.transforms != null) {
- var18 = var18.transform();
- }
-
- if(var18 != null && var18.drawMapDot && var18.isInteractable) {
- var11 = var16.x / 32 - Canvas.localPlayer.x / 32;
- var12 = var16.y / 32 - Canvas.localPlayer.y / 32;
- NetFileRequest.method4554(var1, var2, var11, var12, class39.mapDotSprites[1], var4);
- }
- }
- }
-
- var8 = Players.Players_count;
- int[] var19 = Players.Players_indices;
-
- for(var10 = 0; var10 < var8; ++var10) {
- Player var17 = Client.players[var19[var10]];
- if(var17 != null && var17.isVisible() && !var17.isHidden && var17 != Canvas.localPlayer) {
- var12 = var17.x / 32 - Canvas.localPlayer.x / 32;
- int var13 = var17.y / 32 - Canvas.localPlayer.y / 32;
- boolean var14 = false;
- if(Canvas.localPlayer.team != 0 && var17.team != 0 && var17.team == Canvas.localPlayer.team) {
- var14 = true;
- }
-
- if(var17.isFriend()) {
- NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[3], var4);
- } else if(var14) {
- NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[4], var4);
- } else if(var17.isClanMember()) {
- NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[5], var4);
- } else {
- NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[2], var4);
- }
- }
- }
-
- if(Client.hintArrowType != 0 && Client.cycle % 20 < 10) {
- if(Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) {
- Npc var20 = Client.npcs[Client.hintArrowNpcIndex];
- if(var20 != null) {
- var11 = var20.x / 32 - Canvas.localPlayer.x / 32;
- var12 = var20.y / 32 - Canvas.localPlayer.y / 32;
- UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4);
- }
- }
-
- if(Client.hintArrowType == 2) {
- var10 = Client.hintArrowX * 4 - class50.baseX * 4 + 2 - Canvas.localPlayer.x / 32;
- var11 = Client.hintArrowY * 4 - GraphicsObject.baseY * 4 + 2 - Canvas.localPlayer.y / 32;
- UserComparator5.worldToMinimap(var1, var2, var10, var11, class16.mapMarkerSprites[1], var4);
- }
-
- if(Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) {
- Player var21 = Client.players[Client.hintArrowPlayerIndex];
- if(var21 != null) {
- var11 = var21.x / 32 - Canvas.localPlayer.x / 32;
- var12 = var21.y / 32 - Canvas.localPlayer.y / 32;
- UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4);
- }
- }
- }
-
- if(Client.destinationX != 0) {
- var10 = Client.destinationX * 4 + 2 - Canvas.localPlayer.x / 32;
- var11 = Client.destinationY * 4 + 2 - Canvas.localPlayer.y / 32;
- NetFileRequest.method4554(var1, var2, var10, var11, class16.mapMarkerSprites[0], var4);
- }
-
- if(!Canvas.localPlayer.isHidden) {
- Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215);
+ ++var8;
}
} else {
Rasterizer2D.method5948(var1, var2, 0, var4.xStarts, var4.xWidths);
@@ -379,5 +391,6 @@ public class MouseRecorder implements Runnable {
Client.__client_ot[var3] = true;
}
+
}
}
diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java
index d91cca4a74..a797a7ef58 100644
--- a/runescape-client/src/main/java/MusicPatch.java
+++ b/runescape-client/src/main/java/MusicPatch.java
@@ -98,395 +98,395 @@ public class MusicPatch extends Node {
++var2.index;
++var9;
- byte[] var38 = new byte[var9];
+ byte[] var42 = new byte[var9];
int var12;
- int var14;
+ int var13;
if(var9 > 1) {
- var38[1] = 1;
- int var13 = 1;
+ var42[1] = 1;
+ int var14 = 1;
var12 = 2;
- for(var14 = 2; var14 < var9; ++var14) {
+ for(var13 = 2; var13 < var9; ++var13) {
int var15 = var2.readUnsignedByte();
if(var15 == 0) {
- var13 = var12++;
+ var14 = var12++;
} else {
- if(var15 <= var13) {
+ if(var15 <= var14) {
--var15;
}
- var13 = var15;
+ var14 = var15;
}
- var38[var14] = (byte)var13;
+ var42[var13] = (byte)var14;
}
} else {
var12 = var9;
}
- MusicPatchNode2[] var39 = new MusicPatchNode2[var12];
+ MusicPatchNode2[] var43 = new MusicPatchNode2[var12];
- MusicPatchNode2 var40;
- for(var14 = 0; var14 < var39.length; ++var14) {
- var40 = var39[var14] = new MusicPatchNode2();
+ MusicPatchNode2 var44;
+ for(var13 = 0; var13 < var43.length; ++var13) {
+ var44 = var43[var13] = new MusicPatchNode2();
int var16 = var2.readUnsignedByte();
if(var16 > 0) {
- var40.__m = new byte[var16 * 2];
+ var44.__m = new byte[var16 * 2];
}
var16 = var2.readUnsignedByte();
if(var16 > 0) {
- var40.__f = new byte[var16 * 2 + 2];
- var40.__f[1] = 64;
+ var44.__f = new byte[var16 * 2 + 2];
+ var44.__f[1] = 64;
}
}
- var14 = var2.readUnsignedByte();
- byte[] var47 = var14 > 0?new byte[var14 * 2]:null;
- var14 = var2.readUnsignedByte();
- byte[] var41 = var14 > 0?new byte[var14 * 2]:null;
+ var13 = var2.readUnsignedByte();
+ byte[] var45 = var13 > 0?new byte[var13 * 2]:null;
+ var13 = var2.readUnsignedByte();
+ byte[] var17 = var13 > 0?new byte[var13 * 2]:null;
- int var17;
- for(var17 = 0; var2.array[var17 + var2.index] != 0; ++var17) {
+ int var18;
+ for(var18 = 0; var2.array[var18 + var2.index] != 0; ++var18) {
;
}
- byte[] var18 = new byte[var17];
+ byte[] var19 = new byte[var18];
- int var19;
- for(var19 = 0; var19 < var17; ++var19) {
- var18[var19] = var2.readByte();
+ int var20;
+ for(var20 = 0; var20 < var18; ++var20) {
+ var19[var20] = var2.readByte();
}
++var2.index;
- ++var17;
- var19 = 0;
+ ++var18;
+ var20 = 0;
- int var20;
- for(var20 = 0; var20 < 128; ++var20) {
- var19 += var2.readUnsignedByte();
- this.__q[var20] = (short)var19;
- }
-
- var19 = 0;
-
- for(var20 = 0; var20 < 128; ++var20) {
- var19 += var2.readUnsignedByte();
- this.__q[var20] = (short)(this.__q[var20] + (var19 << 8));
+ int var21;
+ for(var21 = 0; var21 < 128; ++var21) {
+ var20 += var2.readUnsignedByte();
+ this.__q[var21] = (short)var20;
}
var20 = 0;
- int var21 = 0;
- int var22 = 0;
- int var23;
- for(var23 = 0; var23 < 128; ++var23) {
- if(var20 == 0) {
- if(var21 < var18.length) {
- var20 = var18[var21++];
- } else {
- var20 = -1;
- }
-
- var22 = var2.__as_311();
- }
-
- this.__q[var23] = (short)(this.__q[var23] + ((var22 - 1 & 2) << 14));
- this.__l[var23] = var22;
- --var20;
+ for(var21 = 0; var21 < 128; ++var21) {
+ var20 += var2.readUnsignedByte();
+ this.__q[var21] = (short)(this.__q[var21] + (var20 << 8));
}
- var20 = 0;
var21 = 0;
- var23 = 0;
+ int var22 = 0;
+ int var23 = 0;
int var24;
for(var24 = 0; var24 < 128; ++var24) {
- if(this.__l[var24] != 0) {
- if(var20 == 0) {
- if(var21 < var4.length) {
- var20 = var4[var21++];
- } else {
- var20 = -1;
- }
-
- var23 = var2.array[var5++] - 1;
+ if(var21 == 0) {
+ if(var22 < var19.length) {
+ var21 = var19[var22++];
+ } else {
+ var21 = -1;
}
- this.__g[var24] = (byte)var23;
- --var20;
+ var23 = var2.__as_311();
}
+
+ this.__q[var24] = (short)(this.__q[var24] + ((var23 - 1 & 2) << 14));
+ this.__l[var24] = var23;
+ --var21;
}
- var20 = 0;
var21 = 0;
+ var22 = 0;
var24 = 0;
- for(int var25 = 0; var25 < 128; ++var25) {
+ int var25;
+ for(var25 = 0; var25 < 128; ++var25) {
if(this.__l[var25] != 0) {
- if(var20 == 0) {
- if(var21 < var7.length) {
- var20 = var7[var21++];
+ if(var21 == 0) {
+ if(var22 < var4.length) {
+ var21 = var4[var22++];
} else {
- var20 = -1;
+ var21 = -1;
}
- var24 = var2.array[var8++] + 16 << 2;
+ var24 = var2.array[var5++] - 1;
}
- this.__o[var25] = (byte)var24;
- --var20;
+ this.__g[var25] = (byte)var24;
+ --var21;
}
}
- var20 = 0;
var21 = 0;
- MusicPatchNode2 var42 = null;
+ var22 = 0;
+ var25 = 0;
- int var26;
- for(var26 = 0; var26 < 128; ++var26) {
+ for(int var26 = 0; var26 < 128; ++var26) {
if(this.__l[var26] != 0) {
- if(var20 == 0) {
- var42 = var39[var38[var21]];
- if(var21 < var10.length) {
- var20 = var10[var21++];
+ if(var21 == 0) {
+ if(var22 < var7.length) {
+ var21 = var7[var22++];
} else {
- var20 = -1;
+ var21 = -1;
}
+
+ var25 = var2.array[var8++] + 16 << 2;
}
- this.__u[var26] = var42;
- --var20;
+ this.__o[var26] = (byte)var25;
+ --var21;
}
}
- var20 = 0;
var21 = 0;
- var26 = 0;
+ var22 = 0;
+ MusicPatchNode2 var46 = null;
int var27;
for(var27 = 0; var27 < 128; ++var27) {
- if(var20 == 0) {
- if(var21 < var18.length) {
- var20 = var18[var21++];
- } else {
- var20 = -1;
+ if(this.__l[var27] != 0) {
+ if(var21 == 0) {
+ var46 = var43[var42[var22]];
+ if(var22 < var10.length) {
+ var21 = var10[var22++];
+ } else {
+ var21 = -1;
+ }
}
- if(this.__l[var27] > 0) {
- var26 = var2.readUnsignedByte() + 1;
+ this.__u[var27] = var46;
+ --var21;
+ }
+ }
+
+ var21 = 0;
+ var22 = 0;
+ var27 = 0;
+
+ int var28;
+ for(var28 = 0; var28 < 128; ++var28) {
+ if(var21 == 0) {
+ if(var22 < var19.length) {
+ var21 = var19[var22++];
+ } else {
+ var21 = -1;
+ }
+
+ if(this.__l[var28] > 0) {
+ var27 = var2.readUnsignedByte() + 1;
}
}
- this.__w[var27] = (byte)var26;
- --var20;
+ this.__w[var28] = (byte)var27;
+ --var21;
}
this.__m = var2.readUnsignedByte() + 1;
- MusicPatchNode2 var28;
- int var29;
- for(var27 = 0; var27 < var12; ++var27) {
- var28 = var39[var27];
- if(var28.__m != null) {
- for(var29 = 1; var29 < var28.__m.length; var29 += 2) {
- var28.__m[var29] = var2.readByte();
+ MusicPatchNode2 var29;
+ int var30;
+ for(var28 = 0; var28 < var12; ++var28) {
+ var29 = var43[var28];
+ if(var29.__m != null) {
+ for(var30 = 1; var30 < var29.__m.length; var30 += 2) {
+ var29.__m[var30] = var2.readByte();
}
}
- if(var28.__f != null) {
- for(var29 = 3; var29 < var28.__f.length - 2; var29 += 2) {
- var28.__f[var29] = var2.readByte();
+ if(var29.__f != null) {
+ for(var30 = 3; var30 < var29.__f.length - 2; var30 += 2) {
+ var29.__f[var30] = var2.readByte();
}
}
}
- if(var47 != null) {
- for(var27 = 1; var27 < var47.length; var27 += 2) {
- var47[var27] = var2.readByte();
+ if(var45 != null) {
+ for(var28 = 1; var28 < var45.length; var28 += 2) {
+ var45[var28] = var2.readByte();
}
}
- if(var41 != null) {
- for(var27 = 1; var27 < var41.length; var27 += 2) {
- var41[var27] = var2.readByte();
+ if(var17 != null) {
+ for(var28 = 1; var28 < var17.length; var28 += 2) {
+ var17[var28] = var2.readByte();
}
}
- for(var27 = 0; var27 < var12; ++var27) {
- var28 = var39[var27];
- if(var28.__f != null) {
- var19 = 0;
+ for(var28 = 0; var28 < var12; ++var28) {
+ var29 = var43[var28];
+ if(var29.__f != null) {
+ var20 = 0;
- for(var29 = 2; var29 < var28.__f.length; var29 += 2) {
- var19 = 1 + var19 + var2.readUnsignedByte();
- var28.__f[var29] = (byte)var19;
+ for(var30 = 2; var30 < var29.__f.length; var30 += 2) {
+ var20 = 1 + var20 + var2.readUnsignedByte();
+ var29.__f[var30] = (byte)var20;
}
}
}
- for(var27 = 0; var27 < var12; ++var27) {
- var28 = var39[var27];
- if(var28.__m != null) {
- var19 = 0;
+ for(var28 = 0; var28 < var12; ++var28) {
+ var29 = var43[var28];
+ if(var29.__m != null) {
+ var20 = 0;
- for(var29 = 2; var29 < var28.__m.length; var29 += 2) {
- var19 = 1 + var19 + var2.readUnsignedByte();
- var28.__m[var29] = (byte)var19;
+ for(var30 = 2; var30 < var29.__m.length; var30 += 2) {
+ var20 = 1 + var20 + var2.readUnsignedByte();
+ var29.__m[var30] = (byte)var20;
}
}
}
- byte var30;
+ byte var31;
int var32;
int var33;
int var34;
int var35;
int var36;
- int var44;
- byte var46;
- if(var47 != null) {
- var19 = var2.readUnsignedByte();
- var47[0] = (byte)var19;
+ int var37;
+ byte var38;
+ if(var45 != null) {
+ var20 = var2.readUnsignedByte();
+ var45[0] = (byte)var20;
- for(var27 = 2; var27 < var47.length; var27 += 2) {
- var19 = 1 + var19 + var2.readUnsignedByte();
- var47[var27] = (byte)var19;
+ for(var28 = 2; var28 < var45.length; var28 += 2) {
+ var20 = 1 + var20 + var2.readUnsignedByte();
+ var45[var28] = (byte)var20;
}
- var46 = var47[0];
- byte var43 = var47[1];
+ var38 = var45[0];
+ byte var39 = var45[1];
- for(var29 = 0; var29 < var46; ++var29) {
- this.__w[var29] = (byte)(var43 * this.__w[var29] + 32 >> 6);
+ for(var30 = 0; var30 < var38; ++var30) {
+ this.__w[var30] = (byte)(var39 * this.__w[var30] + 32 >> 6);
}
- for(var29 = 2; var29 < var47.length; var29 += 2) {
- var30 = var47[var29];
- byte var31 = var47[var29 + 1];
- var32 = var43 * (var30 - var46) + (var30 - var46) / 2;
+ for(var30 = 2; var30 < var45.length; var30 += 2) {
+ var31 = var45[var30];
+ byte var40 = var45[var30 + 1];
+ var32 = var39 * (var31 - var38) + (var31 - var38) / 2;
- for(var33 = var46; var33 < var30; ++var33) {
- var35 = var30 - var46;
+ for(var33 = var38; var33 < var31; ++var33) {
+ var35 = var31 - var38;
var36 = var32 >>> 31;
var34 = (var32 + var36) / var35 - var36;
this.__w[var33] = (byte)(var34 * this.__w[var33] + 32 >> 6);
- var32 += var31 - var43;
+ var32 += var40 - var39;
}
- var46 = var30;
- var43 = var31;
+ var38 = var31;
+ var39 = var40;
}
- for(var44 = var46; var44 < 128; ++var44) {
- this.__w[var44] = (byte)(var43 * this.__w[var44] + 32 >> 6);
+ for(var37 = var38; var37 < 128; ++var37) {
+ this.__w[var37] = (byte)(var39 * this.__w[var37] + 32 >> 6);
}
- var40 = null;
+ var44 = null;
}
- if(var41 != null) {
- var19 = var2.readUnsignedByte();
- var41[0] = (byte)var19;
+ if(var17 != null) {
+ var20 = var2.readUnsignedByte();
+ var17[0] = (byte)var20;
- for(var27 = 2; var27 < var41.length; var27 += 2) {
- var19 = 1 + var19 + var2.readUnsignedByte();
- var41[var27] = (byte)var19;
+ for(var28 = 2; var28 < var17.length; var28 += 2) {
+ var20 = 1 + var20 + var2.readUnsignedByte();
+ var17[var28] = (byte)var20;
}
- var46 = var41[0];
- int var49 = var41[1] << 1;
+ var38 = var17[0];
+ int var47 = var17[1] << 1;
- for(var29 = 0; var29 < var46; ++var29) {
- var44 = var49 + (this.__o[var29] & 255);
- if(var44 < 0) {
- var44 = 0;
+ for(var30 = 0; var30 < var38; ++var30) {
+ var37 = var47 + (this.__o[var30] & 255);
+ if(var37 < 0) {
+ var37 = 0;
}
- if(var44 > 128) {
- var44 = 128;
+ if(var37 > 128) {
+ var37 = 128;
}
- this.__o[var29] = (byte)var44;
+ this.__o[var30] = (byte)var37;
}
- int var45;
- for(var29 = 2; var29 < var41.length; var29 += 2) {
- var30 = var41[var29];
- var45 = var41[var29 + 1] << 1;
- var32 = var49 * (var30 - var46) + (var30 - var46) / 2;
+ int var48;
+ for(var30 = 2; var30 < var17.length; var30 += 2) {
+ var31 = var17[var30];
+ var48 = var17[var30 + 1] << 1;
+ var32 = var47 * (var31 - var38) + (var31 - var38) / 2;
- for(var33 = var46; var33 < var30; ++var33) {
- var35 = var30 - var46;
+ for(var33 = var38; var33 < var31; ++var33) {
+ var35 = var31 - var38;
var36 = var32 >>> 31;
var34 = (var32 + var36) / var35 - var36;
- int var37 = var34 + (this.__o[var33] & 255);
- if(var37 < 0) {
- var37 = 0;
+ int var41 = var34 + (this.__o[var33] & 255);
+ if(var41 < 0) {
+ var41 = 0;
}
- if(var37 > 128) {
- var37 = 128;
+ if(var41 > 128) {
+ var41 = 128;
}
- this.__o[var33] = (byte)var37;
- var32 += var45 - var49;
+ this.__o[var33] = (byte)var41;
+ var32 += var48 - var47;
}
- var46 = var30;
- var49 = var45;
+ var38 = var31;
+ var47 = var48;
}
- for(var44 = var46; var44 < 128; ++var44) {
- var45 = var49 + (this.__o[var44] & 255);
- if(var45 < 0) {
- var45 = 0;
+ for(var37 = var38; var37 < 128; ++var37) {
+ var48 = var47 + (this.__o[var37] & 255);
+ if(var48 < 0) {
+ var48 = 0;
}
- if(var45 > 128) {
- var45 = 128;
+ if(var48 > 128) {
+ var48 = 128;
}
- this.__o[var44] = (byte)var45;
+ this.__o[var37] = (byte)var48;
}
- Object var48 = null;
+ Object var49 = null;
}
- for(var27 = 0; var27 < var12; ++var27) {
- var39[var27].__q = var2.readUnsignedByte();
+ for(var28 = 0; var28 < var12; ++var28) {
+ var43[var28].__q = var2.readUnsignedByte();
}
- for(var27 = 0; var27 < var12; ++var27) {
- var28 = var39[var27];
- if(var28.__m != null) {
- var28.__w = var2.readUnsignedByte();
+ for(var28 = 0; var28 < var12; ++var28) {
+ var29 = var43[var28];
+ if(var29.__m != null) {
+ var29.__w = var2.readUnsignedByte();
}
- if(var28.__f != null) {
- var28.__o = var2.readUnsignedByte();
+ if(var29.__f != null) {
+ var29.__o = var2.readUnsignedByte();
}
- if(var28.__q > 0) {
- var28.__u = var2.readUnsignedByte();
+ if(var29.__q > 0) {
+ var29.__u = var2.readUnsignedByte();
}
}
- for(var27 = 0; var27 < var12; ++var27) {
- var39[var27].__l = var2.readUnsignedByte();
+ for(var28 = 0; var28 < var12; ++var28) {
+ var43[var28].__l = var2.readUnsignedByte();
}
- for(var27 = 0; var27 < var12; ++var27) {
- var28 = var39[var27];
- if(var28.__l > 0) {
- var28.__g = var2.readUnsignedByte();
+ for(var28 = 0; var28 < var12; ++var28) {
+ var29 = var43[var28];
+ if(var29.__l > 0) {
+ var29.__g = var2.readUnsignedByte();
}
}
- for(var27 = 0; var27 < var12; ++var27) {
- var28 = var39[var27];
- if(var28.__g > 0) {
- var28.__e = var2.readUnsignedByte();
+ for(var28 = 0; var28 < var12; ++var28) {
+ var29 = var43[var28];
+ if(var29.__g > 0) {
+ var29.__e = var2.readUnsignedByte();
}
}
diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java
index c03f0a99ed..6e94a5933f 100644
--- a/runescape-client/src/main/java/MusicPatchNode.java
+++ b/runescape-client/src/main/java/MusicPatchNode.java
@@ -90,7 +90,7 @@ public class MusicPatchNode extends Node {
intValue = 476852577
)
@Export("surfaceOffsetY")
- int __n;
+ int surfaceOffsetY;
@ObfuscatedName("i")
@ObfuscatedGetter(
intValue = -2136855685
diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java
index 25a7e0c8fa..87cc3d2617 100644
--- a/runescape-client/src/main/java/MusicPatchPcmStream.java
+++ b/runescape-client/src/main/java/MusicPatchPcmStream.java
@@ -156,22 +156,22 @@ public class MusicPatchPcmStream extends PcmStream {
protected void __e_172(int[] var1, int var2, int var3) {
this.mixer.__e_172(var1, var2, var3);
- for(MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) {
- if(!this.superStream.__ba_368(var6)) {
- int var4 = var2;
- int var5 = var3;
+ for(MusicPatchNode var4 = (MusicPatchNode)this.queue.last(); var4 != null; var4 = (MusicPatchNode)this.queue.previous()) {
+ if(!this.superStream.__ba_368(var4)) {
+ int var5 = var2;
+ int var6 = var3;
do {
- if(var5 <= var6.__y) {
- this.__m_379(var6, var1, var4, var5, var5 + var4);
- var6.__y -= var5;
+ if(var6 <= var4.__y) {
+ this.__m_379(var4, var1, var5, var6, var6 + var5);
+ var4.__y -= var6;
break;
}
- this.__m_379(var6, var1, var4, var6.__y, var5 + var4);
- var4 += var6.__y;
- var5 -= var6.__y;
- } while(!this.superStream.__bb_369(var6, var1, var4, var5));
+ this.__m_379(var4, var1, var5, var4.__y, var6 + var5);
+ var5 += var4.__y;
+ var6 -= var4.__y;
+ } while(!this.superStream.__bb_369(var4, var1, var5, var6));
}
}
@@ -181,20 +181,20 @@ public class MusicPatchPcmStream extends PcmStream {
protected void __d_173(int var1) {
this.mixer.__d_173(var1);
- for(MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) {
- if(!this.superStream.__ba_368(var3)) {
- int var2 = var1;
+ for(MusicPatchNode var2 = (MusicPatchNode)this.queue.last(); var2 != null; var2 = (MusicPatchNode)this.queue.previous()) {
+ if(!this.superStream.__ba_368(var2)) {
+ int var3 = var1;
do {
- if(var2 <= var3.__y) {
- this.__f_380(var3, var2);
- var3.__y -= var2;
+ if(var3 <= var2.__y) {
+ this.__f_380(var2, var3);
+ var2.__y -= var3;
break;
}
- this.__f_380(var3, var3.__y);
- var2 -= var3.__y;
- } while(!this.superStream.__bb_369(var3, (int[])null, 0, var2));
+ this.__f_380(var2, var2.__y);
+ var3 -= var2.__y;
+ } while(!this.superStream.__bb_369(var2, (int[])null, 0, var3));
}
}
diff --git a/runescape-client/src/main/java/MusicSample.java b/runescape-client/src/main/java/MusicSample.java
index d3f9c83d47..efb8591e29 100644
--- a/runescape-client/src/main/java/MusicSample.java
+++ b/runescape-client/src/main/java/MusicSample.java
@@ -117,10 +117,6 @@ public class MusicSample extends Node {
@Export("__ah")
int __ah;
- static {
- __cd_s = false;
- }
-
MusicSample(byte[] var1) {
this.read(var1);
}
@@ -200,213 +196,213 @@ public class MusicSample extends Node {
}
class114 var14 = field1326[__cd_j[var2]];
- int var16 = var14.field1454;
- int var17 = var14.field1452[var16];
- boolean var15 = !field1324[var17].method2367();
- boolean var45 = var15;
+ int var15 = var14.field1454;
+ int var16 = var14.field1452[var15];
+ boolean var17 = !field1324[var16].method2367();
+ boolean var18 = var17;
- for(var17 = 0; var17 < var14.field1453; ++var17) {
- class109 var18 = field1344[var14.field1455[var17]];
- float[] var19 = __cd_c;
- var18.method2473(var19, var4 >> 1, var45);
+ for(var16 = 0; var16 < var14.field1453; ++var16) {
+ class109 var19 = field1344[var14.field1455[var16]];
+ float[] var20 = __cd_c;
+ var19.method2473(var20, var4 >> 1, var18);
}
- int var40;
- if(!var15) {
- var17 = var14.field1454;
- var40 = var14.field1452[var17];
- field1324[var40].method2375(__cd_c, var4 >> 1);
+ int var48;
+ if(!var17) {
+ var16 = var14.field1454;
+ var48 = var14.field1452[var16];
+ field1324[var48].method2375(__cd_c, var4 >> 1);
}
- int var42;
- if(var15) {
- for(var17 = var4 >> 1; var17 < var4; ++var17) {
- __cd_c[var17] = 0.0F;
+ float[] var21;
+ int var22;
+ int var49;
+ if(var17) {
+ for(var16 = var4 >> 1; var16 < var4; ++var16) {
+ __cd_c[var16] = 0.0F;
}
} else {
- var17 = var4 >> 1;
- var40 = var4 >> 2;
- var42 = var4 >> 3;
- float[] var43 = __cd_c;
+ var16 = var4 >> 1;
+ var48 = var4 >> 2;
+ var49 = var4 >> 3;
+ var21 = __cd_c;
- int var21;
- for(var21 = 0; var21 < var17; ++var21) {
- var43[var21] *= 0.5F;
+ for(var22 = 0; var22 < var16; ++var22) {
+ var21[var22] *= 0.5F;
}
- for(var21 = var17; var21 < var4; ++var21) {
- var43[var21] = -var43[var4 - var21 - 1];
+ for(var22 = var16; var22 < var4; ++var22) {
+ var21[var22] = -var21[var4 - var22 - 1];
}
- float[] var44 = var3?__cd_ag:__cd_r;
- float[] var22 = var3?__cd_aq:__cd_p;
- float[] var23 = var3?__cd_aj:__cd_v;
- int[] var24 = var3?__cd_ar:__cd_av;
+ float[] var23 = var3?__cd_ag:__cd_r;
+ float[] var24 = var3?__cd_aq:__cd_p;
+ float[] var25 = var3?__cd_aj:__cd_v;
+ int[] var26 = var3?__cd_ar:__cd_av;
- int var25;
- float var26;
- float var27;
+ int var27;
float var28;
float var29;
- for(var25 = 0; var25 < var40; ++var25) {
- var26 = var43[var25 * 4] - var43[var4 - var25 * 4 - 1];
- var27 = var43[var25 * 4 + 2] - var43[var4 - var25 * 4 - 3];
- var28 = var44[var25 * 2];
- var29 = var44[var25 * 2 + 1];
- var43[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29;
- var43[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28;
- }
-
float var30;
float var31;
- for(var25 = 0; var25 < var42; ++var25) {
- var26 = var43[var17 + var25 * 4 + 3];
- var27 = var43[var17 + var25 * 4 + 1];
- var28 = var43[var25 * 4 + 3];
- var29 = var43[var25 * 4 + 1];
- var43[var17 + var25 * 4 + 3] = var26 + var28;
- var43[var17 + var25 * 4 + 1] = var27 + var29;
- var30 = var44[var17 - 4 - var25 * 4];
- var31 = var44[var17 - 3 - var25 * 4];
- var43[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31;
- var43[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31;
+ for(var27 = 0; var27 < var48; ++var27) {
+ var28 = var21[var27 * 4] - var21[var4 - var27 * 4 - 1];
+ var29 = var21[var27 * 4 + 2] - var21[var4 - var27 * 4 - 3];
+ var30 = var23[var27 * 2];
+ var31 = var23[var27 * 2 + 1];
+ var21[var4 - var27 * 4 - 1] = var28 * var30 - var29 * var31;
+ var21[var4 - var27 * 4 - 3] = var28 * var31 + var29 * var30;
}
- var25 = WorldMapCacheName.method634(var4 - 1);
+ float var32;
+ float var33;
+ for(var27 = 0; var27 < var49; ++var27) {
+ var28 = var21[var16 + var27 * 4 + 3];
+ var29 = var21[var16 + var27 * 4 + 1];
+ var30 = var21[var27 * 4 + 3];
+ var31 = var21[var27 * 4 + 1];
+ var21[var16 + var27 * 4 + 3] = var28 + var30;
+ var21[var16 + var27 * 4 + 1] = var29 + var31;
+ var32 = var23[var16 - 4 - var27 * 4];
+ var33 = var23[var16 - 3 - var27 * 4];
+ var21[var27 * 4 + 3] = (var28 - var30) * var32 - (var29 - var31) * var33;
+ var21[var27 * 4 + 1] = (var29 - var31) * var32 + (var28 - var30) * var33;
+ }
- int var47;
- int var48;
- int var49;
- int var50;
- for(var47 = 0; var47 < var25 - 3; ++var47) {
- var48 = var4 >> var47 + 2;
- var49 = 8 << var47;
+ var27 = WorldMapCacheName.method634(var4 - 1);
- for(var50 = 0; var50 < 2 << var47; ++var50) {
- int var51 = var4 - var48 * var50 * 2;
- int var52 = var4 - var48 * (var50 * 2 + 1);
+ int var34;
+ int var35;
+ int var36;
+ int var37;
+ for(var34 = 0; var34 < var27 - 3; ++var34) {
+ var35 = var4 >> var34 + 2;
+ var36 = 8 << var34;
- for(int var32 = 0; var32 < var4 >> var47 + 4; ++var32) {
- int var33 = var32 * 4;
- float var34 = var43[var51 - 1 - var33];
- float var35 = var43[var51 - 3 - var33];
- float var36 = var43[var52 - 1 - var33];
- float var37 = var43[var52 - 3 - var33];
- var43[var51 - 1 - var33] = var34 + var36;
- var43[var51 - 3 - var33] = var35 + var37;
- float var38 = var44[var32 * var49];
- float var39 = var44[var32 * var49 + 1];
- var43[var52 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39;
- var43[var52 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39;
+ for(var37 = 0; var37 < 2 << var34; ++var37) {
+ int var38 = var4 - var35 * var37 * 2;
+ int var39 = var4 - var35 * (var37 * 2 + 1);
+
+ for(int var40 = 0; var40 < var4 >> var34 + 4; ++var40) {
+ int var41 = var40 * 4;
+ float var42 = var21[var38 - 1 - var41];
+ float var43 = var21[var38 - 3 - var41];
+ float var44 = var21[var39 - 1 - var41];
+ float var45 = var21[var39 - 3 - var41];
+ var21[var38 - 1 - var41] = var42 + var44;
+ var21[var38 - 3 - var41] = var43 + var45;
+ float var46 = var23[var40 * var36];
+ float var47 = var23[var40 * var36 + 1];
+ var21[var39 - 1 - var41] = (var42 - var44) * var46 - (var43 - var45) * var47;
+ var21[var39 - 3 - var41] = (var43 - var45) * var46 + (var42 - var44) * var47;
}
}
}
- for(var47 = 1; var47 < var42 - 1; ++var47) {
- var48 = var24[var47];
- if(var47 < var48) {
- var49 = var47 * 8;
- var50 = var48 * 8;
- var30 = var43[var49 + 1];
- var43[var49 + 1] = var43[var50 + 1];
- var43[var50 + 1] = var30;
- var30 = var43[var49 + 3];
- var43[var49 + 3] = var43[var50 + 3];
- var43[var50 + 3] = var30;
- var30 = var43[var49 + 5];
- var43[var49 + 5] = var43[var50 + 5];
- var43[var50 + 5] = var30;
- var30 = var43[var49 + 7];
- var43[var49 + 7] = var43[var50 + 7];
- var43[var50 + 7] = var30;
+ for(var34 = 1; var34 < var49 - 1; ++var34) {
+ var35 = var26[var34];
+ if(var34 < var35) {
+ var36 = var34 * 8;
+ var37 = var35 * 8;
+ var32 = var21[var36 + 1];
+ var21[var36 + 1] = var21[var37 + 1];
+ var21[var37 + 1] = var32;
+ var32 = var21[var36 + 3];
+ var21[var36 + 3] = var21[var37 + 3];
+ var21[var37 + 3] = var32;
+ var32 = var21[var36 + 5];
+ var21[var36 + 5] = var21[var37 + 5];
+ var21[var37 + 5] = var32;
+ var32 = var21[var36 + 7];
+ var21[var36 + 7] = var21[var37 + 7];
+ var21[var37 + 7] = var32;
}
}
- for(var47 = 0; var47 < var17; ++var47) {
- var43[var47] = var43[var47 * 2 + 1];
+ for(var34 = 0; var34 < var16; ++var34) {
+ var21[var34] = var21[var34 * 2 + 1];
}
- for(var47 = 0; var47 < var42; ++var47) {
- var43[var4 - 1 - var47 * 2] = var43[var47 * 4];
- var43[var4 - 2 - var47 * 2] = var43[var47 * 4 + 1];
- var43[var4 - var40 - 1 - var47 * 2] = var43[var47 * 4 + 2];
- var43[var4 - var40 - 2 - var47 * 2] = var43[var47 * 4 + 3];
+ for(var34 = 0; var34 < var49; ++var34) {
+ var21[var4 - 1 - var34 * 2] = var21[var34 * 4];
+ var21[var4 - 2 - var34 * 2] = var21[var34 * 4 + 1];
+ var21[var4 - var48 - 1 - var34 * 2] = var21[var34 * 4 + 2];
+ var21[var4 - var48 - 2 - var34 * 2] = var21[var34 * 4 + 3];
}
- for(var47 = 0; var47 < var42; ++var47) {
- var27 = var23[var47 * 2];
- var28 = var23[var47 * 2 + 1];
- var29 = var43[var17 + var47 * 2];
- var30 = var43[var17 + var47 * 2 + 1];
- var31 = var43[var4 - 2 - var47 * 2];
- float var53 = var43[var4 - 1 - var47 * 2];
- float var54 = var28 * (var29 - var31) + var27 * (var30 + var53);
- var43[var17 + var47 * 2] = (var29 + var31 + var54) * 0.5F;
- var43[var4 - 2 - var47 * 2] = (var29 + var31 - var54) * 0.5F;
- var54 = var28 * (var30 + var53) - var27 * (var29 - var31);
- var43[var17 + var47 * 2 + 1] = (var30 - var53 + var54) * 0.5F;
- var43[var4 - 1 - var47 * 2] = (-var30 + var53 + var54) * 0.5F;
+ for(var34 = 0; var34 < var49; ++var34) {
+ var29 = var25[var34 * 2];
+ var30 = var25[var34 * 2 + 1];
+ var31 = var21[var16 + var34 * 2];
+ var32 = var21[var16 + var34 * 2 + 1];
+ var33 = var21[var4 - 2 - var34 * 2];
+ float var51 = var21[var4 - 1 - var34 * 2];
+ float var52 = var30 * (var31 - var33) + var29 * (var32 + var51);
+ var21[var16 + var34 * 2] = (var31 + var33 + var52) * 0.5F;
+ var21[var4 - 2 - var34 * 2] = (var31 + var33 - var52) * 0.5F;
+ var52 = var30 * (var32 + var51) - var29 * (var31 - var33);
+ var21[var16 + var34 * 2 + 1] = (var32 - var51 + var52) * 0.5F;
+ var21[var4 - 1 - var34 * 2] = (-var32 + var51 + var52) * 0.5F;
}
- for(var47 = 0; var47 < var40; ++var47) {
- var43[var47] = var43[var17 + var47 * 2] * var22[var47 * 2] + var43[var17 + var47 * 2 + 1] * var22[var47 * 2 + 1];
- var43[var17 - 1 - var47] = var43[var17 + var47 * 2] * var22[var47 * 2 + 1] - var43[var17 + var47 * 2 + 1] * var22[var47 * 2];
+ for(var34 = 0; var34 < var48; ++var34) {
+ var21[var34] = var21[var16 + var34 * 2] * var24[var34 * 2] + var21[var16 + var34 * 2 + 1] * var24[var34 * 2 + 1];
+ var21[var16 - 1 - var34] = var21[var16 + var34 * 2] * var24[var34 * 2 + 1] - var21[var16 + var34 * 2 + 1] * var24[var34 * 2];
}
- for(var47 = 0; var47 < var40; ++var47) {
- var43[var47 + (var4 - var40)] = -var43[var47];
+ for(var34 = 0; var34 < var48; ++var34) {
+ var21[var34 + (var4 - var48)] = -var21[var34];
}
- for(var47 = 0; var47 < var40; ++var47) {
- var43[var47] = var43[var40 + var47];
+ for(var34 = 0; var34 < var48; ++var34) {
+ var21[var34] = var21[var48 + var34];
}
- for(var47 = 0; var47 < var40; ++var47) {
- var43[var40 + var47] = -var43[var40 - var47 - 1];
+ for(var34 = 0; var34 < var48; ++var34) {
+ var21[var48 + var34] = -var21[var48 - var34 - 1];
}
- for(var47 = 0; var47 < var40; ++var47) {
- var43[var17 + var47] = var43[var4 - var47 - 1];
+ for(var34 = 0; var34 < var48; ++var34) {
+ var21[var16 + var34] = var21[var4 - var34 - 1];
}
- for(var47 = var8; var47 < var9; ++var47) {
- var27 = (float)Math.sin(((double)(var47 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D);
- __cd_c[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27);
+ for(var34 = var8; var34 < var9; ++var34) {
+ var29 = (float)Math.sin(((double)(var34 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D);
+ __cd_c[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29);
}
- for(var47 = var11; var47 < var12; ++var47) {
- var27 = (float)Math.sin(((double)(var47 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D);
- __cd_c[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27);
+ for(var34 = var11; var34 < var12; ++var34) {
+ var29 = (float)Math.sin(((double)(var34 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D);
+ __cd_c[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29);
}
}
- float[] var41 = null;
+ var21 = null;
if(this.__y > 0) {
- var40 = var4 + this.__y >> 2;
- var41 = new float[var40];
- int var20;
+ var48 = var4 + this.__y >> 2;
+ var21 = new float[var48];
if(!this.__b) {
- for(var42 = 0; var42 < this.__h; ++var42) {
- var20 = var42 + (this.__y >> 1);
- var41[var42] += this.__t[var20];
+ for(var49 = 0; var49 < this.__h; ++var49) {
+ var22 = var49 + (this.__y >> 1);
+ var21[var49] += this.__t[var22];
}
}
- if(!var15) {
- for(var42 = var8; var42 < var4 >> 1; ++var42) {
- var20 = var41.length - (var4 >> 1) + var42;
- var41[var20] += __cd_c[var42];
+ if(!var17) {
+ for(var49 = var8; var49 < var4 >> 1; ++var49) {
+ var22 = var21.length - (var4 >> 1) + var49;
+ var21[var22] += __cd_c[var49];
}
}
}
- float[] var46 = this.__t;
+ float[] var50 = this.__t;
this.__t = __cd_c;
- __cd_c = var46;
+ __cd_c = var50;
this.__y = var4;
this.__h = var12 - (var4 >> 1);
- this.__b = var15;
- return var41;
+ this.__b = var17;
+ return var21;
}
@ObfuscatedName("x")
@@ -539,37 +535,37 @@ public class MusicSample extends Node {
var6[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2));
}
- float[] var12 = new float[var3];
+ float[] var13 = new float[var3];
for(int var8 = 0; var8 < var4; ++var8) {
- var12[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2));
- var12[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2));
+ var13[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2));
+ var13[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2));
}
- float[] var13 = new float[var4];
+ float[] var14 = new float[var4];
for(int var9 = 0; var9 < var5; ++var9) {
- var13[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2);
- var13[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2));
+ var14[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2);
+ var14[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2));
}
- int[] var14 = new int[var5];
+ int[] var15 = new int[var5];
int var10 = WorldMapCacheName.method634(var5 - 1);
for(int var11 = 0; var11 < var5; ++var11) {
- var14[var11] = GrandExchangeEvent.method87(var11, var10);
+ var15[var11] = GrandExchangeEvent.method87(var11, var10);
}
if(var1 != 0) {
__cd_ag = var6;
- __cd_aq = var12;
- __cd_aj = var13;
- __cd_ar = var14;
+ __cd_aq = var13;
+ __cd_aj = var14;
+ __cd_ar = var15;
} else {
__cd_r = var6;
- __cd_p = var12;
- __cd_v = var13;
- __cd_av = var14;
+ __cd_p = var13;
+ __cd_v = var14;
+ __cd_av = var15;
}
}
@@ -611,11 +607,11 @@ public class MusicSample extends Node {
__cd_z = new boolean[var5];
__cd_j = new int[var5];
- for(int var15 = 0; var15 < var5; ++var15) {
- __cd_z[var15] = method2338() != 0;
+ for(int var12 = 0; var12 < var5; ++var12) {
+ __cd_z[var12] = method2338() != 0;
method2352(16);
method2352(16);
- __cd_j[var15] = method2352(8);
+ __cd_j[var12] = method2352(8);
}
}
@@ -652,4 +648,8 @@ public class MusicSample extends Node {
return var3 == null?null:new MusicSample(var3);
}
}
+
+ static {
+ __cd_s = false;
+ }
}
diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java
index 6f340aae23..fba9d3abf7 100644
--- a/runescape-client/src/main/java/MusicTrack.java
+++ b/runescape-client/src/main/java/MusicTrack.java
@@ -196,7 +196,7 @@ public class MusicTrack extends Node {
int[] var59 = new int[128];
var28 = 0;
- label231:
+ label222:
for(int var60 = 0; var60 < var2; ++var60) {
var51.writeInt(1297379947);
var51.index += 4;
@@ -218,7 +218,7 @@ public class MusicTrack extends Node {
var51.writeByte(47);
var51.writeByte(0);
var51.__t_298(var51.index - var61);
- continue label231;
+ continue label222;
}
if(var64 == 23) {
@@ -344,77 +344,77 @@ public class MusicTrack extends Node {
int[] var2 = new int[16];
var2[9] = 128;
var1[9] = 128;
- MidiFileReader var4 = new MidiFileReader(this.midi);
- int var5 = var4.trackCount();
+ MidiFileReader var3 = new MidiFileReader(this.midi);
+ int var4 = var3.trackCount();
- int var6;
- for(var6 = 0; var6 < var5; ++var6) {
- var4.gotoTrack(var6);
- var4.readTrackLength(var6);
- var4.markTrackPosition(var6);
+ int var5;
+ for(var5 = 0; var5 < var4; ++var5) {
+ var3.gotoTrack(var5);
+ var3.readTrackLength(var5);
+ var3.markTrackPosition(var5);
}
- label53:
+ label56:
do {
while(true) {
- var6 = var4.getPrioritizedTrack();
- int var7 = var4.trackLengths[var6];
+ var5 = var3.getPrioritizedTrack();
+ int var6 = var3.trackLengths[var5];
- while(var7 == var4.trackLengths[var6]) {
- var4.gotoTrack(var6);
- int var8 = var4.readMessage(var6);
- if(var8 == 1) {
- var4.setTrackDone();
- var4.markTrackPosition(var6);
- continue label53;
+ while(var6 == var3.trackLengths[var5]) {
+ var3.gotoTrack(var5);
+ int var7 = var3.readMessage(var5);
+ if(var7 == 1) {
+ var3.setTrackDone();
+ var3.markTrackPosition(var5);
+ continue label56;
}
- int var9 = var8 & 240;
+ int var8 = var7 & 240;
+ int var9;
int var10;
int var11;
- int var12;
- if(var9 == 176) {
- var10 = var8 & 15;
- var11 = var8 >> 8 & 127;
- var12 = var8 >> 16 & 127;
- if(var11 == 0) {
- var1[var10] = (var12 << 14) + (var1[var10] & -2080769);
+ if(var8 == 176) {
+ var9 = var7 & 15;
+ var10 = var7 >> 8 & 127;
+ var11 = var7 >> 16 & 127;
+ if(var10 == 0) {
+ var1[var9] = (var11 << 14) + (var1[var9] & -2080769);
}
- if(var11 == 32) {
- var1[var10] = (var1[var10] & -16257) + (var12 << 7);
+ if(var10 == 32) {
+ var1[var9] = (var1[var9] & -16257) + (var11 << 7);
}
}
- if(var9 == 192) {
- var10 = var8 & 15;
- var11 = var8 >> 8 & 127;
- var2[var10] = var11 + var1[var10];
+ if(var8 == 192) {
+ var9 = var7 & 15;
+ var10 = var7 >> 8 & 127;
+ var2[var9] = var10 + var1[var9];
}
- if(var9 == 144) {
- var10 = var8 & 15;
- var11 = var8 >> 8 & 127;
- var12 = var8 >> 16 & 127;
- if(var12 > 0) {
- int var13 = var2[var10];
- ByteArrayNode var14 = (ByteArrayNode)this.table.get((long)var13);
- if(var14 == null) {
- var14 = new ByteArrayNode(new byte[128]);
- this.table.put(var14, (long)var13);
+ if(var8 == 144) {
+ var9 = var7 & 15;
+ var10 = var7 >> 8 & 127;
+ var11 = var7 >> 16 & 127;
+ if(var11 > 0) {
+ int var12 = var2[var9];
+ ByteArrayNode var13 = (ByteArrayNode)this.table.get((long)var12);
+ if(var13 == null) {
+ var13 = new ByteArrayNode(new byte[128]);
+ this.table.put(var13, (long)var12);
}
- var14.byteArray[var11] = 1;
+ var13.byteArray[var10] = 1;
}
}
- var4.readTrackLength(var6);
- var4.markTrackPosition(var6);
+ var3.readTrackLength(var5);
+ var3.markTrackPosition(var5);
}
}
- } while(!var4.isDone());
-
+ } while(!var3.isDone());
}
+
}
@ObfuscatedName("q")
diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java
index 94aac85c0a..5c5cf08366 100644
--- a/runescape-client/src/main/java/NetCache.java
+++ b/runescape-client/src/main/java/NetCache.java
@@ -117,6 +117,15 @@ public class NetCache {
@Export("NetCache_ioExceptions")
public static int NetCache_ioExceptions;
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ signature = "(IB)Lbm;",
+ garbageValue = "31"
+ )
+ static Message method4708(int var0) {
+ return (Message)Messages.Messages_hashTable.get((long)var0);
+ }
+
static {
__iq_f = 0;
NetCache_pendingPriorityWrites = new NodeHashTable(4096);
@@ -136,13 +145,4 @@ public class NetCache {
NetCache_crcMismatches = 0;
NetCache_ioExceptions = 0;
}
-
- @ObfuscatedName("w")
- @ObfuscatedSignature(
- signature = "(IB)Lbm;",
- garbageValue = "31"
- )
- static Message method4708(int var0) {
- return (Message)Messages.Messages_hashTable.get((long)var0);
- }
}
diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java
index 7420f200e2..31309cebb8 100644
--- a/runescape-client/src/main/java/NetFileRequest.java
+++ b/runescape-client/src/main/java/NetFileRequest.java
@@ -42,24 +42,24 @@ public class NetFileRequest extends DualNode {
method4555(var3.children, var3.id);
}
- WidgetGroupParent var7 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id);
- if(var7 != null) {
- ClientPreferences.method1809(var7.group);
+ WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id);
+ if(var4 != null) {
+ ClientPreferences.method1809(var4.group);
}
}
if(var3.type == 6) {
- int var5;
+ int var7;
if(var3.sequenceId != -1 || var3.sequenceId2 != -1) {
- boolean var4 = class238.runCs1(var3);
- if(var4) {
- var5 = var3.sequenceId2;
+ boolean var5 = class238.runCs1(var3);
+ if(var5) {
+ var7 = var3.sequenceId2;
} else {
- var5 = var3.sequenceId;
+ var7 = var3.sequenceId;
}
- if(var5 != -1) {
- SequenceDefinition var6 = WorldMapAreaData.getSequenceDefinition(var5);
+ if(var7 != -1) {
+ SequenceDefinition var6 = WorldMapAreaData.getSequenceDefinition(var7);
for(var3.modelFrameCycle += Client.__client_gy; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class22.method295(var3)) {
var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame];
@@ -76,11 +76,11 @@ public class NetFileRequest extends DualNode {
if(var3.__bh != 0 && !var3.isIf3) {
int var8 = var3.__bh >> 16;
- var5 = var3.__bh << 16 >> 16;
+ var7 = var3.__bh << 16 >> 16;
var8 *= Client.__client_gy;
- var5 *= Client.__client_gy;
+ var7 *= Client.__client_gy;
var3.modelAngleX = var8 + var3.modelAngleX & 2047;
- var3.modelAngleY = var5 + var3.modelAngleY & 2047;
+ var3.modelAngleY = var7 + var3.modelAngleY & 2047;
class22.method295(var3);
}
}
@@ -108,8 +108,8 @@ public class NetFileRequest extends DualNode {
} else {
var4.drawAt2(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2);
}
-
}
}
+
}
}
diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java
index 14900a4d47..8ab32819f8 100644
--- a/runescape-client/src/main/java/NetSocket.java
+++ b/runescape-client/src/main/java/NetSocket.java
@@ -181,6 +181,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
this.task = null;
}
+
}
@ObfuscatedName("ay")
@@ -194,28 +195,29 @@ public final class NetSocket extends AbstractSocket implements Runnable {
if(this.exceptionWriting) {
this.exceptionWriting = false;
throw new IOException();
- } else {
- if(this.array == null) {
- this.array = new byte[this.__d];
+ }
+
+ if(this.array == null) {
+ this.array = new byte[this.__d];
+ }
+
+ synchronized(this) {
+ for(int var5 = 0; var5 < var3; ++var5) {
+ this.array[this.__e] = var1[var5 + var2];
+ this.__e = (this.__e + 1) % this.__d;
+ if((this.__k + this.__l) % this.__d == this.__e) {
+ throw new IOException();
+ }
}
- synchronized(this) {
- for(int var5 = 0; var5 < var3; ++var5) {
- this.array[this.__e] = var1[var5 + var2];
- this.__e = (this.__e + 1) % this.__d;
- if((this.__k + this.__l) % this.__d == this.__e) {
- 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();
}
}
+
}
@Export("run")
@@ -234,7 +236,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
try {
this.wait();
- } catch (InterruptedException var10) {
+ } catch (InterruptedException var9) {
;
}
}
@@ -253,7 +255,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
try {
this.outputStream.write(this.array, var2, var1);
- } catch (IOException var9) {
+ } catch (IOException var8) {
this.exceptionWriting = true;
}
@@ -263,7 +265,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
if(this.__e == this.__l) {
this.outputStream.flush();
}
- } catch (IOException var8) {
+ } catch (IOException var7) {
this.exceptionWriting = true;
}
continue;
@@ -281,15 +283,15 @@ public final class NetSocket extends AbstractSocket implements Runnable {
if(this.socket != null) {
this.socket.close();
}
- } catch (IOException var7) {
+ } catch (IOException var6) {
;
}
this.array = null;
break;
}
- } catch (Exception var12) {
- NpcDefinition.sendStackTrace((String)null, var12);
+ } catch (Exception var11) {
+ NPCDefinition.sendStackTrace((String)null, var11);
}
}
@@ -306,226 +308,226 @@ public final class NetSocket extends AbstractSocket implements Runnable {
garbageValue = "-98"
)
public static int method3571(int var0, int var1, int var2, class179 var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) {
+ int var8;
int var9;
- for(int var8 = 0; var8 < 128; ++var8) {
- for(var9 = 0; var9 < 128; ++var9) {
- class178.__fi_q[var8][var9] = 0;
- class178.__fi_w[var8][var9] = 99999999;
+ for(var9 = 0; var9 < 128; ++var9) {
+ for(var8 = 0; var8 < 128; ++var8) {
+ class178.__fi_q[var9][var8] = 0;
+ class178.__fi_w[var9][var8] = 99999999;
}
}
int var10;
- int var11;
- byte var13;
+ byte var11;
+ int var12;
+ int var13;
int var14;
int var15;
+ int var16;
int var17;
+ boolean var18;
int var19;
int var20;
int var21;
- boolean var28;
- int var30;
- int var31;
- int var33;
+ byte var22;
if(var2 == 1) {
- var10 = var0;
- var11 = var1;
- byte var12 = 64;
- var13 = 64;
- var14 = var0 - var12;
- var15 = var1 - var13;
- class178.__fi_q[var12][var13] = 99;
- class178.__fi_w[var12][var13] = 0;
- byte var16 = 0;
- var17 = 0;
- class178.__fi_l[var16] = var0;
- var33 = var16 + 1;
- class178.__fi_e[var16] = var1;
- int[][] var18 = var4.flags;
+ var9 = var0;
+ var10 = var1;
+ var22 = 64;
+ var11 = 64;
+ var12 = var0 - var22;
+ var13 = var1 - var11;
+ class178.__fi_q[var22][var11] = 99;
+ class178.__fi_w[var22][var11] = 0;
+ byte var23 = 0;
+ var14 = 0;
+ class178.__fi_l[var23] = var0;
+ var21 = var23 + 1;
+ class178.__fi_e[var23] = var1;
+ int[][] var24 = var4.flags;
- boolean var29;
- while(true) {
- if(var33 == var17) {
- WidgetGroupParent.__bx_o = var10;
- UrlRequester.__eo_u = var11;
- var29 = false;
- break;
+ boolean var25;
+ label226: {
+ while(var21 != var14) {
+ var9 = class178.__fi_l[var14];
+ var10 = class178.__fi_e[var14];
+ var14 = var14 + 1 & 4095;
+ var19 = var9 - var12;
+ var20 = var10 - var13;
+ var15 = var9 - var4.xInset;
+ var16 = var10 - var4.yInset;
+ if(var3.vmethod3644(1, var9, var10, var4)) {
+ WidgetGroupParent.__bx_o = var9;
+ UrlRequester.__eo_u = var10;
+ var25 = true;
+ break label226;
+ }
+
+ var17 = class178.__fi_w[var19][var20] + 1;
+ if(var19 > 0 && class178.__fi_q[var19 - 1][var20] == 0 && (var24[var15 - 1][var16] & 19136776) == 0) {
+ class178.__fi_l[var21] = var9 - 1;
+ class178.__fi_e[var21] = var10;
+ var21 = var21 + 1 & 4095;
+ class178.__fi_q[var19 - 1][var20] = 2;
+ class178.__fi_w[var19 - 1][var20] = var17;
+ }
+
+ if(var19 < 127 && class178.__fi_q[var19 + 1][var20] == 0 && (var24[var15 + 1][var16] & 19136896) == 0) {
+ class178.__fi_l[var21] = var9 + 1;
+ class178.__fi_e[var21] = var10;
+ var21 = var21 + 1 & 4095;
+ class178.__fi_q[var19 + 1][var20] = 8;
+ class178.__fi_w[var19 + 1][var20] = var17;
+ }
+
+ if(var20 > 0 && class178.__fi_q[var19][var20 - 1] == 0 && (var24[var15][var16 - 1] & 19136770) == 0) {
+ class178.__fi_l[var21] = var9;
+ class178.__fi_e[var21] = var10 - 1;
+ var21 = var21 + 1 & 4095;
+ class178.__fi_q[var19][var20 - 1] = 1;
+ class178.__fi_w[var19][var20 - 1] = var17;
+ }
+
+ if(var20 < 127 && class178.__fi_q[var19][var20 + 1] == 0 && (var24[var15][var16 + 1] & 19136800) == 0) {
+ class178.__fi_l[var21] = var9;
+ class178.__fi_e[var21] = var10 + 1;
+ var21 = var21 + 1 & 4095;
+ class178.__fi_q[var19][var20 + 1] = 4;
+ class178.__fi_w[var19][var20 + 1] = var17;
+ }
+
+ if(var19 > 0 && var20 > 0 && class178.__fi_q[var19 - 1][var20 - 1] == 0 && (var24[var15 - 1][var16 - 1] & 19136782) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) {
+ class178.__fi_l[var21] = var9 - 1;
+ class178.__fi_e[var21] = var10 - 1;
+ var21 = var21 + 1 & 4095;
+ class178.__fi_q[var19 - 1][var20 - 1] = 3;
+ class178.__fi_w[var19 - 1][var20 - 1] = var17;
+ }
+
+ if(var19 < 127 && var20 > 0 && class178.__fi_q[var19 + 1][var20 - 1] == 0 && (var24[var15 + 1][var16 - 1] & 19136899) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) {
+ class178.__fi_l[var21] = var9 + 1;
+ class178.__fi_e[var21] = var10 - 1;
+ var21 = var21 + 1 & 4095;
+ class178.__fi_q[var19 + 1][var20 - 1] = 9;
+ class178.__fi_w[var19 + 1][var20 - 1] = var17;
+ }
+
+ if(var19 > 0 && var20 < 127 && class178.__fi_q[var19 - 1][var20 + 1] == 0 && (var24[var15 - 1][var16 + 1] & 19136824) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) {
+ class178.__fi_l[var21] = var9 - 1;
+ class178.__fi_e[var21] = var10 + 1;
+ var21 = var21 + 1 & 4095;
+ class178.__fi_q[var19 - 1][var20 + 1] = 6;
+ class178.__fi_w[var19 - 1][var20 + 1] = var17;
+ }
+
+ if(var19 < 127 && var20 < 127 && class178.__fi_q[var19 + 1][var20 + 1] == 0 && (var24[var15 + 1][var16 + 1] & 19136992) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) {
+ class178.__fi_l[var21] = var9 + 1;
+ class178.__fi_e[var21] = var10 + 1;
+ var21 = var21 + 1 & 4095;
+ class178.__fi_q[var19 + 1][var20 + 1] = 12;
+ class178.__fi_w[var19 + 1][var20 + 1] = var17;
+ }
}
- var10 = class178.__fi_l[var17];
- var11 = class178.__fi_e[var17];
- var17 = var17 + 1 & 4095;
- var30 = var10 - var14;
- var31 = var11 - var15;
- var19 = var10 - var4.xInset;
- var20 = var11 - var4.yInset;
- if(var3.vmethod3644(1, var10, var11, var4)) {
- WidgetGroupParent.__bx_o = var10;
- UrlRequester.__eo_u = var11;
- var29 = true;
- break;
- }
-
- var21 = class178.__fi_w[var30][var31] + 1;
- if(var30 > 0 && class178.__fi_q[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136776) == 0) {
- class178.__fi_l[var33] = var10 - 1;
- class178.__fi_e[var33] = var11;
- var33 = var33 + 1 & 4095;
- class178.__fi_q[var30 - 1][var31] = 2;
- class178.__fi_w[var30 - 1][var31] = var21;
- }
-
- if(var30 < 127 && class178.__fi_q[var30 + 1][var31] == 0 && (var18[var19 + 1][var20] & 19136896) == 0) {
- class178.__fi_l[var33] = var10 + 1;
- class178.__fi_e[var33] = var11;
- var33 = var33 + 1 & 4095;
- class178.__fi_q[var30 + 1][var31] = 8;
- class178.__fi_w[var30 + 1][var31] = var21;
- }
-
- if(var31 > 0 && class178.__fi_q[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136770) == 0) {
- class178.__fi_l[var33] = var10;
- class178.__fi_e[var33] = var11 - 1;
- var33 = var33 + 1 & 4095;
- class178.__fi_q[var30][var31 - 1] = 1;
- class178.__fi_w[var30][var31 - 1] = var21;
- }
-
- if(var31 < 127 && class178.__fi_q[var30][var31 + 1] == 0 && (var18[var19][var20 + 1] & 19136800) == 0) {
- class178.__fi_l[var33] = var10;
- class178.__fi_e[var33] = var11 + 1;
- var33 = var33 + 1 & 4095;
- class178.__fi_q[var30][var31 + 1] = 4;
- class178.__fi_w[var30][var31 + 1] = var21;
- }
-
- if(var30 > 0 && var31 > 0 && class178.__fi_q[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) {
- class178.__fi_l[var33] = var10 - 1;
- class178.__fi_e[var33] = var11 - 1;
- var33 = var33 + 1 & 4095;
- class178.__fi_q[var30 - 1][var31 - 1] = 3;
- class178.__fi_w[var30 - 1][var31 - 1] = var21;
- }
-
- if(var30 < 127 && var31 > 0 && class178.__fi_q[var30 + 1][var31 - 1] == 0 && (var18[var19 + 1][var20 - 1] & 19136899) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) {
- class178.__fi_l[var33] = var10 + 1;
- class178.__fi_e[var33] = var11 - 1;
- var33 = var33 + 1 & 4095;
- class178.__fi_q[var30 + 1][var31 - 1] = 9;
- class178.__fi_w[var30 + 1][var31 - 1] = var21;
- }
-
- if(var30 > 0 && var31 < 127 && class178.__fi_q[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + 1] & 19136824) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) {
- class178.__fi_l[var33] = var10 - 1;
- class178.__fi_e[var33] = var11 + 1;
- var33 = var33 + 1 & 4095;
- class178.__fi_q[var30 - 1][var31 + 1] = 6;
- class178.__fi_w[var30 - 1][var31 + 1] = var21;
- }
-
- if(var30 < 127 && var31 < 127 && class178.__fi_q[var30 + 1][var31 + 1] == 0 && (var18[var19 + 1][var20 + 1] & 19136992) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) {
- class178.__fi_l[var33] = var10 + 1;
- class178.__fi_e[var33] = var11 + 1;
- var33 = var33 + 1 & 4095;
- class178.__fi_q[var30 + 1][var31 + 1] = 12;
- class178.__fi_w[var30 + 1][var31 + 1] = var21;
- }
+ WidgetGroupParent.__bx_o = var9;
+ UrlRequester.__eo_u = var10;
+ var25 = false;
}
- var28 = var29;
+ var18 = var25;
} else if(var2 == 2) {
- var28 = WorldMapSection2.method593(var0, var1, var3, var4);
+ var18 = WorldMapSection2.method593(var0, var1, var3, var4);
} else {
- var28 = IndexStore.method3585(var0, var1, var2, var3, var4);
+ var18 = IndexStore.method3585(var0, var1, var2, var3, var4);
}
- var9 = var0 - 64;
- var10 = var1 - 64;
- var11 = WidgetGroupParent.__bx_o;
- var30 = UrlRequester.__eo_u;
- if(!var28) {
- var31 = Integer.MAX_VALUE;
- var14 = Integer.MAX_VALUE;
- byte var32 = 10;
- var33 = var3.field2120;
- var17 = var3.field2121;
- int var27 = var3.field2122;
- var19 = var3.field2123;
+ var8 = var0 - 64;
+ var9 = var1 - 64;
+ var10 = WidgetGroupParent.__bx_o;
+ var19 = UrlRequester.__eo_u;
+ if(!var18) {
+ var20 = Integer.MAX_VALUE;
+ var12 = Integer.MAX_VALUE;
+ var22 = 10;
+ var21 = var3.field2120;
+ var14 = var3.field2121;
+ int var29 = var3.field2122;
+ var15 = var3.field2123;
- for(var20 = var33 - var32; var20 <= var32 + var33; ++var20) {
- for(var21 = var17 - var32; var21 <= var17 + var32; ++var21) {
- int var22 = var20 - var9;
- int var23 = var21 - var10;
- if(var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class178.__fi_w[var22][var23] < 100) {
- int var24 = 0;
- if(var20 < var33) {
- var24 = var33 - var20;
- } else if(var20 > var27 + var33 - 1) {
- var24 = var20 - (var27 + var33 - 1);
+ for(var16 = var21 - var22; var16 <= var22 + var21; ++var16) {
+ for(var17 = var14 - var22; var17 <= var14 + var22; ++var17) {
+ int var30 = var16 - var8;
+ int var31 = var17 - var9;
+ if(var30 >= 0 && var31 >= 0 && var30 < 128 && var31 < 128 && class178.__fi_w[var30][var31] < 100) {
+ int var26 = 0;
+ if(var16 < var21) {
+ var26 = var21 - var16;
+ } else if(var16 > var29 + var21 - 1) {
+ var26 = var16 - (var29 + var21 - 1);
}
- int var25 = 0;
- if(var21 < var17) {
- var25 = var17 - var21;
- } else if(var21 > var19 + var17 - 1) {
- var25 = var21 - (var19 + var17 - 1);
+ int var27 = 0;
+ if(var17 < var14) {
+ var27 = var14 - var17;
+ } else if(var17 > var15 + var14 - 1) {
+ var27 = var17 - (var15 + var14 - 1);
}
- int var26 = var25 * var25 + var24 * var24;
- if(var26 < var31 || var26 == var31 && class178.__fi_w[var22][var23] < var14) {
- var31 = var26;
- var14 = class178.__fi_w[var22][var23];
- var11 = var20;
- var30 = var21;
+ int var28 = var27 * var27 + var26 * var26;
+ if(var28 < var20 || var28 == var20 && class178.__fi_w[var30][var31] < var12) {
+ var20 = var28;
+ var12 = class178.__fi_w[var30][var31];
+ var10 = var16;
+ var19 = var17;
}
}
}
}
- if(var31 == Integer.MAX_VALUE) {
+ if(var20 == Integer.MAX_VALUE) {
return -1;
}
}
- if(var0 == var11 && var30 == var1) {
+ if(var0 == var10 && var19 == var1) {
return 0;
} else {
- var13 = 0;
- class178.__fi_l[var13] = var11;
- var31 = var13 + 1;
- class178.__fi_e[var13] = var30;
+ var11 = 0;
+ class178.__fi_l[var11] = var10;
+ var20 = var11 + 1;
+ class178.__fi_e[var11] = var19;
- for(var14 = var15 = class178.__fi_q[var11 - var9][var30 - var10]; var0 != var11 || var30 != var1; var14 = class178.__fi_q[var11 - var9][var30 - var10]) {
- if(var14 != var15) {
- var15 = var14;
- class178.__fi_l[var31] = var11;
- class178.__fi_e[var31++] = var30;
+ for(var12 = var13 = class178.__fi_q[var10 - var8][var19 - var9]; var0 != var10 || var19 != var1; var12 = class178.__fi_q[var10 - var8][var19 - var9]) {
+ if(var12 != var13) {
+ var13 = var12;
+ class178.__fi_l[var20] = var10;
+ class178.__fi_e[var20++] = var19;
}
- if((var14 & 2) != 0) {
- ++var11;
- } else if((var14 & 8) != 0) {
- --var11;
+ if((var12 & 2) != 0) {
+ ++var10;
+ } else if((var12 & 8) != 0) {
+ --var10;
}
- if((var14 & 1) != 0) {
- ++var30;
- } else if((var14 & 4) != 0) {
- --var30;
+ if((var12 & 1) != 0) {
+ ++var19;
+ } else if((var12 & 4) != 0) {
+ --var19;
}
}
- var33 = 0;
+ var21 = 0;
- while(var31-- > 0) {
- var6[var33] = class178.__fi_l[var31];
- var7[var33++] = class178.__fi_e[var31];
- if(var33 >= var6.length) {
+ while(var20-- > 0) {
+ var6[var21] = class178.__fi_l[var20];
+ var7[var21++] = class178.__fi_e[var20];
+ if(var21 >= var6.length) {
break;
}
}
- return var33;
+ return var21;
}
}
diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java
index 56baec5554..fac08c500e 100644
--- a/runescape-client/src/main/java/Node.java
+++ b/runescape-client/src/main/java/Node.java
@@ -31,6 +31,7 @@ public class Node {
this.previous = null;
this.next = null;
}
+
}
@ObfuscatedName("eg")
diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java
index 2e4fcbf1bb..1265b9e59c 100644
--- a/runescape-client/src/main/java/NodeHashTable.java
+++ b/runescape-client/src/main/java/NodeHashTable.java
@@ -124,16 +124,15 @@ public final class NodeHashTable {
this.current = var1.previous;
return var1;
} else {
- do {
- if(this.index >= this.size) {
- return null;
- }
-
+ while(this.index < this.size) {
var1 = this.buckets[this.index++].previous;
- } while(var1 == this.buckets[this.index - 1]);
+ if(var1 != this.buckets[this.index - 1]) {
+ this.current = var1.previous;
+ return var1;
+ }
+ }
- this.current = var1.previous;
- return var1;
+ return null;
}
}
}
diff --git a/runescape-client/src/main/java/Npc.java b/runescape-client/src/main/java/Npc.java
index 8d0db12d02..f76f4debd2 100644
--- a/runescape-client/src/main/java/Npc.java
+++ b/runescape-client/src/main/java/Npc.java
@@ -5,13 +5,13 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("cv")
@Implements("NPC")
-public final class Npc extends Actor {
+public final class NPC extends Actor {
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "Ljz;"
)
@Export("definition")
- NpcDefinition definition;
+ NPCDefinition definition;
@ObfuscatedName("m")
@ObfuscatedSignature(
@@ -129,7 +129,7 @@ public final class Npc extends Actor {
return null;
} else {
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0?WorldMapAreaData.getSequenceDefinition(super.sequence):null;
- SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.idleSequence || var1 == null)?WorldMapAreaData.getSequenceDefinition(super.movementSequence):null;
+ SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.idleSequence && var1 != null?null:WorldMapAreaData.getSequenceDefinition(super.movementSequence);
Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
if(var3 == null) {
return null;
@@ -175,11 +175,13 @@ public final class Npc extends Actor {
var3.indexStore = var1;
var3.indexCache = var2;
NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
+ NodeDeque var5 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) {
IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3);
}
- Object var9 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
+ Object var10 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
+ Object var6 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) {
if(IndexStoreActionHandler.__iv_q == 0) {
Frames.IndexStoreActionHandler_thread = new Thread(new IndexStoreActionHandler());
diff --git a/runescape-client/src/main/java/NpcDefinition.java b/runescape-client/src/main/java/NpcDefinition.java
index 3a2e339a5b..f59f12d6ad 100644
--- a/runescape-client/src/main/java/NpcDefinition.java
+++ b/runescape-client/src/main/java/NpcDefinition.java
@@ -11,7 +11,7 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jz")
@Implements("NPCDefinition")
-public class NpcDefinition extends DualNode {
+public class NPCDefinition extends DualNode {
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "Lir;"
@@ -193,12 +193,7 @@ public class NpcDefinition extends DualNode {
@Export("params")
IterableNodeHashTable params;
- static {
- NpcDefinition_cached = new EvictingDualNodeHashTable(64);
- NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50);
- }
-
- NpcDefinition() {
+ NPCDefinition() {
this.name = "null";
this.size = 1;
this.idleSequence = -1;
@@ -384,8 +379,8 @@ public class NpcDefinition extends DualNode {
@Export("getModel")
public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
if(this.transforms != null) {
- NpcDefinition var12 = this.transform();
- return var12 == null?null:var12.getModel(var1, var2, var3, var4);
+ NPCDefinition var11 = this.transform();
+ return var11 == null?null:var11.getModel(var1, var2, var3, var4);
} else {
Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id);
if(var5 == null) {
@@ -401,33 +396,33 @@ public class NpcDefinition extends DualNode {
return null;
}
- ModelData[] var8 = new ModelData[this.archives.length];
+ ModelData[] var12 = new ModelData[this.archives.length];
- int var9;
- for(var9 = 0; var9 < this.archives.length; ++var9) {
- var8[var9] = ModelData.method2788(NpcDefinition_modelIndexCache, this.archives[var9], 0);
+ int var8;
+ for(var8 = 0; var8 < this.archives.length; ++var8) {
+ var12[var8] = ModelData.method2788(NpcDefinition_modelIndexCache, this.archives[var8], 0);
}
- ModelData var11;
- if(var8.length == 1) {
- var11 = var8[0];
+ ModelData var9;
+ if(var12.length == 1) {
+ var9 = var12[0];
} else {
- var11 = new ModelData(var8, var8.length);
+ var9 = new ModelData(var12, var12.length);
}
if(this.recolorFrom != null) {
- for(var9 = 0; var9 < this.recolorFrom.length; ++var9) {
- var11.recolor(this.recolorFrom[var9], this.recolorTo[var9]);
+ for(var8 = 0; var8 < this.recolorFrom.length; ++var8) {
+ var9.recolor(this.recolorFrom[var8], this.recolorTo[var8]);
}
}
if(this.retextureFrom != null) {
- for(var9 = 0; var9 < this.retextureFrom.length; ++var9) {
- var11.retexture(this.retextureFrom[var9], this.retextureTo[var9]);
+ for(var8 = 0; var8 < this.retextureFrom.length; ++var8) {
+ var9.retexture(this.retextureFrom[var8], this.retextureTo[var8]);
}
}
- var5 = var11.toModel(this.__ag + 64, this.__aq * 5 + 850, -30, -50, -30);
+ var5 = var9.toModel(this.__ag + 64, this.__aq * 5 + 850, -30, -50, -30);
NpcDefinition_cachedModels.put(var5, (long)this.id);
}
@@ -458,20 +453,20 @@ public class NpcDefinition extends DualNode {
@Export("getModelData")
public final ModelData getModelData() {
if(this.transforms != null) {
- NpcDefinition var1 = this.transform();
- return var1 == null?null:var1.getModelData();
+ NPCDefinition var5 = this.transform();
+ return var5 == null?null:var5.getModelData();
} else if(this.__e == null) {
return null;
} else {
- boolean var5 = false;
+ boolean var1 = false;
for(int var2 = 0; var2 < this.__e.length; ++var2) {
if(!NpcDefinition_modelIndexCache.tryLoadRecord(this.__e[var2], 0)) {
- var5 = true;
+ var1 = true;
}
}
- if(var5) {
+ if(var1) {
return null;
} else {
ModelData[] var6 = new ModelData[this.__e.length];
@@ -511,7 +506,7 @@ public class NpcDefinition extends DualNode {
garbageValue = "-113"
)
@Export("transform")
- public final NpcDefinition transform() {
+ public final NPCDefinition transform() {
int var1 = -1;
if(this.transformVarbit != -1) {
var1 = WorldMapSection2.getVarbit(this.transformVarbit);
@@ -557,20 +552,20 @@ public class NpcDefinition extends DualNode {
)
@Export("getIntParam")
public int getIntParam(int var1, int var2) {
- IterableNodeHashTable var4 = this.params;
- int var3;
- if(var4 == null) {
- var3 = var2;
+ IterableNodeHashTable var3 = this.params;
+ int var4;
+ if(var3 == null) {
+ var4 = var2;
} else {
- IntegerNode var5 = (IntegerNode)var4.get((long)var1);
+ IntegerNode var5 = (IntegerNode)var3.get((long)var1);
if(var5 == null) {
- var3 = var2;
+ var4 = var2;
} else {
- var3 = var5.integer;
+ var4 = var5.integer;
}
}
- return var3;
+ return var4;
}
@ObfuscatedName("d")
@@ -623,8 +618,8 @@ public class NpcDefinition extends DualNode {
} catch (Exception var5) {
;
}
-
}
+
}
@ObfuscatedName("e")
@@ -662,47 +657,47 @@ public class NpcDefinition extends DualNode {
if(Login.Login_username.length() == 0) {
class54.method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
} else {
- long var1;
+ long var0;
try {
- URL var3 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws");
- URLConnection var4 = var3.openConnection();
- var4.setRequestProperty("connection", "close");
- var4.setDoInput(true);
- var4.setDoOutput(true);
- var4.setConnectTimeout(5000);
- OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream());
- var5.write("data1=req");
- var5.flush();
- InputStream var6 = var4.getInputStream();
- Buffer var7 = new Buffer(new byte[1000]);
+ URL var2 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws");
+ URLConnection var3 = var2.openConnection();
+ var3.setRequestProperty("connection", "close");
+ var3.setDoInput(true);
+ var3.setDoOutput(true);
+ var3.setConnectTimeout(5000);
+ OutputStreamWriter var4 = new OutputStreamWriter(var3.getOutputStream());
+ var4.write("data1=req");
+ var4.flush();
+ InputStream var5 = var3.getInputStream();
+ Buffer var6 = new Buffer(new byte[1000]);
while(true) {
- int var8 = var6.read(var7.array, var7.index, 1000 - var7.index);
- if(var8 == -1) {
- var7.index = 0;
- long var10 = var7.readLong();
- var1 = var10;
+ int var7 = var5.read(var6.array, var6.index, 1000 - var6.index);
+ if(var7 == -1) {
+ var6.index = 0;
+ long var8 = var6.readLong();
+ var0 = var8;
break;
}
- var7.index += var8;
- if(var7.index >= 1000) {
- var1 = 0L;
+ var6.index += var7;
+ if(var6.index >= 1000) {
+ var0 = 0L;
break;
}
}
- } catch (Exception var14) {
- var1 = 0L;
+ } catch (Exception var10) {
+ var0 = 0L;
}
- int var0;
- if(var1 == 0L) {
- var0 = 5;
+ int var11;
+ if(var0 == 0L) {
+ var11 = 5;
} else {
- var0 = class72.method1778(var1, Login.Login_username);
+ var11 = class72.method1778(var0, Login.Login_username);
}
- switch(var0) {
+ switch(var11) {
case 2:
class54.method1089(Strings.__id_jr, Strings.__id_jv, Strings.__id_ju);
Login.loginIndex = 6;
@@ -722,8 +717,8 @@ public class NpcDefinition extends DualNode {
case 7:
class54.method1089("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username.");
}
-
}
+
}
@ObfuscatedName("kw")
@@ -744,4 +739,9 @@ public class NpcDefinition extends DualNode {
return var0;
}
+
+ static {
+ NpcDefinition_cached = new EvictingDualNodeHashTable(64);
+ NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50);
+ }
}
diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java
index c4ec49ab44..8576904cdd 100644
--- a/runescape-client/src/main/java/ObjectDefinition.java
+++ b/runescape-client/src/main/java/ObjectDefinition.java
@@ -260,15 +260,6 @@ public class ObjectDefinition extends DualNode {
@Export("params")
IterableNodeHashTable params;
- static {
- ObjectDefinition_isLowDetail = false;
- ObjectDefinition_cached = new EvictingDualNodeHashTable(4096);
- __jr_o = new EvictingDualNodeHashTable(500);
- __jr_u = new EvictingDualNodeHashTable(30);
- ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30);
- __jr_l = new ModelData[4];
- }
-
ObjectDefinition() {
this.name = "null";
this.sizeX = 1;
@@ -704,6 +695,7 @@ public class ObjectDefinition extends DualNode {
ModelData var3 = null;
boolean var4;
int var5;
+ int var6;
int var7;
if(this.__d == null) {
if(var1 != 10) {
@@ -721,15 +713,15 @@ public class ObjectDefinition extends DualNode {
var5 = this.__x.length;
- for(int var6 = 0; var6 < var5; ++var6) {
- var7 = this.__x[var6];
+ for(var7 = 0; var7 < var5; ++var7) {
+ var6 = this.__x[var7];
if(var4) {
- var7 += 65536;
+ var6 += 65536;
}
- var3 = (ModelData)__jr_o.get((long)var7);
+ var3 = (ModelData)__jr_o.get((long)var6);
if(var3 == null) {
- var3 = ModelData.method2788(__jr_q, var7 & 65535, 0);
+ var3 = ModelData.method2788(__jr_q, var6 & 65535, 0);
if(var3 == null) {
return null;
}
@@ -738,11 +730,11 @@ public class ObjectDefinition extends DualNode {
var3.__t_226();
}
- __jr_o.put(var3, (long)var7);
+ __jr_o.put(var3, (long)var6);
}
if(var5 > 1) {
- __jr_l[var6] = var3;
+ __jr_l[var7] = var3;
}
}
@@ -750,22 +742,22 @@ public class ObjectDefinition extends DualNode {
var3 = new ModelData(__jr_l, var5);
}
} else {
- int var9 = -1;
+ var7 = -1;
for(var5 = 0; var5 < this.__d.length; ++var5) {
if(this.__d[var5] == var1) {
- var9 = var5;
+ var7 = var5;
break;
}
}
- if(var9 == -1) {
+ if(var7 == -1) {
return null;
}
- var5 = this.__x[var9];
- boolean var10 = this.isRotated ^ var2 > 3;
- if(var10) {
+ var5 = this.__x[var7];
+ boolean var8 = this.isRotated ^ var2 > 3;
+ if(var8) {
var5 += 65536;
}
@@ -776,7 +768,7 @@ public class ObjectDefinition extends DualNode {
return null;
}
- if(var10) {
+ if(var8) {
var3.__t_226();
}
@@ -790,49 +782,49 @@ public class ObjectDefinition extends DualNode {
var4 = true;
}
- boolean var11;
+ boolean var10;
if(this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) {
- var11 = false;
+ var10 = false;
} else {
- var11 = true;
+ var10 = true;
}
- ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, null == this.retextureFrom, true);
+ ModelData var9 = new ModelData(var3, var2 == 0 && !var4 && !var10, this.recolorFrom == null, null == this.retextureFrom, true);
if(var1 == 4 && var2 > 3) {
- var8.__a_224(256);
- var8.__z_225(45, 0, -45);
+ var9.__a_224(256);
+ var9.__z_225(45, 0, -45);
}
var2 &= 3;
if(var2 == 1) {
- var8.__l_221();
+ var9.__l_221();
} else if(var2 == 2) {
- var8.__x_222();
+ var9.__x_222();
} else if(var2 == 3) {
- var8.__d_223();
+ var9.__d_223();
}
if(this.recolorFrom != null) {
- for(var7 = 0; var7 < this.recolorFrom.length; ++var7) {
- var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]);
+ for(var6 = 0; var6 < this.recolorFrom.length; ++var6) {
+ var9.recolor(this.recolorFrom[var6], this.recolorTo[var6]);
}
}
if(this.retextureFrom != null) {
- for(var7 = 0; var7 < this.retextureFrom.length; ++var7) {
- var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]);
+ for(var6 = 0; var6 < this.retextureFrom.length; ++var6) {
+ var9.retexture(this.retextureFrom[var6], this.retextureTo[var6]);
}
}
if(var4) {
- var8.__y_227(this.modelSizeX, this.modelHeight, this.modelSizeY);
+ var9.__y_227(this.modelSizeX, this.modelHeight, this.modelSizeY);
}
- if(var11) {
- var8.__z_225(this.offsetX, this.offsetHeight, this.offsetY);
+ if(var10) {
+ var9.__z_225(this.offsetX, this.offsetHeight, this.offsetY);
}
- return var8;
+ return var9;
}
@ObfuscatedName("a")
@@ -866,20 +858,20 @@ public class ObjectDefinition extends DualNode {
)
@Export("getIntParam")
public int getIntParam(int var1, int var2) {
- IterableNodeHashTable var4 = this.params;
- int var3;
- if(var4 == null) {
- var3 = var2;
+ IterableNodeHashTable var3 = this.params;
+ int var4;
+ if(var3 == null) {
+ var4 = var2;
} else {
- IntegerNode var5 = (IntegerNode)var4.get((long)var1);
+ IntegerNode var5 = (IntegerNode)var3.get((long)var1);
if(var5 == null) {
- var3 = var2;
+ var4 = var2;
} else {
- var3 = var5.integer;
+ var4 = var5.integer;
}
}
- return var3;
+ return var4;
}
@ObfuscatedName("j")
@@ -921,20 +913,20 @@ public class ObjectDefinition extends DualNode {
garbageValue = "-1284680749"
)
@Export("getNpcDefinition")
- public static NpcDefinition getNpcDefinition(int var0) {
- NpcDefinition var1 = (NpcDefinition)NpcDefinition.NpcDefinition_cached.get((long)var0);
+ public static NPCDefinition getNpcDefinition(int var0) {
+ NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0);
if(var1 != null) {
return var1;
} else {
- byte[] var2 = NpcDefinition.NpcDefinition_indexCache.takeRecord(9, var0);
- var1 = new NpcDefinition();
+ byte[] var2 = NPCDefinition.NpcDefinition_indexCache.takeRecord(9, var0);
+ var1 = new NPCDefinition();
var1.id = var0;
if(var2 != null) {
var1.read(new Buffer(var2));
}
var1.init();
- NpcDefinition.NpcDefinition_cached.put(var1, (long)var0);
+ NPCDefinition.NpcDefinition_cached.put(var1, (long)var0);
return var1;
}
}
@@ -947,4 +939,13 @@ public class ObjectDefinition extends DualNode {
public static void method5041() {
ItemDefinition.Sprite_cached.clear();
}
+
+ static {
+ ObjectDefinition_isLowDetail = false;
+ ObjectDefinition_cached = new EvictingDualNodeHashTable(4096);
+ __jr_o = new EvictingDualNodeHashTable(500);
+ __jr_u = new EvictingDualNodeHashTable(30);
+ ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30);
+ __jr_l = new ModelData[4];
+ }
}
diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java
index ba344aa439..71f53831dc 100644
--- a/runescape-client/src/main/java/ObjectSound.java
+++ b/runescape-client/src/main/java/ObjectSound.java
@@ -87,7 +87,7 @@ public final class ObjectSound extends Node {
intValue = -1041508847
)
@Export("surfaceOffsetY")
- int __n;
+ int surfaceOffsetY;
@ObfuscatedName("i")
@ObfuscatedSignature(
signature = "Lds;"
@@ -101,10 +101,6 @@ public final class ObjectSound extends Node {
@Export("obj")
ObjectDefinition obj;
- static {
- objectSounds = new NodeDeque();
- }
-
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "(I)V",
@@ -134,4 +130,8 @@ public final class ObjectSound extends Node {
}
}
+
+ static {
+ objectSounds = new NodeDeque();
+ }
}
diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java
index 84e8db0e18..470211364c 100644
--- a/runescape-client/src/main/java/Occluder.java
+++ b/runescape-client/src/main/java/Occluder.java
@@ -84,7 +84,7 @@ public final class Occluder {
intValue = -407777817
)
@Export("surfaceOffsetY")
- int __n;
+ int surfaceOffsetY;
@ObfuscatedName("i")
@ObfuscatedGetter(
intValue = 1324959981
diff --git a/runescape-client/src/main/java/OverlayDefinition.java b/runescape-client/src/main/java/OverlayDefinition.java
index 001869f336..f0a9acd2d5 100644
--- a/runescape-client/src/main/java/OverlayDefinition.java
+++ b/runescape-client/src/main/java/OverlayDefinition.java
@@ -77,10 +77,6 @@ public class OverlayDefinition extends DualNode {
@Export("lightness2")
public int lightness2;
- static {
- __jf_f = new EvictingDualNodeHashTable(64);
- }
-
public OverlayDefinition() {
this.rgb = 0;
this.texture = -1;
@@ -246,4 +242,8 @@ public class OverlayDefinition extends DualNode {
}
}
+
+ static {
+ __jf_f = new EvictingDualNodeHashTable(64);
+ }
}
diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java
index 8198487a11..b1d7542d1b 100644
--- a/runescape-client/src/main/java/PacketBuffer.java
+++ b/runescape-client/src/main/java/PacketBuffer.java
@@ -29,10 +29,6 @@ public final class PacketBuffer extends Buffer {
@Export("bitIndex")
int bitIndex;
- static {
- PacketBuffer_masks = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1};
- }
-
public PacketBuffer(int var1) {
super(var1);
}
@@ -196,7 +192,6 @@ public final class PacketBuffer extends Buffer {
--NetCache.NetCache_pendingWritesCount;
++NetCache.NetCache_pendingPriorityWritesCount;
}
-
} else {
if(!var5) {
var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6);
@@ -217,10 +212,10 @@ public final class PacketBuffer extends Buffer {
NetCache.NetCache_pendingWrites.put(var8, var6);
++NetCache.NetCache_pendingWritesCount;
}
-
}
}
}
+
}
@ObfuscatedName("f")
@@ -231,4 +226,8 @@ public final class PacketBuffer extends Buffer {
public static int method4081(int var0, int var1) {
return (var0 + 40000 << 8) + var1;
}
+
+ static {
+ PacketBuffer_masks = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1};
+ }
}
diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java
index 15514416c1..ca652bd1f3 100644
--- a/runescape-client/src/main/java/PacketBufferNode.java
+++ b/runescape-client/src/main/java/PacketBufferNode.java
@@ -44,11 +44,6 @@ public class PacketBufferNode extends Node {
@Export("__w")
public int __w;
- static {
- packetBufferNodes = new PacketBufferNode[300];
- __gg_u = 0;
- }
-
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "(I)V",
@@ -59,6 +54,7 @@ public class PacketBufferNode extends Node {
if(__gg_u < packetBufferNodes.length) {
packetBufferNodes[++__gg_u - 1] = this;
}
+
}
@ObfuscatedName("kq")
@@ -69,4 +65,9 @@ public class PacketBufferNode extends Node {
static boolean method3673(Widget var0) {
return var0.isHidden;
}
+
+ static {
+ packetBufferNodes = new PacketBufferNode[300];
+ __gg_u = 0;
+ }
}
diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java
index 2f2d8a1ffd..50dcc93318 100644
--- a/runescape-client/src/main/java/PacketWriter.java
+++ b/runescape-client/src/main/java/PacketWriter.java
@@ -88,7 +88,7 @@ public class PacketWriter {
signature = "Lge;"
)
@Export("surfaceOffsetY")
- ServerPacket __n;
+ ServerPacket surfaceOffsetY;
@ObfuscatedName("i")
@ObfuscatedSignature(
signature = "Lge;"
diff --git a/runescape-client/src/main/java/ParamKeyDefinition.java b/runescape-client/src/main/java/ParamKeyDefinition.java
index eb4b7f01a1..292d57d75d 100644
--- a/runescape-client/src/main/java/ParamKeyDefinition.java
+++ b/runescape-client/src/main/java/ParamKeyDefinition.java
@@ -35,10 +35,6 @@ public class ParamKeyDefinition extends DualNode {
@Export("isMembersOnly")
boolean isMembersOnly;
- static {
- ParamKeyDefinition_cached = new EvictingDualNodeHashTable(64);
- }
-
ParamKeyDefinition() {
this.isMembersOnly = true;
}
@@ -132,15 +128,15 @@ public class ParamKeyDefinition extends DualNode {
int var12;
if(0L != var7) {
var12 = class65.scene.getObjectFlags(var0, var2, var3, var7);
- int var39 = HitSplatDefinition.method4972(var7);
- int var40 = var12 & 31;
- int var41 = var12 >> 6 & 3;
- ObjectDefinition var13;
+ int var13 = HitSplatDefinition.method4972(var7);
+ int var14 = var12 & 31;
+ int var15 = var12 >> 6 & 3;
+ ObjectDefinition var16;
if(var1 == 0) {
class65.scene.removeBoundaryObject(var0, var2, var3);
- var13 = class50.getObjectDefinition(var39);
- if(var13.interactType != 0) {
- Client.collisionMaps[var0].__g_288(var2, var3, var40, var41, var13.boolean1);
+ var16 = class50.getObjectDefinition(var13);
+ if(var16.interactType != 0) {
+ Client.collisionMaps[var0].__g_288(var2, var3, var14, var15, var16.boolean1);
}
}
@@ -150,20 +146,20 @@ public class ParamKeyDefinition extends DualNode {
if(var1 == 2) {
class65.scene.__c_242(var0, var2, var3);
- var13 = class50.getObjectDefinition(var39);
- if(var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) {
+ var16 = class50.getObjectDefinition(var13);
+ if(var2 + var16.sizeX > 103 || var3 + var16.sizeX > 103 || var2 + var16.sizeY > 103 || var3 + var16.sizeY > 103) {
return;
}
- if(var13.interactType != 0) {
- Client.collisionMaps[var0].__l_289(var2, var3, var13.sizeX, var13.sizeY, var41, var13.boolean1);
+ if(var16.interactType != 0) {
+ Client.collisionMaps[var0].__l_289(var2, var3, var16.sizeX, var16.sizeY, var15, var16.boolean1);
}
}
if(var1 == 3) {
class65.scene.removeFloorDecoration(var0, var2, var3);
- var13 = class50.getObjectDefinition(var39);
- if(var13.interactType == 1) {
+ var16 = class50.getObjectDefinition(var13);
+ if(var16.interactType == 1) {
Client.collisionMaps[var0].__x_291(var2, var3);
}
}
@@ -175,24 +171,24 @@ public class ParamKeyDefinition extends DualNode {
var12 = var0 + 1;
}
- Scene var42 = class65.scene;
- CollisionMap var14 = Client.collisionMaps[var0];
- ObjectDefinition var15 = class50.getObjectDefinition(var4);
- int var16;
+ Scene var36 = class65.scene;
+ CollisionMap var37 = Client.collisionMaps[var0];
+ ObjectDefinition var38 = class50.getObjectDefinition(var4);
int var17;
+ int var39;
if(var5 != 1 && var5 != 3) {
- var16 = var15.sizeX;
- var17 = var15.sizeY;
+ var39 = var38.sizeX;
+ var17 = var38.sizeY;
} else {
- var16 = var15.sizeY;
- var17 = var15.sizeX;
+ var39 = var38.sizeY;
+ var17 = var38.sizeX;
}
int var18;
int var19;
- if(var16 + var2 <= 104) {
- var18 = (var16 >> 1) + var2;
- var19 = var2 + (var16 + 1 >> 1);
+ if(var39 + var2 <= 104) {
+ var18 = (var39 >> 1) + var2;
+ var19 = var2 + (var39 + 1 >> 1);
} else {
var18 = var2;
var19 = var2 + 1;
@@ -210,186 +206,192 @@ public class ParamKeyDefinition extends DualNode {
int[][] var22 = Tiles.Tiles_heights[var12];
int var23 = var22[var18][var21] + var22[var19][var20] + var22[var18][var20] + var22[var19][var21] >> 2;
- int var24 = (var2 << 7) + (var16 << 6);
+ int var24 = (var2 << 7) + (var39 << 6);
int var25 = (var3 << 7) + (var17 << 6);
- long var26 = FontName.method5637(var2, var3, 2, var15.int1 == 0, var4);
+ long var26 = FontName.method5637(var2, var3, 2, var38.int1 == 0, var4);
int var28 = (var5 << 6) + var6;
- if(var15.int3 == 1) {
+ if(var38.int3 == 1) {
var28 += 256;
}
Object var29;
if(var6 == 22) {
- if(var15.animationId == -1 && var15.transforms == null) {
- var29 = var15.getModel(22, var5, var22, var24, var23, var25);
+ if(var38.animationId == -1 && var38.transforms == null) {
+ var29 = var38.getModel(22, var5, var22, var24, var23, var25);
} else {
- var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+ var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
}
- var42.newFloorDecoration(var0, var2, var3, var23, (Entity)var29, var26, var28);
- if(var15.interactType == 1) {
- var14.__o_286(var2, var3);
+ var36.newFloorDecoration(var0, var2, var3, var23, (Entity)var29, var26, var28);
+ if(var38.interactType == 1) {
+ var37.__o_286(var2, var3);
}
} else if(var6 != 10 && var6 != 11) {
if(var6 >= 12) {
- if(var15.animationId == -1 && var15.transforms == null) {
- var29 = var15.getModel(var6, var5, var22, var24, var23, var25);
+ if(var38.animationId == -1 && var38.transforms == null) {
+ var29 = var38.getModel(var6, var5, var22, var24, var23, var25);
} else {
- var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+ var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
}
- var42.__d_238(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28);
- if(var15.interactType != 0) {
- var14.__q_284(var2, var3, var16, var17, var15.boolean1);
+ var36.__d_238(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28);
+ if(var38.interactType != 0) {
+ var37.__q_284(var2, var3, var39, var17, var38.boolean1);
}
} else if(var6 == 0) {
- if(var15.animationId == -1 && var15.transforms == null) {
- var29 = var15.getModel(0, var5, var22, var24, var23, var25);
+ if(var38.animationId == -1 && var38.transforms == null) {
+ var29 = var38.getModel(0, var5, var22, var24, var23, var25);
} else {
- var29 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+ var29 = new DynamicObject(var4, 0, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
}
- var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_t[var5], 0, var26, var28);
- if(var15.interactType != 0) {
- var14.__f_283(var2, var3, var6, var5, var15.boolean1);
+ var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_t[var5], 0, var26, var28);
+ if(var38.interactType != 0) {
+ var37.__f_283(var2, var3, var6, var5, var38.boolean1);
}
} else if(var6 == 1) {
- if(var15.animationId == -1 && var15.transforms == null) {
- var29 = var15.getModel(1, var5, var22, var24, var23, var25);
+ if(var38.animationId == -1 && var38.transforms == null) {
+ var29 = var38.getModel(1, var5, var22, var24, var23, var25);
} else {
- var29 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+ var29 = new DynamicObject(var4, 1, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
}
- var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_y[var5], 0, var26, var28);
- if(var15.interactType != 0) {
- var14.__f_283(var2, var3, var6, var5, var15.boolean1);
+ var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_y[var5], 0, var26, var28);
+ if(var38.interactType != 0) {
+ var37.__f_283(var2, var3, var6, var5, var38.boolean1);
}
} else {
- int var35;
+ int var30;
+ Object var31;
if(var6 == 2) {
- var35 = var5 + 1 & 3;
- Object var30;
- Object var31;
- if(var15.animationId == -1 && var15.transforms == null) {
- var30 = var15.getModel(2, var5 + 4, var22, var24, var23, var25);
- var31 = var15.getModel(2, var35, var22, var24, var23, var25);
+ var30 = var5 + 1 & 3;
+ Object var32;
+ if(var38.animationId == -1 && var38.transforms == null) {
+ var31 = var38.getModel(2, var5 + 4, var22, var24, var23, var25);
+ var32 = var38.getModel(2, var30, var22, var24, var23, var25);
} else {
- var30 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
- var31 = new DynamicObject(var4, 2, var35, var12, var2, var3, var15.animationId, true, (Entity)null);
+ var31 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
+ var32 = new DynamicObject(var4, 2, var30, var12, var2, var3, var38.animationId, true, (Entity)null);
}
- var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var30, (Entity)var31, Tiles.__bq_t[var5], Tiles.__bq_t[var35], var26, var28);
- if(var15.interactType != 0) {
- var14.__f_283(var2, var3, var6, var5, var15.boolean1);
+ var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var31, (Entity)var32, Tiles.__bq_t[var5], Tiles.__bq_t[var30], var26, var28);
+ if(var38.interactType != 0) {
+ var37.__f_283(var2, var3, var6, var5, var38.boolean1);
}
} else if(var6 == 3) {
- if(var15.animationId == -1 && var15.transforms == null) {
- var29 = var15.getModel(3, var5, var22, var24, var23, var25);
+ if(var38.animationId == -1 && var38.transforms == null) {
+ var29 = var38.getModel(3, var5, var22, var24, var23, var25);
} else {
- var29 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+ var29 = new DynamicObject(var4, 3, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
}
- var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_y[var5], 0, var26, var28);
- if(var15.interactType != 0) {
- var14.__f_283(var2, var3, var6, var5, var15.boolean1);
+ var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_y[var5], 0, var26, var28);
+ if(var38.interactType != 0) {
+ var37.__f_283(var2, var3, var6, var5, var38.boolean1);
}
} else if(var6 == 9) {
- if(var15.animationId == -1 && var15.transforms == null) {
- var29 = var15.getModel(var6, var5, var22, var24, var23, var25);
+ if(var38.animationId == -1 && var38.transforms == null) {
+ var29 = var38.getModel(var6, var5, var22, var24, var23, var25);
} else {
- var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+ var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
}
- var42.__d_238(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28);
- if(var15.interactType != 0) {
- var14.__q_284(var2, var3, var16, var17, var15.boolean1);
+ var36.__d_238(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28);
+ if(var38.interactType != 0) {
+ var37.__q_284(var2, var3, var39, var17, var38.boolean1);
}
} else if(var6 == 4) {
- if(var15.animationId == -1 && var15.transforms == null) {
- var29 = var15.getModel(4, var5, var22, var24, var23, var25);
+ if(var38.animationId == -1 && var38.transforms == null) {
+ var29 = var38.getModel(4, var5, var22, var24, var23, var25);
} else {
- var29 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+ var29 = new DynamicObject(var4, 4, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
}
- var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_t[var5], 0, 0, 0, var26, var28);
+ var36.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_t[var5], 0, 0, 0, var26, var28);
} else {
- Object var32;
- long var36;
+ long var40;
if(var6 == 5) {
- var35 = 16;
- var36 = var42.__ar_244(var0, var2, var3);
- if(var36 != 0L) {
- var35 = class50.getObjectDefinition(HitSplatDefinition.method4972(var36)).int2;
+ var30 = 16;
+ var40 = var36.__ar_244(var0, var2, var3);
+ if(var40 != 0L) {
+ var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2;
}
- if(var15.animationId == -1 && var15.transforms == null) {
- var32 = var15.getModel(4, var5, var22, var24, var23, var25);
+ if(var38.animationId == -1 && var38.transforms == null) {
+ var31 = var38.getModel(4, var5, var22, var24, var23, var25);
} else {
- var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+ var31 = new DynamicObject(var4, 4, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
}
- var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, Tiles.__bq_t[var5], 0, var35 * Tiles.__bq_h[var5], var35 * Tiles.__bq_b[var5], var26, var28);
+ var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)null, Tiles.__bq_t[var5], 0, var30 * Tiles.__bq_h[var5], var30 * Tiles.__bq_b[var5], var26, var28);
} else if(var6 == 6) {
- var35 = 8;
- var36 = var42.__ar_244(var0, var2, var3);
- if(var36 != 0L) {
- var35 = class50.getObjectDefinition(HitSplatDefinition.method4972(var36)).int2 / 2;
+ var30 = 8;
+ var40 = var36.__ar_244(var0, var2, var3);
+ if(var40 != 0L) {
+ var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2;
}
- if(var15.animationId == -1 && var15.transforms == null) {
- var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25);
+ if(var38.animationId == -1 && var38.transforms == null) {
+ var31 = var38.getModel(4, var5 + 4, var22, var24, var23, var25);
} else {
- var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
+ var31 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
}
- var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, 256, var5, var35 * Tiles.__bq_c[var5], var35 * Tiles.__bq_r[var5], var26, var28);
- } else if(var6 == 7) {
- int var38 = var5 + 2 & 3;
- if(var15.animationId == -1 && var15.transforms == null) {
- var29 = var15.getModel(4, var38 + 4, var22, var24, var23, var25);
- } else {
- var29 = new DynamicObject(var4, 4, var38 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
- }
+ var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)null, 256, var5, var30 * Tiles.__bq_c[var5], var30 * Tiles.__bq_r[var5], var26, var28);
+ } else {
+ int var34;
+ if(var6 == 7) {
+ var34 = var5 + 2 & 3;
+ if(var38.animationId == -1 && var38.transforms == null) {
+ var29 = var38.getModel(4, var34 + 4, var22, var24, var23, var25);
+ } else {
+ var29 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
+ }
- var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, 256, var38, 0, 0, var26, var28);
- } else if(var6 == 8) {
- var35 = 8;
- var36 = var42.__ar_244(var0, var2, var3);
- if(var36 != 0L) {
- var35 = class50.getObjectDefinition(HitSplatDefinition.method4972(var36)).int2 / 2;
- }
+ var36.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, 256, var34, 0, 0, var26, var28);
+ } else if(var6 == 8) {
+ var30 = 8;
+ var40 = var36.__ar_244(var0, var2, var3);
+ if(var40 != 0L) {
+ var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2;
+ }
- int var34 = var5 + 2 & 3;
- Object var33;
- if(var15.animationId == -1 && var15.transforms == null) {
- var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25);
- var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25);
- } else {
- var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
- var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
- }
+ var34 = var5 + 2 & 3;
+ Object var35;
+ if(var38.animationId == -1 && var38.transforms == null) {
+ var31 = var38.getModel(4, var5 + 4, var22, var24, var23, var25);
+ var35 = var38.getModel(4, var34 + 4, var22, var24, var23, var25);
+ } else {
+ var31 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
+ var35 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
+ }
- var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)var33, 256, var5, var35 * Tiles.__bq_c[var5], var35 * Tiles.__bq_r[var5], var26, var28);
+ var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)var35, 256, var5, var30 * Tiles.__bq_c[var5], var30 * Tiles.__bq_r[var5], var26, var28);
+ }
}
}
}
} else {
- if(var15.animationId == -1 && var15.transforms == null) {
- var29 = var15.getModel(10, var5, var22, var24, var23, var25);
+ if(var38.animationId == -1 && var38.transforms == null) {
+ var29 = var38.getModel(10, var5, var22, var24, var23, var25);
} else {
- var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+ var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
}
if(var29 != null) {
- var42.__d_238(var0, var2, var3, var23, var16, var17, (Entity)var29, var6 == 11?256:0, var26, var28);
+ var36.__d_238(var0, var2, var3, var23, var39, var17, (Entity)var29, var6 == 11?256:0, var26, var28);
}
- if(var15.interactType != 0) {
- var14.__q_284(var2, var3, var16, var17, var15.boolean1);
+ if(var38.interactType != 0) {
+ var37.__q_284(var2, var3, var39, var17, var38.boolean1);
}
}
}
}
}
+
+ static {
+ ParamKeyDefinition_cached = new EvictingDualNodeHashTable(64);
+ }
}
diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java
index 14f603392f..aec03a566e 100644
--- a/runescape-client/src/main/java/PcmPlayer.java
+++ b/runescape-client/src/main/java/PcmPlayer.java
@@ -242,7 +242,7 @@ public class PcmPlayer {
}
this.nextPosition = var3;
- } catch (Exception var7) {
+ } catch (Exception var6) {
this.close();
this.retryTimeMs = var1 + 2000L;
}
@@ -256,11 +256,11 @@ public class PcmPlayer {
this.skip(256);
this.timeMs += (long)(256000 / class309.PcmPlayer_sampleRate);
}
- } catch (Exception var6) {
+ } catch (Exception var5) {
this.timeMs = var1;
}
-
}
+
}
@ObfuscatedName("ac")
@@ -358,36 +358,36 @@ public class PcmPlayer {
int var5 = 255;
int var6;
- PcmStream var10;
- label104:
+ PcmStream var7;
+ label106:
for(var6 = 7; var5 != 0; --var6) {
- int var7;
int var8;
+ int var9;
if(var6 < 0) {
- var7 = var6 & 3;
- var8 = -(var6 >> 2);
+ var8 = var6 & 3;
+ var9 = -(var6 >> 2);
} else {
- var7 = var6;
- var8 = 0;
+ var8 = var6;
+ var9 = 0;
}
- for(int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) {
- if((var9 & 1) != 0) {
- var5 &= ~(1 << var7);
- var10 = null;
- PcmStream var11 = this.__ay[var7];
+ for(int var10 = var5 >>> var8 & 286331153; var10 != 0; var10 >>>= 4) {
+ if((var10 & 1) != 0) {
+ var5 &= ~(1 << var8);
+ var7 = null;
+ PcmStream var11 = this.__ay[var8];
- label98:
+ label100:
while(true) {
while(true) {
if(var11 == null) {
- break label98;
+ break label100;
}
AbstractSound var12 = var11.sound;
- if(var12 != null && var12.position > var8) {
- var5 |= 1 << var7;
- var10 = var11;
+ if(var12 != null && var12.position > var9) {
+ var5 |= 1 << var8;
+ var7 = var11;
var11 = var11.after;
} else {
var11.active = true;
@@ -398,7 +398,7 @@ public class PcmPlayer {
}
if(var4 >= this.__z) {
- break label104;
+ break label106;
}
PcmStream var14 = var11.firstSubStream();
@@ -410,14 +410,14 @@ public class PcmPlayer {
PcmStream var18 = var11.after;
var11.after = null;
- if(var10 == null) {
- this.__ay[var7] = var18;
+ if(var7 == null) {
+ this.__ay[var8] = var18;
} else {
- var10.after = var18;
+ var7.after = var18;
}
if(var18 == null) {
- this.__ah[var7] = var10;
+ this.__ah[var8] = var7;
}
var11 = var18;
@@ -426,8 +426,8 @@ public class PcmPlayer {
}
}
- var7 += 4;
- ++var8;
+ var8 += 4;
+ ++var9;
}
}
@@ -436,8 +436,8 @@ public class PcmPlayer {
PcmStream[] var17 = this.__ay;
this.__ah[var6] = null;
- for(var17[var6] = null; var16 != null; var16 = var10) {
- var10 = var16.after;
+ for(var17[var6] = null; var16 != null; var16 = var7) {
+ var7 = var16.after;
var16.after = null;
}
}
diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java
index 155afecb84..d83c67a531 100644
--- a/runescape-client/src/main/java/Player.java
+++ b/runescape-client/src/main/java/Player.java
@@ -206,22 +206,22 @@ public final class Player extends Actor {
this.team = 0;
int[] var4 = new int[12];
+ int var5;
int var6;
- int var7;
- for(int var5 = 0; var5 < 12; ++var5) {
- var6 = var1.readUnsignedByte();
- if(var6 == 0) {
- var4[var5] = 0;
+ for(int var7 = 0; var7 < 12; ++var7) {
+ var5 = var1.readUnsignedByte();
+ if(var5 == 0) {
+ var4[var7] = 0;
} else {
- var7 = var1.readUnsignedByte();
- var4[var5] = var7 + (var6 << 8);
- if(var5 == 0 && var4[0] == 65535) {
+ var6 = var1.readUnsignedByte();
+ var4[var7] = var6 + (var5 << 8);
+ if(var7 == 0 && var4[0] == 65535) {
var3 = var1.__ag_302();
break;
}
- if(var4[var5] >= 512) {
- int var8 = Skills.getItemDefinition(var4[var5] - 512).int1;
+ if(var4[var7] >= 512) {
+ int var8 = Skills.getItemDefinition(var4[var7] - 512).int1;
if(var8 != 0) {
this.team = var8;
}
@@ -231,13 +231,13 @@ public final class Player extends Actor {
int[] var9 = new int[5];
- for(var6 = 0; var6 < 5; ++var6) {
- var7 = var1.readUnsignedByte();
- if(var7 < 0 || var7 >= class229.__hz_l[var6].length) {
- var7 = 0;
+ for(var5 = 0; var5 < 5; ++var5) {
+ var6 = var1.readUnsignedByte();
+ if(var6 < 0 || var6 >= class229.__hz_l[var5].length) {
+ var6 = 0;
}
- var9[var6] = var7;
+ var9[var5] = var6;
}
super.idleSequence = var1.__ag_302();
@@ -386,7 +386,7 @@ public final class Player extends Actor {
return null;
} else {
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0?WorldMapAreaData.getSequenceDefinition(super.sequence):null;
- SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null?null:WorldMapAreaData.getSequenceDefinition(super.movementSequence);
+ SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.idleSequence != super.movementSequence || var1 == null)?WorldMapAreaData.getSequenceDefinition(super.movementSequence):null;
Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
if(var3 == null) {
return null;
@@ -541,5 +541,6 @@ public final class Player extends Actor {
Client.isSpellSelected = false;
class22.method295(var0);
}
+
}
}
diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java
index 378fa71777..22f133981d 100644
--- a/runescape-client/src/main/java/PlayerAppearance.java
+++ b/runescape-client/src/main/java/PlayerAppearance.java
@@ -47,11 +47,6 @@ public class PlayerAppearance {
@Export("__u")
long __u;
- static {
- __hi_d = new int[]{8, 11, 4, 6, 9, 7, 10};
- PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260);
- }
-
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "([I[IZII)V",
@@ -94,25 +89,30 @@ public class PlayerAppearance {
KitDefinition var4;
do {
- if(!var2) {
- --var3;
- if(var3 < 0) {
- var3 = KitDefinition.__im_q - 1;
- }
- } else {
- ++var3;
- if(var3 >= KitDefinition.__im_q) {
- var3 = 0;
- }
- }
+ do {
+ do {
+ if(!var2) {
+ --var3;
+ if(var3 < 0) {
+ var3 = KitDefinition.__im_q - 1;
+ }
+ } else {
+ ++var3;
+ if(var3 >= KitDefinition.__im_q) {
+ var3 = 0;
+ }
+ }
- var4 = WorldMapSection1.getKitDefinition(var3);
- } while(var4 == null || var4.__k || var1 + (this.isFemale?7:0) != var4.__o);
+ var4 = WorldMapSection1.getKitDefinition(var3);
+ } while(var4 == null);
+ } while(var4.__k);
+ } while(var1 + (this.isFemale?7:0) != var4.__o);
this.equipment[__hi_d[var1]] = var3 + 256;
this.setHash();
}
}
+
}
@ObfuscatedName("q")
@@ -153,6 +153,7 @@ public class PlayerAppearance {
if(this.isFemale != var1) {
this.__m_385((int[])null, this.bodyColors, var1, -1);
}
+
}
@ObfuscatedName("o")
@@ -240,8 +241,8 @@ public class PlayerAppearance {
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 var8 = 0; var8 < 12; ++var8) {
+ var7[var8] = this.equipment[var8];
}
if(var1.shield >= 0) {
@@ -255,86 +256,86 @@ public class PlayerAppearance {
}
}
- Model var8 = (Model)PlayerAppearance_cachedModels.get(var5);
- if(var8 == null) {
+ Model var15 = (Model)PlayerAppearance_cachedModels.get(var5);
+ if(var15 == null) {
boolean var9 = false;
- int var11;
- for(int var10 = 0; var10 < 12; ++var10) {
- var11 = var7[var10];
- if(var11 >= 256 && var11 < 512 && !WorldMapSection1.getKitDefinition(var11 - 256).__w_413()) {
+ int var10;
+ for(int var11 = 0; var11 < 12; ++var11) {
+ var10 = var7[var11];
+ if(var10 >= 256 && var10 < 512 && !WorldMapSection1.getKitDefinition(var10 - 256).__w_413()) {
var9 = true;
}
- if(var11 >= 512 && !Skills.getItemDefinition(var11 - 512).__z_431(this.isFemale)) {
+ if(var10 >= 512 && !Skills.getItemDefinition(var10 - 512).__z_431(this.isFemale)) {
var9 = true;
}
}
if(var9) {
if(this.__u != -1L) {
- var8 = (Model)PlayerAppearance_cachedModels.get(this.__u);
+ var15 = (Model)PlayerAppearance_cachedModels.get(this.__u);
}
- if(var8 == null) {
+ if(var15 == null) {
return null;
}
}
- if(var8 == null) {
- ModelData[] var16 = new ModelData[12];
- var11 = 0;
+ if(var15 == null) {
+ ModelData[] var17 = new ModelData[12];
+ var10 = 0;
- int var13;
- for(int var12 = 0; var12 < 12; ++var12) {
- var13 = var7[var12];
+ int var12;
+ for(int var13 = 0; var13 < 12; ++var13) {
+ var12 = var7[var13];
ModelData var14;
- if(var13 >= 256 && var13 < 512) {
- var14 = WorldMapSection1.getKitDefinition(var13 - 256).__o_414();
+ if(var12 >= 256 && var12 < 512) {
+ var14 = WorldMapSection1.getKitDefinition(var12 - 256).__o_414();
if(var14 != null) {
- var16[var11++] = var14;
+ var17[var10++] = var14;
}
}
- if(var13 >= 512) {
- var14 = Skills.getItemDefinition(var13 - 512).__j_432(this.isFemale);
+ if(var12 >= 512) {
+ var14 = Skills.getItemDefinition(var12 - 512).__j_432(this.isFemale);
if(var14 != null) {
- var16[var11++] = var14;
+ var17[var10++] = var14;
}
}
}
- ModelData var18 = new ModelData(var16, var11);
+ ModelData var18 = new ModelData(var17, var10);
- for(var13 = 0; var13 < 5; ++var13) {
- if(this.bodyColors[var13] < class229.__hz_l[var13].length) {
- var18.recolor(__hi_g[var13], class229.__hz_l[var13][this.bodyColors[var13]]);
+ for(var12 = 0; var12 < 5; ++var12) {
+ if(this.bodyColors[var12] < class229.__hz_l[var12].length) {
+ var18.recolor(__hi_g[var12], class229.__hz_l[var12][this.bodyColors[var12]]);
}
- if(this.bodyColors[var13] < IndexCacheLoader.__bd_x[var13].length) {
- var18.recolor(class227.__hj_e[var13], IndexCacheLoader.__bd_x[var13][this.bodyColors[var13]]);
+ if(this.bodyColors[var12] < IndexCacheLoader.__bd_x[var12].length) {
+ var18.recolor(class227.__hj_e[var12], IndexCacheLoader.__bd_x[var12][this.bodyColors[var12]]);
}
}
- var8 = var18.toModel(64, 850, -30, -50, -30);
- PlayerAppearance_cachedModels.put(var8, var5);
+ var15 = var18.toModel(64, 850, -30, -50, -30);
+ PlayerAppearance_cachedModels.put(var15, var5);
this.__u = var5;
}
}
if(var1 == null && var3 == null) {
- return var8;
+ return var15;
} else {
- Model var17;
+ Model var16;
if(var1 != null && var3 != null) {
- var17 = var1.animateSequence2(var8, var2, var3, var4);
+ var16 = var1.animateSequence2(var15, var2, var3, var4);
} else if(var1 != null) {
- var17 = var1.animateSequence(var8, var2);
+ var16 = var1.animateSequence(var15, var2);
} else {
- var17 = var3.animateSequence(var8, var4);
+ var16 = var3.animateSequence(var15, var4);
}
- return var17;
+ return var16;
}
}
}
@@ -351,14 +352,14 @@ public class PlayerAppearance {
} else {
boolean var1 = false;
- int var3;
- for(int var2 = 0; var2 < 12; ++var2) {
- var3 = this.equipment[var2];
- if(var3 >= 256 && var3 < 512 && !WorldMapSection1.getKitDefinition(var3 - 256).__u_415()) {
+ int var2;
+ for(int var3 = 0; var3 < 12; ++var3) {
+ var2 = this.equipment[var3];
+ if(var2 >= 256 && var2 < 512 && !WorldMapSection1.getKitDefinition(var2 - 256).__u_415()) {
var1 = true;
}
- if(var3 >= 512 && !Skills.getItemDefinition(var3 - 512).__s_433(this.isFemale)) {
+ if(var2 >= 512 && !Skills.getItemDefinition(var2 - 512).__s_433(this.isFemale)) {
var1 = true;
}
}
@@ -367,36 +368,36 @@ public class PlayerAppearance {
return null;
} else {
ModelData[] var7 = new ModelData[12];
- var3 = 0;
+ var2 = 0;
- int var5;
- for(int var4 = 0; var4 < 12; ++var4) {
- var5 = this.equipment[var4];
+ int var4;
+ for(int var5 = 0; var5 < 12; ++var5) {
+ var4 = this.equipment[var5];
ModelData var6;
- if(var5 >= 256 && var5 < 512) {
- var6 = WorldMapSection1.getKitDefinition(var5 - 256).__g_416();
+ if(var4 >= 256 && var4 < 512) {
+ var6 = WorldMapSection1.getKitDefinition(var4 - 256).__g_416();
if(var6 != null) {
- var7[var3++] = var6;
+ var7[var2++] = var6;
}
}
- if(var5 >= 512) {
- var6 = Skills.getItemDefinition(var5 - 512).__t_434(this.isFemale);
+ if(var4 >= 512) {
+ var6 = Skills.getItemDefinition(var4 - 512).__t_434(this.isFemale);
if(var6 != null) {
- var7[var3++] = var6;
+ var7[var2++] = var6;
}
}
}
- ModelData var8 = new ModelData(var7, var3);
+ ModelData var8 = new ModelData(var7, var2);
- for(var5 = 0; var5 < 5; ++var5) {
- if(this.bodyColors[var5] < class229.__hz_l[var5].length) {
- var8.recolor(__hi_g[var5], class229.__hz_l[var5][this.bodyColors[var5]]);
+ for(var4 = 0; var4 < 5; ++var4) {
+ if(this.bodyColors[var4] < class229.__hz_l[var4].length) {
+ var8.recolor(__hi_g[var4], class229.__hz_l[var4][this.bodyColors[var4]]);
}
- if(this.bodyColors[var5] < IndexCacheLoader.__bd_x[var5].length) {
- var8.recolor(class227.__hj_e[var5], IndexCacheLoader.__bd_x[var5][this.bodyColors[var5]]);
+ if(this.bodyColors[var4] < IndexCacheLoader.__bd_x[var4].length) {
+ var8.recolor(class227.__hj_e[var4], IndexCacheLoader.__bd_x[var4][this.bodyColors[var4]]);
}
}
@@ -414,4 +415,9 @@ public class PlayerAppearance {
public int getChatHeadId() {
return this.npcTransformId == -1?(this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20):305419896 + ObjectDefinition.getNpcDefinition(this.npcTransformId).id;
}
+
+ static {
+ __hi_d = new int[]{8, 11, 4, 6, 9, 7, 10};
+ PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260);
+ }
}
diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java
index 93f6790cab..0664235179 100644
--- a/runescape-client/src/main/java/PlayerType.java
+++ b/runescape-client/src/main/java/PlayerType.java
@@ -44,6 +44,7 @@ public enum PlayerType implements Enumerated {
)
@Export("PlayerType_hardcoreIronman")
PlayerType_hardcoreIronman(5, 10, false, false, true);
+
@ObfuscatedName("ak")
@Export("__ij_ak")
static Image __ij_ak;
@@ -66,7 +67,7 @@ public enum PlayerType implements Enumerated {
@Export("isUser")
public final boolean isUser;
- PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) {
+ private PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) {
this.id = var3;
this.modIcon = var4;
this.isPrivileged = var6;
@@ -94,7 +95,7 @@ public enum PlayerType implements Enumerated {
var1.ids[var2] = -1;
var1.quantities[var2] = 0;
}
-
}
+
}
}
diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java
index 0b8eca1f88..76af47352c 100644
--- a/runescape-client/src/main/java/Players.java
+++ b/runescape-client/src/main/java/Players.java
@@ -70,22 +70,6 @@ public class Players {
@Export("NetCache_reference")
public static Buffer NetCache_reference;
- static {
- __cq_q = new byte[2048];
- __cq_w = new byte[2048];
- __cq_o = new Buffer[2048];
- Players_count = 0;
- Players_indices = new int[2048];
- __cq_l = 0;
- __cq_e = new int[2048];
- Players_regions = new int[2048];
- Players_orientations = new int[2048];
- Players_targetIndices = new int[2048];
- __cq_n = 0;
- __cq_i = new int[2048];
- __cq_a = new Buffer(new byte[5000]);
- }
-
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lfx;"
@@ -169,25 +153,39 @@ public class Players {
)
@Export("clickWidget")
static final void clickWidget(Widget var0, int var1, int var2) {
- if(Client.clickedWidget == null && !Client.isMenuOpen) {
- if(var0 != null && class48.method869(var0) != null) {
- Client.clickedWidget = var0;
- Client.clickedWidgetParent = class48.method869(var0);
- Client.widgetClickX = var1;
- Client.widgetClickY = var2;
- MouseRecorder.widgetDragDuration = 0;
- Client.isDraggingWidget = false;
- int var3 = Client.menuOptionsCount - 1;
- if(var3 != -1) {
- UnitPriceComparator.tempMenuAction = new MenuAction();
- UnitPriceComparator.tempMenuAction.argument1 = Client.menuArguments1[var3];
- UnitPriceComparator.tempMenuAction.argument2 = Client.menuArguments2[var3];
- UnitPriceComparator.tempMenuAction.opcode = Client.menuOpcodes[var3];
- UnitPriceComparator.tempMenuAction.argument0 = Client.menuArguments0[var3];
- UnitPriceComparator.tempMenuAction.action = Client.menuActions[var3];
- }
-
+ if(Client.clickedWidget == null && !Client.isMenuOpen && var0 != null && class48.method869(var0) != null) {
+ Client.clickedWidget = var0;
+ Client.clickedWidgetParent = class48.method869(var0);
+ Client.widgetClickX = var1;
+ Client.widgetClickY = var2;
+ MouseRecorder.widgetDragDuration = 0;
+ Client.isDraggingWidget = false;
+ int var3 = Client.menuOptionsCount - 1;
+ if(var3 != -1) {
+ UnitPriceComparator.tempMenuAction = new MenuAction();
+ UnitPriceComparator.tempMenuAction.argument1 = Client.menuArguments1[var3];
+ UnitPriceComparator.tempMenuAction.argument2 = Client.menuArguments2[var3];
+ UnitPriceComparator.tempMenuAction.opcode = Client.menuOpcodes[var3];
+ UnitPriceComparator.tempMenuAction.argument0 = Client.menuArguments0[var3];
+ UnitPriceComparator.tempMenuAction.action = Client.menuActions[var3];
}
}
+
+ }
+
+ static {
+ __cq_q = new byte[2048];
+ __cq_w = new byte[2048];
+ __cq_o = new Buffer[2048];
+ Players_count = 0;
+ Players_indices = new int[2048];
+ __cq_l = 0;
+ __cq_e = new int[2048];
+ Players_regions = new int[2048];
+ Players_orientations = new int[2048];
+ Players_targetIndices = new int[2048];
+ __cq_n = 0;
+ __cq_i = new int[2048];
+ __cq_a = new Buffer(new byte[5000]);
}
}
diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java
index 477a8d02cc..777fc86bd5 100644
--- a/runescape-client/src/main/java/Rasterizer2D.java
+++ b/runescape-client/src/main/java/Rasterizer2D.java
@@ -28,13 +28,6 @@ public class Rasterizer2D extends DualNode {
@Export("Rasterizer2D_xClipEnd")
public static int Rasterizer2D_xClipEnd;
- static {
- Rasterizer2D_yClipStart = 0;
- Rasterizer2D_yClipEnd = 0;
- Rasterizer2D_xClipStart = 0;
- Rasterizer2D_xClipEnd = 0;
- }
-
@ObfuscatedName("dp")
@Export("Rasterizer2D_replace")
public static void Rasterizer2D_replace(int[] var0, int var1, int var2) {
@@ -230,8 +223,8 @@ public class Rasterizer2D extends DualNode {
++var6;
var11 = var11 + var9 + var9;
}
-
}
+
}
@ObfuscatedName("dk")
@@ -249,102 +242,102 @@ public class Rasterizer2D extends DualNode {
int var6 = (var3 >> 16 & 255) * var4;
int var7 = (var3 >> 8 & 255) * var4;
int var8 = var4 * (var3 & 255);
- int var12 = var1 - var2;
- if(var12 < Rasterizer2D_yClipStart) {
- var12 = Rasterizer2D_yClipStart;
+ int var9 = var1 - var2;
+ if(var9 < Rasterizer2D_yClipStart) {
+ var9 = Rasterizer2D_yClipStart;
}
- int var13 = var2 + var1 + 1;
- if(var13 > Rasterizer2D_yClipEnd) {
- var13 = Rasterizer2D_yClipEnd;
+ int var10 = var2 + var1 + 1;
+ if(var10 > Rasterizer2D_yClipEnd) {
+ var10 = Rasterizer2D_yClipEnd;
}
- int var14 = var12;
- int var15 = var2 * var2;
- int var16 = 0;
- int var17 = var1 - var12;
- int var18 = var17 * var17;
- int var19 = var18 - var17;
- if(var1 > var13) {
- var1 = var13;
+ int var11 = var9;
+ int var12 = var2 * var2;
+ int var13 = 0;
+ int var14 = var1 - var9;
+ int var15 = var14 * var14;
+ int var16 = var15 - var14;
+ if(var1 > var10) {
+ var1 = var10;
}
- int var9;
- int var10;
- int var11;
+ int var17;
+ int var18;
+ int var19;
int var20;
int var21;
int var22;
int var23;
int var24;
- while(var14 < var1) {
- while(var19 <= var15 || var18 <= var15) {
- var18 = var18 + var16 + var16;
- var19 += var16++ + var16;
+ while(var11 < var1) {
+ while(var16 <= var12 || var15 <= var12) {
+ var15 = var15 + var13 + var13;
+ var16 += var13++ + var13;
}
- var20 = var0 - var16 + 1;
+ var20 = var0 - var13 + 1;
if(var20 < Rasterizer2D_xClipStart) {
var20 = Rasterizer2D_xClipStart;
}
- var21 = var0 + var16;
+ var21 = var0 + var13;
if(var21 > Rasterizer2D_xClipEnd) {
var21 = Rasterizer2D_xClipEnd;
}
- var22 = var20 + var14 * Rasterizer2D_width;
+ var22 = var20 + var11 * Rasterizer2D_width;
for(var23 = var20; var23 < var21; ++var23) {
- var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255);
- var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5;
- var11 = var5 * (Rasterizer2D_pixels[var22] & 255);
- var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8);
+ var17 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255);
+ var18 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5;
+ var19 = var5 * (Rasterizer2D_pixels[var22] & 255);
+ var24 = (var8 + var19 >> 8) + (var6 + var17 >> 8 << 16) + (var7 + var18 >> 8 << 8);
Rasterizer2D_pixels[var22++] = var24;
}
- ++var14;
- var18 -= var17-- + var17;
- var19 -= var17 + var17;
+ ++var11;
+ var15 -= var14-- + var14;
+ var16 -= var14 + var14;
}
- var16 = var2;
- var17 = -var17;
- var19 = var15 + var17 * var17;
- var18 = var19 - var2;
+ var13 = var2;
+ var14 = -var14;
+ var16 = var12 + var14 * var14;
+ var15 = var16 - var2;
- for(var19 -= var17; var14 < var13; var18 += var17++ + var17) {
- while(var19 > var15 && var18 > var15) {
- var19 -= var16-- + var16;
- var18 -= var16 + var16;
+ for(var16 -= var14; var11 < var10; var15 += var14++ + var14) {
+ while(var16 > var12 && var15 > var12) {
+ var16 -= var13-- + var13;
+ var15 -= var13 + var13;
}
- var20 = var0 - var16;
+ var20 = var0 - var13;
if(var20 < Rasterizer2D_xClipStart) {
var20 = Rasterizer2D_xClipStart;
}
- var21 = var0 + var16;
+ var21 = var0 + var13;
if(var21 > Rasterizer2D_xClipEnd - 1) {
var21 = Rasterizer2D_xClipEnd - 1;
}
- var22 = var20 + var14 * Rasterizer2D_width;
+ var22 = var20 + var11 * Rasterizer2D_width;
for(var23 = var20; var23 <= var21; ++var23) {
- var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255);
- var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5;
- var11 = var5 * (Rasterizer2D_pixels[var22] & 255);
- var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8);
+ var17 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255);
+ var18 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5;
+ var19 = var5 * (Rasterizer2D_pixels[var22] & 255);
+ var24 = (var8 + var19 >> 8) + (var6 + var17 >> 8 << 16) + (var7 + var18 >> 8 << 8);
Rasterizer2D_pixels[var22++] = var24;
}
- ++var14;
- var19 = var19 + var17 + var17;
+ ++var11;
+ var16 = var16 + var14 + var14;
}
-
}
}
+
}
@ObfuscatedName("dl")
@@ -459,8 +452,8 @@ public class Rasterizer2D extends DualNode {
var9 += var8;
var6 += var7;
}
-
}
+
}
@ObfuscatedName("dv")
@@ -517,8 +510,8 @@ public class Rasterizer2D extends DualNode {
var8 += var9;
}
}
-
}
+
}
@ObfuscatedName("do")
@@ -528,78 +521,76 @@ public class Rasterizer2D extends DualNode {
)
@Export("raster2d7")
public static void raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) {
- if(var0 + var2 >= 0 && var3 + var1 >= 0) {
- if(var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) {
- int var8 = 0;
- int var9 = 0;
- if(var0 < 0) {
- var8 -= var0;
- var2 += var0;
+ if(var0 + var2 >= 0 && var3 + var1 >= 0 && var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) {
+ int var8 = 0;
+ int var9 = 0;
+ if(var0 < 0) {
+ var8 -= var0;
+ var2 += var0;
+ }
+
+ if(var1 < 0) {
+ var9 -= var1;
+ var3 += var1;
+ }
+
+ if(var0 + var2 > Rasterizer2D_width) {
+ var2 = Rasterizer2D_width - var0;
+ }
+
+ if(var3 + var1 > Rasterizer2D_height) {
+ var3 = Rasterizer2D_height - var1;
+ }
+
+ int var10 = var6.length / var7;
+ int var11 = Rasterizer2D_width - var2;
+ int var12 = var4 >>> 24;
+ int var13 = var5 >>> 24;
+ int var14;
+ int var15;
+ int var16;
+ int var17;
+ int var18;
+ if(var12 == 255 && var13 == 255) {
+ var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width;
+
+ for(var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) {
+ for(var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) {
+ var17 = (var15 - var1) % var10;
+ var18 = (var16 - var0) % var7;
+ if(var6[var18 + var17 * var7] != 0) {
+ Rasterizer2D_pixels[var14++] = var5;
+ } else {
+ Rasterizer2D_pixels[var14++] = var4;
+ }
+ }
+
+ var14 += var11;
}
+ } else {
+ var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width;
- if(var1 < 0) {
- var9 -= var1;
- var3 += var1;
- }
-
- if(var0 + var2 > Rasterizer2D_width) {
- var2 = Rasterizer2D_width - var0;
- }
-
- if(var3 + var1 > Rasterizer2D_height) {
- var3 = Rasterizer2D_height - var1;
- }
-
- int var10 = var6.length / var7;
- int var11 = Rasterizer2D_width - var2;
- int var12 = var4 >>> 24;
- int var13 = var5 >>> 24;
- int var14;
- int var15;
- int var16;
- int var17;
- int var18;
- if(var12 == 255 && var13 == 255) {
- var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width;
-
- for(var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) {
- for(var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) {
- var17 = (var15 - var1) % var10;
- var18 = (var16 - var0) % var7;
- if(var6[var18 + var17 * var7] != 0) {
- Rasterizer2D_pixels[var14++] = var5;
- } else {
- Rasterizer2D_pixels[var14++] = var4;
- }
+ for(var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) {
+ for(var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) {
+ var17 = (var15 - var1) % var10;
+ var18 = (var16 - var0) % var7;
+ int var19 = var4;
+ if(var6[var18 + var17 * var7] != 0) {
+ var19 = var5;
}
- var14 += var11;
+ int var20 = var19 >>> 24;
+ int var21 = 255 - var20;
+ int var22 = Rasterizer2D_pixels[var14];
+ int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8;
+ Rasterizer2D_pixels[var14++] = var23;
}
- } else {
- var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width;
- for(var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) {
- for(var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) {
- var17 = (var15 - var1) % var10;
- var18 = (var16 - var0) % var7;
- int var19 = var4;
- if(var6[var18 + var17 * var7] != 0) {
- var19 = var5;
- }
-
- int var20 = var19 >>> 24;
- int var21 = 255 - var20;
- int var22 = Rasterizer2D_pixels[var14];
- int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8;
- Rasterizer2D_pixels[var14++] = var23;
- }
-
- var14 += var11;
- }
+ var14 += var11;
}
-
}
}
+
}
@ObfuscatedName("dh")
@@ -639,10 +630,10 @@ public class Rasterizer2D extends DualNode {
int var4 = var0 + Rasterizer2D_width * var1;
for(int var5 = 0; var5 < var2; ++var5) {
- Rasterizer2D_pixels[var4 + var5] = var3; // XXX
+ Rasterizer2D_pixels[var4 + var5] = var3;
}
-
}
+
}
@ObfuscatedName("du")
@@ -662,17 +653,17 @@ public class Rasterizer2D extends DualNode {
int var6 = (var3 >> 16 & 255) * var4;
int var7 = (var3 >> 8 & 255) * var4;
int var8 = var4 * (var3 & 255);
- int var12 = var0 + Rasterizer2D_width * var1;
+ int var9 = var0 + Rasterizer2D_width * var1;
- for(int var13 = 0; var13 < var2; ++var13) {
- int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255);
- int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5;
- int var11 = var5 * (Rasterizer2D_pixels[var12] & 255);
- int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8);
- Rasterizer2D_pixels[var12++] = var14;
+ for(int var10 = 0; var10 < var2; ++var10) {
+ int var11 = var5 * (Rasterizer2D_pixels[var9] >> 16 & 255);
+ int var12 = (Rasterizer2D_pixels[var9] >> 8 & 255) * var5;
+ int var13 = var5 * (Rasterizer2D_pixels[var9] & 255);
+ int var14 = (var8 + var13 >> 8) + (var6 + var11 >> 8 << 16) + (var7 + var12 >> 8 << 8);
+ Rasterizer2D_pixels[var9++] = var14;
}
-
}
+
}
@ObfuscatedName("dm")
@@ -693,8 +684,8 @@ public class Rasterizer2D extends DualNode {
for(int var5 = 0; var5 < var2; ++var5) {
Rasterizer2D_pixels[var4 + var5 * Rasterizer2D_width] = var3;
}
-
}
+
}
@ObfuscatedName("dq")
@@ -714,18 +705,18 @@ public class Rasterizer2D extends DualNode {
int var6 = (var3 >> 16 & 255) * var4;
int var7 = (var3 >> 8 & 255) * var4;
int var8 = var4 * (var3 & 255);
- int var12 = var0 + Rasterizer2D_width * var1;
+ int var9 = var0 + Rasterizer2D_width * var1;
- for(int var13 = 0; var13 < var2; ++var13) {
- int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255);
- int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5;
- int var11 = var5 * (Rasterizer2D_pixels[var12] & 255);
- int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8);
- Rasterizer2D_pixels[var12] = var14;
- var12 += Rasterizer2D_width;
+ for(int var10 = 0; var10 < var2; ++var10) {
+ int var11 = var5 * (Rasterizer2D_pixels[var9] >> 16 & 255);
+ int var12 = (Rasterizer2D_pixels[var9] >> 8 & 255) * var5;
+ int var13 = var5 * (Rasterizer2D_pixels[var9] & 255);
+ int var14 = (var8 + var13 >> 8) + (var6 + var11 >> 8 << 16) + (var7 + var12 >> 8 << 8);
+ Rasterizer2D_pixels[var9] = var14;
+ var9 += Rasterizer2D_width;
}
-
}
+
}
@ObfuscatedName("et")
@@ -739,14 +730,12 @@ public class Rasterizer2D extends DualNode {
} else {
Rasterizer2D_drawHorizontalLine(var0 + var2, var1, -var2 + 1, var4);
}
-
} else if(var2 == 0) {
if(var3 >= 0) {
Rasterizer2D_drawVerticalLine(var0, var1, var3 + 1, var4);
} else {
Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4);
}
-
} else {
if(var3 + var2 < 0) {
var0 += var2;
@@ -806,8 +795,8 @@ public class Rasterizer2D extends DualNode {
++var1;
}
}
-
}
+
}
@ObfuscatedName("eb")
@@ -816,6 +805,7 @@ public class Rasterizer2D extends DualNode {
if(var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) {
Rasterizer2D_pixels[var0 + Rasterizer2D_width * var1] = var2;
}
+
}
@ObfuscatedName("ek")
@@ -833,4 +823,11 @@ public class Rasterizer2D extends DualNode {
}
}
+
+ static {
+ Rasterizer2D_yClipStart = 0;
+ Rasterizer2D_yClipEnd = 0;
+ Rasterizer2D_xClipStart = 0;
+ Rasterizer2D_xClipEnd = 0;
+ }
}
diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java
index bde438c83e..d8e6f7da96 100644
--- a/runescape-client/src/main/java/Rasterizer3D.java
+++ b/runescape-client/src/main/java/Rasterizer3D.java
@@ -73,36 +73,6 @@ public class Rasterizer3D extends Rasterizer2D {
@Export("Rasterizer3D_cosine")
public static int[] Rasterizer3D_cosine;
- static {
- __et_m = false;
- __et_f = false;
- Rasterizer3D_isLowDetailTexture = false;
- __et_w = true;
- Rasterizer3D_alpha = 0;
- Rasterizer3D_zoom = 512;
- Rasterizer3D_rowOffsets = new int[1024];
- Rasterizer3D_colorPalette = new int[65536];
- __et_r = new int[512];
- __et_p = new int[2048];
- Rasterizer3D_sine = new int[2048];
- Rasterizer3D_cosine = new int[2048];
-
- int var0;
- for(var0 = 1; var0 < 512; ++var0) {
- __et_r[var0] = 32768 / var0;
- }
-
- for(var0 = 1; var0 < 2048; ++var0) {
- __et_p[var0] = 65536 / var0;
- }
-
- for(var0 = 0; var0 < 2048; ++var0) {
- Rasterizer3D_sine[var0] = (int)(65536.0D * Math.sin((double)var0 * 0.0030679615D));
- Rasterizer3D_cosine[var0] = (int)(65536.0D * Math.cos((double)var0 * 0.0030679615D));
- }
-
- }
-
@ObfuscatedName("m")
@Export("Rasterizer3D_method1")
public static final void Rasterizer3D_method1() {
@@ -195,9 +165,9 @@ public class Rasterizer3D extends Rasterizer2D {
--var23;
}
- double var27 = var6 - 0.3333333333333333D;
- if(var27 < 0.0D) {
- ++var27;
+ double var25 = var6 - 0.3333333333333333D;
+ if(var25 < 0.0D) {
+ ++var25;
}
if(6.0D * var23 < 1.0D) {
@@ -220,21 +190,21 @@ public class Rasterizer3D extends Rasterizer2D {
var15 = var21;
}
- if(6.0D * var27 < 1.0D) {
- var17 = var21 + (var19 - var21) * 6.0D * var27;
- } else if(2.0D * var27 < 1.0D) {
+ if(6.0D * var25 < 1.0D) {
+ var17 = var21 + (var19 - var21) * 6.0D * var25;
+ } else if(2.0D * var25 < 1.0D) {
var17 = var19;
- } else if(3.0D * var27 < 2.0D) {
- var17 = var21 + (var19 - var21) * (0.6666666666666666D - var27) * 6.0D;
+ } else if(3.0D * var25 < 2.0D) {
+ var17 = var21 + (var19 - var21) * (0.6666666666666666D - var25) * 6.0D;
} else {
var17 = var21;
}
}
- int var29 = (int)(var13 * 256.0D);
+ int var28 = (int)(var13 * 256.0D);
int var20 = (int)(var15 * 256.0D);
- int var30 = (int)(var17 * 256.0D);
- int var22 = var30 + (var20 << 8) + (var29 << 16);
+ int var27 = (int)(var17 * 256.0D);
+ int var22 = var27 + (var20 << 8) + (var28 << 16);
var22 = Rasterizer3D_brighten(var22, var0);
if(var22 == 0) {
var22 = 1;
@@ -353,107 +323,107 @@ public class Rasterizer3D extends Rasterizer2D {
var6 += var20;
var0 += Rasterizer2D.Rasterizer2D_width;
}
- } else {
- var2 -= var1;
- var1 -= var0;
- var0 = Rasterizer3D_rowOffsets[var0];
+ }
+ var2 -= var1;
+ var1 -= var0;
+ var0 = Rasterizer3D_rowOffsets[var0];
+
+ while(true) {
+ --var1;
+ if(var1 < 0) {
+ while(true) {
+ --var2;
+ if(var2 < 0) {
+ return;
+ }
+
+ Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19);
+ var5 += var17;
+ var4 += var15;
+ var6 += var20;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19);
+ var5 += var17;
+ var3 += var16;
+ var6 += var20;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ var4 = var3 <<= 14;
+ if(var0 < 0) {
+ var4 -= var0 * var17;
+ var3 -= var0 * var16;
+ var6 -= var0 * var20;
+ var0 = 0;
+ }
+
+ var5 <<= 14;
+ if(var2 < 0) {
+ var5 -= var15 * var2;
+ var2 = 0;
+ }
+
+ if((var0 == var2 || var17 >= var16) && (var0 != var2 || var15 <= var16)) {
+ var1 -= var2;
+ var2 -= var0;
+ var0 = Rasterizer3D_rowOffsets[var0];
+
+ while(true) {
+ --var2;
+ if(var2 < 0) {
+ while(true) {
+ --var1;
+ if(var1 < 0) {
+ return;
+ }
+
+ Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19);
+ var5 += var15;
+ var3 += var16;
+ var6 += var20;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19);
+ var4 += var17;
+ var3 += var16;
+ var6 += var20;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ var1 -= var2;
+ var2 -= var0;
+ var0 = Rasterizer3D_rowOffsets[var0];
+
+ while(true) {
+ --var2;
+ if(var2 < 0) {
while(true) {
--var1;
if(var1 < 0) {
- while(true) {
- --var2;
- if(var2 < 0) {
- return;
- }
-
- Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19);
- var5 += var17;
- var4 += var15;
- var6 += var20;
- var0 += Rasterizer2D.Rasterizer2D_width;
- }
+ return;
}
- Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19);
- var5 += var17;
+ Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19);
+ var5 += var15;
var3 += var16;
var6 += var20;
var0 += Rasterizer2D.Rasterizer2D_width;
}
}
- } else {
- var4 = var3 <<= 14;
- if(var0 < 0) {
- var4 -= var0 * var17;
- var3 -= var0 * var16;
- var6 -= var0 * var20;
- var0 = 0;
- }
- var5 <<= 14;
- if(var2 < 0) {
- var5 -= var15 * var2;
- var2 = 0;
- }
-
- if(var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) {
- var1 -= var2;
- var2 -= var0;
- var0 = Rasterizer3D_rowOffsets[var0];
-
- while(true) {
- --var2;
- if(var2 < 0) {
- while(true) {
- --var1;
- if(var1 < 0) {
- return;
- }
-
- Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19);
- var5 += var15;
- var3 += var16;
- var6 += var20;
- var0 += Rasterizer2D.Rasterizer2D_width;
- }
- }
-
- Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19);
- var4 += var17;
- var3 += var16;
- var6 += var20;
- var0 += Rasterizer2D.Rasterizer2D_width;
- }
- } else {
- var1 -= var2;
- var2 -= var0;
- var0 = Rasterizer3D_rowOffsets[var0];
-
- while(true) {
- --var2;
- if(var2 < 0) {
- while(true) {
- --var1;
- if(var1 < 0) {
- return;
- }
-
- Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19);
- var5 += var15;
- var3 += var16;
- var6 += var20;
- var0 += Rasterizer2D.Rasterizer2D_width;
- }
- }
-
- Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19);
- var4 += var17;
- var3 += var16;
- var6 += var20;
- var0 += Rasterizer2D.Rasterizer2D_width;
- }
- }
+ Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19);
+ var4 += var17;
+ var3 += var16;
+ var6 += var20;
+ var0 += Rasterizer2D.Rasterizer2D_width;
}
}
} else if(var1 <= var2) {
@@ -510,107 +480,107 @@ public class Rasterizer3D extends Rasterizer2D {
var7 += var20;
var1 += Rasterizer2D.Rasterizer2D_width;
}
- } else {
- var0 -= var2;
- var2 -= var1;
- var1 = Rasterizer3D_rowOffsets[var1];
+ }
+ var0 -= var2;
+ var2 -= var1;
+ var1 = Rasterizer3D_rowOffsets[var1];
+
+ while(true) {
+ --var2;
+ if(var2 < 0) {
+ while(true) {
+ --var0;
+ if(var0 < 0) {
+ return;
+ }
+
+ Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19);
+ var3 += var16;
+ var5 += var17;
+ var7 += var20;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19);
+ var3 += var16;
+ var4 += var15;
+ var7 += var20;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ var5 = var4 <<= 14;
+ if(var1 < 0) {
+ var5 -= var16 * var1;
+ var4 -= var15 * var1;
+ var7 -= var20 * var1;
+ var1 = 0;
+ }
+
+ var3 <<= 14;
+ if(var0 < 0) {
+ var3 -= var0 * var17;
+ var0 = 0;
+ }
+
+ if(var16 < var15) {
+ var2 -= var0;
+ var0 -= var1;
+ var1 = Rasterizer3D_rowOffsets[var1];
+
+ while(true) {
+ --var0;
+ if(var0 < 0) {
+ while(true) {
+ --var2;
+ if(var2 < 0) {
+ return;
+ }
+
+ Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19);
+ var3 += var17;
+ var4 += var15;
+ var7 += var20;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19);
+ var5 += var16;
+ var4 += var15;
+ var7 += var20;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ var2 -= var0;
+ var0 -= var1;
+ var1 = Rasterizer3D_rowOffsets[var1];
+
+ while(true) {
+ --var0;
+ if(var0 < 0) {
while(true) {
--var2;
if(var2 < 0) {
- while(true) {
- --var0;
- if(var0 < 0) {
- return;
- }
-
- Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19);
- var3 += var16;
- var5 += var17;
- var7 += var20;
- var1 += Rasterizer2D.Rasterizer2D_width;
- }
+ return;
}
Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19);
- var3 += var16;
+ var3 += var17;
var4 += var15;
var7 += var20;
var1 += Rasterizer2D.Rasterizer2D_width;
}
}
- } else {
- var5 = var4 <<= 14;
- if(var1 < 0) {
- var5 -= var16 * var1;
- var4 -= var15 * var1;
- var7 -= var20 * var1;
- var1 = 0;
- }
- var3 <<= 14;
- if(var0 < 0) {
- var3 -= var0 * var17;
- var0 = 0;
- }
-
- if(var16 < var15) {
- var2 -= var0;
- var0 -= var1;
- var1 = Rasterizer3D_rowOffsets[var1];
-
- while(true) {
- --var0;
- if(var0 < 0) {
- while(true) {
- --var2;
- if(var2 < 0) {
- return;
- }
-
- Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19);
- var3 += var17;
- var4 += var15;
- var7 += var20;
- var1 += Rasterizer2D.Rasterizer2D_width;
- }
- }
-
- Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19);
- var5 += var16;
- var4 += var15;
- var7 += var20;
- var1 += Rasterizer2D.Rasterizer2D_width;
- }
- } else {
- var2 -= var0;
- var0 -= var1;
- var1 = Rasterizer3D_rowOffsets[var1];
-
- while(true) {
- --var0;
- if(var0 < 0) {
- while(true) {
- --var2;
- if(var2 < 0) {
- return;
- }
-
- Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19);
- var3 += var17;
- var4 += var15;
- var7 += var20;
- var1 += Rasterizer2D.Rasterizer2D_width;
- }
- }
-
- Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19);
- var5 += var16;
- var4 += var15;
- var7 += var20;
- var1 += Rasterizer2D.Rasterizer2D_width;
- }
- }
+ Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19);
+ var5 += var16;
+ var4 += var15;
+ var7 += var20;
+ var1 += Rasterizer2D.Rasterizer2D_width;
}
}
} else if(var2 < Rasterizer3D_clipHeight) {
@@ -666,110 +636,111 @@ public class Rasterizer3D extends Rasterizer2D {
var8 += var20;
var2 += Rasterizer2D.Rasterizer2D_width;
}
- } else {
- var1 -= var0;
- var0 -= var2;
- var2 = Rasterizer3D_rowOffsets[var2];
+ }
+ var1 -= var0;
+ var0 -= var2;
+ var2 = Rasterizer3D_rowOffsets[var2];
+
+ while(true) {
+ --var0;
+ if(var0 < 0) {
+ while(true) {
+ --var1;
+ if(var1 < 0) {
+ return;
+ }
+
+ Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19);
+ var4 += var15;
+ var3 += var16;
+ var8 += var20;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19);
+ var4 += var15;
+ var5 += var17;
+ var8 += var20;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ var3 = var5 <<= 14;
+ if(var2 < 0) {
+ var3 -= var15 * var2;
+ var5 -= var17 * var2;
+ var8 -= var20 * var2;
+ var2 = 0;
+ }
+
+ var4 <<= 14;
+ if(var1 < 0) {
+ var4 -= var16 * var1;
+ var1 = 0;
+ }
+
+ if(var15 < var17) {
+ var0 -= var1;
+ var1 -= var2;
+ var2 = Rasterizer3D_rowOffsets[var2];
+
+ while(true) {
+ --var1;
+ if(var1 < 0) {
+ while(true) {
+ --var0;
+ if(var0 < 0) {
+ return;
+ }
+
+ Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19);
+ var4 += var16;
+ var5 += var17;
+ var8 += var20;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19);
+ var3 += var15;
+ var5 += var17;
+ var8 += var20;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ var0 -= var1;
+ var1 -= var2;
+ var2 = Rasterizer3D_rowOffsets[var2];
+
+ while(true) {
+ --var1;
+ if(var1 < 0) {
while(true) {
--var0;
if(var0 < 0) {
- while(true) {
- --var1;
- if(var1 < 0) {
- return;
- }
-
- Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19);
- var4 += var15;
- var3 += var16;
- var8 += var20;
- var2 += Rasterizer2D.Rasterizer2D_width;
- }
+ return;
}
Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19);
- var4 += var15;
+ var4 += var16;
var5 += var17;
var8 += var20;
var2 += Rasterizer2D.Rasterizer2D_width;
}
}
- } else {
- var3 = var5 <<= 14;
- if(var2 < 0) {
- var3 -= var15 * var2;
- var5 -= var17 * var2;
- var8 -= var20 * var2;
- var2 = 0;
- }
- var4 <<= 14;
- if(var1 < 0) {
- var4 -= var16 * var1;
- var1 = 0;
- }
-
- if(var15 < var17) {
- var0 -= var1;
- var1 -= var2;
- var2 = Rasterizer3D_rowOffsets[var2];
-
- while(true) {
- --var1;
- if(var1 < 0) {
- while(true) {
- --var0;
- if(var0 < 0) {
- return;
- }
-
- Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19);
- var4 += var16;
- var5 += var17;
- var8 += var20;
- var2 += Rasterizer2D.Rasterizer2D_width;
- }
- }
-
- Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19);
- var3 += var15;
- var5 += var17;
- var8 += var20;
- var2 += Rasterizer2D.Rasterizer2D_width;
- }
- } else {
- var0 -= var1;
- var1 -= var2;
- var2 = Rasterizer3D_rowOffsets[var2];
-
- while(true) {
- --var1;
- if(var1 < 0) {
- while(true) {
- --var0;
- if(var0 < 0) {
- return;
- }
-
- Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19);
- var4 += var16;
- var5 += var17;
- var8 += var20;
- var2 += Rasterizer2D.Rasterizer2D_width;
- }
- }
-
- Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19);
- var3 += var15;
- var5 += var17;
- var8 += var20;
- var2 += Rasterizer2D.Rasterizer2D_width;
- }
- }
+ Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19);
+ var3 += var15;
+ var5 += var17;
+ var8 += var20;
+ var2 += Rasterizer2D.Rasterizer2D_width;
}
}
}
+
}
@ObfuscatedName("d")
@@ -848,7 +819,6 @@ public class Rasterizer3D extends Rasterizer2D {
} while(var3 > 0);
}
}
-
} else {
var3 = var5 - var4;
if(Rasterizer3D_alpha == 0) {
@@ -870,9 +840,9 @@ public class Rasterizer3D extends Rasterizer2D {
--var3;
} while(var3 > 0);
}
-
}
}
+
}
@ObfuscatedName("a")
@@ -942,100 +912,100 @@ public class Rasterizer3D extends Rasterizer2D {
var3 += var7;
var0 += Rasterizer2D.Rasterizer2D_width;
}
- } else {
- var2 -= var1;
- var1 -= var0;
- var0 = Rasterizer3D_rowOffsets[var0];
+ }
+ var2 -= var1;
+ var1 -= var0;
+ var0 = Rasterizer3D_rowOffsets[var0];
+
+ while(true) {
+ --var1;
+ if(var1 < 0) {
+ while(true) {
+ --var2;
+ if(var2 < 0) {
+ return;
+ }
+
+ Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14);
+ var5 += var9;
+ var4 += var8;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14);
+ var5 += var9;
+ var3 += var7;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ var4 = var3 <<= 14;
+ if(var0 < 0) {
+ var4 -= var0 * var9;
+ var3 -= var0 * var7;
+ var0 = 0;
+ }
+
+ var5 <<= 14;
+ if(var2 < 0) {
+ var5 -= var8 * var2;
+ var2 = 0;
+ }
+
+ if(var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) {
+ var1 -= var2;
+ var2 -= var0;
+ var0 = Rasterizer3D_rowOffsets[var0];
+
+ while(true) {
+ --var2;
+ if(var2 < 0) {
+ while(true) {
+ --var1;
+ if(var1 < 0) {
+ return;
+ }
+
+ Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14);
+ var5 += var8;
+ var3 += var7;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14);
+ var4 += var9;
+ var3 += var7;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ var1 -= var2;
+ var2 -= var0;
+ var0 = Rasterizer3D_rowOffsets[var0];
+
+ while(true) {
+ --var2;
+ if(var2 < 0) {
while(true) {
--var1;
if(var1 < 0) {
- while(true) {
- --var2;
- if(var2 < 0) {
- return;
- }
-
- Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14);
- var5 += var9;
- var4 += var8;
- var0 += Rasterizer2D.Rasterizer2D_width;
- }
+ return;
}
- Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14);
- var5 += var9;
+ Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14);
+ var5 += var8;
var3 += var7;
var0 += Rasterizer2D.Rasterizer2D_width;
}
}
- } else {
- var4 = var3 <<= 14;
- if(var0 < 0) {
- var4 -= var0 * var9;
- var3 -= var0 * var7;
- var0 = 0;
- }
- var5 <<= 14;
- if(var2 < 0) {
- var5 -= var8 * var2;
- var2 = 0;
- }
-
- if(var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) {
- var1 -= var2;
- var2 -= var0;
- var0 = Rasterizer3D_rowOffsets[var0];
-
- while(true) {
- --var2;
- if(var2 < 0) {
- while(true) {
- --var1;
- if(var1 < 0) {
- return;
- }
-
- Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14);
- var5 += var8;
- var3 += var7;
- var0 += Rasterizer2D.Rasterizer2D_width;
- }
- }
-
- Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14);
- var4 += var9;
- var3 += var7;
- var0 += Rasterizer2D.Rasterizer2D_width;
- }
- } else {
- var1 -= var2;
- var2 -= var0;
- var0 = Rasterizer3D_rowOffsets[var0];
-
- while(true) {
- --var2;
- if(var2 < 0) {
- while(true) {
- --var1;
- if(var1 < 0) {
- return;
- }
-
- Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14);
- var5 += var8;
- var3 += var7;
- var0 += Rasterizer2D.Rasterizer2D_width;
- }
- }
-
- Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14);
- var4 += var9;
- var3 += var7;
- var0 += Rasterizer2D.Rasterizer2D_width;
- }
- }
+ Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14);
+ var4 += var9;
+ var3 += var7;
+ var0 += Rasterizer2D.Rasterizer2D_width;
}
}
} else if(var1 <= var2) {
@@ -1088,100 +1058,100 @@ public class Rasterizer3D extends Rasterizer2D {
var4 += var8;
var1 += Rasterizer2D.Rasterizer2D_width;
}
- } else {
- var0 -= var2;
- var2 -= var1;
- var1 = Rasterizer3D_rowOffsets[var1];
+ }
+ var0 -= var2;
+ var2 -= var1;
+ var1 = Rasterizer3D_rowOffsets[var1];
+
+ while(true) {
+ --var2;
+ if(var2 < 0) {
+ while(true) {
+ --var0;
+ if(var0 < 0) {
+ return;
+ }
+
+ Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14);
+ var3 += var7;
+ var5 += var9;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14);
+ var3 += var7;
+ var4 += var8;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ var5 = var4 <<= 14;
+ if(var1 < 0) {
+ var5 -= var7 * var1;
+ var4 -= var8 * var1;
+ var1 = 0;
+ }
+
+ var3 <<= 14;
+ if(var0 < 0) {
+ var3 -= var0 * var9;
+ var0 = 0;
+ }
+
+ if(var7 < var8) {
+ var2 -= var0;
+ var0 -= var1;
+ var1 = Rasterizer3D_rowOffsets[var1];
+
+ while(true) {
+ --var0;
+ if(var0 < 0) {
+ while(true) {
+ --var2;
+ if(var2 < 0) {
+ return;
+ }
+
+ Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14);
+ var3 += var9;
+ var4 += var8;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14);
+ var5 += var7;
+ var4 += var8;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ var2 -= var0;
+ var0 -= var1;
+ var1 = Rasterizer3D_rowOffsets[var1];
+
+ while(true) {
+ --var0;
+ if(var0 < 0) {
while(true) {
--var2;
if(var2 < 0) {
- while(true) {
- --var0;
- if(var0 < 0) {
- return;
- }
-
- Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14);
- var3 += var7;
- var5 += var9;
- var1 += Rasterizer2D.Rasterizer2D_width;
- }
+ return;
}
- Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14);
- var3 += var7;
+ Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14);
+ var3 += var9;
var4 += var8;
var1 += Rasterizer2D.Rasterizer2D_width;
}
}
- } else {
- var5 = var4 <<= 14;
- if(var1 < 0) {
- var5 -= var7 * var1;
- var4 -= var8 * var1;
- var1 = 0;
- }
- var3 <<= 14;
- if(var0 < 0) {
- var3 -= var0 * var9;
- var0 = 0;
- }
-
- if(var7 < var8) {
- var2 -= var0;
- var0 -= var1;
- var1 = Rasterizer3D_rowOffsets[var1];
-
- while(true) {
- --var0;
- if(var0 < 0) {
- while(true) {
- --var2;
- if(var2 < 0) {
- return;
- }
-
- Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14);
- var3 += var9;
- var4 += var8;
- var1 += Rasterizer2D.Rasterizer2D_width;
- }
- }
-
- Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14);
- var5 += var7;
- var4 += var8;
- var1 += Rasterizer2D.Rasterizer2D_width;
- }
- } else {
- var2 -= var0;
- var0 -= var1;
- var1 = Rasterizer3D_rowOffsets[var1];
-
- while(true) {
- --var0;
- if(var0 < 0) {
- while(true) {
- --var2;
- if(var2 < 0) {
- return;
- }
-
- Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14);
- var3 += var9;
- var4 += var8;
- var1 += Rasterizer2D.Rasterizer2D_width;
- }
- }
-
- Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14);
- var5 += var7;
- var4 += var8;
- var1 += Rasterizer2D.Rasterizer2D_width;
- }
- }
+ Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14);
+ var5 += var7;
+ var4 += var8;
+ var1 += Rasterizer2D.Rasterizer2D_width;
}
}
} else if(var2 < Rasterizer3D_clipHeight) {
@@ -1233,102 +1203,103 @@ public class Rasterizer3D extends Rasterizer2D {
var5 += var9;
var2 += Rasterizer2D.Rasterizer2D_width;
}
- } else {
- var1 -= var0;
- var0 -= var2;
- var2 = Rasterizer3D_rowOffsets[var2];
+ }
+ var1 -= var0;
+ var0 -= var2;
+ var2 = Rasterizer3D_rowOffsets[var2];
+
+ while(true) {
+ --var0;
+ if(var0 < 0) {
+ while(true) {
+ --var1;
+ if(var1 < 0) {
+ return;
+ }
+
+ Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14);
+ var4 += var8;
+ var3 += var7;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14);
+ var4 += var8;
+ var5 += var9;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ var3 = var5 <<= 14;
+ if(var2 < 0) {
+ var3 -= var8 * var2;
+ var5 -= var9 * var2;
+ var2 = 0;
+ }
+
+ var4 <<= 14;
+ if(var1 < 0) {
+ var4 -= var7 * var1;
+ var1 = 0;
+ }
+
+ if(var8 < var9) {
+ var0 -= var1;
+ var1 -= var2;
+ var2 = Rasterizer3D_rowOffsets[var2];
+
+ while(true) {
+ --var1;
+ if(var1 < 0) {
+ while(true) {
+ --var0;
+ if(var0 < 0) {
+ return;
+ }
+
+ Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14);
+ var4 += var7;
+ var5 += var9;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14);
+ var3 += var8;
+ var5 += var9;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ }
+ }
+
+ var0 -= var1;
+ var1 -= var2;
+ var2 = Rasterizer3D_rowOffsets[var2];
+
+ while(true) {
+ --var1;
+ if(var1 < 0) {
while(true) {
--var0;
if(var0 < 0) {
- while(true) {
- --var1;
- if(var1 < 0) {
- return;
- }
-
- Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14);
- var4 += var8;
- var3 += var7;
- var2 += Rasterizer2D.Rasterizer2D_width;
- }
+ return;
}
Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14);
- var4 += var8;
+ var4 += var7;
var5 += var9;
var2 += Rasterizer2D.Rasterizer2D_width;
}
}
- } else {
- var3 = var5 <<= 14;
- if(var2 < 0) {
- var3 -= var8 * var2;
- var5 -= var9 * var2;
- var2 = 0;
- }
- var4 <<= 14;
- if(var1 < 0) {
- var4 -= var7 * var1;
- var1 = 0;
- }
-
- if(var8 < var9) {
- var0 -= var1;
- var1 -= var2;
- var2 = Rasterizer3D_rowOffsets[var2];
-
- while(true) {
- --var1;
- if(var1 < 0) {
- while(true) {
- --var0;
- if(var0 < 0) {
- return;
- }
-
- Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14);
- var4 += var7;
- var5 += var9;
- var2 += Rasterizer2D.Rasterizer2D_width;
- }
- }
-
- Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14);
- var3 += var8;
- var5 += var9;
- var2 += Rasterizer2D.Rasterizer2D_width;
- }
- } else {
- var0 -= var1;
- var1 -= var2;
- var2 = Rasterizer3D_rowOffsets[var2];
-
- while(true) {
- --var1;
- if(var1 < 0) {
- while(true) {
- --var0;
- if(var0 < 0) {
- return;
- }
-
- Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14);
- var4 += var7;
- var5 += var9;
- var2 += Rasterizer2D.Rasterizer2D_width;
- }
- }
-
- Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14);
- var3 += var8;
- var5 += var9;
- var2 += Rasterizer2D.Rasterizer2D_width;
- }
- }
+ Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14);
+ var3 += var8;
+ var5 += var9;
+ var2 += Rasterizer2D.Rasterizer2D_width;
}
}
+
}
@ObfuscatedName("z")
@@ -1541,33 +1512,112 @@ public class Rasterizer3D extends Rasterizer2D {
var35 += var37;
var38 += var40;
}
- } else {
- var2 -= var1;
- var1 -= var0;
- var0 = Rasterizer3D_rowOffsets[var0];
+ }
+ var2 -= var1;
+ var1 -= var0;
+ var0 = Rasterizer3D_rowOffsets[var0];
+
+ while(true) {
+ --var1;
+ if(var1 < 0) {
+ while(true) {
+ --var2;
+ if(var2 < 0) {
+ return;
+ }
+
+ Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+ var5 += var28;
+ var4 += var27;
+ var6 += var31;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+ var5 += var28;
+ var3 += var26;
+ var6 += var31;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ var4 = var3 <<= 14;
+ if(var0 < 0) {
+ var4 -= var0 * var28;
+ var3 -= var0 * var26;
+ var6 -= var0 * var31;
+ var0 = 0;
+ }
+
+ var5 <<= 14;
+ if(var2 < 0) {
+ var5 -= var27 * var2;
+ var2 = 0;
+ }
+
+ var41 = var0 - Rasterizer3D_clipMidY;
+ var32 += var34 * var41;
+ var35 += var37 * var41;
+ var38 += var40 * var41;
+ if(var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) {
+ var1 -= var2;
+ var2 -= var0;
+ var0 = Rasterizer3D_rowOffsets[var0];
+
+ while(true) {
+ --var2;
+ if(var2 < 0) {
+ while(true) {
+ --var1;
+ if(var1 < 0) {
+ return;
+ }
+
+ Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+ var5 += var27;
+ var3 += var26;
+ var6 += var31;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+ var4 += var28;
+ var3 += var26;
+ var6 += var31;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ var1 -= var2;
+ var2 -= var0;
+ var0 = Rasterizer3D_rowOffsets[var0];
+
+ while(true) {
+ --var2;
+ if(var2 < 0) {
while(true) {
--var1;
if(var1 < 0) {
- while(true) {
- --var2;
- if(var2 < 0) {
- return;
- }
-
- Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
- var5 += var28;
- var4 += var27;
- var6 += var31;
- var0 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
+ return;
}
Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
- var5 += var28;
+ var5 += var27;
var3 += var26;
var6 += var31;
var0 += Rasterizer2D.Rasterizer2D_width;
@@ -1576,94 +1626,15 @@ public class Rasterizer3D extends Rasterizer2D {
var38 += var40;
}
}
- } else {
- var4 = var3 <<= 14;
- if(var0 < 0) {
- var4 -= var0 * var28;
- var3 -= var0 * var26;
- var6 -= var0 * var31;
- var0 = 0;
- }
- var5 <<= 14;
- if(var2 < 0) {
- var5 -= var27 * var2;
- var2 = 0;
- }
-
- var41 = var0 - Rasterizer3D_clipMidY;
- var32 += var34 * var41;
- var35 += var37 * var41;
- var38 += var40 * var41;
- if(var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) {
- var1 -= var2;
- var2 -= var0;
- var0 = Rasterizer3D_rowOffsets[var0];
-
- while(true) {
- --var2;
- if(var2 < 0) {
- while(true) {
- --var1;
- if(var1 < 0) {
- return;
- }
-
- Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
- var5 += var27;
- var3 += var26;
- var6 += var31;
- var0 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
-
- Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
- var4 += var28;
- var3 += var26;
- var6 += var31;
- var0 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- } else {
- var1 -= var2;
- var2 -= var0;
- var0 = Rasterizer3D_rowOffsets[var0];
-
- while(true) {
- --var2;
- if(var2 < 0) {
- while(true) {
- --var1;
- if(var1 < 0) {
- return;
- }
-
- Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
- var5 += var27;
- var3 += var26;
- var6 += var31;
- var0 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
-
- Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
- var4 += var28;
- var3 += var26;
- var6 += var31;
- var0 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
+ Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+ var4 += var28;
+ var3 += var26;
+ var6 += var31;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
}
}
} else if(var1 <= var2) {
@@ -1730,33 +1701,112 @@ public class Rasterizer3D extends Rasterizer2D {
var35 += var37;
var38 += var40;
}
- } else {
- var0 -= var2;
- var2 -= var1;
- var1 = Rasterizer3D_rowOffsets[var1];
+ }
+ var0 -= var2;
+ var2 -= var1;
+ var1 = Rasterizer3D_rowOffsets[var1];
+
+ while(true) {
+ --var2;
+ if(var2 < 0) {
+ while(true) {
+ --var0;
+ if(var0 < 0) {
+ return;
+ }
+
+ Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+ var3 += var26;
+ var5 += var28;
+ var7 += var31;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+ var3 += var26;
+ var4 += var27;
+ var7 += var31;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ var5 = var4 <<= 14;
+ if(var1 < 0) {
+ var5 -= var26 * var1;
+ var4 -= var27 * var1;
+ var7 -= var31 * var1;
+ var1 = 0;
+ }
+
+ var3 <<= 14;
+ if(var0 < 0) {
+ var3 -= var0 * var28;
+ var0 = 0;
+ }
+
+ var41 = var1 - Rasterizer3D_clipMidY;
+ var32 += var34 * var41;
+ var35 += var37 * var41;
+ var38 += var40 * var41;
+ if(var26 < var27) {
+ var2 -= var0;
+ var0 -= var1;
+ var1 = Rasterizer3D_rowOffsets[var1];
+
+ while(true) {
+ --var0;
+ if(var0 < 0) {
+ while(true) {
+ --var2;
+ if(var2 < 0) {
+ return;
+ }
+
+ Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+ var3 += var28;
+ var4 += var27;
+ var7 += var31;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+ var5 += var26;
+ var4 += var27;
+ var7 += var31;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ var2 -= var0;
+ var0 -= var1;
+ var1 = Rasterizer3D_rowOffsets[var1];
+
+ while(true) {
+ --var0;
+ if(var0 < 0) {
while(true) {
--var2;
if(var2 < 0) {
- while(true) {
- --var0;
- if(var0 < 0) {
- return;
- }
-
- Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
- var3 += var26;
- var5 += var28;
- var7 += var31;
- var1 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
+ return;
}
Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
- var3 += var26;
+ var3 += var28;
var4 += var27;
var7 += var31;
var1 += Rasterizer2D.Rasterizer2D_width;
@@ -1765,94 +1815,15 @@ public class Rasterizer3D extends Rasterizer2D {
var38 += var40;
}
}
- } else {
- var5 = var4 <<= 14;
- if(var1 < 0) {
- var5 -= var26 * var1;
- var4 -= var27 * var1;
- var7 -= var31 * var1;
- var1 = 0;
- }
- var3 <<= 14;
- if(var0 < 0) {
- var3 -= var0 * var28;
- var0 = 0;
- }
-
- var41 = var1 - Rasterizer3D_clipMidY;
- var32 += var34 * var41;
- var35 += var37 * var41;
- var38 += var40 * var41;
- if(var26 < var27) {
- var2 -= var0;
- var0 -= var1;
- var1 = Rasterizer3D_rowOffsets[var1];
-
- while(true) {
- --var0;
- if(var0 < 0) {
- while(true) {
- --var2;
- if(var2 < 0) {
- return;
- }
-
- Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
- var3 += var28;
- var4 += var27;
- var7 += var31;
- var1 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
-
- Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
- var5 += var26;
- var4 += var27;
- var7 += var31;
- var1 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- } else {
- var2 -= var0;
- var0 -= var1;
- var1 = Rasterizer3D_rowOffsets[var1];
-
- while(true) {
- --var0;
- if(var0 < 0) {
- while(true) {
- --var2;
- if(var2 < 0) {
- return;
- }
-
- Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
- var3 += var28;
- var4 += var27;
- var7 += var31;
- var1 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
-
- Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
- var5 += var26;
- var4 += var27;
- var7 += var31;
- var1 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
+ Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+ var5 += var26;
+ var4 += var27;
+ var7 += var31;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
}
}
} else if(var2 < Rasterizer3D_clipHeight) {
@@ -1918,33 +1889,112 @@ public class Rasterizer3D extends Rasterizer2D {
var35 += var37;
var38 += var40;
}
- } else {
- var1 -= var0;
- var0 -= var2;
- var2 = Rasterizer3D_rowOffsets[var2];
+ }
+ var1 -= var0;
+ var0 -= var2;
+ var2 = Rasterizer3D_rowOffsets[var2];
+
+ while(true) {
+ --var0;
+ if(var0 < 0) {
+ while(true) {
+ --var1;
+ if(var1 < 0) {
+ return;
+ }
+
+ Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+ var4 += var27;
+ var3 += var26;
+ var8 += var31;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+ var4 += var27;
+ var5 += var28;
+ var8 += var31;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ var3 = var5 <<= 14;
+ if(var2 < 0) {
+ var3 -= var27 * var2;
+ var5 -= var28 * var2;
+ var8 -= var31 * var2;
+ var2 = 0;
+ }
+
+ var4 <<= 14;
+ if(var1 < 0) {
+ var4 -= var26 * var1;
+ var1 = 0;
+ }
+
+ var41 = var2 - Rasterizer3D_clipMidY;
+ var32 += var34 * var41;
+ var35 += var37 * var41;
+ var38 += var40 * var41;
+ if(var27 < var28) {
+ var0 -= var1;
+ var1 -= var2;
+ var2 = Rasterizer3D_rowOffsets[var2];
+
+ while(true) {
+ --var1;
+ if(var1 < 0) {
+ while(true) {
+ --var0;
+ if(var0 < 0) {
+ return;
+ }
+
+ Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+ var4 += var26;
+ var5 += var28;
+ var8 += var31;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+ var3 += var27;
+ var5 += var28;
+ var8 += var31;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ var0 -= var1;
+ var1 -= var2;
+ var2 = Rasterizer3D_rowOffsets[var2];
+
+ while(true) {
+ --var1;
+ if(var1 < 0) {
while(true) {
--var0;
if(var0 < 0) {
- while(true) {
- --var1;
- if(var1 < 0) {
- return;
- }
-
- Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
- var4 += var27;
- var3 += var26;
- var8 += var31;
- var2 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
+ return;
}
Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
- var4 += var27;
+ var4 += var26;
var5 += var28;
var8 += var31;
var2 += Rasterizer2D.Rasterizer2D_width;
@@ -1953,98 +2003,20 @@ public class Rasterizer3D extends Rasterizer2D {
var38 += var40;
}
}
- } else {
- var3 = var5 <<= 14;
- if(var2 < 0) {
- var3 -= var27 * var2;
- var5 -= var28 * var2;
- var8 -= var31 * var2;
- var2 = 0;
- }
- var4 <<= 14;
- if(var1 < 0) {
- var4 -= var26 * var1;
- var1 = 0;
- }
-
- var41 = var2 - Rasterizer3D_clipMidY;
- var32 += var34 * var41;
- var35 += var37 * var41;
- var38 += var40 * var41;
- if(var27 < var28) {
- var0 -= var1;
- var1 -= var2;
- var2 = Rasterizer3D_rowOffsets[var2];
-
- while(true) {
- --var1;
- if(var1 < 0) {
- while(true) {
- --var0;
- if(var0 < 0) {
- return;
- }
-
- Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
- var4 += var26;
- var5 += var28;
- var8 += var31;
- var2 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
-
- Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
- var3 += var27;
- var5 += var28;
- var8 += var31;
- var2 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- } else {
- var0 -= var1;
- var1 -= var2;
- var2 = Rasterizer3D_rowOffsets[var2];
-
- while(true) {
- --var1;
- if(var1 < 0) {
- while(true) {
- --var0;
- if(var0 < 0) {
- return;
- }
-
- Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
- var4 += var26;
- var5 += var28;
- var8 += var31;
- var2 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
-
- Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
- var3 += var27;
- var5 += var28;
- var8 += var31;
- var2 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
+ Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+ var3 += var27;
+ var5 += var28;
+ var8 += var31;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
}
}
}
}
+
}
@ObfuscatedName("s")
@@ -2063,409 +2035,409 @@ public class Rasterizer3D extends Rasterizer2D {
if(var5 < var6) {
var4 += var5;
var7 += var5 * var8;
- int var17 = var6 - var5;
- int var15;
+ int var15 = var6 - var5;
int var16;
int var10000;
- int var18;
+ int var17;
int var19;
int var20;
int var21;
int var22;
int var23;
+ int var24;
if(Rasterizer3D_isLowDetailTexture) {
- var23 = var5 - Rasterizer3D_clipMidX;
- var9 += var23 * (var12 >> 3);
- var10 += (var13 >> 3) * var23;
- var11 += var23 * (var14 >> 3);
- var22 = var11 >> 12;
- if(var22 != 0) {
- var18 = var9 / var22;
- var19 = var10 / var22;
- if(var18 < 0) {
- var18 = 0;
- } else if(var18 > 4032) {
- var18 = 4032;
+ var24 = var5 - Rasterizer3D_clipMidX;
+ var9 += var24 * (var12 >> 3);
+ var10 += (var13 >> 3) * var24;
+ var11 += var24 * (var14 >> 3);
+ var23 = var11 >> 12;
+ if(var23 != 0) {
+ var19 = var9 / var23;
+ var20 = var10 / var23;
+ if(var19 < 0) {
+ var19 = 0;
+ } else if(var19 > 4032) {
+ var19 = 4032;
}
} else {
- var18 = 0;
var19 = 0;
+ var20 = 0;
}
var9 += var12;
var10 += var13;
var11 += var14;
- var22 = var11 >> 12;
- if(var22 != 0) {
- var20 = var9 / var22;
- var21 = var10 / var22;
- if(var20 < 0) {
- var20 = 0;
- } else if(var20 > 4032) {
- var20 = 4032;
+ var23 = var11 >> 12;
+ if(var23 != 0) {
+ var21 = var9 / var23;
+ var22 = var10 / var23;
+ if(var21 < 0) {
+ var21 = 0;
+ } else if(var21 > 4032) {
+ var21 = 4032;
}
} else {
- var20 = 0;
var21 = 0;
+ var22 = 0;
}
- var2 = (var18 << 20) + var19;
- var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20);
- var17 >>= 3;
+ var2 = (var19 << 20) + var20;
+ var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20);
+ var15 >>= 3;
var8 <<= 3;
- var15 = var7 >> 8;
+ var16 = var7 >> 8;
if(__et_f) {
- if(var17 > 0) {
+ if(var15 > 0) {
do {
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var10000 = var16 + var2;
- var18 = var20;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var10000 = var17 + var2;
var19 = var21;
+ var20 = var22;
var9 += var12;
var10 += var13;
var11 += var14;
- var22 = var11 >> 12;
- if(var22 != 0) {
- var20 = var9 / var22;
- var21 = var10 / var22;
- if(var20 < 0) {
- var20 = 0;
- } else if(var20 > 4032) {
- var20 = 4032;
+ var23 = var11 >> 12;
+ if(var23 != 0) {
+ var21 = var9 / var23;
+ var22 = var10 / var23;
+ if(var21 < 0) {
+ var21 = 0;
+ } else if(var21 > 4032) {
+ var21 = 4032;
}
} else {
- var20 = 0;
var21 = 0;
+ var22 = 0;
}
- var2 = (var18 << 20) + var19;
- var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20);
+ var2 = (var19 << 20) + var20;
+ var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20);
var7 += var8;
- var15 = var7 >> 8;
- --var17;
- } while(var17 > 0);
+ var16 = var7 >> 8;
+ --var15;
+ } while(var15 > 0);
}
- var17 = var6 - var5 & 7;
- if(var17 > 0) {
+ var15 = var6 - var5 & 7;
+ if(var15 > 0) {
do {
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
- --var17;
- } while(var17 > 0);
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
+ --var15;
+ } while(var15 > 0);
}
} else {
- if(var17 > 0) {
+ if(var15 > 0) {
do {
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var10000 = var16 + var2;
- var18 = var20;
+ var10000 = var17 + var2;
var19 = var21;
+ var20 = var22;
var9 += var12;
var10 += var13;
var11 += var14;
- var22 = var11 >> 12;
- if(var22 != 0) {
- var20 = var9 / var22;
- var21 = var10 / var22;
- if(var20 < 0) {
- var20 = 0;
- } else if(var20 > 4032) {
- var20 = 4032;
+ var23 = var11 >> 12;
+ if(var23 != 0) {
+ var21 = var9 / var23;
+ var22 = var10 / var23;
+ if(var21 < 0) {
+ var21 = 0;
+ } else if(var21 > 4032) {
+ var21 = 4032;
}
} else {
- var20 = 0;
var21 = 0;
+ var22 = 0;
}
- var2 = (var18 << 20) + var19;
- var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20);
+ var2 = (var19 << 20) + var20;
+ var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20);
var7 += var8;
- var15 = var7 >> 8;
- --var17;
- } while(var17 > 0);
+ var16 = var7 >> 8;
+ --var15;
+ } while(var15 > 0);
}
- var17 = var6 - var5 & 7;
- if(var17 > 0) {
+ var15 = var6 - var5 & 7;
+ if(var15 > 0) {
do {
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
- --var17;
- } while(var17 > 0);
+ var2 += var17;
+ --var15;
+ } while(var15 > 0);
}
}
} else {
- var23 = var5 - Rasterizer3D_clipMidX;
- var9 += var23 * (var12 >> 3);
- var10 += (var13 >> 3) * var23;
- var11 += var23 * (var14 >> 3);
- var22 = var11 >> 14;
- if(var22 != 0) {
- var18 = var9 / var22;
- var19 = var10 / var22;
- if(var18 < 0) {
- var18 = 0;
- } else if(var18 > 16256) {
- var18 = 16256;
+ var24 = var5 - Rasterizer3D_clipMidX;
+ var9 += var24 * (var12 >> 3);
+ var10 += (var13 >> 3) * var24;
+ var11 += var24 * (var14 >> 3);
+ var23 = var11 >> 14;
+ if(var23 != 0) {
+ var19 = var9 / var23;
+ var20 = var10 / var23;
+ if(var19 < 0) {
+ var19 = 0;
+ } else if(var19 > 16256) {
+ var19 = 16256;
}
} else {
- var18 = 0;
var19 = 0;
+ var20 = 0;
}
var9 += var12;
var10 += var13;
var11 += var14;
- var22 = var11 >> 14;
- if(var22 != 0) {
- var20 = var9 / var22;
- var21 = var10 / var22;
- if(var20 < 0) {
- var20 = 0;
- } else if(var20 > 16256) {
- var20 = 16256;
+ var23 = var11 >> 14;
+ if(var23 != 0) {
+ var21 = var9 / var23;
+ var22 = var10 / var23;
+ if(var21 < 0) {
+ var21 = 0;
+ } else if(var21 > 16256) {
+ var21 = 16256;
}
} else {
- var20 = 0;
var21 = 0;
+ var22 = 0;
}
- var2 = (var18 << 18) + var19;
- var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18);
- var17 >>= 3;
+ var2 = (var19 << 18) + var20;
+ var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18);
+ var15 >>= 3;
var8 <<= 3;
- var15 = var7 >> 8;
+ var16 = var7 >> 8;
if(__et_f) {
- if(var17 > 0) {
+ if(var15 > 0) {
do {
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var10000 = var16 + var2;
- var18 = var20;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var10000 = var17 + var2;
var19 = var21;
+ var20 = var22;
var9 += var12;
var10 += var13;
var11 += var14;
- var22 = var11 >> 14;
- if(var22 != 0) {
- var20 = var9 / var22;
- var21 = var10 / var22;
- if(var20 < 0) {
- var20 = 0;
- } else if(var20 > 16256) {
- var20 = 16256;
+ var23 = var11 >> 14;
+ if(var23 != 0) {
+ var21 = var9 / var23;
+ var22 = var10 / var23;
+ if(var21 < 0) {
+ var21 = 0;
+ } else if(var21 > 16256) {
+ var21 = 16256;
}
} else {
- var20 = 0;
var21 = 0;
+ var22 = 0;
}
- var2 = (var18 << 18) + var19;
- var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18);
+ var2 = (var19 << 18) + var20;
+ var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18);
var7 += var8;
- var15 = var7 >> 8;
- --var17;
- } while(var17 > 0);
+ var16 = var7 >> 8;
+ --var15;
+ } while(var15 > 0);
}
- var17 = var6 - var5 & 7;
- if(var17 > 0) {
+ var15 = var6 - var5 & 7;
+ if(var15 > 0) {
do {
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
- --var17;
- } while(var17 > 0);
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
+ --var15;
+ } while(var15 > 0);
}
} else {
- if(var17 > 0) {
+ if(var15 > 0) {
do {
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var10000 = var16 + var2;
- var18 = var20;
+ var10000 = var17 + var2;
var19 = var21;
+ var20 = var22;
var9 += var12;
var10 += var13;
var11 += var14;
- var22 = var11 >> 14;
- if(var22 != 0) {
- var20 = var9 / var22;
- var21 = var10 / var22;
- if(var20 < 0) {
- var20 = 0;
- } else if(var20 > 16256) {
- var20 = 16256;
+ var23 = var11 >> 14;
+ if(var23 != 0) {
+ var21 = var9 / var23;
+ var22 = var10 / var23;
+ if(var21 < 0) {
+ var21 = 0;
+ } else if(var21 > 16256) {
+ var21 = 16256;
}
} else {
- var20 = 0;
var21 = 0;
+ var22 = 0;
}
- var2 = (var18 << 18) + var19;
- var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18);
+ var2 = (var19 << 18) + var20;
+ var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18);
var7 += var8;
- var15 = var7 >> 8;
- --var17;
- } while(var17 > 0);
+ var16 = var7 >> 8;
+ --var15;
+ } while(var15 > 0);
}
- var17 = var6 - var5 & 7;
- if(var17 > 0) {
+ var15 = var6 - var5 & 7;
+ if(var15 > 0) {
do {
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
- --var17;
- } while(var17 > 0);
+ var2 += var17;
+ --var15;
+ } while(var15 > 0);
}
}
}
-
}
+
}
@ObfuscatedName("t")
@@ -2583,33 +2555,112 @@ public class Rasterizer3D extends Rasterizer2D {
var35 += var37;
var38 += var40;
}
- } else {
- var2 -= var1;
- var1 -= var0;
- var0 = Rasterizer3D_rowOffsets[var0];
+ }
+ var2 -= var1;
+ var1 -= var0;
+ var0 = Rasterizer3D_rowOffsets[var0];
+
+ while(true) {
+ --var1;
+ if(var1 < 0) {
+ while(true) {
+ --var2;
+ if(var2 < 0) {
+ return;
+ }
+
+ Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+ var5 += var28;
+ var4 += var27;
+ var6 += var31;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+ var5 += var28;
+ var3 += var26;
+ var6 += var31;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ var4 = var3 <<= 14;
+ if(var0 < 0) {
+ var4 -= var0 * var28;
+ var3 -= var0 * var26;
+ var6 -= var0 * var31;
+ var0 = 0;
+ }
+
+ var5 <<= 14;
+ if(var2 < 0) {
+ var5 -= var27 * var2;
+ var2 = 0;
+ }
+
+ var41 = var0 - Rasterizer3D_clipMidY;
+ var32 += var34 * var41;
+ var35 += var37 * var41;
+ var38 += var40 * var41;
+ if(var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) {
+ var1 -= var2;
+ var2 -= var0;
+ var0 = Rasterizer3D_rowOffsets[var0];
+
+ while(true) {
+ --var2;
+ if(var2 < 0) {
+ while(true) {
+ --var1;
+ if(var1 < 0) {
+ return;
+ }
+
+ Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+ var5 += var27;
+ var3 += var26;
+ var6 += var31;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+ var4 += var28;
+ var3 += var26;
+ var6 += var31;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ var1 -= var2;
+ var2 -= var0;
+ var0 = Rasterizer3D_rowOffsets[var0];
+
+ while(true) {
+ --var2;
+ if(var2 < 0) {
while(true) {
--var1;
if(var1 < 0) {
- while(true) {
- --var2;
- if(var2 < 0) {
- return;
- }
-
- Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
- var5 += var28;
- var4 += var27;
- var6 += var31;
- var0 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
+ return;
}
Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
- var5 += var28;
+ var5 += var27;
var3 += var26;
var6 += var31;
var0 += Rasterizer2D.Rasterizer2D_width;
@@ -2618,94 +2669,15 @@ public class Rasterizer3D extends Rasterizer2D {
var38 += var40;
}
}
- } else {
- var4 = var3 <<= 14;
- if(var0 < 0) {
- var4 -= var0 * var28;
- var3 -= var0 * var26;
- var6 -= var0 * var31;
- var0 = 0;
- }
- var5 <<= 14;
- if(var2 < 0) {
- var5 -= var27 * var2;
- var2 = 0;
- }
-
- var41 = var0 - Rasterizer3D_clipMidY;
- var32 += var34 * var41;
- var35 += var37 * var41;
- var38 += var40 * var41;
- if((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) {
- var1 -= var2;
- var2 -= var0;
- var0 = Rasterizer3D_rowOffsets[var0];
-
- while(true) {
- --var2;
- if(var2 < 0) {
- while(true) {
- --var1;
- if(var1 < 0) {
- return;
- }
-
- Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
- var5 += var27;
- var3 += var26;
- var6 += var31;
- var0 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
-
- Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
- var4 += var28;
- var3 += var26;
- var6 += var31;
- var0 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- } else {
- var1 -= var2;
- var2 -= var0;
- var0 = Rasterizer3D_rowOffsets[var0];
-
- while(true) {
- --var2;
- if(var2 < 0) {
- while(true) {
- --var1;
- if(var1 < 0) {
- return;
- }
-
- Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
- var5 += var27;
- var3 += var26;
- var6 += var31;
- var0 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
-
- Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
- var4 += var28;
- var3 += var26;
- var6 += var31;
- var0 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
+ Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+ var4 += var28;
+ var3 += var26;
+ var6 += var31;
+ var0 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
}
}
} else if(var1 <= var2) {
@@ -2772,33 +2744,112 @@ public class Rasterizer3D extends Rasterizer2D {
var35 += var37;
var38 += var40;
}
- } else {
- var0 -= var2;
- var2 -= var1;
- var1 = Rasterizer3D_rowOffsets[var1];
+ }
+ var0 -= var2;
+ var2 -= var1;
+ var1 = Rasterizer3D_rowOffsets[var1];
+
+ while(true) {
+ --var2;
+ if(var2 < 0) {
+ while(true) {
+ --var0;
+ if(var0 < 0) {
+ return;
+ }
+
+ Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+ var3 += var26;
+ var5 += var28;
+ var7 += var31;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+ var3 += var26;
+ var4 += var27;
+ var7 += var31;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ var5 = var4 <<= 14;
+ if(var1 < 0) {
+ var5 -= var26 * var1;
+ var4 -= var27 * var1;
+ var7 -= var31 * var1;
+ var1 = 0;
+ }
+
+ var3 <<= 14;
+ if(var0 < 0) {
+ var3 -= var0 * var28;
+ var0 = 0;
+ }
+
+ var41 = var1 - Rasterizer3D_clipMidY;
+ var32 += var34 * var41;
+ var35 += var37 * var41;
+ var38 += var40 * var41;
+ if(var26 < var27) {
+ var2 -= var0;
+ var0 -= var1;
+ var1 = Rasterizer3D_rowOffsets[var1];
+
+ while(true) {
+ --var0;
+ if(var0 < 0) {
+ while(true) {
+ --var2;
+ if(var2 < 0) {
+ return;
+ }
+
+ Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+ var3 += var28;
+ var4 += var27;
+ var7 += var31;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+ var5 += var26;
+ var4 += var27;
+ var7 += var31;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ var2 -= var0;
+ var0 -= var1;
+ var1 = Rasterizer3D_rowOffsets[var1];
+
+ while(true) {
+ --var0;
+ if(var0 < 0) {
while(true) {
--var2;
if(var2 < 0) {
- while(true) {
- --var0;
- if(var0 < 0) {
- return;
- }
-
- Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
- var3 += var26;
- var5 += var28;
- var7 += var31;
- var1 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
+ return;
}
Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
- var3 += var26;
+ var3 += var28;
var4 += var27;
var7 += var31;
var1 += Rasterizer2D.Rasterizer2D_width;
@@ -2807,94 +2858,15 @@ public class Rasterizer3D extends Rasterizer2D {
var38 += var40;
}
}
- } else {
- var5 = var4 <<= 14;
- if(var1 < 0) {
- var5 -= var26 * var1;
- var4 -= var27 * var1;
- var7 -= var31 * var1;
- var1 = 0;
- }
- var3 <<= 14;
- if(var0 < 0) {
- var3 -= var0 * var28;
- var0 = 0;
- }
-
- var41 = var1 - Rasterizer3D_clipMidY;
- var32 += var34 * var41;
- var35 += var37 * var41;
- var38 += var40 * var41;
- if(var26 < var27) {
- var2 -= var0;
- var0 -= var1;
- var1 = Rasterizer3D_rowOffsets[var1];
-
- while(true) {
- --var0;
- if(var0 < 0) {
- while(true) {
- --var2;
- if(var2 < 0) {
- return;
- }
-
- Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
- var3 += var28;
- var4 += var27;
- var7 += var31;
- var1 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
-
- Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
- var5 += var26;
- var4 += var27;
- var7 += var31;
- var1 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- } else {
- var2 -= var0;
- var0 -= var1;
- var1 = Rasterizer3D_rowOffsets[var1];
-
- while(true) {
- --var0;
- if(var0 < 0) {
- while(true) {
- --var2;
- if(var2 < 0) {
- return;
- }
-
- Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
- var3 += var28;
- var4 += var27;
- var7 += var31;
- var1 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
-
- Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
- var5 += var26;
- var4 += var27;
- var7 += var31;
- var1 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
+ Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+ var5 += var26;
+ var4 += var27;
+ var7 += var31;
+ var1 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
}
}
} else if(var2 < Rasterizer3D_clipHeight) {
@@ -2960,33 +2932,112 @@ public class Rasterizer3D extends Rasterizer2D {
var35 += var37;
var38 += var40;
}
- } else {
- var1 -= var0;
- var0 -= var2;
- var2 = Rasterizer3D_rowOffsets[var2];
+ }
+ var1 -= var0;
+ var0 -= var2;
+ var2 = Rasterizer3D_rowOffsets[var2];
+
+ while(true) {
+ --var0;
+ if(var0 < 0) {
+ while(true) {
+ --var1;
+ if(var1 < 0) {
+ return;
+ }
+
+ Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+ var4 += var27;
+ var3 += var26;
+ var8 += var31;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+ var4 += var27;
+ var5 += var28;
+ var8 += var31;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ var3 = var5 <<= 14;
+ if(var2 < 0) {
+ var3 -= var27 * var2;
+ var5 -= var28 * var2;
+ var8 -= var31 * var2;
+ var2 = 0;
+ }
+
+ var4 <<= 14;
+ if(var1 < 0) {
+ var4 -= var26 * var1;
+ var1 = 0;
+ }
+
+ var41 = var2 - Rasterizer3D_clipMidY;
+ var32 += var34 * var41;
+ var35 += var37 * var41;
+ var38 += var40 * var41;
+ if(var27 < var28) {
+ var0 -= var1;
+ var1 -= var2;
+ var2 = Rasterizer3D_rowOffsets[var2];
+
+ while(true) {
+ --var1;
+ if(var1 < 0) {
+ while(true) {
+ --var0;
+ if(var0 < 0) {
+ return;
+ }
+
+ Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+ var4 += var26;
+ var5 += var28;
+ var8 += var31;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+ var3 += var27;
+ var5 += var28;
+ var8 += var31;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
+ }
+ }
+
+ var0 -= var1;
+ var1 -= var2;
+ var2 = Rasterizer3D_rowOffsets[var2];
+
+ while(true) {
+ --var1;
+ if(var1 < 0) {
while(true) {
--var0;
if(var0 < 0) {
- while(true) {
- --var1;
- if(var1 < 0) {
- return;
- }
-
- Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
- var4 += var27;
- var3 += var26;
- var8 += var31;
- var2 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
+ return;
}
Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
- var4 += var27;
+ var4 += var26;
var5 += var28;
var8 += var31;
var2 += Rasterizer2D.Rasterizer2D_width;
@@ -2995,98 +3046,20 @@ public class Rasterizer3D extends Rasterizer2D {
var38 += var40;
}
}
- } else {
- var3 = var5 <<= 14;
- if(var2 < 0) {
- var3 -= var27 * var2;
- var5 -= var28 * var2;
- var8 -= var31 * var2;
- var2 = 0;
- }
- var4 <<= 14;
- if(var1 < 0) {
- var4 -= var26 * var1;
- var1 = 0;
- }
-
- var41 = var2 - Rasterizer3D_clipMidY;
- var32 += var34 * var41;
- var35 += var37 * var41;
- var38 += var40 * var41;
- if(var27 < var28) {
- var0 -= var1;
- var1 -= var2;
- var2 = Rasterizer3D_rowOffsets[var2];
-
- while(true) {
- --var1;
- if(var1 < 0) {
- while(true) {
- --var0;
- if(var0 < 0) {
- return;
- }
-
- Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
- var4 += var26;
- var5 += var28;
- var8 += var31;
- var2 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
-
- Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
- var3 += var27;
- var5 += var28;
- var8 += var31;
- var2 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- } else {
- var0 -= var1;
- var1 -= var2;
- var2 = Rasterizer3D_rowOffsets[var2];
-
- while(true) {
- --var1;
- if(var1 < 0) {
- while(true) {
- --var0;
- if(var0 < 0) {
- return;
- }
-
- Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
- var4 += var26;
- var5 += var28;
- var8 += var31;
- var2 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
-
- Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
- var3 += var27;
- var5 += var28;
- var8 += var31;
- var2 += Rasterizer2D.Rasterizer2D_width;
- var32 += var34;
- var35 += var37;
- var38 += var40;
- }
- }
+ Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+ var3 += var27;
+ var5 += var28;
+ var8 += var31;
+ var2 += Rasterizer2D.Rasterizer2D_width;
+ var32 += var34;
+ var35 += var37;
+ var38 += var40;
}
}
}
}
+
}
@ObfuscatedName("y")
@@ -3105,9 +3078,9 @@ public class Rasterizer3D extends Rasterizer2D {
if(var5 < var6) {
var4 += var5;
var7 += var5 * var8;
- int var17 = var6 - var5;
- int var15;
+ int var15 = var6 - var5;
int var16;
+ int var17;
int var18;
int var19;
int var20;
@@ -3128,9 +3101,9 @@ public class Rasterizer3D extends Rasterizer2D {
var19 = 0;
}
- var9 += var17 * var12;
- var10 += var13 * var17;
- var11 += var17 * var14;
+ var9 += var15 * var12;
+ var10 += var13 * var15;
+ var11 += var15 * var14;
var22 = var11 >> 12;
if(var22 != 0) {
var20 = var9 / var22;
@@ -3141,120 +3114,120 @@ public class Rasterizer3D extends Rasterizer2D {
}
var2 = (var18 << 20) + var19;
- var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20);
- var17 >>= 3;
+ var17 = (var21 - var19) / var15 + ((var20 - var18) / var15 << 20);
+ var15 >>= 3;
var8 <<= 3;
- var15 = var7 >> 8;
+ var16 = var7 >> 8;
if(__et_f) {
- if(var17 > 0) {
+ if(var15 > 0) {
do {
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var7 += var8;
- var15 = var7 >> 8;
- --var17;
- } while(var17 > 0);
+ var16 = var7 >> 8;
+ --var15;
+ } while(var15 > 0);
}
- var17 = var6 - var5 & 7;
- if(var17 > 0) {
+ var15 = var6 - var5 & 7;
+ if(var15 > 0) {
do {
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
- --var17;
- } while(var17 > 0);
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
+ --var15;
+ } while(var15 > 0);
}
} else {
- if(var17 > 0) {
+ if(var15 > 0) {
do {
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
var7 += var8;
- var15 = var7 >> 8;
- --var17;
- } while(var17 > 0);
+ var16 = var7 >> 8;
+ --var15;
+ } while(var15 > 0);
}
- var17 = var6 - var5 & 7;
- if(var17 > 0) {
+ var15 = var6 - var5 & 7;
+ if(var15 > 0) {
do {
if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
- --var17;
- } while(var17 > 0);
+ var2 += var17;
+ --var15;
+ } while(var15 > 0);
}
}
} else {
@@ -3271,9 +3244,9 @@ public class Rasterizer3D extends Rasterizer2D {
var19 = 0;
}
- var9 += var17 * var12;
- var10 += var13 * var17;
- var11 += var17 * var14;
+ var9 += var15 * var12;
+ var10 += var13 * var15;
+ var11 += var15 * var14;
var22 = var11 >> 14;
if(var22 != 0) {
var20 = var9 / var22;
@@ -3284,125 +3257,125 @@ public class Rasterizer3D extends Rasterizer2D {
}
var2 = (var18 << 18) + var19;
- var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18);
- var17 >>= 3;
+ var17 = (var21 - var19) / var15 + ((var20 - var18) / var15 << 18);
+ var15 >>= 3;
var8 <<= 3;
- var15 = var7 >> 8;
+ var16 = var7 >> 8;
if(__et_f) {
- if(var17 > 0) {
+ if(var15 > 0) {
do {
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
var7 += var8;
- var15 = var7 >> 8;
- --var17;
- } while(var17 > 0);
+ var16 = var7 >> 8;
+ --var15;
+ } while(var15 > 0);
}
- var17 = var6 - var5 & 7;
- if(var17 > 0) {
+ var15 = var6 - var5 & 7;
+ if(var15 > 0) {
do {
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
- var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
- var2 += var16;
- --var17;
- } while(var17 > 0);
+ var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+ var2 += var17;
+ --var15;
+ } while(var15 > 0);
}
} else {
- if(var17 > 0) {
+ if(var15 > 0) {
do {
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
+ var2 += var17;
var7 += var8;
- var15 = var7 >> 8;
- --var17;
- } while(var17 > 0);
+ var16 = var7 >> 8;
+ --var15;
+ } while(var15 > 0);
}
- var17 = var6 - var5 & 7;
- if(var17 > 0) {
+ var15 = var6 - var5 & 7;
+ if(var15 > 0) {
do {
if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
- var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+ var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
}
++var4;
- var2 += var16;
- --var17;
- } while(var17 > 0);
+ var2 += var17;
+ --var15;
+ } while(var15 > 0);
}
}
}
-
}
+
}
@ObfuscatedName("h")
@@ -3446,4 +3419,34 @@ public class Rasterizer3D extends Rasterizer2D {
static final int method3008(int var0, int var1, int var2, int var3) {
return var2 * var1 - var3 * var0 >> 16;
}
+
+ static {
+ __et_m = false;
+ __et_f = false;
+ Rasterizer3D_isLowDetailTexture = false;
+ __et_w = true;
+ Rasterizer3D_alpha = 0;
+ Rasterizer3D_zoom = 512;
+ Rasterizer3D_rowOffsets = new int[1024];
+ Rasterizer3D_colorPalette = new int[65536];
+ __et_r = new int[512];
+ __et_p = new int[2048];
+ Rasterizer3D_sine = new int[2048];
+ Rasterizer3D_cosine = new int[2048];
+
+ int var0;
+ for(var0 = 1; var0 < 512; ++var0) {
+ __et_r[var0] = 32768 / var0;
+ }
+
+ for(var0 = 1; var0 < 2048; ++var0) {
+ __et_p[var0] = 65536 / var0;
+ }
+
+ for(var0 = 0; var0 < 2048; ++var0) {
+ Rasterizer3D_sine[var0] = (int)(65536.0D * Math.sin((double)var0 * 0.0030679615D));
+ Rasterizer3D_cosine[var0] = (int)(65536.0D * Math.cos((double)var0 * 0.0030679615D));
+ }
+
+ }
}
diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java
index 5f2fda9c74..8c4fa3affb 100644
--- a/runescape-client/src/main/java/RawPcmStream.java
+++ b/runescape-client/src/main/java/RawPcmStream.java
@@ -41,7 +41,7 @@ public class RawPcmStream extends PcmStream {
boolean __k;
@ObfuscatedName("n")
@Export("surfaceOffsetY")
- int __n;
+ int surfaceOffsetY;
@ObfuscatedName("i")
@Export("__i")
int __i;
@@ -108,12 +108,12 @@ public class RawPcmStream extends PcmStream {
@ObfuscatedName("l")
protected int __l_171() {
- return this.__q == 0 && this.__n == 0?0:1;
+ return this.__q == 0 && this.surfaceOffsetY == 0?0:1;
}
@ObfuscatedName("e")
public synchronized void __e_172(int[] var1, int var2, int var3) {
- if(this.__q == 0 && this.__n == 0) {
+ if(this.__q == 0 && this.surfaceOffsetY == 0) {
this.__d_173(var3);
} else {
RawSound var4 = (RawSound)super.sound;
@@ -175,7 +175,9 @@ public class RawPcmStream extends PcmStream {
this.__m = var5 + var5 - 1 - this.__m;
this.__f = -this.__f;
}
- } else if(this.__f < 0) {
+ }
+
+ if(this.__f < 0) {
while(true) {
var9 = this.__ap_203(var1, var9, var5, var3, var4.samples[this.end - 1]);
if(this.__m >= var5) {
@@ -184,112 +186,112 @@ public class RawPcmStream extends PcmStream {
this.__m = var6 - 1 - (var6 - 1 - this.__m) % var8;
}
- } else {
- while(true) {
- var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.start]);
- if(this.__m < var6) {
- return;
- }
-
- this.__m = var5 + (this.__m - var5) % var8;
- }
}
- } else {
- if(this.__e > 0) {
- if(this.__k) {
- label140: {
- if(this.__f < 0) {
- var9 = this.__ap_203(var1, var2, var5, var3, var4.samples[this.start]);
- if(this.__m >= var5) {
- return;
- }
- this.__m = var5 + var5 - 1 - this.__m;
- this.__f = -this.__f;
- if(--this.__e == 0) {
- break label140;
- }
+ while(true) {
+ var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.start]);
+ if(this.__m < var6) {
+ return;
+ }
+
+ this.__m = var5 + (this.__m - var5) % var8;
+ }
+ }
+
+ if(this.__e > 0) {
+ if(this.__k) {
+ label118: {
+ if(this.__f < 0) {
+ var9 = this.__ap_203(var1, var2, var5, var3, var4.samples[this.start]);
+ if(this.__m >= var5) {
+ return;
}
- do {
- var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.end - 1]);
- if(this.__m < var6) {
- return;
- }
+ this.__m = var5 + var5 - 1 - this.__m;
+ this.__f = -this.__f;
+ if(--this.__e == 0) {
+ break label118;
+ }
+ }
- this.__m = var6 + var6 - 1 - this.__m;
- this.__f = -this.__f;
- if(--this.__e == 0) {
- break;
- }
+ do {
+ var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.end - 1]);
+ if(this.__m < var6) {
+ return;
+ }
- var9 = this.__ap_203(var1, var9, var5, var3, var4.samples[this.start]);
- if(this.__m >= var5) {
- return;
- }
+ this.__m = var6 + var6 - 1 - this.__m;
+ this.__f = -this.__f;
+ if(--this.__e == 0) {
+ break;
+ }
- this.__m = var5 + var5 - 1 - this.__m;
- this.__f = -this.__f;
- } while(--this.__e != 0);
+ var9 = this.__ap_203(var1, var9, var5, var3, var4.samples[this.start]);
+ if(this.__m >= var5) {
+ return;
+ }
+
+ this.__m = var5 + var5 - 1 - this.__m;
+ this.__f = -this.__f;
+ } while(--this.__e != 0);
+ }
+ } else {
+ int var10;
+ if(this.__f < 0) {
+ while(true) {
+ var9 = this.__ap_203(var1, var9, var5, var3, var4.samples[this.end - 1]);
+ if(this.__m >= var5) {
+ return;
+ }
+
+ var10 = (var6 - 1 - this.__m) / var8;
+ if(var10 >= this.__e) {
+ this.__m += var8 * this.__e;
+ this.__e = 0;
+ break;
+ }
+
+ this.__m += var8 * var10;
+ this.__e -= var10;
}
} else {
- int var10;
- if(this.__f < 0) {
- while(true) {
- var9 = this.__ap_203(var1, var9, var5, var3, var4.samples[this.end - 1]);
- if(this.__m >= var5) {
- return;
- }
-
- var10 = (var6 - 1 - this.__m) / var8;
- if(var10 >= this.__e) {
- this.__m += var8 * this.__e;
- this.__e = 0;
- break;
- }
-
- this.__m += var8 * var10;
- this.__e -= var10;
+ while(true) {
+ var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.start]);
+ if(this.__m < var6) {
+ return;
}
- } else {
- while(true) {
- var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.start]);
- if(this.__m < var6) {
- return;
- }
- var10 = (this.__m - var5) / var8;
- if(var10 >= this.__e) {
- this.__m -= var8 * this.__e;
- this.__e = 0;
- break;
- }
-
- this.__m -= var8 * var10;
- this.__e -= var10;
+ var10 = (this.__m - var5) / var8;
+ if(var10 >= this.__e) {
+ this.__m -= var8 * this.__e;
+ this.__e = 0;
+ break;
}
+
+ this.__m -= var8 * var10;
+ this.__e -= var10;
}
}
}
+ }
- if(this.__f < 0) {
- this.__ap_203(var1, var9, 0, var3, 0);
- if(this.__m < 0) {
- this.__m = -1;
- this.__b_189();
- this.remove();
- }
- } else {
- this.__ad_202(var1, var9, var7, var3, 0);
- if(this.__m >= var7) {
- this.__m = var7;
- this.__b_189();
- this.remove();
- }
+ if(this.__f < 0) {
+ this.__ap_203(var1, var9, 0, var3, 0);
+ if(this.__m < 0) {
+ this.__m = -1;
+ this.__b_189();
+ this.remove();
+ }
+ } else {
+ this.__ad_202(var1, var9, var7, var3, 0);
+ if(this.__m >= var7) {
+ this.__m = var7;
+ this.__b_189();
+ this.remove();
}
-
}
}
+
}
@ObfuscatedName("x")
@@ -300,24 +302,24 @@ public class RawPcmStream extends PcmStream {
@ObfuscatedName("d")
public synchronized void __d_173(int var1) {
- if(this.__n > 0) {
- if(var1 >= this.__n) {
+ if(this.surfaceOffsetY > 0) {
+ if(var1 >= this.surfaceOffsetY) {
if(this.__q == Integer.MIN_VALUE) {
this.__q = 0;
this.__l = 0;
this.__g = 0;
this.__u = 0;
this.remove();
- var1 = this.__n;
+ var1 = this.surfaceOffsetY;
}
- this.__n = 0;
+ this.surfaceOffsetY = 0;
this.__o_180();
} else {
this.__u += this.__i * var1;
this.__g += this.__a * var1;
this.__l += this.__z * var1;
- this.__n -= var1;
+ this.surfaceOffsetY -= var1;
}
}
@@ -366,7 +368,6 @@ public class RawPcmStream extends PcmStream {
this.__m = var3 + (this.__m - var3) % var6;
}
-
} else {
if(this.__f < 0) {
if(this.__m >= var3) {
@@ -387,12 +388,11 @@ public class RawPcmStream extends PcmStream {
this.__m = var3 + var3 - 1 - this.__m;
this.__f = -this.__f;
}
-
}
} else {
if(this.__e > 0) {
if(this.__k) {
- label123: {
+ label113: {
if(this.__f < 0) {
if(this.__m >= var3) {
return;
@@ -401,7 +401,7 @@ public class RawPcmStream extends PcmStream {
this.__m = var3 + var3 - 1 - this.__m;
this.__f = -this.__f;
if(--this.__e == 0) {
- break label123;
+ break label113;
}
}
@@ -469,8 +469,8 @@ public class RawPcmStream extends PcmStream {
this.__b_189();
this.remove();
}
-
}
+
}
@ObfuscatedName("a")
@@ -490,7 +490,7 @@ public class RawPcmStream extends PcmStream {
synchronized void __j_184(int var1, int var2) {
this.__q = var1;
this.__o = var2;
- this.__n = 0;
+ this.surfaceOffsetY = 0;
this.__o_180();
}
@@ -535,12 +535,12 @@ public class RawPcmStream extends PcmStream {
@ObfuscatedName("b")
@Export("__b_189")
void __b_189() {
- if(this.__n != 0) {
+ if(this.surfaceOffsetY != 0) {
if(this.__q == Integer.MIN_VALUE) {
this.__q = 0;
}
- this.__n = 0;
+ this.surfaceOffsetY = 0;
this.__o_180();
}
@@ -561,7 +561,7 @@ public class RawPcmStream extends PcmStream {
int var4 = method2603(var2, var3);
int var5 = method2494(var2, var3);
if(var4 == this.__g && var5 == this.__l) {
- this.__n = 0;
+ this.surfaceOffsetY = 0;
} else {
int var6 = var2 - this.__u;
if(this.__u - var2 > var6) {
@@ -588,7 +588,7 @@ public class RawPcmStream extends PcmStream {
var1 = var6;
}
- this.__n = var1;
+ this.surfaceOffsetY = var1;
this.__q = var2;
this.__o = var3;
this.__i = (var2 - this.__u) / var1;
@@ -596,6 +596,7 @@ public class RawPcmStream extends PcmStream {
this.__z = (var5 - this.__l) / var1;
}
}
+
}
@ObfuscatedName("v")
@@ -605,7 +606,7 @@ public class RawPcmStream extends PcmStream {
this.__z_183(0);
this.remove();
} else if(this.__g == 0 && this.__l == 0) {
- this.__n = 0;
+ this.surfaceOffsetY = 0;
this.__q = 0;
this.__u = 0;
this.remove();
@@ -635,12 +636,13 @@ public class RawPcmStream extends PcmStream {
var1 = var2;
}
- this.__n = var1;
+ this.surfaceOffsetY = var1;
this.__q = Integer.MIN_VALUE;
this.__i = -this.__u / var1;
this.__a = -this.__g / var1;
this.__z = -this.__l / var1;
}
+
}
@ObfuscatedName("ah")
@@ -669,20 +671,20 @@ public class RawPcmStream extends PcmStream {
@ObfuscatedName("at")
@Export("__at_196")
public boolean __at_196() {
- return this.__n != 0;
+ return this.surfaceOffsetY != 0;
}
@ObfuscatedName("ad")
@Export("__ad_202")
int __ad_202(int[] var1, int var2, int var3, int var4, int var5) {
while(true) {
- if(this.__n > 0) {
- int var6 = var2 + this.__n;
+ if(this.surfaceOffsetY > 0) {
+ int var6 = var2 + this.surfaceOffsetY;
if(var6 > var4) {
var6 = var4;
}
- this.__n += var2;
+ this.surfaceOffsetY += var2;
if(this.__f == 256 && (this.__m & 255) == 0) {
if(PcmPlayer.isStereo) {
var2 = method2533(0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, this.__a, this.__z, 0, var6, var3, this);
@@ -695,8 +697,8 @@ public class RawPcmStream extends PcmStream {
var2 = method2536(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, this.__i, 0, var6, var3, this, this.__f, var5);
}
- this.__n -= var2;
- if(this.__n != 0) {
+ this.surfaceOffsetY -= var2;
+ if(this.surfaceOffsetY != 0) {
return var2;
}
@@ -727,13 +729,13 @@ public class RawPcmStream extends PcmStream {
@Export("__ap_203")
int __ap_203(int[] var1, int var2, int var3, int var4, int var5) {
while(true) {
- if(this.__n > 0) {
- int var6 = var2 + this.__n;
+ if(this.surfaceOffsetY > 0) {
+ int var6 = var2 + this.surfaceOffsetY;
if(var6 > var4) {
var6 = var4;
}
- this.__n += var2;
+ this.surfaceOffsetY += var2;
if(this.__f == -256 && (this.__m & 255) == 0) {
if(PcmPlayer.isStereo) {
var2 = method2547(0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, this.__a, this.__z, 0, var6, var3, this);
@@ -746,8 +748,8 @@ public class RawPcmStream extends PcmStream {
var2 = method2538(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, this.__i, 0, var6, var3, this, this.__f, var5);
}
- this.__n -= var2;
- if(this.__n != 0) {
+ this.surfaceOffsetY -= var2;
+ if(this.surfaceOffsetY != 0) {
return var2;
}
@@ -818,23 +820,23 @@ public class RawPcmStream extends PcmStream {
} else {
if(this.__u < var1) {
this.__i = 1;
- this.__n = var1 - this.__u;
+ this.surfaceOffsetY = var1 - this.__u;
} else if(this.__u > var1) {
this.__i = -1;
- this.__n = this.__u - var1;
+ this.surfaceOffsetY = this.__u - var1;
} else {
this.__i = 0;
}
if(this.__g < var2) {
this.__a = 1;
- if(this.__n == 0 || this.__n > var2 - this.__g) {
- this.__n = var2 - this.__g;
+ if(this.surfaceOffsetY == 0 || this.surfaceOffsetY > var2 - this.__g) {
+ this.surfaceOffsetY = var2 - this.__g;
}
} else if(this.__g > var2) {
this.__a = -1;
- if(this.__n == 0 || this.__n > this.__g - var2) {
- this.__n = this.__g - var2;
+ if(this.surfaceOffsetY == 0 || this.surfaceOffsetY > this.__g - var2) {
+ this.surfaceOffsetY = this.__g - var2;
}
} else {
this.__a = 0;
@@ -842,13 +844,13 @@ public class RawPcmStream extends PcmStream {
if(this.__l < var3) {
this.__z = 1;
- if(this.__n == 0 || this.__n > var3 - this.__l) {
- this.__n = var3 - this.__l;
+ if(this.surfaceOffsetY == 0 || this.surfaceOffsetY > var3 - this.__l) {
+ this.surfaceOffsetY = var3 - this.__l;
}
} else if(this.__l > var3) {
this.__z = -1;
- if(this.__n == 0 || this.__n > this.__l - var3) {
- this.__n = this.__l - var3;
+ if(this.surfaceOffsetY == 0 || this.surfaceOffsetY > this.__l - var3) {
+ this.surfaceOffsetY = this.__l - var3;
}
} else {
this.__z = 0;
@@ -896,19 +898,19 @@ public class RawPcmStream extends PcmStream {
var5 = var6;
}
- int var10001;
- for(var5 -= 3; var3 < var5; var1[var10001] += var0[var2++] * var4) {
- var10001 = var3++;
- var1[var10001] += var0[var2++] * var4;
- var10001 = var3++;
- var1[var10001] += var0[var2++] * var4;
- var10001 = var3++;
- var1[var10001] += var0[var2++] * var4;
- var10001 = var3++;
+ int var9;
+ for(var5 -= 3; var3 < var5; var1[var9] += var0[var2++] * var4) {
+ var9 = var3++;
+ var1[var9] += var0[var2++] * var4;
+ var9 = var3++;
+ var1[var9] += var0[var2++] * var4;
+ var9 = var3++;
+ var1[var9] += var0[var2++] * var4;
+ var9 = var3++;
}
- for(var5 += 3; var3 < var5; var1[var10001] += var0[var2++] * var4) {
- var10001 = var3++;
+ for(var5 += 3; var3 < var5; var1[var9] += var0[var2++] * var4) {
+ var9 = var3++;
}
var8.__m = var2 << 8;
@@ -931,35 +933,35 @@ public class RawPcmStream extends PcmStream {
var4 <<= 1;
var7 <<= 1;
- int var10001;
- byte var11;
- for(var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) {
- var11 = var1[var3++];
- var10001 = var4++;
- var2[var10001] += var11 * var5;
- var10001 = var4++;
- var2[var10001] += var11 * var6;
- var11 = var1[var3++];
- var10001 = var4++;
- var2[var10001] += var11 * var5;
- var10001 = var4++;
- var2[var10001] += var11 * var6;
- var11 = var1[var3++];
- var10001 = var4++;
- var2[var10001] += var11 * var5;
- var10001 = var4++;
- var2[var10001] += var11 * var6;
- var11 = var1[var3++];
- var10001 = var4++;
- var2[var10001] += var11 * var5;
- var10001 = var4++;
+ int var11;
+ byte var12;
+ for(var7 -= 6; var4 < var7; var2[var11] += var12 * var6) {
+ var12 = var1[var3++];
+ var11 = var4++;
+ var2[var11] += var12 * var5;
+ var11 = var4++;
+ var2[var11] += var12 * var6;
+ var12 = var1[var3++];
+ var11 = var4++;
+ var2[var11] += var12 * var5;
+ var11 = var4++;
+ var2[var11] += var12 * var6;
+ var12 = var1[var3++];
+ var11 = var4++;
+ var2[var11] += var12 * var5;
+ var11 = var4++;
+ var2[var11] += var12 * var6;
+ var12 = var1[var3++];
+ var11 = var4++;
+ var2[var11] += var12 * var5;
+ var11 = var4++;
}
- for(var7 += 6; var4 < var7; var2[var10001] += var11 * var6) {
- var11 = var1[var3++];
- var10001 = var4++;
- var2[var10001] += var11 * var5;
- var10001 = var4++;
+ for(var7 += 6; var4 < var7; var2[var11] += var12 * var6) {
+ var12 = var1[var3++];
+ var11 = var4++;
+ var2[var11] += var12 * var5;
+ var11 = var4++;
}
var10.__m = var3 << 8;
@@ -978,19 +980,19 @@ public class RawPcmStream extends PcmStream {
var5 = var6;
}
- int var10001;
- for(var5 -= 3; var3 < var5; var1[var10001] += var0[var2--] * var4) {
- var10001 = var3++;
- var1[var10001] += var0[var2--] * var4;
- var10001 = var3++;
- var1[var10001] += var0[var2--] * var4;
- var10001 = var3++;
- var1[var10001] += var0[var2--] * var4;
- var10001 = var3++;
+ int var9;
+ for(var5 -= 3; var3 < var5; var1[var9] += var0[var2--] * var4) {
+ var9 = var3++;
+ var1[var9] += var0[var2--] * var4;
+ var9 = var3++;
+ var1[var9] += var0[var2--] * var4;
+ var9 = var3++;
+ var1[var9] += var0[var2--] * var4;
+ var9 = var3++;
}
- for(var5 += 3; var3 < var5; var1[var10001] += var0[var2--] * var4) {
- var10001 = var3++;
+ for(var5 += 3; var3 < var5; var1[var9] += var0[var2--] * var4) {
+ var9 = var3++;
}
var8.__m = var2 << 8;
@@ -1013,35 +1015,35 @@ public class RawPcmStream extends PcmStream {
var4 <<= 1;
var7 <<= 1;
- int var10001;
- byte var11;
- for(var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) {
- var11 = var1[var3--];
- var10001 = var4++;
- var2[var10001] += var11 * var5;
- var10001 = var4++;
- var2[var10001] += var11 * var6;
- var11 = var1[var3--];
- var10001 = var4++;
- var2[var10001] += var11 * var5;
- var10001 = var4++;
- var2[var10001] += var11 * var6;
- var11 = var1[var3--];
- var10001 = var4++;
- var2[var10001] += var11 * var5;
- var10001 = var4++;
- var2[var10001] += var11 * var6;
- var11 = var1[var3--];
- var10001 = var4++;
- var2[var10001] += var11 * var5;
- var10001 = var4++;
+ int var11;
+ byte var12;
+ for(var7 -= 6; var4 < var7; var2[var11] += var12 * var6) {
+ var12 = var1[var3--];
+ var11 = var4++;
+ var2[var11] += var12 * var5;
+ var11 = var4++;
+ var2[var11] += var12 * var6;
+ var12 = var1[var3--];
+ var11 = var4++;
+ var2[var11] += var12 * var5;
+ var11 = var4++;
+ var2[var11] += var12 * var6;
+ var12 = var1[var3--];
+ var11 = var4++;
+ var2[var11] += var12 * var5;
+ var11 = var4++;
+ var2[var11] += var12 * var6;
+ var12 = var1[var3--];
+ var11 = var4++;
+ var2[var11] += var12 * var5;
+ var11 = var4++;
}
- for(var7 += 6; var4 < var7; var2[var10001] += var11 * var6) {
- var11 = var1[var3--];
- var10001 = var4++;
- var2[var10001] += var11 * var5;
- var10001 = var4++;
+ for(var7 += 6; var4 < var7; var2[var11] += var12 * var6) {
+ var12 = var1[var3--];
+ var11 = var4++;
+ var2[var11] += var12 * var5;
+ var11 = var4++;
}
var10.__m = var3 << 8;
@@ -1058,12 +1060,12 @@ public class RawPcmStream extends PcmStream {
}
byte var13;
- int var10001;
+ int var14;
while(var5 < var7) {
var1 = var4 >> 8;
var13 = var2[var1];
- var10001 = var5++;
- var3[var10001] += ((var13 << 8) + (var2[var1 + 1] - var13) * (var4 & 255)) * var6 >> 6;
+ var14 = var5++;
+ var3[var14] += ((var13 << 8) + (var2[var1 + 1] - var13) * (var4 & 255)) * var6 >> 6;
var4 += var11;
}
@@ -1073,8 +1075,8 @@ public class RawPcmStream extends PcmStream {
for(var1 = var12; var5 < var7; var4 += var11) {
var13 = var2[var4 >> 8];
- var10001 = var5++;
- var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6;
+ var14 = var5++;
+ var3[var14] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6;
}
var10.__m = var4;
@@ -1093,15 +1095,15 @@ public class RawPcmStream extends PcmStream {
var5 <<= 1;
byte var14;
- int var10001;
+ int var15;
for(var8 <<= 1; var5 < var8; var4 += var12) {
var1 = var4 >> 8;
var14 = var2[var1];
var0 = (var14 << 8) + (var4 & 255) * (var2[var1 + 1] - var14);
- var10001 = var5++;
- var3[var10001] += var0 * var6 >> 6;
- var10001 = var5++;
- var3[var10001] += var0 * var7 >> 6;
+ var15 = var5++;
+ var3[var15] += var0 * var6 >> 6;
+ var15 = var5++;
+ var3[var15] += var0 * var7 >> 6;
}
if(var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12 - 1) / var12) > var9) {
@@ -1113,10 +1115,10 @@ public class RawPcmStream extends PcmStream {
for(var1 = var13; var5 < var8; var4 += var12) {
var14 = var2[var4 >> 8];
var0 = (var14 << 8) + (var1 - var14) * (var4 & 255);
- var10001 = var5++;
- var3[var10001] += var0 * var6 >> 6;
- var10001 = var5++;
- var3[var10001] += var0 * var7 >> 6;
+ var15 = var5++;
+ var3[var15] += var0 * var6 >> 6;
+ var15 = var5++;
+ var3[var15] += var0 * var7 >> 6;
}
var11.__m = var4;
@@ -1132,12 +1134,12 @@ public class RawPcmStream extends PcmStream {
var7 = var8;
}
- int var10001;
+ int var13;
while(var5 < var7) {
var1 = var4 >> 8;
- byte var13 = var2[var1 - 1];
- var10001 = var5++;
- var3[var10001] += ((var13 << 8) + (var2[var1] - var13) * (var4 & 255)) * var6 >> 6;
+ byte var14 = var2[var1 - 1];
+ var13 = var5++;
+ var3[var13] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 255)) * var6 >> 6;
var4 += var11;
}
@@ -1148,8 +1150,8 @@ public class RawPcmStream extends PcmStream {
var0 = var12;
for(var1 = var11; var5 < var7; var4 += var1) {
- var10001 = var5++;
- var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6;
+ var13 = var5++;
+ var3[var13] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6;
}
var10.__m = var4;
@@ -1167,15 +1169,15 @@ public class RawPcmStream extends PcmStream {
var5 <<= 1;
- int var10001;
+ int var14;
for(var8 <<= 1; var5 < var8; var4 += var12) {
var1 = var4 >> 8;
- byte var14 = var2[var1 - 1];
- var0 = (var2[var1] - var14) * (var4 & 255) + (var14 << 8);
- var10001 = var5++;
- var3[var10001] += var0 * var6 >> 6;
- var10001 = var5++;
- var3[var10001] += var0 * var7 >> 6;
+ byte var15 = var2[var1 - 1];
+ var0 = (var2[var1] - var15) * (var4 & 255) + (var15 << 8);
+ var14 = var5++;
+ var3[var14] += var0 * var6 >> 6;
+ var14 = var5++;
+ var3[var14] += var0 * var7 >> 6;
}
if(var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12) / var12) > var9) {
@@ -1186,10 +1188,10 @@ public class RawPcmStream extends PcmStream {
for(var1 = var13; var5 < var8; var4 += var12) {
var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1);
- var10001 = var5++;
- var3[var10001] += var0 * var6 >> 6;
- var10001 = var5++;
- var3[var10001] += var0 * var7 >> 6;
+ var14 = var5++;
+ var3[var14] += var0 * var6 >> 6;
+ var14 = var5++;
+ var3[var14] += var0 * var7 >> 6;
}
var11.__m = var4;
@@ -1212,24 +1214,24 @@ public class RawPcmStream extends PcmStream {
var9.__g += var9.__a * (var6 - var3);
var9.__l += var9.__z * (var6 - var3);
- int var10001;
+ int var10;
for(var6 -= 3; var3 < var6; var4 += var5) {
- var10001 = var3++;
- var1[var10001] += var0[var2++] * var4;
+ var10 = var3++;
+ var1[var10] += var0[var2++] * var4;
var4 += var5;
- var10001 = var3++;
- var1[var10001] += var0[var2++] * var4;
+ var10 = var3++;
+ var1[var10] += var0[var2++] * var4;
var4 += var5;
- var10001 = var3++;
- var1[var10001] += var0[var2++] * var4;
+ var10 = var3++;
+ var1[var10] += var0[var2++] * var4;
var4 += var5;
- var10001 = var3++;
- var1[var10001] += var0[var2++] * var4;
+ var10 = var3++;
+ var1[var10] += var0[var2++] * var4;
}
for(var6 += 3; var3 < var6; var4 += var5) {
- var10001 = var3++;
- var1[var10001] += var0[var2++] * var4;
+ var10 = var3++;
+ var1[var10] += var0[var2++] * var4;
}
var9.__u = var4 >> 2;
@@ -1257,44 +1259,44 @@ public class RawPcmStream extends PcmStream {
var9 <<= 1;
byte var13;
- int var10001;
+ int var14;
for(var9 -= 6; var4 < var9; var6 += var8) {
var13 = var1[var3++];
- var10001 = var4++;
- var2[var10001] += var13 * var5;
+ var14 = var4++;
+ var2[var14] += var13 * var5;
var5 += var7;
- var10001 = var4++;
- var2[var10001] += var13 * var6;
+ var14 = var4++;
+ var2[var14] += var13 * var6;
var6 += var8;
var13 = var1[var3++];
- var10001 = var4++;
- var2[var10001] += var13 * var5;
+ var14 = var4++;
+ var2[var14] += var13 * var5;
var5 += var7;
- var10001 = var4++;
- var2[var10001] += var13 * var6;
+ var14 = var4++;
+ var2[var14] += var13 * var6;
var6 += var8;
var13 = var1[var3++];
- var10001 = var4++;
- var2[var10001] += var13 * var5;
+ var14 = var4++;
+ var2[var14] += var13 * var5;
var5 += var7;
- var10001 = var4++;
- var2[var10001] += var13 * var6;
+ var14 = var4++;
+ var2[var14] += var13 * var6;
var6 += var8;
var13 = var1[var3++];
- var10001 = var4++;
- var2[var10001] += var13 * var5;
+ var14 = var4++;
+ var2[var14] += var13 * var5;
var5 += var7;
- var10001 = var4++;
- var2[var10001] += var13 * var6;
+ var14 = var4++;
+ var2[var14] += var13 * var6;
}
for(var9 += 6; var4 < var9; var6 += var8) {
var13 = var1[var3++];
- var10001 = var4++;
- var2[var10001] += var13 * var5;
+ var14 = var4++;
+ var2[var14] += var13 * var5;
var5 += var7;
- var10001 = var4++;
- var2[var10001] += var13 * var6;
+ var14 = var4++;
+ var2[var14] += var13 * var6;
}
var12.__g = var5 >> 2;
@@ -1319,24 +1321,24 @@ public class RawPcmStream extends PcmStream {
var9.__g += var9.__a * (var6 - var3);
var9.__l += var9.__z * (var6 - var3);
- int var10001;
+ int var10;
for(var6 -= 3; var3 < var6; var4 += var5) {
- var10001 = var3++;
- var1[var10001] += var0[var2--] * var4;
+ var10 = var3++;
+ var1[var10] += var0[var2--] * var4;
var4 += var5;
- var10001 = var3++;
- var1[var10001] += var0[var2--] * var4;
+ var10 = var3++;
+ var1[var10] += var0[var2--] * var4;
var4 += var5;
- var10001 = var3++;
- var1[var10001] += var0[var2--] * var4;
+ var10 = var3++;
+ var1[var10] += var0[var2--] * var4;
var4 += var5;
- var10001 = var3++;
- var1[var10001] += var0[var2--] * var4;
+ var10 = var3++;
+ var1[var10] += var0[var2--] * var4;
}
for(var6 += 3; var3 < var6; var4 += var5) {
- var10001 = var3++;
- var1[var10001] += var0[var2--] * var4;
+ var10 = var3++;
+ var1[var10] += var0[var2--] * var4;
}
var9.__u = var4 >> 2;
@@ -1364,44 +1366,44 @@ public class RawPcmStream extends PcmStream {
var9 <<= 1;
byte var13;
- int var10001;
+ int var14;
for(var9 -= 6; var4 < var9; var6 += var8) {
var13 = var1[var3--];
- var10001 = var4++;
- var2[var10001] += var13 * var5;
+ var14 = var4++;
+ var2[var14] += var13 * var5;
var5 += var7;
- var10001 = var4++;
- var2[var10001] += var13 * var6;
+ var14 = var4++;
+ var2[var14] += var13 * var6;
var6 += var8;
var13 = var1[var3--];
- var10001 = var4++;
- var2[var10001] += var13 * var5;
+ var14 = var4++;
+ var2[var14] += var13 * var5;
var5 += var7;
- var10001 = var4++;
- var2[var10001] += var13 * var6;
+ var14 = var4++;
+ var2[var14] += var13 * var6;
var6 += var8;
var13 = var1[var3--];
- var10001 = var4++;
- var2[var10001] += var13 * var5;
+ var14 = var4++;
+ var2[var14] += var13 * var5;
var5 += var7;
- var10001 = var4++;
- var2[var10001] += var13 * var6;
+ var14 = var4++;
+ var2[var14] += var13 * var6;
var6 += var8;
var13 = var1[var3--];
- var10001 = var4++;
- var2[var10001] += var13 * var5;
+ var14 = var4++;
+ var2[var14] += var13 * var5;
var5 += var7;
- var10001 = var4++;
- var2[var10001] += var13 * var6;
+ var14 = var4++;
+ var2[var14] += var13 * var6;
}
for(var9 += 6; var4 < var9; var6 += var8) {
var13 = var1[var3--];
- var10001 = var4++;
- var2[var10001] += var13 * var5;
+ var14 = var4++;
+ var2[var14] += var13 * var5;
var5 += var7;
- var10001 = var4++;
- var2[var10001] += var13 * var6;
+ var14 = var4++;
+ var2[var14] += var13 * var6;
}
var12.__g = var5 >> 2;
@@ -1422,12 +1424,12 @@ public class RawPcmStream extends PcmStream {
}
byte var14;
- int var10001;
+ int var15;
while(var5 < var8) {
var1 = var4 >> 8;
var14 = var2[var1];
- var10001 = var5++;
- var3[var10001] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255)) * var6 >> 6;
+ var15 = var5++;
+ var3[var15] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255)) * var6 >> 6;
var6 += var7;
var4 += var12;
}
@@ -1438,8 +1440,8 @@ public class RawPcmStream extends PcmStream {
for(var1 = var13; var5 < var8; var4 += var12) {
var14 = var2[var4 >> 8];
- var10001 = var5++;
- var3[var10001] += ((var14 << 8) + (var1 - var14) * (var4 & 255)) * var6 >> 6;
+ var15 = var5++;
+ var3[var15] += ((var14 << 8) + (var1 - var14) * (var4 & 255)) * var6 >> 6;
var6 += var7;
}
@@ -1463,16 +1465,16 @@ public class RawPcmStream extends PcmStream {
var5 <<= 1;
byte var16;
- int var10001;
+ int var17;
for(var10 <<= 1; var5 < var10; var4 += var14) {
var1 = var4 >> 8;
var16 = var2[var1];
var0 = (var16 << 8) + (var4 & 255) * (var2[var1 + 1] - var16);
- var10001 = var5++;
- var3[var10001] += var0 * var6 >> 6;
+ var17 = var5++;
+ var3[var17] += var0 * var6 >> 6;
var6 += var8;
- var10001 = var5++;
- var3[var10001] += var0 * var7 >> 6;
+ var17 = var5++;
+ var3[var17] += var0 * var7 >> 6;
var7 += var9;
}
@@ -1485,11 +1487,11 @@ public class RawPcmStream extends PcmStream {
for(var1 = var15; var5 < var10; var4 += var14) {
var16 = var2[var4 >> 8];
var0 = (var16 << 8) + (var1 - var16) * (var4 & 255);
- var10001 = var5++;
- var3[var10001] += var0 * var6 >> 6;
+ var17 = var5++;
+ var3[var17] += var0 * var6 >> 6;
var6 += var8;
- var10001 = var5++;
- var3[var10001] += var0 * var7 >> 6;
+ var17 = var5++;
+ var3[var17] += var0 * var7 >> 6;
var7 += var9;
}
@@ -1512,12 +1514,12 @@ public class RawPcmStream extends PcmStream {
var8 = var9;
}
- int var10001;
+ int var14;
while(var5 < var8) {
var1 = var4 >> 8;
- byte var14 = var2[var1 - 1];
- var10001 = var5++;
- var3[var10001] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 255)) * var6 >> 6;
+ byte var15 = var2[var1 - 1];
+ var14 = var5++;
+ var3[var14] += ((var15 << 8) + (var2[var1] - var15) * (var4 & 255)) * var6 >> 6;
var6 += var7;
var4 += var12;
}
@@ -1529,8 +1531,8 @@ public class RawPcmStream extends PcmStream {
var0 = var13;
for(var1 = var12; var5 < var8; var4 += var1) {
- var10001 = var5++;
- var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6;
+ var14 = var5++;
+ var3[var14] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6;
var6 += var7;
}
@@ -1553,16 +1555,16 @@ public class RawPcmStream extends PcmStream {
var5 <<= 1;
- int var10001;
+ int var16;
for(var10 <<= 1; var5 < var10; var4 += var14) {
var1 = var4 >> 8;
- byte var16 = var2[var1 - 1];
- var0 = (var2[var1] - var16) * (var4 & 255) + (var16 << 8);
- var10001 = var5++;
- var3[var10001] += var0 * var6 >> 6;
+ byte var17 = var2[var1 - 1];
+ var0 = (var2[var1] - var17) * (var4 & 255) + (var17 << 8);
+ var16 = var5++;
+ var3[var16] += var0 * var6 >> 6;
var6 += var8;
- var10001 = var5++;
- var3[var10001] += var0 * var7 >> 6;
+ var16 = var5++;
+ var3[var16] += var0 * var7 >> 6;
var7 += var9;
}
@@ -1574,11 +1576,11 @@ public class RawPcmStream extends PcmStream {
for(var1 = var15; var5 < var10; var4 += var14) {
var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1);
- var10001 = var5++;
- var3[var10001] += var0 * var6 >> 6;
+ var16 = var5++;
+ var3[var16] += var0 * var6 >> 6;
var6 += var8;
- var10001 = var5++;
- var3[var10001] += var0 * var7 >> 6;
+ var16 = var5++;
+ var3[var16] += var0 * var7 >> 6;
var7 += var9;
}
diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java
index 1f11fe607a..2fef1af12b 100644
--- a/runescape-client/src/main/java/RunException.java
+++ b/runescape-client/src/main/java/RunException.java
@@ -54,13 +54,14 @@ public class RunException extends RuntimeException {
)
public static void method3431() {
Object var0 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
+ Object var1 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) {
if(IndexStoreActionHandler.__iv_q != 0) {
IndexStoreActionHandler.__iv_q = 1;
try {
IndexStoreActionHandler.IndexStoreActionHandler_lock.wait();
- } catch (InterruptedException var3) {
+ } catch (InterruptedException var4) {
;
}
}
diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java
index 2f474a0fc0..94792b0c66 100644
--- a/runescape-client/src/main/java/Scene.java
+++ b/runescape-client/src/main/java/Scene.java
@@ -196,34 +196,6 @@ public class Scene {
@Export("__bd")
int[][] __bd;
- static {
- Scene_isLowDetail = true;
- tileUpdateCount = 0;
- Scene_plane = 0;
- Scene_gameObjects = new GameObject[100];
- checkClick = false;
- Scene_selectedPlane = 0;
- Scene_selectedScreenX = 0;
- Scene_selectedScreenY = 0;
- Scene_selectedX = -1;
- Scene_selectedY = -1;
- __em_ab = false;
- __em_ad = 4;
- Scene_planeOccluderCounts = new int[__em_ad];
- Scene_planeOccluders = new Occluder[__em_ad][500];
- Scene_currentOccludersCount = 0;
- Scene_currentOccluders = new Occluder[500];
- Scene_tilesDeque = new NodeDeque();
- __em_au = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76};
- __em_ao = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160};
- __em_aa = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19};
- __em_ax = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0};
- __em_af = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4};
- __em_ai = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0};
- __em_ba = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8};
- visibilityMap = new boolean[8][32][51][51];
- }
-
public Scene(int var1, int var2, int var3, int[][][] var4) {
this.Scene_minPlane = 0;
this.tempGameObjectsCount = 0;
@@ -299,10 +271,10 @@ public class Scene {
for(int var6 = 0; var6 < var5.gameObjectsCount; ++var6) {
GameObject var7 = var5.gameObjects[var6];
- long var9 = var7.tag;
- int var11 = (int)(var9 >>> 14 & 3L);
- boolean var8 = var11 == 2;
- if(var8 && var7.startX == var1 && var2 == var7.startY) {
+ long var8 = var7.tag;
+ int var10 = (int)(var8 >>> 14 & 3L);
+ boolean var11 = var10 == 2;
+ if(var11 && var7.startX == var1 && var2 == var7.startY) {
--var7.plane;
}
}
@@ -324,6 +296,7 @@ public class Scene {
if(var5 != null) {
this.tiles[var1][var2][var3].minPlane = var4;
}
+
}
@ObfuscatedName("u")
@@ -362,6 +335,7 @@ public class Scene {
this.tiles[var1][var2][var3].paint = var21;
}
+
}
@ObfuscatedName("g")
@@ -384,6 +358,7 @@ public class Scene {
this.tiles[var1][var2][var3].floorDecoration = var9;
}
+
}
@ObfuscatedName("l")
@@ -448,6 +423,7 @@ public class Scene {
this.tiles[var1][var2][var3].boundaryObject = var12;
}
+
}
@ObfuscatedName("x")
@@ -478,6 +454,7 @@ public class Scene {
this.tiles[var1][var2][var3].wallDecoration = var14;
}
+
}
@ObfuscatedName("d")
@@ -549,69 +526,69 @@ public class Scene {
)
@Export("newGameObject")
boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Entity var9, int var10, boolean var11, long var12, int var14) {
- int var16;
- for(int var15 = var2; var15 < var2 + var4; ++var15) {
- for(var16 = var3; var16 < var3 + var5; ++var16) {
- if(var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) {
+ int var15;
+ for(int var16 = var2; var16 < var2 + var4; ++var16) {
+ for(var15 = var3; var15 < var3 + var5; ++var15) {
+ if(var16 < 0 || var15 < 0 || var16 >= this.xSize || var15 >= this.ySize) {
return false;
}
- Tile var17 = this.tiles[var1][var15][var16];
+ Tile var17 = this.tiles[var1][var16][var15];
if(var17 != null && var17.gameObjectsCount >= 5) {
return false;
}
}
}
- GameObject var21 = new GameObject();
- var21.tag = var12;
- var21.flags = var14;
- var21.plane = var1;
- var21.centerX = var6;
- var21.centerY = var7;
- var21.height = var8;
- var21.entity = var9;
- var21.orientation = var10;
- var21.startX = var2;
- var21.startY = var3;
- var21.endX = var2 + var4 - 1;
- var21.endY = var3 + var5 - 1;
+ GameObject var20 = new GameObject();
+ var20.tag = var12;
+ var20.flags = var14;
+ var20.plane = var1;
+ var20.centerX = var6;
+ var20.centerY = var7;
+ var20.height = var8;
+ var20.entity = var9;
+ var20.orientation = var10;
+ var20.startX = var2;
+ var20.startY = var3;
+ var20.endX = var2 + var4 - 1;
+ var20.endY = var3 + var5 - 1;
- for(var16 = var2; var16 < var2 + var4; ++var16) {
- for(int var22 = var3; var22 < var3 + var5; ++var22) {
+ for(var15 = var2; var15 < var2 + var4; ++var15) {
+ for(int var21 = var3; var21 < var3 + var5; ++var21) {
int var18 = 0;
- if(var16 > var2) {
+ if(var15 > var2) {
++var18;
}
- if(var16 < var2 + var4 - 1) {
+ if(var15 < var2 + var4 - 1) {
var18 += 4;
}
- if(var22 > var3) {
+ if(var21 > var3) {
var18 += 8;
}
- if(var22 < var3 + var5 - 1) {
+ if(var21 < var3 + var5 - 1) {
var18 += 2;
}
for(int var19 = var1; var19 >= 0; --var19) {
- if(this.tiles[var19][var16][var22] == null) {
- this.tiles[var19][var16][var22] = new Tile(var19, var16, var22);
+ if(this.tiles[var19][var15][var21] == null) {
+ this.tiles[var19][var15][var21] = new Tile(var19, var15, var21);
}
}
- Tile var23 = this.tiles[var1][var16][var22];
- var23.gameObjects[var23.gameObjectsCount] = var21;
- var23.gameObjectEdgeMasks[var23.gameObjectsCount] = var18;
- var23.gameObjectsEdgeMask |= var18;
- ++var23.gameObjectsCount;
+ Tile var22 = this.tiles[var1][var15][var21];
+ var22.gameObjects[var22.gameObjectsCount] = var20;
+ var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18;
+ var22.gameObjectsEdgeMask |= var18;
+ ++var22.gameObjectsCount;
}
}
if(var11) {
- this.tempGameObjects[this.tempGameObjectsCount++] = var21;
+ this.tempGameObjects[this.tempGameObjectsCount++] = var20;
}
return true;
@@ -676,6 +653,7 @@ public class Scene {
var6.yOffset = var4 * var6.yOffset / 16;
}
}
+
}
@ObfuscatedName("h")
@@ -685,6 +663,7 @@ public class Scene {
if(var4 != null) {
var4.boundaryObject = null;
}
+
}
@ObfuscatedName("b")
@@ -694,6 +673,7 @@ public class Scene {
if(var4 != null) {
var4.wallDecoration = null;
}
+
}
@ObfuscatedName("c")
@@ -703,16 +683,16 @@ public class Scene {
if(var4 != null) {
for(int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
GameObject var6 = var4.gameObjects[var5];
- long var8 = var6.tag;
- int var10 = (int)(var8 >>> 14 & 3L);
- boolean var7 = var10 == 2;
- if(var7 && var2 == var6.startX && var3 == var6.startY) {
+ long var7 = var6.tag;
+ int var9 = (int)(var7 >>> 14 & 3L);
+ boolean var10 = var9 == 2;
+ if(var10 && var2 == var6.startX && var3 == var6.startY) {
this.removeGameObject(var6);
return;
}
}
-
}
+
}
@ObfuscatedName("p")
@@ -722,6 +702,7 @@ public class Scene {
if(var4 != null) {
var4.floorDecoration = null;
}
+
}
@ObfuscatedName("v")
@@ -731,6 +712,7 @@ public class Scene {
if(var4 != null) {
var4.groundItemPile = null;
}
+
}
@ObfuscatedName("ag")
@@ -765,10 +747,10 @@ public class Scene {
} else {
for(int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
GameObject var6 = var4.gameObjects[var5];
- long var8 = var6.tag;
- int var10 = (int)(var8 >>> 14 & 3L);
- boolean var7 = var10 == 2;
- if(var7 && var2 == var6.startX && var3 == var6.startY) {
+ long var7 = var6.tag;
+ int var9 = (int)(var7 >>> 14 & 3L);
+ boolean var10 = var9 == 2;
+ if(var10 && var2 == var6.startX && var3 == var6.startY) {
return var6;
}
}
@@ -810,10 +792,10 @@ public class Scene {
} else {
for(int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
GameObject var6 = var4.gameObjects[var5];
- long var8 = var6.tag;
- int var10 = (int)(var8 >>> 14 & 3L);
- boolean var7 = var10 == 2;
- if(var7 && var2 == var6.startX && var3 == var6.startY) {
+ long var7 = var6.tag;
+ int var9 = (int)(var7 >>> 14 & 3L);
+ boolean var10 = var9 == 2;
+ if(var10 && var2 == var6.startX && var3 == var6.startY) {
return var6.tag;
}
}
@@ -861,34 +843,34 @@ public class Scene {
Tile var7 = this.tiles[var4][var5][var6];
if(var7 != null) {
BoundaryObject var8 = var7.boundaryObject;
- ModelData var10;
+ ModelData var9;
if(var8 != null && var8.entity1 instanceof ModelData) {
- ModelData var9 = (ModelData)var8.entity1;
- this.__ab_249(var9, var4, var5, var6, 1, 1);
+ ModelData var10 = (ModelData)var8.entity1;
+ this.__ab_249(var10, var4, var5, var6, 1, 1);
if(var8.entity2 instanceof ModelData) {
- var10 = (ModelData)var8.entity2;
- this.__ab_249(var10, var4, var5, var6, 1, 1);
- ModelData.method2800(var9, var10, 0, 0, 0, false);
- var8.entity2 = var10.toModel(var10.__aq, var10.__aj, var1, var2, var3);
+ var9 = (ModelData)var8.entity2;
+ this.__ab_249(var9, var4, var5, var6, 1, 1);
+ ModelData.method2800(var10, var9, 0, 0, 0, false);
+ var8.entity2 = var9.toModel(var9.__aq, var9.__aj, var1, var2, var3);
}
- var8.entity1 = var9.toModel(var9.__aq, var9.__aj, var1, var2, var3);
+ var8.entity1 = var10.toModel(var10.__aq, var10.__aj, var1, var2, var3);
}
- for(int var12 = 0; var12 < var7.gameObjectsCount; ++var12) {
- GameObject var14 = var7.gameObjects[var12];
- if(var14 != null && var14.entity instanceof ModelData) {
- ModelData var11 = (ModelData)var14.entity;
- this.__ab_249(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1);
- var14.entity = var11.toModel(var11.__aq, var11.__aj, var1, var2, var3);
+ for(int var13 = 0; var13 < var7.gameObjectsCount; ++var13) {
+ GameObject var11 = var7.gameObjects[var13];
+ if(var11 != null && var11.entity instanceof ModelData) {
+ ModelData var12 = (ModelData)var11.entity;
+ this.__ab_249(var12, var4, var5, var6, var11.endX - var11.startX + 1, var11.endY - var11.startY + 1);
+ var11.entity = var12.toModel(var12.__aq, var12.__aj, var1, var2, var3);
}
}
- FloorDecoration var13 = var7.floorDecoration;
- if(var13 != null && var13.entity instanceof ModelData) {
- var10 = (ModelData)var13.entity;
- this.__al_248(var10, var4, var5, var6);
- var13.entity = var10.toModel(var10.__aq, var10.__aj, var1, var2, var3);
+ FloorDecoration var14 = var7.floorDecoration;
+ if(var14 != null && var14.entity instanceof ModelData) {
+ var9 = (ModelData)var14.entity;
+ this.__al_248(var9, var4, var5, var6);
+ var14.entity = var9.toModel(var9.__aq, var9.__aj, var1, var2, var3);
}
}
}
@@ -1002,27 +984,26 @@ public class Scene {
Tile var7 = this.tiles[var4][var5][var6];
if(var7 != null) {
TilePaint var8 = var7.paint;
- int var10;
+ int var9;
if(var8 != null) {
- int var9 = var8.rgb;
- if(var9 != 0) {
- for(var10 = 0; var10 < 4; ++var10) {
- var1[var2] = var9;
- var1[var2 + 1] = var9;
- var1[var2 + 2] = var9;
- var1[var2 + 3] = var9;
+ int var10 = var8.rgb;
+ if(var10 != 0) {
+ for(var9 = 0; var9 < 4; ++var9) {
+ var1[var2] = var10;
+ var1[var2 + 1] = var10;
+ var1[var2 + 2] = var10;
+ var1[var2 + 3] = var10;
var2 += var3;
}
-
}
} else {
TileModel var18 = var7.model;
if(var18 != null) {
- var10 = var18.shape;
+ var9 = var18.shape;
int var11 = var18.rotation;
int var12 = var18.underlayRgb;
int var13 = var18.overlayRgb;
- int[] var14 = this.__bk[var10];
+ int[] var14 = this.__bk[var9];
int[] var15 = this.__bd[var11];
int var16 = 0;
int var17;
@@ -1055,10 +1036,10 @@ public class Scene {
var2 += var3;
}
}
-
}
}
}
+
}
@ObfuscatedName("ap")
@@ -1073,6 +1054,7 @@ public class Scene {
Scene_selectedX = -1;
Scene_selectedY = -1;
}
+
}
@ObfuscatedName("as")
@@ -1170,47 +1152,47 @@ public class Scene {
int var12;
int var13;
- int var14;
- Tile var15;
+ Tile var14;
+ int var15;
int var16;
for(var7 = this.Scene_minPlane; var7 < this.planes; ++var7) {
var8 = this.tiles[var7];
for(var9 = -25; var9 <= 0; ++var9) {
var10 = var9 + Scene_cameraXTile;
- var16 = Scene_cameraXTile - var9;
- if(var10 >= Scene_cameraXTileMin || var16 < Scene_cameraXTileMax) {
- for(var12 = -25; var12 <= 0; ++var12) {
- var13 = var12 + Scene_cameraYTile;
- var14 = Scene_cameraYTile - var12;
+ var15 = Scene_cameraXTile - var9;
+ if(var10 >= Scene_cameraXTileMin || var15 < Scene_cameraXTileMax) {
+ for(var16 = -25; var16 <= 0; ++var16) {
+ var12 = var16 + Scene_cameraYTile;
+ var13 = Scene_cameraYTile - var16;
if(var10 >= Scene_cameraXTileMin) {
- if(var13 >= Scene_cameraYTileMin) {
- var15 = var8[var10][var13];
- if(var15 != null && var15.drawPrimary) {
- this.drawTile(var15, true);
+ if(var12 >= Scene_cameraYTileMin) {
+ var14 = var8[var10][var12];
+ if(var14 != null && var14.drawPrimary) {
+ this.drawTile(var14, true);
}
}
- if(var14 < Scene_cameraYTileMax) {
- var15 = var8[var10][var14];
- if(var15 != null && var15.drawPrimary) {
- this.drawTile(var15, true);
+ if(var13 < Scene_cameraYTileMax) {
+ var14 = var8[var10][var13];
+ if(var14 != null && var14.drawPrimary) {
+ this.drawTile(var14, true);
}
}
}
- if(var16 < Scene_cameraXTileMax) {
- if(var13 >= Scene_cameraYTileMin) {
- var15 = var8[var16][var13];
- if(var15 != null && var15.drawPrimary) {
- this.drawTile(var15, true);
+ if(var15 < Scene_cameraXTileMax) {
+ if(var12 >= Scene_cameraYTileMin) {
+ var14 = var8[var15][var12];
+ if(var14 != null && var14.drawPrimary) {
+ this.drawTile(var14, true);
}
}
- if(var14 < Scene_cameraYTileMax) {
- var15 = var8[var16][var14];
- if(var15 != null && var15.drawPrimary) {
- this.drawTile(var15, true);
+ if(var13 < Scene_cameraYTileMax) {
+ var14 = var8[var15][var13];
+ if(var14 != null && var14.drawPrimary) {
+ this.drawTile(var14, true);
}
}
}
@@ -1229,39 +1211,39 @@ public class Scene {
for(var9 = -25; var9 <= 0; ++var9) {
var10 = var9 + Scene_cameraXTile;
- var16 = Scene_cameraXTile - var9;
- if(var10 >= Scene_cameraXTileMin || var16 < Scene_cameraXTileMax) {
- for(var12 = -25; var12 <= 0; ++var12) {
- var13 = var12 + Scene_cameraYTile;
- var14 = Scene_cameraYTile - var12;
+ var15 = Scene_cameraXTile - var9;
+ if(var10 >= Scene_cameraXTileMin || var15 < Scene_cameraXTileMax) {
+ for(var16 = -25; var16 <= 0; ++var16) {
+ var12 = var16 + Scene_cameraYTile;
+ var13 = Scene_cameraYTile - var16;
if(var10 >= Scene_cameraXTileMin) {
- if(var13 >= Scene_cameraYTileMin) {
- var15 = var8[var10][var13];
- if(var15 != null && var15.drawPrimary) {
- this.drawTile(var15, false);
+ if(var12 >= Scene_cameraYTileMin) {
+ var14 = var8[var10][var12];
+ if(var14 != null && var14.drawPrimary) {
+ this.drawTile(var14, false);
}
}
- if(var14 < Scene_cameraYTileMax) {
- var15 = var8[var10][var14];
- if(var15 != null && var15.drawPrimary) {
- this.drawTile(var15, false);
+ if(var13 < Scene_cameraYTileMax) {
+ var14 = var8[var10][var13];
+ if(var14 != null && var14.drawPrimary) {
+ this.drawTile(var14, false);
}
}
}
- if(var16 < Scene_cameraXTileMax) {
- if(var13 >= Scene_cameraYTileMin) {
- var15 = var8[var16][var13];
- if(var15 != null && var15.drawPrimary) {
- this.drawTile(var15, false);
+ if(var15 < Scene_cameraXTileMax) {
+ if(var12 >= Scene_cameraYTileMin) {
+ var14 = var8[var15][var12];
+ if(var14 != null && var14.drawPrimary) {
+ this.drawTile(var14, false);
}
}
- if(var14 < Scene_cameraYTileMax) {
- var15 = var8[var16][var14];
- if(var15 != null && var15.drawPrimary) {
- this.drawTile(var15, false);
+ if(var13 < Scene_cameraYTileMax) {
+ var14 = var8[var15][var13];
+ if(var14 != null && var14.drawPrimary) {
+ this.drawTile(var14, false);
}
}
}
@@ -1294,12 +1276,12 @@ public class Scene {
int var7;
Tile[][] var8;
Tile var9;
+ int var10;
int var11;
+ int var12;
+ int var13;
int var14;
int var15;
- int var16;
- int var24;
- int var25;
do {
do {
do {
@@ -1307,13 +1289,13 @@ public class Scene {
do {
do {
while(true) {
- BoundaryObject var10;
- GameObject var12;
- int var17;
+ BoundaryObject var16;
+ GameObject var17;
int var18;
+ int var19;
boolean var20;
int var21;
- Tile var36;
+ Tile var22;
while(true) {
do {
var3 = (Tile)Scene_tilesDeque.removeLast();
@@ -1381,15 +1363,15 @@ public class Scene {
this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
}
- var10 = var9.boundaryObject;
- if(var10 != null) {
- var10.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag);
+ var16 = var9.boundaryObject;
+ if(var16 != null) {
+ var16.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag);
}
- for(var11 = 0; var11 < var9.gameObjectsCount; ++var11) {
- var12 = var9.gameObjects[var11];
- if(var12 != null) {
- var12.entity.renderDraw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag);
+ for(var10 = 0; var10 < var9.gameObjectsCount; ++var10) {
+ var17 = var9.gameObjects[var10];
+ if(var17 != null) {
+ var17.entity.renderDraw(var17.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var17.centerX - Scene_cameraX, var17.height - Scene_cameraY, var17.centerY - Scene_cameraZ, var17.tag);
}
}
}
@@ -1408,10 +1390,10 @@ public class Scene {
}
var21 = 0;
- var11 = 0;
- BoundaryObject var31 = var3.boundaryObject;
- WallDecoration var13 = var3.wallDecoration;
- if(var31 != null || var13 != null) {
+ var10 = 0;
+ BoundaryObject var23 = var3.boundaryObject;
+ WallDecoration var24 = var3.wallDecoration;
+ if(var23 != null || var24 != null) {
if(var4 == Scene_cameraXTile) {
++var21;
} else if(Scene_cameraXTile < var4) {
@@ -1424,21 +1406,21 @@ public class Scene {
var21 += 6;
}
- var11 = __em_au[var21];
+ var10 = __em_au[var21];
var3.__b = __em_aa[var21];
}
- if(var31 != null) {
- if((var31.orientationA & __em_ao[var21]) != 0) {
- if(var31.orientationA == 16) {
+ if(var23 != null) {
+ if((var23.orientationA & __em_ao[var21]) != 0) {
+ if(var23.orientationA == 16) {
var3.drawGameObjectEdges = 3;
var3.__y = __em_ax[var21];
var3.__h = 3 - var3.__y;
- } else if(var31.orientationA == 32) {
+ } else if(var23.orientationA == 32) {
var3.drawGameObjectEdges = 6;
var3.__y = __em_af[var21];
var3.__h = 6 - var3.__y;
- } else if(var31.orientationA == 64) {
+ } else if(var23.orientationA == 64) {
var3.drawGameObjectEdges = 12;
var3.__y = __em_ai[var21];
var3.__h = 12 - var3.__y;
@@ -1451,93 +1433,93 @@ public class Scene {
var3.drawGameObjectEdges = 0;
}
- if((var31.orientationA & var11) != 0 && !this.__bb_254(var7, var4, var5, var31.orientationA)) {
- var31.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
+ if((var23.orientationA & var10) != 0 && !this.__bb_254(var7, var4, var5, var23.orientationA)) {
+ var23.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
}
- if((var31.orientationB & var11) != 0 && !this.__bb_254(var7, var4, var5, var31.orientationB)) {
- var31.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
+ if((var23.orientationB & var10) != 0 && !this.__bb_254(var7, var4, var5, var23.orientationB)) {
+ var23.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
}
}
- if(var13 != null && !this.__bs_255(var7, var4, var5, var13.entity1.height)) {
- if((var13.orientation & var11) != 0) {
- var13.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag);
- } else if(var13.orientation == 256) {
- var14 = var13.x - Scene_cameraX;
- var15 = var13.tileHeight - Scene_cameraY;
- var16 = var13.y - Scene_cameraZ;
- var17 = var13.orientation2;
- if(var17 != 1 && var17 != 2) {
- var18 = var14;
+ if(var24 != null && !this.__bs_255(var7, var4, var5, var24.entity1.height)) {
+ if((var24.orientation & var10) != 0) {
+ var24.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var24.x - Scene_cameraX + var24.xOffset, var24.tileHeight - Scene_cameraY, var24.y - Scene_cameraZ + var24.yOffset, var24.tag);
+ } else if(var24.orientation == 256) {
+ var11 = var24.x - Scene_cameraX;
+ var12 = var24.tileHeight - Scene_cameraY;
+ var13 = var24.y - Scene_cameraZ;
+ var18 = var24.orientation2;
+ if(var18 != 1 && var18 != 2) {
+ var19 = var11;
} else {
- var18 = -var14;
+ var19 = -var11;
}
- int var19;
- if(var17 != 2 && var17 != 3) {
- var19 = var16;
+ int var25;
+ if(var18 != 2 && var18 != 3) {
+ var25 = var13;
} else {
- var19 = -var16;
+ var25 = -var13;
}
- if(var19 < var18) {
- var13.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag);
- } else if(var13.entity2 != null) {
- var13.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag);
+ if(var25 < var19) {
+ var24.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var24.xOffset, var12, var13 + var24.yOffset, var24.tag);
+ } else if(var24.entity2 != null) {
+ var24.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var12, var13, var24.tag);
}
}
}
if(var20) {
- FloorDecoration var22 = var3.floorDecoration;
- if(var22 != null) {
- var22.entity.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag);
+ FloorDecoration var34 = var3.floorDecoration;
+ if(var34 != null) {
+ var34.entity.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var34.x - Scene_cameraX, var34.tileHeight - Scene_cameraY, var34.y - Scene_cameraZ, var34.tag);
}
- GroundItemPile var23 = var3.groundItemPile;
- if(var23 != null && var23.height == 0) {
- if(var23.second != null) {
- var23.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
+ GroundItemPile var26 = var3.groundItemPile;
+ if(var26 != null && var26.height == 0) {
+ if(var26.second != null) {
+ var26.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag);
}
- if(var23.third != null) {
- var23.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
+ if(var26.third != null) {
+ var26.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag);
}
- if(var23.first != null) {
- var23.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
+ if(var26.first != null) {
+ var26.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag);
}
}
}
- var14 = var3.gameObjectsEdgeMask;
- if(var14 != 0) {
- if(var4 < Scene_cameraXTile && (var14 & 4) != 0) {
- var36 = var8[var4 + 1][var5];
- if(var36 != null && var36.drawSecondary) {
- Scene_tilesDeque.addFirst(var36);
+ var11 = var3.gameObjectsEdgeMask;
+ if(var11 != 0) {
+ if(var4 < Scene_cameraXTile && (var11 & 4) != 0) {
+ var22 = var8[var4 + 1][var5];
+ if(var22 != null && var22.drawSecondary) {
+ Scene_tilesDeque.addFirst(var22);
}
}
- if(var5 < Scene_cameraYTile && (var14 & 2) != 0) {
- var36 = var8[var4][var5 + 1];
- if(var36 != null && var36.drawSecondary) {
- Scene_tilesDeque.addFirst(var36);
+ if(var5 < Scene_cameraYTile && (var11 & 2) != 0) {
+ var22 = var8[var4][var5 + 1];
+ if(var22 != null && var22.drawSecondary) {
+ Scene_tilesDeque.addFirst(var22);
}
}
- if(var4 > Scene_cameraXTile && (var14 & 1) != 0) {
- var36 = var8[var4 - 1][var5];
- if(var36 != null && var36.drawSecondary) {
- Scene_tilesDeque.addFirst(var36);
+ if(var4 > Scene_cameraXTile && (var11 & 1) != 0) {
+ var22 = var8[var4 - 1][var5];
+ if(var22 != null && var22.drawSecondary) {
+ Scene_tilesDeque.addFirst(var22);
}
}
- if(var5 > Scene_cameraYTile && (var14 & 8) != 0) {
- var36 = var8[var4][var5 - 1];
- if(var36 != null && var36.drawSecondary) {
- Scene_tilesDeque.addFirst(var36);
+ if(var5 > Scene_cameraYTile && (var11 & 8) != 0) {
+ var22 = var8[var4][var5 - 1];
+ if(var22 != null && var22.drawSecondary) {
+ Scene_tilesDeque.addFirst(var22);
}
}
}
@@ -1555,9 +1537,9 @@ public class Scene {
}
if(var20) {
- var10 = var3.boundaryObject;
- if(!this.__bb_254(var7, var4, var5, var10.orientationA)) {
- var10.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag);
+ var16 = var3.boundaryObject;
+ if(!this.__bb_254(var7, var4, var5, var16.orientationA)) {
+ var16.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag);
}
var3.drawGameObjectEdges = 0;
@@ -1569,104 +1551,105 @@ public class Scene {
}
try {
- int var34 = var3.gameObjectsCount;
+ int var32 = var3.gameObjectsCount;
var3.drawGameObjects = false;
var21 = 0;
- label563:
- for(var11 = 0; var11 < var34; ++var11) {
- var12 = var3.gameObjects[var11];
- if(var12.lastDrawn != Scene_drawnCount) {
- for(var24 = var12.startX; var24 <= var12.endX; ++var24) {
- for(var14 = var12.startY; var14 <= var12.endY; ++var14) {
- var36 = var8[var24][var14];
- if(var36.drawPrimary) {
+ label562:
+ for(var10 = 0; var10 < var32; ++var10) {
+ var17 = var3.gameObjects[var10];
+ if(var17.lastDrawn != Scene_drawnCount) {
+ for(var14 = var17.startX; var14 <= var17.endX; ++var14) {
+ for(var11 = var17.startY; var11 <= var17.endY; ++var11) {
+ var22 = var8[var14][var11];
+ if(var22.drawPrimary) {
var3.drawGameObjects = true;
- continue label563;
+ continue label562;
}
- if(var36.drawGameObjectEdges != 0) {
- var16 = 0;
- if(var24 > var12.startX) {
- ++var16;
+ if(var22.drawGameObjectEdges != 0) {
+ var13 = 0;
+ if(var14 > var17.startX) {
+ ++var13;
}
- if(var24 < var12.endX) {
- var16 += 4;
+ if(var14 < var17.endX) {
+ var13 += 4;
}
- if(var14 > var12.startY) {
- var16 += 8;
+ if(var11 > var17.startY) {
+ var13 += 8;
}
- if(var14 < var12.endY) {
- var16 += 2;
+ if(var11 < var17.endY) {
+ var13 += 2;
}
- if((var16 & var36.drawGameObjectEdges) == var3.__h) {
+ if((var13 & var22.drawGameObjectEdges) == var3.__h) {
var3.drawGameObjects = true;
- continue label563;
+ continue label562;
}
}
}
}
- Scene_gameObjects[var21++] = var12;
- var24 = Scene_cameraXTile - var12.startX;
- var14 = var12.endX - Scene_cameraXTile;
- if(var14 > var24) {
- var24 = var14;
+ Scene_gameObjects[var21++] = var17;
+ var14 = Scene_cameraXTile - var17.startX;
+ var11 = var17.endX - Scene_cameraXTile;
+ if(var11 > var14) {
+ var14 = var11;
}
- var15 = Scene_cameraYTile - var12.startY;
- var16 = var12.endY - Scene_cameraYTile;
- if(var16 > var15) {
- var12.__d = var24 + var16;
+ var12 = Scene_cameraYTile - var17.startY;
+ var13 = var17.endY - Scene_cameraYTile;
+ if(var13 > var12) {
+ var17.__d = var14 + var13;
} else {
- var12.__d = var24 + var15;
+ var17.__d = var14 + var12;
}
}
}
while(var21 > 0) {
- var11 = -50;
- var25 = -1;
+ var10 = -50;
+ var15 = -1;
- for(var24 = 0; var24 < var21; ++var24) {
- GameObject var35 = Scene_gameObjects[var24];
- if(var35.lastDrawn != Scene_drawnCount) {
- if(var35.__d > var11) {
- var11 = var35.__d;
- var25 = var24;
- } else if(var11 == var35.__d) {
- var15 = var35.centerX - Scene_cameraX;
- var16 = var35.centerY - Scene_cameraZ;
- var17 = Scene_gameObjects[var25].centerX - Scene_cameraX;
- var18 = Scene_gameObjects[var25].centerY - Scene_cameraZ;
- if(var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) {
- var25 = var24;
+ GameObject var33;
+ for(var14 = 0; var14 < var21; ++var14) {
+ var33 = Scene_gameObjects[var14];
+ if(var33.lastDrawn != Scene_drawnCount) {
+ if(var33.__d > var10) {
+ var10 = var33.__d;
+ var15 = var14;
+ } else if(var10 == var33.__d) {
+ var12 = var33.centerX - Scene_cameraX;
+ var13 = var33.centerY - Scene_cameraZ;
+ var18 = Scene_gameObjects[var15].centerX - Scene_cameraX;
+ var19 = Scene_gameObjects[var15].centerY - Scene_cameraZ;
+ if(var12 * var12 + var13 * var13 > var18 * var18 + var19 * var19) {
+ var15 = var14;
}
}
}
}
- if(var25 == -1) {
+ if(var15 == -1) {
break;
}
- GameObject var33 = Scene_gameObjects[var25];
+ var33 = Scene_gameObjects[var15];
var33.lastDrawn = Scene_drawnCount;
if(!this.__bq_256(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) {
var33.entity.renderDraw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag);
}
- for(var14 = var33.startX; var14 <= var33.endX; ++var14) {
- for(var15 = var33.startY; var15 <= var33.endY; ++var15) {
- Tile var26 = var8[var14][var15];
- if(var26.drawGameObjectEdges != 0) {
- Scene_tilesDeque.addFirst(var26);
- } else if((var14 != var4 || var15 != var5) && var26.drawSecondary) {
- Scene_tilesDeque.addFirst(var26);
+ for(var11 = var33.startX; var11 <= var33.endX; ++var11) {
+ for(var12 = var33.startY; var12 <= var33.endY; ++var12) {
+ Tile var35 = var8[var11][var12];
+ if(var35.drawGameObjectEdges != 0) {
+ Scene_tilesDeque.addFirst(var35);
+ } else if((var11 != var4 || var12 != var5) && var35.drawSecondary) {
+ Scene_tilesDeque.addFirst(var35);
}
}
}
@@ -1675,7 +1658,7 @@ public class Scene {
if(!var3.drawGameObjects) {
break;
}
- } catch (Exception var28) {
+ } catch (Exception var27) {
var3.drawGameObjects = false;
break;
}
@@ -1713,18 +1696,18 @@ public class Scene {
var3.drawSecondary = false;
--tileUpdateCount;
- GroundItemPile var32 = var3.groundItemPile;
- if(var32 != null && var32.height != 0) {
- if(var32.second != null) {
- var32.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag);
+ GroundItemPile var28 = var3.groundItemPile;
+ if(var28 != null && var28.height != 0) {
+ if(var28.second != null) {
+ var28.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag);
}
- if(var32.third != null) {
- var32.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag);
+ if(var28.third != null) {
+ var28.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag);
}
- if(var32.first != null) {
- var32.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag);
+ if(var28.first != null) {
+ var28.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag);
}
}
@@ -1734,38 +1717,38 @@ public class Scene {
if((var29.orientation & var3.__b) != 0) {
var29.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag);
} else if(var29.orientation == 256) {
- var11 = var29.x - Scene_cameraX;
- var25 = var29.tileHeight - Scene_cameraY;
- var24 = var29.y - Scene_cameraZ;
- var14 = var29.orientation2;
- if(var14 != 1 && var14 != 2) {
- var15 = var11;
+ var10 = var29.x - Scene_cameraX;
+ var15 = var29.tileHeight - Scene_cameraY;
+ var14 = var29.y - Scene_cameraZ;
+ var11 = var29.orientation2;
+ if(var11 != 1 && var11 != 2) {
+ var12 = var10;
} else {
- var15 = -var11;
+ var12 = -var10;
}
- if(var14 != 2 && var14 != 3) {
- var16 = var24;
+ if(var11 != 2 && var11 != 3) {
+ var13 = var14;
} else {
- var16 = -var24;
+ var13 = -var14;
}
- if(var16 >= var15) {
- var29.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag);
+ if(var13 >= var12) {
+ var29.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10 + var29.xOffset, var15, var14 + var29.yOffset, var29.tag);
} else if(var29.entity2 != null) {
- var29.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag);
+ var29.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10, var15, var14, var29.tag);
}
}
}
- BoundaryObject var27 = var3.boundaryObject;
- if(var27 != null) {
- if((var27.orientationB & var3.__b) != 0 && !this.__bb_254(var7, var4, var5, var27.orientationB)) {
- var27.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag);
+ BoundaryObject var31 = var3.boundaryObject;
+ if(var31 != null) {
+ if((var31.orientationB & var3.__b) != 0 && !this.__bb_254(var7, var4, var5, var31.orientationB)) {
+ var31.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
}
- if((var27.orientationA & var3.__b) != 0 && !this.__bb_254(var7, var4, var5, var27.orientationA)) {
- var27.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag);
+ if((var31.orientationA & var3.__b) != 0 && !this.__bb_254(var7, var4, var5, var31.orientationA)) {
+ var31.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
}
}
}
@@ -1912,11 +1895,11 @@ public class Scene {
Rasterizer3D.method3037(var23, var25, var29, var22, var24, var28, method3108(var30, var1.swColor), method3108(var30, var1.seColor), method3108(var30, var1.nwColor));
}
}
-
}
}
}
}
+
}
@ObfuscatedName("aa")
@@ -2010,8 +1993,8 @@ public class Scene {
int var5;
int var6;
int var7;
- int var9;
- boolean var13;
+ int var8;
+ boolean var9;
if(var4.type == 1) {
var5 = var4.minTileX - Scene_cameraXTile + 25;
if(var5 >= 0 && var5 <= 50) {
@@ -2025,32 +2008,32 @@ public class Scene {
var7 = 50;
}
- var13 = false;
+ var9 = false;
while(var6 <= var7) {
if(visibleTiles[var5][var6++]) {
- var13 = true;
+ var9 = true;
break;
}
}
- if(var13) {
- var9 = Scene_cameraX - var4.minX;
- if(var9 > 32) {
+ if(var9) {
+ var8 = Scene_cameraX - var4.minX;
+ if(var8 > 32) {
var4.__k = 1;
} else {
- if(var9 >= -32) {
+ if(var8 >= -32) {
continue;
}
var4.__k = 2;
- var9 = -var9;
+ var8 = -var8;
}
- var4.__a = (var4.minZ - Scene_cameraZ << 8) / var9;
- var4.__z = (var4.maxZ - Scene_cameraZ << 8) / var9;
- var4.__j = (var4.minY - Scene_cameraY << 8) / var9;
- var4.__s = (var4.maxY - Scene_cameraY << 8) / var9;
+ var4.__a = (var4.minZ - Scene_cameraZ << 8) / var8;
+ var4.__z = (var4.maxZ - Scene_cameraZ << 8) / var8;
+ var4.__j = (var4.minY - Scene_cameraY << 8) / var8;
+ var4.__s = (var4.maxY - Scene_cameraY << 8) / var8;
Scene_currentOccluders[Scene_currentOccludersCount++] = var4;
}
}
@@ -2067,32 +2050,32 @@ public class Scene {
var7 = 50;
}
- var13 = false;
+ var9 = false;
while(var6 <= var7) {
if(visibleTiles[var6++][var5]) {
- var13 = true;
+ var9 = true;
break;
}
}
- if(var13) {
- var9 = Scene_cameraZ - var4.minZ;
- if(var9 > 32) {
+ if(var9) {
+ var8 = Scene_cameraZ - var4.minZ;
+ if(var8 > 32) {
var4.__k = 3;
} else {
- if(var9 >= -32) {
+ if(var8 >= -32) {
continue;
}
var4.__k = 4;
- var9 = -var9;
+ var8 = -var8;
}
- var4.__n = (var4.minX - Scene_cameraX << 8) / var9;
- var4.__i = (var4.maxX - Scene_cameraX << 8) / var9;
- var4.__j = (var4.minY - Scene_cameraY << 8) / var9;
- var4.__s = (var4.maxY - Scene_cameraY << 8) / var9;
+ var4.surfaceOffsetY = (var4.minX - Scene_cameraX << 8) / var8;
+ var4.__i = (var4.maxX - Scene_cameraX << 8) / var8;
+ var4.__j = (var4.minY - Scene_cameraY << 8) / var8;
+ var4.__s = (var4.maxY - Scene_cameraY << 8) / var8;
Scene_currentOccluders[Scene_currentOccludersCount++] = var4;
}
}
@@ -2110,31 +2093,31 @@ public class Scene {
}
if(var6 <= var7) {
- int var8 = var4.minTileX - Scene_cameraXTile + 25;
- if(var8 < 0) {
- var8 = 0;
+ int var10 = var4.minTileX - Scene_cameraXTile + 25;
+ if(var10 < 0) {
+ var10 = 0;
}
- var9 = var4.maxTileX - Scene_cameraXTile + 25;
- if(var9 > 50) {
- var9 = 50;
+ var8 = var4.maxTileX - Scene_cameraXTile + 25;
+ if(var8 > 50) {
+ var8 = 50;
}
- boolean var10 = false;
+ boolean var11 = false;
- label144:
- for(int var11 = var8; var11 <= var9; ++var11) {
- for(int var12 = var6; var12 <= var7; ++var12) {
- if(visibleTiles[var11][var12]) {
- var10 = true;
- break label144;
+ label140:
+ for(int var12 = var10; var12 <= var8; ++var12) {
+ for(int var13 = var6; var13 <= var7; ++var13) {
+ if(visibleTiles[var12][var13]) {
+ var11 = true;
+ break label140;
}
}
}
- if(var10) {
+ if(var11) {
var4.__k = 5;
- var4.__n = (var4.minX - Scene_cameraX << 8) / var5;
+ var4.surfaceOffsetY = (var4.minX - Scene_cameraX << 8) / var5;
var4.__i = (var4.maxX - Scene_cameraX << 8) / var5;
var4.__a = (var4.minZ - Scene_cameraZ << 8) / var5;
var4.__z = (var4.maxZ - Scene_cameraZ << 8) / var5;
@@ -2406,7 +2389,7 @@ public class Scene {
} else if(var5.__k == 3) {
var6 = var5.minZ - var3;
if(var6 > 0) {
- var7 = (var6 * var5.__n >> 8) + var5.minX;
+ var7 = (var6 * var5.surfaceOffsetY >> 8) + var5.minX;
var8 = (var6 * var5.__i >> 8) + var5.maxX;
var9 = (var6 * var5.__j >> 8) + var5.minY;
var10 = (var6 * var5.__s >> 8) + var5.maxY;
@@ -2417,7 +2400,7 @@ public class Scene {
} else if(var5.__k == 4) {
var6 = var3 - var5.minZ;
if(var6 > 0) {
- var7 = (var6 * var5.__n >> 8) + var5.minX;
+ var7 = (var6 * var5.surfaceOffsetY >> 8) + var5.minX;
var8 = (var6 * var5.__i >> 8) + var5.maxX;
var9 = (var6 * var5.__j >> 8) + var5.minY;
var10 = (var6 * var5.__s >> 8) + var5.maxY;
@@ -2428,7 +2411,7 @@ public class Scene {
} else if(var5.__k == 5) {
var6 = var2 - var5.minY;
if(var6 > 0) {
- var7 = (var6 * var5.__n >> 8) + var5.minX;
+ var7 = (var6 * var5.surfaceOffsetY >> 8) + var5.minX;
var8 = (var6 * var5.__i >> 8) + var5.maxX;
var9 = (var6 * var5.__a >> 8) + var5.minZ;
var10 = (var6 * var5.__z >> 8) + var5.maxZ;
@@ -2475,8 +2458,8 @@ public class Scene {
int var7;
int var8;
int var9;
+ int var10;
int var11;
- int var12;
for(var6 = 128; var6 <= 383; var6 += 32) {
for(var7 = 0; var7 < 2048; var7 += 64) {
Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6];
@@ -2486,20 +2469,20 @@ public class Scene {
var8 = (var6 - 128) / 32;
var9 = var7 / 64;
- for(int var10 = -26; var10 < 26; ++var10) {
- for(var11 = -26; var11 < 26; ++var11) {
- var12 = var10 * 128;
- int var13 = var11 * 128;
+ for(int var12 = -26; var12 < 26; ++var12) {
+ for(var10 = -26; var10 < 26; ++var10) {
+ var11 = var12 * 128;
+ int var13 = var10 * 128;
boolean var14 = false;
for(int var15 = -var1; var15 <= var2; var15 += 128) {
- if(method3100(var12, var0[var8] + var15, var13)) {
+ if(method3100(var11, var0[var8] + var15, var13)) {
var14 = true;
break;
}
}
- var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14;
+ var5[var8][var9][var12 + 1 + 25][var10 + 1 + 25] = var14;
}
}
}
@@ -2512,24 +2495,24 @@ public class Scene {
boolean var16 = false;
label76:
- for(var11 = -1; var11 <= 1; ++var11) {
- for(var12 = -1; var12 <= 1; ++var12) {
- if(var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) {
+ for(var10 = -1; var10 <= 1; ++var10) {
+ for(var11 = -1; var11 <= 1; ++var11) {
+ if(var5[var6][var7][var8 + var10 + 1 + 25][var9 + var11 + 1 + 25]) {
var16 = true;
break label76;
}
- if(var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) {
+ if(var5[var6][(var7 + 1) % 31][var8 + var10 + 1 + 25][var9 + var11 + 1 + 25]) {
var16 = true;
break label76;
}
- if(var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) {
+ if(var5[var6 + 1][var7][var8 + var10 + 1 + 25][var9 + var11 + 1 + 25]) {
var16 = true;
break label76;
}
- if(var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) {
+ if(var5[var6 + 1][(var7 + 1) % 31][var8 + var10 + 1 + 25][var9 + var11 + 1 + 25]) {
var16 = true;
break label76;
}
@@ -2600,4 +2583,32 @@ public class Scene {
return var8 == 0?(var9 != 0?(var9 < 0?var10 <= 0:var10 >= 0):true):(var8 < 0?var9 <= 0 && var10 <= 0:var9 >= 0 && var10 >= 0);
}
}
+
+ static {
+ Scene_isLowDetail = true;
+ tileUpdateCount = 0;
+ Scene_plane = 0;
+ Scene_gameObjects = new GameObject[100];
+ checkClick = false;
+ Scene_selectedPlane = 0;
+ Scene_selectedScreenX = 0;
+ Scene_selectedScreenY = 0;
+ Scene_selectedX = -1;
+ Scene_selectedY = -1;
+ __em_ab = false;
+ __em_ad = 4;
+ Scene_planeOccluderCounts = new int[__em_ad];
+ Scene_planeOccluders = new Occluder[__em_ad][500];
+ Scene_currentOccludersCount = 0;
+ Scene_currentOccluders = new Occluder[500];
+ Scene_tilesDeque = new NodeDeque();
+ __em_au = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76};
+ __em_ao = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160};
+ __em_aa = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19};
+ __em_ax = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0};
+ __em_af = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4};
+ __em_ai = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0};
+ __em_ba = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8};
+ visibilityMap = new boolean[8][32][51][51];
+ }
}
diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java
index 068866a0a1..98f1a2e841 100644
--- a/runescape-client/src/main/java/Script.java
+++ b/runescape-client/src/main/java/Script.java
@@ -53,10 +53,6 @@ public class Script extends DualNode {
@Export("switches")
IterableNodeHashTable[] switches;
- static {
- Script_cached = new EvictingDualNodeHashTable(128);
- }
-
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "(II)[Llh;",
@@ -77,6 +73,7 @@ public class Script extends DualNode {
if(var1 != null) {
var1.remove();
}
+
}
@ObfuscatedName("e")
@@ -116,23 +113,26 @@ public class Script extends DualNode {
garbageValue = "-1584807244"
)
static void method2201(SequenceDefinition var0, int var1, int var2, int var3) {
- if(Client.soundEffectCount < 50 && Client.__client_qc != 0) {
- if(var0.__e != null && var1 < var0.__e.length) {
- int var4 = var0.__e[var1];
- if(var4 != 0) {
- int var5 = var4 >> 8;
- int var6 = var4 >> 4 & 7;
- int var7 = var4 & 15;
- Client.soundEffectIds[Client.soundEffectCount] = var5;
- Client.unknownSoundValues1[Client.soundEffectCount] = var6;
- Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0;
- Client.soundEffects[Client.soundEffectCount] = null;
- int var8 = (var2 - 64) / 128;
- int var9 = (var3 - 64) / 128;
- Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16);
- ++Client.soundEffectCount;
- }
+ if(Client.soundEffectCount < 50 && Client.__client_qc != 0 && var0.__e != null && var1 < var0.__e.length) {
+ int var4 = var0.__e[var1];
+ if(var4 != 0) {
+ int var5 = var4 >> 8;
+ int var6 = var4 >> 4 & 7;
+ int var7 = var4 & 15;
+ Client.soundEffectIds[Client.soundEffectCount] = var5;
+ Client.unknownSoundValues1[Client.soundEffectCount] = var6;
+ Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0;
+ Client.soundEffects[Client.soundEffectCount] = null;
+ int var8 = (var2 - 64) / 128;
+ int var9 = (var3 - 64) / 128;
+ Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16);
+ ++Client.soundEffectCount;
}
}
+
+ }
+
+ static {
+ Script_cached = new EvictingDualNodeHashTable(128);
}
}
diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java
index 664404b3ce..dd826a436b 100644
--- a/runescape-client/src/main/java/ScriptEvent.java
+++ b/runescape-client/src/main/java/ScriptEvent.java
@@ -154,7 +154,7 @@ public class ScriptEvent extends Node {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.color2;
return 1;
} else if(var0 == 1613) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal();
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.rectangleMode.ordinal();
return 1;
} else if(var0 == 1614) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.__bv?1:0;
@@ -311,9 +311,9 @@ public class ScriptEvent extends Node {
for(int var3 = 0; var3 < var2.length; ++var3) {
int var4 = var3 * 32 + 15 + 128;
int var5 = var4 * 3 + 600;
- int var7 = Rasterizer3D.Rasterizer3D_sine[var4];
- int var6 = method1176(var5, var1);
- var2[var3] = var6 * var7 >> 16;
+ int var6 = Rasterizer3D.Rasterizer3D_sine[var4];
+ int var7 = method1176(var5, var1);
+ var2[var3] = var7 * var6 >> 16;
}
Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334);
diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java
index c31e812dc4..c45cad9ed6 100644
--- a/runescape-client/src/main/java/ScriptFrame.java
+++ b/runescape-client/src/main/java/ScriptFrame.java
@@ -41,7 +41,7 @@ public class ScriptFrame {
for(int var3 = 0; var3 < var2.length; ++var3) {
Enumerated var4 = var2[var3];
- if(var1 == var4.rsOrdinal()) {
+ if(var1 == var4.ordinal()) {
return var4;
}
}
diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java
index 2e3d8fb8bd..6dbd4cdd7e 100644
--- a/runescape-client/src/main/java/SequenceDefinition.java
+++ b/runescape-client/src/main/java/SequenceDefinition.java
@@ -104,11 +104,6 @@ public class SequenceDefinition extends DualNode {
@Export("__t")
public int __t;
- static {
- SequenceDefinition_cached = new EvictingDualNodeHashTable(64);
- __jh_o = new EvictingDualNodeHashTable(100);
- }
-
SequenceDefinition() {
this.frameCount = -1;
this.__k = false;
@@ -375,4 +370,9 @@ public class SequenceDefinition extends DualNode {
}
}
}
+
+ static {
+ SequenceDefinition_cached = new EvictingDualNodeHashTable(64);
+ __jh_o = new EvictingDualNodeHashTable(100);
+ }
}
diff --git a/runescape-client/src/main/java/ServerBuild.java b/runescape-client/src/main/java/ServerBuild.java
index 30b828ab0f..bbb329c86e 100644
--- a/runescape-client/src/main/java/ServerBuild.java
+++ b/runescape-client/src/main/java/ServerBuild.java
@@ -50,15 +50,15 @@ public class ServerBuild {
@Export("id")
public final int id;
+ ServerBuild(String var1, int var2) {
+ this.name = var1;
+ this.id = var2;
+ }
+
static {
__iy_m = new ServerBuild("LIVE", 0);
__iy_f = new ServerBuild("BUILDLIVE", 3);
__iy_q = new ServerBuild("RC", 1);
__iy_w = new ServerBuild("WIP", 2);
}
-
- ServerBuild(String var1, int var2) {
- this.name = var1;
- this.id = var2;
- }
}
diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java
index ec2fe9dc64..484b147891 100644
--- a/runescape-client/src/main/java/ServerPacket.java
+++ b/runescape-client/src/main/java/ServerPacket.java
@@ -536,6 +536,111 @@ public class ServerPacket {
@Export("length")
public final int length;
+ ServerPacket(int var1, int var2) {
+ this.id = var1;
+ this.length = var2;
+ }
+
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ signature = "(I)Llq;",
+ garbageValue = "2048918805"
+ )
+ static IndexedSprite method3663() {
+ IndexedSprite var0 = new IndexedSprite();
+ var0.width = class328.indexedSpriteWidth;
+ var0.height = class328.indexedSpriteHeight;
+ var0.xOffset = class328.indexedSpriteOffsetXs[0];
+ var0.yOffset = class328.indexedSpriteOffsetYs[0];
+ var0.subWidth = VarbitDefinition.indexedSpriteWidths[0];
+ var0.subHeight = SecureRandomCallable.indexedSpriteHeights[0];
+ var0.palette = class328.indexedSpritePalette;
+ var0.pixels = class328.spritePixels[0];
+ class328.indexedSpriteOffsetXs = null;
+ class328.indexedSpriteOffsetYs = null;
+ VarbitDefinition.indexedSpriteWidths = null;
+ SecureRandomCallable.indexedSpriteHeights = null;
+ class328.indexedSpritePalette = null;
+ class328.spritePixels = (byte[][])null;
+ return var0;
+ }
+
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ signature = "([BIIIIIIILem;[Lfy;I)V",
+ garbageValue = "-1257461571"
+ )
+ static final void method3662(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) {
+ Buffer var10 = new Buffer(var0);
+ int var11 = -1;
+
+ while(true) {
+ int var12 = var10.__at_308();
+ if(var12 == 0) {
+ return;
+ }
+
+ var11 += var12;
+ int var13 = 0;
+
+ while(true) {
+ int var14 = var10.__ae_307();
+ if(var14 == 0) {
+ break;
+ }
+
+ var13 += var14 - 1;
+ int var15 = var13 & 63;
+ int var16 = var13 >> 6 & 63;
+ int var17 = var13 >> 12;
+ int var18 = var10.readUnsignedByte();
+ int var19 = var18 >> 2;
+ int var20 = var18 & 3;
+ if(var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) {
+ ObjectDefinition var21 = class50.getObjectDefinition(var11);
+ int var22 = var16 & 7;
+ int var23 = var15 & 7;
+ int var24 = var21.sizeX;
+ int var25 = var21.sizeY;
+ int var26;
+ if((var20 & 1) == 1) {
+ var26 = var24;
+ var24 = var25;
+ var25 = var26;
+ }
+
+ int var27 = var7 & 3;
+ int var28;
+ if(var27 == 0) {
+ var28 = var22;
+ } else if(var27 == 1) {
+ var28 = var23;
+ } else if(var27 == 2) {
+ var28 = 7 - var22 - (var24 - 1);
+ } else {
+ var28 = 7 - var23 - (var25 - 1);
+ }
+
+ var26 = var2 + var28;
+ int var29 = var3 + class171.method3496(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20);
+ if(var26 > 0 && var29 > 0 && var26 < 103 && var29 < 103) {
+ int var30 = var1;
+ if((Tiles.Tiles_renderFlags[1][var26][var29] & 2) == 2) {
+ var30 = var1 - 1;
+ }
+
+ CollisionMap var31 = null;
+ if(var30 >= 0) {
+ var31 = var9[var30];
+ }
+
+ class227.method4446(var1, var26, var29, var11, var20 + var7 & 3, var19, var8, var31);
+ }
+ }
+ }
+ }
+ }
+
static {
__ge_m = new ServerPacket(0, -2);
__ge_f = new ServerPacket(1, 0);
@@ -623,109 +728,4 @@ public class ServerPacket {
__ge_cm = new ServerPacket(83, 6);
__ge_cj = new ServerPacket(84, 2);
}
-
- ServerPacket(int var1, int var2) {
- this.id = var1;
- this.length = var2;
- }
-
- @ObfuscatedName("g")
- @ObfuscatedSignature(
- signature = "(I)Llq;",
- garbageValue = "2048918805"
- )
- static IndexedSprite method3663() {
- IndexedSprite var0 = new IndexedSprite();
- var0.width = class328.indexedSpriteWidth;
- var0.height = class328.indexedSpriteHeight;
- var0.xOffset = class328.indexedSpriteOffsetXs[0];
- var0.yOffset = class328.indexedSpriteOffsetYs[0];
- var0.subWidth = VarbitDefinition.indexedSpriteWidths[0];
- var0.subHeight = SecureRandomCallable.indexedSpriteHeights[0];
- var0.palette = class328.indexedSpritePalette;
- var0.pixels = class328.spritePixels[0];
- class328.indexedSpriteOffsetXs = null;
- class328.indexedSpriteOffsetYs = null;
- VarbitDefinition.indexedSpriteWidths = null;
- SecureRandomCallable.indexedSpriteHeights = null;
- class328.indexedSpritePalette = null;
- class328.spritePixels = null;
- return var0;
- }
-
- @ObfuscatedName("g")
- @ObfuscatedSignature(
- signature = "([BIIIIIIILem;[Lfy;I)V",
- garbageValue = "-1257461571"
- )
- static final void method3662(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) {
- Buffer var10 = new Buffer(var0);
- int var11 = -1;
-
- while(true) {
- int var12 = var10.__at_308();
- if(var12 == 0) {
- return;
- }
-
- var11 += var12;
- int var13 = 0;
-
- while(true) {
- int var14 = var10.__ae_307();
- if(var14 == 0) {
- break;
- }
-
- var13 += var14 - 1;
- int var15 = var13 & 63;
- int var16 = var13 >> 6 & 63;
- int var17 = var13 >> 12;
- int var18 = var10.readUnsignedByte();
- int var19 = var18 >> 2;
- int var20 = var18 & 3;
- if(var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) {
- ObjectDefinition var21 = class50.getObjectDefinition(var11);
- int var24 = var16 & 7;
- int var25 = var15 & 7;
- int var27 = var21.sizeX;
- int var28 = var21.sizeY;
- int var29;
- if((var20 & 1) == 1) {
- var29 = var27;
- var27 = var28;
- var28 = var29;
- }
-
- int var26 = var7 & 3;
- int var23;
- if(var26 == 0) {
- var23 = var24;
- } else if(var26 == 1) {
- var23 = var25;
- } else if(var26 == 2) {
- var23 = 7 - var24 - (var27 - 1);
- } else {
- var23 = 7 - var25 - (var28 - 1);
- }
-
- var29 = var2 + var23;
- int var30 = var3 + class171.method3496(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20);
- if(var29 > 0 && var30 > 0 && var29 < 103 && var30 < 103) {
- int var31 = var1;
- if((Tiles.Tiles_renderFlags[1][var29][var30] & 2) == 2) {
- var31 = var1 - 1;
- }
-
- CollisionMap var32 = null;
- if(var31 >= 0) {
- var32 = var9[var31];
- }
-
- class227.method4446(var1, var29, var30, var11, var20 + var7 & 3, var19, var8, var32);
- }
- }
- }
- }
- }
}
diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java
index 469999c36d..2a2ed1d14e 100644
--- a/runescape-client/src/main/java/Skills.java
+++ b/runescape-client/src/main/java/Skills.java
@@ -16,20 +16,6 @@ public class Skills {
@Export("__hc_ef")
static int[] __hc_ef;
- static {
- Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false};
- Skills_experienceTable = new int[99];
- int var0 = 0;
-
- for(int var1 = 0; var1 < 99; ++var1) {
- int var2 = var1 + 1;
- int var3 = (int)((double)var2 + 300.0D * Math.pow(2.0D, (double)var2 / 7.0D));
- var0 += var3;
- Skills_experienceTable[var1] = var0 / 4;
- }
-
- }
-
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(II)Ljv;",
@@ -90,4 +76,18 @@ public class Skills {
return var1;
}
}
+
+ static {
+ Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false};
+ Skills_experienceTable = new int[99];
+ int var0 = 0;
+
+ for(int var1 = 0; var1 < 99; ++var1) {
+ int var2 = var1 + 1;
+ int var3 = (int)((double)var2 + 300.0D * Math.pow(2.0D, (double)var2 / 7.0D));
+ var0 += var3;
+ Skills_experienceTable[var1] = var0 / 4;
+ }
+
+ }
}
diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java
index 11816e754e..110d02e5e9 100644
--- a/runescape-client/src/main/java/SoundCache.java
+++ b/runescape-client/src/main/java/SoundCache.java
@@ -159,64 +159,66 @@ public class SoundCache {
for(int var6 = 0; var6 < var5; ++var6) {
char var7 = var0.charAt(var6 + var1);
- if(var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) {
- var3[var6 + var4] = (byte)var7;
- } else if(var7 == 8364) {
- var3[var6 + var4] = -128;
- } else if(var7 == 8218) {
- var3[var6 + var4] = -126;
- } else if(var7 == 402) {
- var3[var6 + var4] = -125;
- } else if(var7 == 8222) {
- var3[var6 + var4] = -124;
- } else if(var7 == 8230) {
- var3[var6 + var4] = -123;
- } else if(var7 == 8224) {
- var3[var6 + var4] = -122;
- } else if(var7 == 8225) {
- var3[var6 + var4] = -121;
- } else if(var7 == 710) {
- var3[var6 + var4] = -120;
- } else if(var7 == 8240) {
- var3[var6 + var4] = -119;
- } else if(var7 == 352) {
- var3[var6 + var4] = -118;
- } else if(var7 == 8249) {
- var3[var6 + var4] = -117;
- } else if(var7 == 338) {
- var3[var6 + var4] = -116;
- } else if(var7 == 381) {
- var3[var6 + var4] = -114;
- } else if(var7 == 8216) {
- var3[var6 + var4] = -111;
- } else if(var7 == 8217) {
- var3[var6 + var4] = -110;
- } else if(var7 == 8220) {
- var3[var6 + var4] = -109;
- } else if(var7 == 8221) {
- var3[var6 + var4] = -108;
- } else if(var7 == 8226) {
- var3[var6 + var4] = -107;
- } else if(var7 == 8211) {
- var3[var6 + var4] = -106;
- } else if(var7 == 8212) {
- var3[var6 + var4] = -105;
- } else if(var7 == 732) {
- var3[var6 + var4] = -104;
- } else if(var7 == 8482) {
- var3[var6 + var4] = -103;
- } else if(var7 == 353) {
- var3[var6 + var4] = -102;
- } else if(var7 == 8250) {
- var3[var6 + var4] = -101;
- } else if(var7 == 339) {
- var3[var6 + var4] = -100;
- } else if(var7 == 382) {
- var3[var6 + var4] = -98;
- } else if(var7 == 376) {
- var3[var6 + var4] = -97;
+ if((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) {
+ if(var7 == 8364) {
+ var3[var6 + var4] = -128;
+ } else if(var7 == 8218) {
+ var3[var6 + var4] = -126;
+ } else if(var7 == 402) {
+ var3[var6 + var4] = -125;
+ } else if(var7 == 8222) {
+ var3[var6 + var4] = -124;
+ } else if(var7 == 8230) {
+ var3[var6 + var4] = -123;
+ } else if(var7 == 8224) {
+ var3[var6 + var4] = -122;
+ } else if(var7 == 8225) {
+ var3[var6 + var4] = -121;
+ } else if(var7 == 710) {
+ var3[var6 + var4] = -120;
+ } else if(var7 == 8240) {
+ var3[var6 + var4] = -119;
+ } else if(var7 == 352) {
+ var3[var6 + var4] = -118;
+ } else if(var7 == 8249) {
+ var3[var6 + var4] = -117;
+ } else if(var7 == 338) {
+ var3[var6 + var4] = -116;
+ } else if(var7 == 381) {
+ var3[var6 + var4] = -114;
+ } else if(var7 == 8216) {
+ var3[var6 + var4] = -111;
+ } else if(var7 == 8217) {
+ var3[var6 + var4] = -110;
+ } else if(var7 == 8220) {
+ var3[var6 + var4] = -109;
+ } else if(var7 == 8221) {
+ var3[var6 + var4] = -108;
+ } else if(var7 == 8226) {
+ var3[var6 + var4] = -107;
+ } else if(var7 == 8211) {
+ var3[var6 + var4] = -106;
+ } else if(var7 == 8212) {
+ var3[var6 + var4] = -105;
+ } else if(var7 == 732) {
+ var3[var6 + var4] = -104;
+ } else if(var7 == 8482) {
+ var3[var6 + var4] = -103;
+ } else if(var7 == 353) {
+ var3[var6 + var4] = -102;
+ } else if(var7 == 8250) {
+ var3[var6 + var4] = -101;
+ } else if(var7 == 339) {
+ var3[var6 + var4] = -100;
+ } else if(var7 == 382) {
+ var3[var6 + var4] = -98;
+ } else if(var7 == 376) {
+ var3[var6 + var4] = -97;
+ } else {
+ var3[var6 + var4] = 63;
+ }
} else {
- var3[var6 + var4] = 63;
+ var3[var6 + var4] = (byte)var7;
}
}
diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java
index 798f86746b..279ac2a6ff 100644
--- a/runescape-client/src/main/java/SoundSystem.java
+++ b/runescape-client/src/main/java/SoundSystem.java
@@ -34,8 +34,8 @@ public class SoundSystem implements Runnable {
var2.run();
}
}
- } catch (Exception var4) {
- NpcDefinition.sendStackTrace((String)null, var4);
+ } catch (Exception var3) {
+ NPCDefinition.sendStackTrace((String)null, var3);
}
}
diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java
index b690fbb072..2d3c8ac8db 100644
--- a/runescape-client/src/main/java/SpotAnimationDefinition.java
+++ b/runescape-client/src/main/java/SpotAnimationDefinition.java
@@ -92,11 +92,6 @@ public class SpotAnimationDefinition extends DualNode {
@Export("__z")
int __z;
- static {
- SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64);
- SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30);
- }
-
SpotAnimationDefinition() {
this.sequence = -1;
this.widthScale = 128;
@@ -240,4 +235,9 @@ public class SpotAnimationDefinition extends DualNode {
static int method4822() {
return Client.isResizable?2:1;
}
+
+ static {
+ SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64);
+ SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30);
+ }
}
diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java
index a416d44c18..f70d76b3ad 100644
--- a/runescape-client/src/main/java/Sprite.java
+++ b/runescape-client/src/main/java/Sprite.java
@@ -105,6 +105,7 @@ public final class Sprite extends Rasterizer2D {
this.yOffset = 0;
this.xOffset = 0;
}
+
}
@ObfuscatedName("o")
@@ -147,6 +148,7 @@ public final class Sprite extends Rasterizer2D {
this.yOffset -= var2;
this.xOffset -= var4;
}
+
}
@ObfuscatedName("u")
@@ -268,6 +270,7 @@ public final class Sprite extends Rasterizer2D {
if(var6 > 0 && var5 > 0) {
Sprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, var4, var3, var6, var5, var7, var8);
}
+
}
@ObfuscatedName("a")
@@ -314,6 +317,7 @@ public final class Sprite extends Rasterizer2D {
if(var6 > 0 && var5 > 0) {
Sprite_andAnotherOne(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var4, var3, var6, var5, var7, var8);
}
+
}
@ObfuscatedName("j")
@@ -379,6 +383,7 @@ public final class Sprite extends Rasterizer2D {
Sprite_somethingElse(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var7, var8, var13, var14, var3, var4, var11, var12, var5);
}
+
}
@ObfuscatedName("t")
@@ -429,6 +434,7 @@ public final class Sprite extends Rasterizer2D {
Sprite_anotherOne(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var6, var5, var8, var7, var9, var10, var3, var4);
}
}
+
}
@ObfuscatedName("h")
@@ -475,6 +481,7 @@ public final class Sprite extends Rasterizer2D {
if(var7 > 0 && var6 > 0) {
Sprite_alpha1(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var5, var4, var7, var6, var8, var9, var3);
}
+
}
@ObfuscatedName("c")
@@ -540,6 +547,7 @@ public final class Sprite extends Rasterizer2D {
Sprite_alpha2(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var8, var9, var14, var15, var3, var4, var12, var13, var6, var5);
}
+
}
@ObfuscatedName("v")
@@ -589,8 +597,8 @@ public final class Sprite extends Rasterizer2D {
} else {
method6075(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3);
}
-
}
+
}
@ObfuscatedName("aj")
@@ -659,8 +667,8 @@ public final class Sprite extends Rasterizer2D {
} else {
method6078(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5);
}
-
}
+
}
@ObfuscatedName("ac")
@@ -669,11 +677,10 @@ public final class Sprite extends Rasterizer2D {
int var9 = var2 < 0?-var2:0;
int var10 = var2 + this.subHeight <= var6?this.subHeight:var6 - var2;
int var11 = var1 < 0?-var1:0;
- int var10000;
if(this.subWidth + var1 <= var5) {
- var10000 = this.subWidth;
+ int var12 = this.subWidth;
} else {
- var10000 = var5 - var1;
+ int var10000 = var5 - var1;
}
int var13 = var3 + var11 + (var9 + var2 + var4) * Rasterizer2D.Rasterizer2D_width + var1;
@@ -691,17 +698,17 @@ public final class Sprite extends Rasterizer2D {
var19 = var11;
}
- int var12;
+ int var20;
if(this.subWidth + var1 <= var16 + var17) {
- var12 = this.subWidth;
+ var20 = this.subWidth;
} else {
- var12 = var16 + var17 - var1;
+ var20 = var16 + var17 - var1;
}
- for(int var20 = var19; var20 < var12; ++var20) {
- int var21 = this.pixels[var20 + var15 * this.subWidth];
- if(var21 != 0) {
- Rasterizer2D.Rasterizer2D_pixels[var18++] = var21;
+ for(int var21 = var19; var21 < var20; ++var21) {
+ int var22 = this.pixels[var21 + var15 * this.subWidth];
+ if(var22 != 0) {
+ Rasterizer2D.Rasterizer2D_pixels[var18++] = var22;
} else {
++var18;
}
@@ -742,7 +749,7 @@ public final class Sprite extends Rasterizer2D {
var16 += var14;
var17 += Rasterizer2D.Rasterizer2D_width;
}
- } catch (Exception var23) {
+ } catch (Exception var22) {
;
}
@@ -783,7 +790,7 @@ public final class Sprite extends Rasterizer2D {
var15 += var13;
var16 += Rasterizer2D.Rasterizer2D_width;
}
- } catch (Exception var22) {
+ } catch (Exception var21) {
;
}
@@ -1259,10 +1266,10 @@ public final class Sprite extends Rasterizer2D {
var31 += var27;
}
}
-
}
}
}
+
}
@ObfuscatedName("al")
@@ -1380,9 +1387,9 @@ public final class Sprite extends Rasterizer2D {
var9 += var10;
}
-
}
}
+
} else {
throw new IllegalArgumentException();
}
diff --git a/runescape-client/src/main/java/SpriteIds.java b/runescape-client/src/main/java/SpriteIds.java
index e621c81af8..5bbf397c8e 100644
--- a/runescape-client/src/main/java/SpriteIds.java
+++ b/runescape-client/src/main/java/SpriteIds.java
@@ -133,22 +133,22 @@ public class SpriteIds {
if(!SpriteMask.method4392(var0, var2, var3)) {
return null;
} else {
- byte[] var5 = var1.takeRecord(var2, var3);
- Font var4;
- if(var5 == null) {
- var4 = null;
+ byte[] var4 = var1.takeRecord(var2, var3);
+ Font var5;
+ if(var4 == null) {
+ var5 = null;
} else {
- Font var6 = new Font(var5, class328.indexedSpriteOffsetXs, class328.indexedSpriteOffsetYs, VarbitDefinition.indexedSpriteWidths, SecureRandomCallable.indexedSpriteHeights, class328.indexedSpritePalette, class328.spritePixels);
+ Font var6 = new Font(var4, class328.indexedSpriteOffsetXs, class328.indexedSpriteOffsetYs, VarbitDefinition.indexedSpriteWidths, SecureRandomCallable.indexedSpriteHeights, class328.indexedSpritePalette, class328.spritePixels);
class328.indexedSpriteOffsetXs = null;
class328.indexedSpriteOffsetYs = null;
VarbitDefinition.indexedSpriteWidths = null;
SecureRandomCallable.indexedSpriteHeights = null;
class328.indexedSpritePalette = null;
- class328.spritePixels = null;
- var4 = var6;
+ class328.spritePixels = (byte[][])null;
+ var5 = var6;
}
- return var4;
+ return var5;
}
}
diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java
index 25f84bfa89..87709cb762 100644
--- a/runescape-client/src/main/java/Strings.java
+++ b/runescape-client/src/main/java/Strings.java
@@ -22,14 +22,6 @@ public class Strings {
@Export("__id_ju")
public static String __id_ju;
- static {
- __id_bq = "Please visit the support page for assistance.";
- __id_cp = "Please visit the support page for assistance.";
- __id_jr = "";
- __id_jv = "Page has opened in a new window.";
- __id_ju = "(Please check your popup blocker.)";
- }
-
@ObfuscatedName("ay")
@ObfuscatedSignature(
signature = "([BI)[B",
@@ -40,26 +32,36 @@ public class Strings {
Buffer var1 = new Buffer(var0);
int var2 = var1.readUnsignedByte();
int var3 = var1.readInt();
- if(var3 < 0 || AbstractIndexCache.__ir_s != 0 && var3 > AbstractIndexCache.__ir_s) {
- throw new RuntimeException();
- } else if(var2 == 0) {
- byte[] var4 = new byte[var3];
- var1.__al_305(var4, 0, var3);
- return var4;
- } else {
- int var6 = var1.readInt();
- if(var6 < 0 || AbstractIndexCache.__ir_s != 0 && var6 > AbstractIndexCache.__ir_s) {
- throw new RuntimeException();
+ if(var3 >= 0 && (AbstractIndexCache.__ir_s == 0 || var3 <= AbstractIndexCache.__ir_s)) {
+ if(var2 == 0) {
+ byte[] var6 = new byte[var3];
+ var1.__al_305(var6, 0, var3);
+ return var6;
} else {
- byte[] var5 = new byte[var6];
- if(var2 == 1) {
- Bzip2Decompressor.Bzip2Decompressor_decompress(var5, var6, var0, var3, 9);
+ int var4 = var1.readInt();
+ if(var4 < 0 || AbstractIndexCache.__ir_s != 0 && var4 > AbstractIndexCache.__ir_s) {
+ throw new RuntimeException();
} else {
- AbstractIndexCache.gzipDecompressor.decompress(var1, var5);
- }
+ byte[] var5 = new byte[var4];
+ if(var2 == 1) {
+ Bzip2Decompressor.Bzip2Decompressor_decompress(var5, var4, var0, var3, 9);
+ } else {
+ AbstractIndexCache.gzipDecompressor.decompress(var1, var5);
+ }
- return var5;
+ return var5;
+ }
}
+ } else {
+ throw new RuntimeException();
}
}
+
+ static {
+ __id_bq = "Please visit the support page for assistance.";
+ __id_cp = "Please visit the support page for assistance.";
+ __id_jr = "";
+ __id_jv = "Page has opened in a new window.";
+ __id_ju = "(Please check your popup blocker.)";
+ }
}
diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java
index 57bbe957ab..e51930d323 100644
--- a/runescape-client/src/main/java/StructDefinition.java
+++ b/runescape-client/src/main/java/StructDefinition.java
@@ -25,10 +25,6 @@ public class StructDefinition extends DualNode {
@Export("params")
IterableNodeHashTable params;
- static {
- __jq_f = new EvictingDualNodeHashTable(64);
- }
-
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "(B)V",
@@ -75,20 +71,20 @@ public class StructDefinition extends DualNode {
)
@Export("getIntParam")
public int getIntParam(int var1, int var2) {
- IterableNodeHashTable var4 = this.params;
- int var3;
- if(var4 == null) {
- var3 = var2;
+ IterableNodeHashTable var3 = this.params;
+ int var4;
+ if(var3 == null) {
+ var4 = var2;
} else {
- IntegerNode var5 = (IntegerNode)var4.get((long)var1);
+ IntegerNode var5 = (IntegerNode)var3.get((long)var1);
if(var5 == null) {
- var3 = var2;
+ var4 = var2;
} else {
- var3 = var5.integer;
+ var4 = var5.integer;
}
}
- return var3;
+ return var4;
}
@ObfuscatedName("u")
@@ -107,181 +103,181 @@ public class StructDefinition extends DualNode {
garbageValue = "2127224103"
)
static int method4952(int var0, Script var1, boolean var2) {
- int var4 = -1;
- Widget var3;
+ int var3 = -1;
+ Widget var4;
if(var0 >= 2000) {
var0 -= 1000;
- var4 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var3 = Huffman.getWidget(var4);
+ var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ var4 = Huffman.getWidget(var3);
} else {
- var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
+ var4 = var2?WorldMapIcon1.__t_i:class12.__n_n;
}
if(var0 == 1100) {
class179.Interpreter_intStackSize -= 2;
- var3.scrollX = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- if(var3.scrollX > var3.scrollWidth - var3.width) {
- var3.scrollX = var3.scrollWidth - var3.width;
+ var4.scrollX = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
+ if(var4.scrollX > var4.scrollWidth - var4.width) {
+ var4.scrollX = var4.scrollWidth - var4.width;
}
- if(var3.scrollX < 0) {
- var3.scrollX = 0;
+ if(var4.scrollX < 0) {
+ var4.scrollX = 0;
}
- var3.scrollY = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- if(var3.scrollY > var3.scrollHeight - var3.height) {
- var3.scrollY = var3.scrollHeight - var3.height;
+ var4.scrollY = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
+ if(var4.scrollY > var4.scrollHeight - var4.height) {
+ var4.scrollY = var4.scrollHeight - var4.height;
}
- if(var3.scrollY < 0) {
- var3.scrollY = 0;
+ if(var4.scrollY < 0) {
+ var4.scrollY = 0;
}
- class22.method295(var3);
+ class22.method295(var4);
return 1;
} else if(var0 == 1101) {
- var3.color = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- class22.method295(var3);
+ var4.color = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ class22.method295(var4);
return 1;
} else if(var0 == 1102) {
- var3.fill = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- class22.method295(var3);
+ var4.fill = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ class22.method295(var4);
return 1;
} else if(var0 == 1103) {
- var3.transparency = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- class22.method295(var3);
+ var4.transparency = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ class22.method295(var4);
return 1;
} else if(var0 == 1104) {
- var3.lineWid = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- class22.method295(var3);
+ var4.lineWid = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ class22.method295(var4);
return 1;
} else if(var0 == 1105) {
- var3.spriteId2 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- class22.method295(var3);
+ var4.spriteId2 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ class22.method295(var4);
return 1;
} else if(var0 == 1106) {
- var3.spriteAngle = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- class22.method295(var3);
+ var4.spriteAngle = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ class22.method295(var4);
return 1;
} else if(var0 == 1107) {
- var3.spriteTiling = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- class22.method295(var3);
+ var4.spriteTiling = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ class22.method295(var4);
return 1;
} else if(var0 == 1108) {
- var3.modelType = 1;
- var3.modelId = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- class22.method295(var3);
+ var4.modelType = 1;
+ var4.modelId = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ class22.method295(var4);
return 1;
} else if(var0 == 1109) {
class179.Interpreter_intStackSize -= 6;
- var3.modelOffsetX = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var3.modelOffsetY = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- var3.modelAngleX = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
- var3.modelAngleY = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3];
- var3.modelAngleZ = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 4];
- var3.modelZoom = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 5];
- class22.method295(var3);
+ var4.modelOffsetX = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
+ var4.modelOffsetY = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
+ var4.modelAngleX = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
+ var4.modelAngleY = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3];
+ var4.modelAngleZ = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 4];
+ var4.modelZoom = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 5];
+ class22.method295(var4);
return 1;
} else {
- int var8;
+ int var5;
if(var0 == 1110) {
- var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- if(var8 != var3.sequenceId) {
- var3.sequenceId = var8;
- var3.modelFrame = 0;
- var3.modelFrameCycle = 0;
- class22.method295(var3);
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ if(var5 != var4.sequenceId) {
+ var4.sequenceId = var5;
+ var4.modelFrame = 0;
+ var4.modelFrameCycle = 0;
+ class22.method295(var4);
}
return 1;
} else if(var0 == 1111) {
- var3.modelOrthog = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- class22.method295(var3);
+ var4.modelOrthog = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ class22.method295(var4);
return 1;
} else if(var0 == 1112) {
- String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- if(!var7.equals(var3.text)) {
- var3.text = var7;
- class22.method295(var3);
+ String var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ if(!var8.equals(var4.text)) {
+ var4.text = var8;
+ class22.method295(var4);
}
return 1;
} else if(var0 == 1113) {
- var3.fontId = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- class22.method295(var3);
+ var4.fontId = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ class22.method295(var4);
return 1;
} else if(var0 == 1114) {
class179.Interpreter_intStackSize -= 3;
- var3.textXAlignment = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var3.textYAlignment = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- var3.textLineHeight = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
- class22.method295(var3);
+ var4.textXAlignment = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
+ var4.textYAlignment = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
+ var4.textLineHeight = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
+ class22.method295(var4);
return 1;
} else if(var0 == 1115) {
- var3.textShadowed = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- class22.method295(var3);
+ var4.textShadowed = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ class22.method295(var4);
return 1;
} else if(var0 == 1116) {
- var3.outline = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- class22.method295(var3);
+ var4.outline = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ class22.method295(var4);
return 1;
} else if(var0 == 1117) {
- var3.spriteShadow = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- class22.method295(var3);
+ var4.spriteShadow = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ class22.method295(var4);
return 1;
} else if(var0 == 1118) {
- var3.spriteFlipV = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- class22.method295(var3);
+ var4.spriteFlipV = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ class22.method295(var4);
return 1;
} else if(var0 == 1119) {
- var3.spriteFlipH = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- class22.method295(var3);
+ var4.spriteFlipH = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ class22.method295(var4);
return 1;
} else if(var0 == 1120) {
class179.Interpreter_intStackSize -= 2;
- var3.scrollWidth = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var3.scrollHeight = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- class22.method295(var3);
- if(var4 != -1 && var3.type == 0) {
- class39.revalidateWidgetScroll(Widget.widgets[var4 >> 16], var3, false);
+ var4.scrollWidth = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
+ var4.scrollHeight = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
+ class22.method295(var4);
+ if(var3 != -1 && var4.type == 0) {
+ class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false);
}
return 1;
} else if(var0 == 1121) {
- TilePaint.method3060(var3.id, var3.childIndex);
- Client.__client_mo = var3;
- class22.method295(var3);
+ TilePaint.method3060(var4.id, var4.childIndex);
+ Client.__client_mo = var4;
+ class22.method295(var4);
return 1;
} else if(var0 == 1122) {
- var3.spriteId = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- class22.method295(var3);
+ var4.spriteId = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ class22.method295(var4);
return 1;
} else if(var0 == 1123) {
- var3.color2 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- class22.method295(var3);
+ var4.color2 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ class22.method295(var4);
return 1;
} else if(var0 == 1124) {
- var3.__af = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- class22.method295(var3);
+ var4.__af = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ class22.method295(var4);
return 1;
} else if(var0 == 1125) {
- var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- RectangleMode var6 = (RectangleMode)ScriptFrame.findEnumerated(class311.method5822(), var8);
- if(var6 != null) {
- var3.rectangleMode = var6;
- class22.method295(var3);
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ RectangleMode var7 = (RectangleMode)ScriptFrame.findEnumerated(class311.method5822(), var5);
+ if(var7 != null) {
+ var4.rectangleMode = var7;
+ class22.method295(var4);
}
return 1;
} else {
- boolean var5;
+ boolean var6;
if(var0 == 1126) {
- var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- var3.__ba = var5;
+ var6 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ var4.__ba = var6;
return 1;
} else if(var0 == 1127) {
- var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- var3.__bv = var5;
+ var6 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ var4.__bv = var6;
return 1;
} else {
return 2;
@@ -289,4 +285,8 @@ public class StructDefinition extends DualNode {
}
}
}
+
+ static {
+ __jq_f = new EvictingDualNodeHashTable(64);
+ }
}
diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java
index 6f03e0a231..0cac8c6353 100644
--- a/runescape-client/src/main/java/StudioGame.java
+++ b/runescape-client/src/main/java/StudioGame.java
@@ -30,7 +30,7 @@ public enum StudioGame implements Enumerated {
signature = "Lis;"
)
@Export("__is_w")
- __is_w("game4", "Game 4", 3),
+ __is_w("game4", "Game 4", 3),
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "Lis;"
@@ -43,7 +43,7 @@ public enum StudioGame implements Enumerated {
)
@Export("__is_u")
__is_u("oldscape", "RuneScape 2007", 5);
-
+
@ObfuscatedName("g")
@Export("name")
public final String name;
@@ -53,8 +53,8 @@ public enum StudioGame implements Enumerated {
)
@Export("id")
final int id;
-
- StudioGame(String var3, String var4, int var5) {
+
+ private StudioGame(String var3, String var4, int var5) {
this.name = var3;
this.id = var5;
}
diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java
index 0ab109ab03..9e7d086c56 100644
--- a/runescape-client/src/main/java/TaskHandler.java
+++ b/runescape-client/src/main/java/TaskHandler.java
@@ -148,30 +148,30 @@ public class TaskHandler implements Runnable {
try {
this.wait();
- } catch (InterruptedException var8) {
+ } catch (InterruptedException var7) {
;
}
}
}
try {
- int var5 = var1.type;
- if(var5 == 1) {
+ int var2 = var1.type;
+ if(var2 == 1) {
var1.result = new Socket(InetAddress.getByName((String)var1.objectArgument), var1.intArgument);
- } else if(var5 == 2) {
+ } else if(var2 == 2) {
Thread var3 = new Thread((Runnable)var1.objectArgument);
var3.setDaemon(true);
var3.start();
var3.setPriority(var1.intArgument);
var1.result = var3;
- } else if(var5 == 4) {
+ } else if(var2 == 4) {
var1.result = new DataInputStream(((URL)var1.objectArgument).openStream());
}
var1.status = 1;
- } catch (ThreadDeath var6) {
- throw var6;
- } catch (Throwable var7) {
+ } catch (ThreadDeath var5) {
+ throw var5;
+ } catch (Throwable var6) {
var1.status = 2;
}
}
diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java
index ee59d8609c..d9e140e229 100644
--- a/runescape-client/src/main/java/Texture.java
+++ b/runescape-client/src/main/java/Texture.java
@@ -203,7 +203,7 @@ public class Texture extends Node {
int var5;
int var6;
int var7;
- int[] var10;
+ int[] var8;
if(this.animationDirection == 1 || this.animationDirection == 3) {
if(Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) {
Texture_animatedPixels = new int[this.pixels.length];
@@ -227,9 +227,9 @@ public class Texture extends Node {
Texture_animatedPixels[var6] = this.pixels[var7];
}
- var10 = this.pixels;
+ var8 = this.pixels;
this.pixels = Texture_animatedPixels;
- Texture_animatedPixels = var10;
+ Texture_animatedPixels = var8;
}
if(this.animationDirection == 2 || this.animationDirection == 4) {
@@ -252,17 +252,17 @@ public class Texture extends Node {
for(var6 = 0; var6 < var3; var6 += var2) {
for(var7 = 0; var7 < var2; ++var7) {
- int var8 = var6 + var7;
- int var9 = var6 + (var7 + var4 & var5);
- Texture_animatedPixels[var8] = this.pixels[var9];
+ int var9 = var6 + var7;
+ int var10 = var6 + (var7 + var4 & var5);
+ Texture_animatedPixels[var9] = this.pixels[var10];
}
}
- var10 = this.pixels;
+ var8 = this.pixels;
this.pixels = Texture_animatedPixels;
- Texture_animatedPixels = var10;
+ Texture_animatedPixels = var8;
}
-
}
+
}
}
diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java
index 07bb12eef5..2fea63be05 100644
--- a/runescape-client/src/main/java/TextureProvider.java
+++ b/runescape-client/src/main/java/TextureProvider.java
@@ -237,14 +237,14 @@ public class TextureProvider implements TextureLoader {
if(var0 == null) {
return null;
} else if(var0 instanceof byte[]) {
- byte[] var6 = (byte[])((byte[])var0);
+ byte[] var5 = (byte[])((byte[])((byte[])var0));
if(var1) {
- int var4 = var6.length;
- byte[] var5 = new byte[var4];
- System.arraycopy(var6, 0, var5, 0, var4);
- return var5;
+ int var3 = var5.length;
+ byte[] var4 = new byte[var3];
+ System.arraycopy(var5, 0, var4, 0, var3);
+ return var4;
} else {
- return var6;
+ return var5;
}
} else if(var0 instanceof AbstractByteArrayCopier) {
AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0;
@@ -264,7 +264,7 @@ public class TextureProvider implements TextureLoader {
Buffer var4 = new Buffer(var0);
int var5 = -1;
- label69:
+ label71:
while(true) {
int var6 = var4.__at_308();
if(var6 == 0) {
@@ -276,38 +276,50 @@ public class TextureProvider implements TextureLoader {
boolean var8 = false;
while(true) {
- int var9;
- while(!var8) {
- var9 = var4.__ae_307();
- if(var9 == 0) {
- continue label69;
- }
+ int var12;
+ ObjectDefinition var15;
+ do {
+ int var13;
+ int var14;
+ do {
+ do {
+ do {
+ do {
+ int var9;
+ while(var8) {
+ var9 = var4.__ae_307();
+ if(var9 == 0) {
+ continue label71;
+ }
- var7 += var9 - 1;
- int var10 = var7 & 63;
- int var11 = var7 >> 6 & 63;
- int var12 = var4.readUnsignedByte() >> 2;
- int var13 = var11 + var1;
- int var14 = var10 + var2;
- if(var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) {
- ObjectDefinition var15 = class50.getObjectDefinition(var5);
- if(var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) {
- if(!var15.__g_422()) {
- ++Client.__client_fk;
- var3 = false;
- }
+ var4.readUnsignedByte();
+ }
- var8 = true;
- }
- }
+ var9 = var4.__ae_307();
+ if(var9 == 0) {
+ continue label71;
+ }
+
+ var7 += var9 - 1;
+ int var10 = var7 & 63;
+ int var11 = var7 >> 6 & 63;
+ var12 = var4.readUnsignedByte() >> 2;
+ var13 = var11 + var1;
+ var14 = var10 + var2;
+ } while(var13 <= 0);
+ } while(var14 <= 0);
+ } while(var13 >= 103);
+ } while(var14 >= 103);
+
+ var15 = class50.getObjectDefinition(var5);
+ } while(var12 == 22 && Client.isLowDetail && var15.int1 == 0 && var15.interactType != 1 && !var15.boolean2);
+
+ if(!var15.__g_422()) {
+ ++Client.__client_fk;
+ var3 = false;
}
- var9 = var4.__ae_307();
- if(var9 == 0) {
- break;
- }
-
- var4.readUnsignedByte();
+ var8 = true;
}
}
}
@@ -356,10 +368,10 @@ public class TextureProvider implements TextureLoader {
class179.Interpreter_intStackSize -= 5;
var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- int var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
+ int var11 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
int var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3];
- int var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 4];
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5);
+ int var12 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 4];
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3 + (var12 - var11) * (var4 - var3) / (var6 - var11);
return 1;
} else if(var0 == 4007) {
class179.Interpreter_intStackSize -= 2;
@@ -446,10 +458,10 @@ public class TextureProvider implements TextureLoader {
return 1;
} else if(var0 == 4018) {
class179.Interpreter_intStackSize -= 3;
- long var9 = (long)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- long var11 = (long)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- long var13 = (long)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11);
+ long var5 = (long)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
+ long var7 = (long)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
+ long var9 = (long)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (int)(var9 * var5 / var7);
return 1;
} else {
return 2;
diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java
index f4bff62ad3..af37a5a06e 100644
--- a/runescape-client/src/main/java/Tile.java
+++ b/runescape-client/src/main/java/Tile.java
@@ -158,132 +158,129 @@ public final class Tile extends Node {
garbageValue = "117"
)
@Export("addNpcToMenu")
- static final void addNpcToMenu(NpcDefinition var0, int var1, int var2, int var3) {
+ static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) {
if(Client.menuOptionsCount < 400) {
if(var0.transforms != null) {
var0 = var0.transform();
}
- if(var0 != null) {
- if(var0.isInteractable) {
- if(!var0.isFollower || Client.followerIndex == var1) {
- String var4 = var0.name;
- int var7;
- int var8;
- if(var0.combatLevel != 0) {
- var7 = var0.combatLevel;
- var8 = Canvas.localPlayer.combatLevel;
- int var9 = var8 - var7;
- String var6;
- if(var9 < -9) {
- var6 = BufferedFile.colorStartTag(16711680);
- } else if(var9 < -6) {
- var6 = BufferedFile.colorStartTag(16723968);
- } else if(var9 < -3) {
- var6 = BufferedFile.colorStartTag(16740352);
- } else if(var9 < 0) {
- var6 = BufferedFile.colorStartTag(16756736);
- } else if(var9 > 9) {
- var6 = BufferedFile.colorStartTag(65280);
- } else if(var9 > 6) {
- var6 = BufferedFile.colorStartTag(4259584);
- } else if(var9 > 3) {
- var6 = BufferedFile.colorStartTag(8453888);
- } else if(var9 > 0) {
- var6 = BufferedFile.colorStartTag(12648192);
- } else {
- var6 = BufferedFile.colorStartTag(16776960);
+ if(var0 != null && var0.isInteractable && (!var0.isFollower || Client.followerIndex == var1)) {
+ String var4 = var0.name;
+ int var5;
+ int var6;
+ int var7;
+ if(var0.combatLevel != 0) {
+ var5 = var0.combatLevel;
+ var6 = Canvas.localPlayer.combatLevel;
+ var7 = var6 - var5;
+ String var8;
+ if(var7 < -9) {
+ var8 = BufferedFile.colorStartTag(16711680);
+ } else if(var7 < -6) {
+ var8 = BufferedFile.colorStartTag(16723968);
+ } else if(var7 < -3) {
+ var8 = BufferedFile.colorStartTag(16740352);
+ } else if(var7 < 0) {
+ var8 = BufferedFile.colorStartTag(16756736);
+ } else if(var7 > 9) {
+ var8 = BufferedFile.colorStartTag(65280);
+ } else if(var7 > 6) {
+ var8 = BufferedFile.colorStartTag(4259584);
+ } else if(var7 > 3) {
+ var8 = BufferedFile.colorStartTag(8453888);
+ } else if(var7 > 0) {
+ var8 = BufferedFile.colorStartTag(12648192);
+ } else {
+ var8 = BufferedFile.colorStartTag(16776960);
+ }
+
+ var4 = var4 + var8 + " (level-" + var0.combatLevel + ")";
+ }
+
+ if(var0.isFollower && Client.followerOpsLowPriority) {
+ Tiles.method1106("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
+ }
+
+ if(Client.isItemSelected == 1) {
+ Tiles.method1106("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16776960) + var4, 7, var1, var2, var3);
+ } else if(Client.isSpellSelected) {
+ if((FloorDecoration.selectedSpellFlags & 2) == 2) {
+ Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16776960) + var4, 8, var1, var2, var3);
+ }
+ } else {
+ var7 = var0.isFollower && Client.followerOpsLowPriority?2000:0;
+ String[] var10 = var0.actions;
+ if(var10 != null) {
+ for(var5 = 4; var5 >= 0; --var5) {
+ if(var10[var5] != null && !var10[var5].equalsIgnoreCase("Attack")) {
+ var6 = 0;
+ if(var5 == 0) {
+ var6 = var7 + 9;
+ }
+
+ if(var5 == 1) {
+ var6 = var7 + 10;
+ }
+
+ if(var5 == 2) {
+ var6 = var7 + 11;
+ }
+
+ if(var5 == 3) {
+ var6 = var7 + 12;
+ }
+
+ if(var5 == 4) {
+ var6 = var7 + 13;
+ }
+
+ Tiles.method1106(var10[var5], BufferedFile.colorStartTag(16776960) + var4, var6, var1, var2, var3);
}
-
- var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")";
}
+ }
- if(var0.isFollower && Client.followerOpsLowPriority) {
- Tiles.method1106("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
- }
-
- if(Client.isItemSelected == 1) {
- Tiles.method1106("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16776960) + var4, 7, var1, var2, var3);
- } else if(Client.isSpellSelected) {
- if((FloorDecoration.selectedSpellFlags & 2) == 2) {
- Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16776960) + var4, 8, var1, var2, var3);
- }
- } else {
- int var10 = var0.isFollower && Client.followerOpsLowPriority?2000:0;
- String[] var11 = var0.actions;
- if(var11 != null) {
- for(var7 = 4; var7 >= 0; --var7) {
- if(var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) {
- var8 = 0;
- if(var7 == 0) {
- var8 = var10 + 9;
- }
-
- if(var7 == 1) {
- var8 = var10 + 10;
- }
-
- if(var7 == 2) {
- var8 = var10 + 11;
- }
-
- if(var7 == 3) {
- var8 = var10 + 12;
- }
-
- if(var7 == 4) {
- var8 = var10 + 13;
- }
-
- Tiles.method1106(var11[var7], BufferedFile.colorStartTag(16776960) + var4, var8, var1, var2, var3);
+ if(var10 != null) {
+ for(var5 = 4; var5 >= 0; --var5) {
+ if(var10[var5] != null && var10[var5].equalsIgnoreCase("Attack")) {
+ short var9 = 0;
+ if(AttackOption.AttackOption_hidden != Client.npcAttackOption) {
+ if(AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > Canvas.localPlayer.combatLevel) {
+ var9 = 2000;
}
+
+ var6 = 0;
+ if(var5 == 0) {
+ var6 = var9 + 9;
+ }
+
+ if(var5 == 1) {
+ var6 = var9 + 10;
+ }
+
+ if(var5 == 2) {
+ var6 = var9 + 11;
+ }
+
+ if(var5 == 3) {
+ var6 = var9 + 12;
+ }
+
+ if(var5 == 4) {
+ var6 = var9 + 13;
+ }
+
+ Tiles.method1106(var10[var5], BufferedFile.colorStartTag(16776960) + var4, var6, var1, var2, var3);
}
}
-
- if(var11 != null) {
- for(var7 = 4; var7 >= 0; --var7) {
- if(var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) {
- short var12 = 0;
- if(AttackOption.AttackOption_hidden != Client.npcAttackOption) {
- if(AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > Canvas.localPlayer.combatLevel) {
- var12 = 2000;
- }
-
- var8 = 0;
- if(var7 == 0) {
- var8 = var12 + 9;
- }
-
- if(var7 == 1) {
- var8 = var12 + 10;
- }
-
- if(var7 == 2) {
- var8 = var12 + 11;
- }
-
- if(var7 == 3) {
- var8 = var12 + 12;
- }
-
- if(var7 == 4) {
- var8 = var12 + 13;
- }
-
- Tiles.method1106(var11[var7], BufferedFile.colorStartTag(16776960) + var4, var8, var1, var2, var3);
- }
- }
- }
- }
-
- if(!var0.isFollower || !Client.followerOpsLowPriority) {
- Tiles.method1106("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
- }
}
+ }
+ if(!var0.isFollower || !Client.followerOpsLowPriority) {
+ Tiles.method1106("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
}
}
}
}
+
}
}
diff --git a/runescape-client/src/main/java/TileModel.java b/runescape-client/src/main/java/TileModel.java
index 5f6589ce02..cbc9bbd68f 100644
--- a/runescape-client/src/main/java/TileModel.java
+++ b/runescape-client/src/main/java/TileModel.java
@@ -72,16 +72,6 @@ public final class TileModel {
@Export("overlayRgb")
int overlayRgb;
- static {
- __dv_z = new int[6];
- __dv_j = new int[6];
- __dv_s = new int[6];
- __dv_t = new int[6];
- __dv_y = new int[6];
- __dv_h = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}};
- __dv_b = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}};
- }
-
TileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) {
this.isFlat = true;
if(var7 != var6 || var8 != var6 || var9 != var6) {
@@ -106,210 +96,220 @@ public final class TileModel {
int var28 = var20 * var4;
int var29 = var5 * var20;
+ int var30;
int var31;
int var32;
int var33;
int var34;
int var35;
- int var36;
- for(int var30 = 0; var30 < var25; ++var30) {
- var31 = var24[var30];
- if((var31 & 1) == 0 && var31 <= 8) {
- var31 = (var31 - var2 - var2 - 1 & 7) + 1;
+ for(int var36 = 0; var36 < var25; ++var36) {
+ var30 = var24[var36];
+ if((var30 & 1) == 0 && var30 <= 8) {
+ var30 = (var30 - var2 - var2 - 1 & 7) + 1;
}
- if(var31 > 8 && var31 <= 12) {
- var31 = (var31 - 9 - var2 & 3) + 9;
+ if(var30 > 8 && var30 <= 12) {
+ var30 = (var30 - 9 - var2 & 3) + 9;
}
- if(var31 > 12 && var31 <= 16) {
- var31 = (var31 - 13 - var2 & 3) + 13;
+ if(var30 > 12 && var30 <= 16) {
+ var30 = (var30 - 13 - var2 & 3) + 13;
}
- if(var31 == 1) {
- var32 = var28;
- var33 = var29;
- var34 = var6;
- var35 = var10;
- var36 = var14;
- } else if(var31 == 2) {
- var32 = var28 + var21;
- var33 = var29;
- var34 = var7 + var6 >> 1;
- var35 = var11 + var10 >> 1;
- var36 = var15 + var14 >> 1;
- } else if(var31 == 3) {
- var32 = var28 + var20;
- var33 = var29;
- var34 = var7;
- var35 = var11;
- var36 = var15;
- } else if(var31 == 4) {
- var32 = var28 + var20;
- var33 = var29 + var21;
- var34 = var8 + var7 >> 1;
- var35 = var11 + var12 >> 1;
- var36 = var15 + var16 >> 1;
- } else if(var31 == 5) {
- var32 = var28 + var20;
- var33 = var29 + var20;
- var34 = var8;
- var35 = var12;
- var36 = var16;
- } else if(var31 == 6) {
- var32 = var28 + var21;
- var33 = var29 + var20;
- var34 = var8 + var9 >> 1;
- var35 = var13 + var12 >> 1;
- var36 = var17 + var16 >> 1;
- } else if(var31 == 7) {
- var32 = var28;
- var33 = var29 + var20;
- var34 = var9;
- var35 = var13;
- var36 = var17;
- } else if(var31 == 8) {
- var32 = var28;
- var33 = var29 + var21;
- var34 = var9 + var6 >> 1;
- var35 = var13 + var10 >> 1;
- var36 = var17 + var14 >> 1;
- } else if(var31 == 9) {
- var32 = var28 + var21;
- var33 = var29 + var22;
- var34 = var7 + var6 >> 1;
- var35 = var11 + var10 >> 1;
- var36 = var15 + var14 >> 1;
- } else if(var31 == 10) {
- var32 = var28 + var23;
- var33 = var29 + var21;
- var34 = var8 + var7 >> 1;
- var35 = var11 + var12 >> 1;
- var36 = var15 + var16 >> 1;
- } else if(var31 == 11) {
- var32 = var28 + var21;
- var33 = var29 + var23;
- var34 = var8 + var9 >> 1;
- var35 = var13 + var12 >> 1;
- var36 = var17 + var16 >> 1;
- } else if(var31 == 12) {
- var32 = var28 + var22;
- var33 = var29 + var21;
- var34 = var9 + var6 >> 1;
- var35 = var13 + var10 >> 1;
- var36 = var17 + var14 >> 1;
- } else if(var31 == 13) {
- var32 = var28 + var22;
- var33 = var29 + var22;
- var34 = var6;
- var35 = var10;
- var36 = var14;
- } else if(var31 == 14) {
- var32 = var28 + var23;
- var33 = var29 + var22;
- var34 = var7;
- var35 = var11;
- var36 = var15;
- } else if(var31 == 15) {
- var32 = var28 + var23;
- var33 = var29 + var23;
- var34 = var8;
- var35 = var12;
- var36 = var16;
+ if(var30 == 1) {
+ var31 = var28;
+ var32 = var29;
+ var33 = var6;
+ var34 = var10;
+ var35 = var14;
+ } else if(var30 == 2) {
+ var31 = var28 + var21;
+ var32 = var29;
+ var33 = var7 + var6 >> 1;
+ var34 = var11 + var10 >> 1;
+ var35 = var15 + var14 >> 1;
+ } else if(var30 == 3) {
+ var31 = var28 + var20;
+ var32 = var29;
+ var33 = var7;
+ var34 = var11;
+ var35 = var15;
+ } else if(var30 == 4) {
+ var31 = var28 + var20;
+ var32 = var29 + var21;
+ var33 = var8 + var7 >> 1;
+ var34 = var11 + var12 >> 1;
+ var35 = var15 + var16 >> 1;
+ } else if(var30 == 5) {
+ var31 = var28 + var20;
+ var32 = var29 + var20;
+ var33 = var8;
+ var34 = var12;
+ var35 = var16;
+ } else if(var30 == 6) {
+ var31 = var28 + var21;
+ var32 = var29 + var20;
+ var33 = var8 + var9 >> 1;
+ var34 = var13 + var12 >> 1;
+ var35 = var17 + var16 >> 1;
+ } else if(var30 == 7) {
+ var31 = var28;
+ var32 = var29 + var20;
+ var33 = var9;
+ var34 = var13;
+ var35 = var17;
+ } else if(var30 == 8) {
+ var31 = var28;
+ var32 = var29 + var21;
+ var33 = var9 + var6 >> 1;
+ var34 = var13 + var10 >> 1;
+ var35 = var17 + var14 >> 1;
+ } else if(var30 == 9) {
+ var31 = var28 + var21;
+ var32 = var29 + var22;
+ var33 = var7 + var6 >> 1;
+ var34 = var11 + var10 >> 1;
+ var35 = var15 + var14 >> 1;
+ } else if(var30 == 10) {
+ var31 = var28 + var23;
+ var32 = var29 + var21;
+ var33 = var8 + var7 >> 1;
+ var34 = var11 + var12 >> 1;
+ var35 = var15 + var16 >> 1;
+ } else if(var30 == 11) {
+ var31 = var28 + var21;
+ var32 = var29 + var23;
+ var33 = var8 + var9 >> 1;
+ var34 = var13 + var12 >> 1;
+ var35 = var17 + var16 >> 1;
+ } else if(var30 == 12) {
+ var31 = var28 + var22;
+ var32 = var29 + var21;
+ var33 = var9 + var6 >> 1;
+ var34 = var13 + var10 >> 1;
+ var35 = var17 + var14 >> 1;
+ } else if(var30 == 13) {
+ var31 = var28 + var22;
+ var32 = var29 + var22;
+ var33 = var6;
+ var34 = var10;
+ var35 = var14;
+ } else if(var30 == 14) {
+ var31 = var28 + var23;
+ var32 = var29 + var22;
+ var33 = var7;
+ var34 = var11;
+ var35 = var15;
+ } else if(var30 == 15) {
+ var31 = var28 + var23;
+ var32 = var29 + var23;
+ var33 = var8;
+ var34 = var12;
+ var35 = var16;
} else {
- var32 = var28 + var22;
- var33 = var29 + var23;
- var34 = var9;
- var35 = var13;
- var36 = var17;
+ var31 = var28 + var22;
+ var32 = var29 + var23;
+ var33 = var9;
+ var34 = var13;
+ var35 = var17;
}
- this.vertexX[var30] = var32;
- this.vertexY[var30] = var34;
- this.vertexZ[var30] = var33;
- var26[var30] = var35;
- var27[var30] = var36;
+ this.vertexX[var36] = var31;
+ this.vertexY[var36] = var33;
+ this.vertexZ[var36] = var32;
+ var26[var36] = var34;
+ var27[var36] = var35;
}
int[] var38 = __dv_b[var1];
- var31 = var38.length / 4;
- this.faceX = new int[var31];
- this.faceY = new int[var31];
- this.faceZ = new int[var31];
- this.triangleColorA = new int[var31];
- this.triangleColorB = new int[var31];
- this.triangleColorC = new int[var31];
+ var30 = var38.length / 4;
+ this.faceX = new int[var30];
+ this.faceY = new int[var30];
+ this.faceZ = new int[var30];
+ this.triangleColorA = new int[var30];
+ this.triangleColorB = new int[var30];
+ this.triangleColorC = new int[var30];
if(var3 != -1) {
- this.triangleTextureId = new int[var31];
+ this.triangleTextureId = new int[var30];
}
- var32 = 0;
+ var31 = 0;
- for(var33 = 0; var33 < var31; ++var33) {
- var34 = var38[var32];
- var35 = var38[var32 + 1];
- var36 = var38[var32 + 2];
- int var37 = var38[var32 + 3];
- var32 += 4;
- if(var35 < 4) {
- var35 = var35 - var2 & 3;
+ for(var32 = 0; var32 < var30; ++var32) {
+ var33 = var38[var31];
+ var34 = var38[var31 + 1];
+ var35 = var38[var31 + 2];
+ int var37 = var38[var31 + 3];
+ var31 += 4;
+ if(var34 < 4) {
+ var34 = var34 - var2 & 3;
}
- if(var36 < 4) {
- var36 = var36 - var2 & 3;
+ if(var35 < 4) {
+ var35 = var35 - var2 & 3;
}
if(var37 < 4) {
var37 = var37 - var2 & 3;
}
- this.faceX[var33] = var35;
- this.faceY[var33] = var36;
- this.faceZ[var33] = var37;
- if(var34 == 0) {
- this.triangleColorA[var33] = var26[var35];
- this.triangleColorB[var33] = var26[var36];
- this.triangleColorC[var33] = var26[var37];
+ this.faceX[var32] = var34;
+ this.faceY[var32] = var35;
+ this.faceZ[var32] = var37;
+ if(var33 == 0) {
+ this.triangleColorA[var32] = var26[var34];
+ this.triangleColorB[var32] = var26[var35];
+ this.triangleColorC[var32] = var26[var37];
if(this.triangleTextureId != null) {
- this.triangleTextureId[var33] = -1;
+ this.triangleTextureId[var32] = -1;
}
} else {
- this.triangleColorA[var33] = var27[var35];
- this.triangleColorB[var33] = var27[var36];
- this.triangleColorC[var33] = var27[var37];
+ this.triangleColorA[var32] = var27[var34];
+ this.triangleColorB[var32] = var27[var35];
+ this.triangleColorC[var32] = var27[var37];
if(this.triangleTextureId != null) {
- this.triangleTextureId[var33] = var3;
+ this.triangleTextureId[var32] = var3;
}
}
}
- var33 = var6;
- var34 = var7;
+ var32 = var6;
+ var33 = var7;
if(var7 < var6) {
- var33 = var7;
+ var32 = var7;
}
if(var7 > var7) {
- var34 = var7;
+ var33 = var7;
}
- if(var8 < var33) {
+ if(var8 < var32) {
+ var32 = var8;
+ }
+
+ if(var8 > var33) {
var33 = var8;
}
- if(var8 > var34) {
- var34 = var8;
+ if(var9 < var32) {
+ var32 = var9;
}
- if(var9 < var33) {
+ if(var9 > var33) {
var33 = var9;
}
- if(var9 > var34) {
- var34 = var9;
- }
-
+ var32 /= 14;
var33 /= 14;
- var34 /= 14;
+ }
+
+ static {
+ __dv_z = new int[6];
+ __dv_j = new int[6];
+ __dv_s = new int[6];
+ __dv_t = new int[6];
+ __dv_y = new int[6];
+ __dv_h = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}};
+ __dv_b = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}};
}
}
diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java
index 0a2baa9bb2..1d2ab9c9f2 100644
--- a/runescape-client/src/main/java/TilePaint.java
+++ b/runescape-client/src/main/java/TilePaint.java
@@ -95,25 +95,26 @@ public final class TilePaint {
class65.scene.removeGroundItemPile(SoundSystem.plane, var0, var1);
} else {
var2.addLast(var5);
- GroundItem var12 = null;
GroundItem var11 = null;
+ GroundItem var12 = null;
for(var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) {
if(var5.id != var6.id) {
- if(var12 == null) {
- var12 = var6;
+ if(var11 == null) {
+ var11 = var6;
}
- if(var12.id != var6.id && var11 == null) {
- var11 = var6;
+ if(var11.id != var6.id && var12 == null) {
+ var12 = var6;
}
}
}
long var9 = FontName.method5637(var0, var1, 3, false, 0);
- class65.scene.newGroundItemPile(SoundSystem.plane, var0, var1, class32.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, SoundSystem.plane), var5, var9, var12, var11);
+ class65.scene.newGroundItemPile(SoundSystem.plane, var0, var1, class32.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, SoundSystem.plane), var5, var9, var11, var12);
}
}
+
}
@ObfuscatedName("id")
diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java
index cd80b832f6..d69f5b194b 100644
--- a/runescape-client/src/main/java/Tiles.java
+++ b/runescape-client/src/main/java/Tiles.java
@@ -59,20 +59,6 @@ public final class Tiles {
@Export("__bq_v")
static int __bq_v;
- static {
- Tiles_heights = new int[4][105][105];
- Tiles_renderFlags = new byte[4][104][104];
- Tiles_minPlane = 99;
- __bq_t = new int[]{1, 2, 4, 8};
- __bq_y = new int[]{16, 32, 64, 128};
- __bq_h = new int[]{1, 0, -1, 0};
- __bq_b = new int[]{0, -1, 0, 1};
- __bq_c = new int[]{1, -1, -1, 1};
- __bq_r = new int[]{-1, -1, 1, 1};
- __bq_p = (int)(Math.random() * 17.0D) - 8;
- __bq_v = (int)(Math.random() * 33.0D) - 16;
- }
-
@ObfuscatedName("aq")
@ObfuscatedSignature(
signature = "(IZII)V",
@@ -96,4 +82,18 @@ public final class Tiles {
public static final void method1106(String var0, String var1, int var2, int var3, int var4, int var5) {
class16.insertMenuItem(var0, var1, var2, var3, var4, var5, false);
}
+
+ static {
+ Tiles_heights = new int[4][105][105];
+ Tiles_renderFlags = new byte[4][104][104];
+ Tiles_minPlane = 99;
+ __bq_t = new int[]{1, 2, 4, 8};
+ __bq_y = new int[]{16, 32, 64, 128};
+ __bq_h = new int[]{1, 0, -1, 0};
+ __bq_b = new int[]{0, -1, 0, 1};
+ __bq_c = new int[]{1, -1, -1, 1};
+ __bq_r = new int[]{-1, -1, 1, 1};
+ __bq_p = (int)(Math.random() * 17.0D) - 8;
+ __bq_v = (int)(Math.random() * 33.0D) - 16;
+ }
}
diff --git a/runescape-client/src/main/java/TotalQuantityComparator.java b/runescape-client/src/main/java/TotalQuantityComparator.java
index 5043399310..a2a28803a8 100644
--- a/runescape-client/src/main/java/TotalQuantityComparator.java
+++ b/runescape-client/src/main/java/TotalQuantityComparator.java
@@ -44,18 +44,18 @@ final class TotalQuantityComparator implements Comparator {
var7 = var0.readUnsignedByte();
if(var7 == 0) {
if(var1 == 0) {
- int[] var8 = Tiles.Tiles_heights[0][var2];
- int var11 = var2 + var4 + 932731;
- int var12 = var3 + var5 + 556238;
- int var13 = Script.method2204(var11 + 45365, var12 + 91923, 4) - 128 + (Script.method2204(10294 + var11, 37821 + var12, 2) - 128 >> 1) + (Script.method2204(var11, var12, 1) - 128 >> 2);
- var13 = (int)((double)var13 * 0.3D) + 35;
- if(var13 < 10) {
- var13 = 10;
- } else if(var13 > 60) {
- var13 = 60;
+ int[] var12 = Tiles.Tiles_heights[0][var2];
+ int var9 = var2 + var4 + 932731;
+ int var10 = var3 + var5 + 556238;
+ int var11 = Script.method2204(var9 + 45365, var10 + 91923, 4) - 128 + (Script.method2204(10294 + var9, 37821 + var10, 2) - 128 >> 1) + (Script.method2204(var9, var10, 1) - 128 >> 2);
+ var11 = (int)((double)var11 * 0.3D) + 35;
+ if(var11 < 10) {
+ var11 = 10;
+ } else if(var11 > 60) {
+ var11 = 60;
}
- var8[var3] = -var13 * 8;
+ var12[var3] = -var11 * 8;
} else {
Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240;
}
@@ -63,15 +63,15 @@ final class TotalQuantityComparator implements Comparator {
}
if(var7 == 1) {
- int var14 = var0.readUnsignedByte();
- if(var14 == 1) {
- var14 = 0;
+ int var8 = var0.readUnsignedByte();
+ if(var8 == 1) {
+ var8 = 0;
}
if(var1 == 0) {
- Tiles.Tiles_heights[0][var2][var3] = -var14 * 8;
+ Tiles.Tiles_heights[0][var2][var3] = -var8 * 8;
} else {
- Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var14 * 8;
+ Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8;
}
break;
}
@@ -127,87 +127,85 @@ final class TotalQuantityComparator implements Comparator {
)
@Export("addPlayerToMenu")
static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) {
- if(Canvas.localPlayer != var0) {
- if(Client.menuOptionsCount < 400) {
- String var4;
- int var7;
- if(var0.skillLevel == 0) {
- String var5 = var0.actions[0] + var0.username + var0.actions[1];
- var7 = var0.combatLevel;
- int var8 = Canvas.localPlayer.combatLevel;
- int var9 = var8 - var7;
- String var6;
- if(var9 < -9) {
- var6 = BufferedFile.colorStartTag(16711680);
- } else if(var9 < -6) {
- var6 = BufferedFile.colorStartTag(16723968);
- } else if(var9 < -3) {
- var6 = BufferedFile.colorStartTag(16740352);
- } else if(var9 < 0) {
- var6 = BufferedFile.colorStartTag(16756736);
- } else if(var9 > 9) {
- var6 = BufferedFile.colorStartTag(65280);
- } else if(var9 > 6) {
- var6 = BufferedFile.colorStartTag(4259584);
- } else if(var9 > 3) {
- var6 = BufferedFile.colorStartTag(8453888);
- } else if(var9 > 0) {
- var6 = BufferedFile.colorStartTag(12648192);
- } else {
- var6 = BufferedFile.colorStartTag(16776960);
- }
-
- var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2];
+ if(Canvas.localPlayer != var0 && Client.menuOptionsCount < 400) {
+ String var4;
+ int var5;
+ if(var0.skillLevel == 0) {
+ String var6 = var0.actions[0] + var0.username + var0.actions[1];
+ var5 = var0.combatLevel;
+ int var7 = Canvas.localPlayer.combatLevel;
+ int var8 = var7 - var5;
+ String var9;
+ if(var8 < -9) {
+ var9 = BufferedFile.colorStartTag(16711680);
+ } else if(var8 < -6) {
+ var9 = BufferedFile.colorStartTag(16723968);
+ } else if(var8 < -3) {
+ var9 = BufferedFile.colorStartTag(16740352);
+ } else if(var8 < 0) {
+ var9 = BufferedFile.colorStartTag(16756736);
+ } else if(var8 > 9) {
+ var9 = BufferedFile.colorStartTag(65280);
+ } else if(var8 > 6) {
+ var9 = BufferedFile.colorStartTag(4259584);
+ } else if(var8 > 3) {
+ var9 = BufferedFile.colorStartTag(8453888);
+ } else if(var8 > 0) {
+ var9 = BufferedFile.colorStartTag(12648192);
} else {
- var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2];
+ var9 = BufferedFile.colorStartTag(16776960);
}
- int var10;
- if(Client.isItemSelected == 1) {
- Tiles.method1106("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16777215) + var4, 14, var1, var2, var3);
- } else if(Client.isSpellSelected) {
- if((FloorDecoration.selectedSpellFlags & 8) == 8) {
- Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16777215) + var4, 15, var1, var2, var3);
- }
- } else {
- for(var10 = 7; var10 >= 0; --var10) {
- if(Client.playerMenuActions[var10] != null) {
- short var11 = 0;
- if(Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) {
- if(AttackOption.AttackOption_hidden == Client.playerAttackOption) {
- continue;
- }
+ var4 = var6 + var9 + " (level-" + var0.combatLevel + ")" + var0.actions[2];
+ } else {
+ var4 = var0.actions[0] + var0.username + var0.actions[1] + " (skill-" + var0.skillLevel + ")" + var0.actions[2];
+ }
- if(AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > Canvas.localPlayer.combatLevel) {
- var11 = 2000;
- }
+ int var10;
+ if(Client.isItemSelected == 1) {
+ Tiles.method1106("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16777215) + var4, 14, var1, var2, var3);
+ } else if(Client.isSpellSelected) {
+ if((FloorDecoration.selectedSpellFlags & 8) == 8) {
+ Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16777215) + var4, 15, var1, var2, var3);
+ }
+ } else {
+ for(var10 = 7; var10 >= 0; --var10) {
+ if(Client.playerMenuActions[var10] != null) {
+ short var11 = 0;
+ if(Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) {
+ if(AttackOption.AttackOption_hidden == Client.playerAttackOption) {
+ continue;
+ }
- if(Canvas.localPlayer.team != 0 && var0.team != 0) {
- if(var0.team == Canvas.localPlayer.team) {
- var11 = 2000;
- } else {
- var11 = 0;
- }
- }
- } else if(Client.playerOptionsPriorities[var10]) {
+ if(AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > Canvas.localPlayer.combatLevel) {
var11 = 2000;
}
- boolean var12 = false;
- var7 = Client.playerMenuOpcodes[var10] + var11;
- Tiles.method1106(Client.playerMenuActions[var10], BufferedFile.colorStartTag(16777215) + var4, var7, var1, var2, var3);
+ if(Canvas.localPlayer.team != 0 && var0.team != 0) {
+ if(var0.team == Canvas.localPlayer.team) {
+ var11 = 2000;
+ } else {
+ var11 = 0;
+ }
+ }
+ } else if(Client.playerOptionsPriorities[var10]) {
+ var11 = 2000;
}
+
+ boolean var12 = false;
+ var5 = Client.playerMenuOpcodes[var10] + var11;
+ Tiles.method1106(Client.playerMenuActions[var10], BufferedFile.colorStartTag(16777215) + var4, var5, var1, var2, var3);
}
}
+ }
- for(var10 = 0; var10 < Client.menuOptionsCount; ++var10) {
- if(Client.menuOpcodes[var10] == 23) {
- Client.menuTargetNames[var10] = BufferedFile.colorStartTag(16777215) + var4;
- break;
- }
+ for(var10 = 0; var10 < Client.menuOptionsCount; ++var10) {
+ if(Client.menuOpcodes[var10] == 23) {
+ Client.menuTargetNames[var10] = BufferedFile.colorStartTag(16777215) + var4;
+ break;
}
-
}
}
+
}
}
diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java
index dd0f2233b5..66b02b3a4f 100644
--- a/runescape-client/src/main/java/TriBool.java
+++ b/runescape-client/src/main/java/TriBool.java
@@ -31,12 +31,6 @@ public class TriBool {
@Export("urlRequester")
static UrlRequester urlRequester;
- static {
- TriBool_unknown = new TriBool();
- TriBool_true = new TriBool();
- TriBool_false = new TriBool();
- }
-
@ObfuscatedName("go")
@ObfuscatedSignature(
signature = "(I)V",
@@ -48,4 +42,10 @@ public class TriBool {
}
}
+
+ static {
+ TriBool_unknown = new TriBool();
+ TriBool_true = new TriBool();
+ TriBool_false = new TriBool();
+ }
}
diff --git a/runescape-client/src/main/java/UnderlayDefinition.java b/runescape-client/src/main/java/UnderlayDefinition.java
index 67346653c6..8451b57554 100644
--- a/runescape-client/src/main/java/UnderlayDefinition.java
+++ b/runescape-client/src/main/java/UnderlayDefinition.java
@@ -50,10 +50,6 @@ public class UnderlayDefinition extends DualNode {
@Export("hueMultiplier")
public int hueMultiplier;
- static {
- UnderlayDefinition_cached = new EvictingDualNodeHashTable(64);
- }
-
UnderlayDefinition() {
this.rgb = 0;
}
@@ -183,4 +179,8 @@ public class UnderlayDefinition extends DualNode {
static class249[] method4839() {
return new class249[]{class249.field3277, class249.field3273, class249.field3274};
}
+
+ static {
+ UnderlayDefinition_cached = new EvictingDualNodeHashTable(64);
+ }
}
diff --git a/runescape-client/src/main/java/UnitPriceComparator.java b/runescape-client/src/main/java/UnitPriceComparator.java
index 915d54d60f..95817c8ac3 100644
--- a/runescape-client/src/main/java/UnitPriceComparator.java
+++ b/runescape-client/src/main/java/UnitPriceComparator.java
@@ -200,7 +200,7 @@ final class UnitPriceComparator implements Comparator {
if(Client.viewportTempX > -1 && Client.cycle % 20 < 10) {
Player.headIconHintSprites[0].drawAt2(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28);
}
-
}
+
}
}
diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java
index 0c8feaf05e..a526a7dc64 100644
--- a/runescape-client/src/main/java/UrlRequester.java
+++ b/runescape-client/src/main/java/UrlRequester.java
@@ -90,7 +90,7 @@ public class UrlRequester implements Runnable {
if(var1 == null) {
try {
this.wait();
- } catch (InterruptedException var13) {
+ } catch (InterruptedException var12) {
;
}
continue;
@@ -106,16 +106,16 @@ public class UrlRequester implements Runnable {
var3.setReadTimeout(5000);
var3.setUseCaches(false);
var3.setRequestProperty("Connection", "close");
- int var7 = var3.getContentLength();
- if(var7 >= 0) {
- byte[] var5 = new byte[var7];
+ int var4 = var3.getContentLength();
+ if(var4 >= 0) {
+ byte[] var5 = new byte[var4];
var2 = new DataInputStream(var3.getInputStream());
var2.readFully(var5);
var1.response0 = var5;
}
var1.isDone0 = true;
- } catch (IOException var14) {
+ } catch (IOException var13) {
var1.isDone0 = true;
} finally {
if(var2 != null) {
@@ -127,8 +127,8 @@ public class UrlRequester implements Runnable {
}
}
- } catch (Exception var17) {
- NpcDefinition.sendStackTrace((String)null, var17);
+ } catch (Exception var16) {
+ NPCDefinition.sendStackTrace((String)null, var16);
}
}
diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java
index a0b5d7b61c..c498f16cc2 100644
--- a/runescape-client/src/main/java/UserComparator10.java
+++ b/runescape-client/src/main/java/UserComparator10.java
@@ -51,7 +51,7 @@ public class UserComparator10 extends AbstractUserComparator {
Client.__client_fh = true;
}
}
-
}
+
}
}
diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java
index fb9a9a7e5f..2e2e173386 100644
--- a/runescape-client/src/main/java/UserComparator7.java
+++ b/runescape-client/src/main/java/UserComparator7.java
@@ -66,48 +66,48 @@ public class UserComparator7 extends AbstractUserComparator {
var8[var9] = var0.readStringCp1252NullTerminated();
}
- String var20 = var0.readStringCp1252NullTerminated();
+ String var26 = var0.readStringCp1252NullTerminated();
byte[][] var10 = new byte[var7][];
- int var12;
+ int var11;
if(var4 == 3) {
- for(int var11 = 0; var11 < var7; ++var11) {
- var12 = var0.readInt();
- var10[var11] = new byte[var12];
- var0.__al_305(var10[var11], 0, var12);
+ for(int var12 = 0; var12 < var7; ++var12) {
+ var11 = var0.readInt();
+ var10[var12] = new byte[var11];
+ var0.__al_305(var10[var12], 0, var11);
}
}
var2.operations[var3] = var4;
- Class[] var21 = new Class[var7];
+ Class[] var27 = new Class[var7];
- for(var12 = 0; var12 < var7; ++var12) {
- var21[var12] = VarcInt.loadClassFromDescriptor(var8[var12]);
+ for(var11 = 0; var11 < var7; ++var11) {
+ var27[var11] = VarcInt.loadClassFromDescriptor(var8[var11]);
}
- Class var22 = VarcInt.loadClassFromDescriptor(var20);
+ Class var13 = VarcInt.loadClassFromDescriptor(var26);
if(VarcInt.loadClassFromDescriptor(var5).getClassLoader() == null) {
throw new SecurityException();
}
- Method[] var13 = VarcInt.loadClassFromDescriptor(var5).getDeclaredMethods();
- Method[] var14 = var13;
+ Method[] var14 = VarcInt.loadClassFromDescriptor(var5).getDeclaredMethods();
+ Method[] var15 = var14;
- for(int var15 = 0; var15 < var14.length; ++var15) {
- Method var16 = var14[var15];
- if(Reflection.getMethodName(var16).equals(var6)) {
- Class[] var17 = Reflection.getParameterTypes(var16);
- if(var21.length == var17.length) {
- boolean var18 = true;
+ for(int var16 = 0; var16 < var15.length; ++var16) {
+ Method var17 = var15[var16];
+ if(Reflection.getMethodName(var17).equals(var6)) {
+ Class[] var18 = Reflection.getParameterTypes(var17);
+ if(var27.length == var18.length) {
+ boolean var19 = true;
- for(int var19 = 0; var19 < var21.length; ++var19) {
- if(var21[var19] != var17[var19]) {
- var18 = false;
+ for(int var20 = 0; var20 < var27.length; ++var20) {
+ if(var27[var20] != var18[var20]) {
+ var19 = false;
break;
}
}
- if(var18 && var22 == var16.getReturnType()) {
- var2.methods[var3] = var16;
+ if(var19 && var13 == var17.getReturnType()) {
+ var2.methods[var3] = var17;
}
}
}
@@ -131,15 +131,15 @@ public class UserComparator7 extends AbstractUserComparator {
var2.fields[var3] = Reflection.findField(VarcInt.loadClassFromDescriptor(var5), var6);
}
- } catch (ClassNotFoundException var24) {
+ } catch (ClassNotFoundException var21) {
var2.creationErrors[var3] = -1;
- } catch (SecurityException var25) {
+ } catch (SecurityException var22) {
var2.creationErrors[var3] = -2;
- } catch (NullPointerException var26) {
+ } catch (NullPointerException var23) {
var2.creationErrors[var3] = -3;
- } catch (Exception var27) {
+ } catch (Exception var24) {
var2.creationErrors[var3] = -4;
- } catch (Throwable var28) {
+ } catch (Throwable var25) {
var2.creationErrors[var3] = -5;
}
}
diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java
index 561e9e45aa..121ef5cb60 100644
--- a/runescape-client/src/main/java/UserComparator9.java
+++ b/runescape-client/src/main/java/UserComparator9.java
@@ -53,8 +53,8 @@ public class UserComparator9 extends AbstractUserComparator {
++NetCache.NetCache_ioExceptions;
NetCache.NetCache_socket = null;
}
-
}
+
}
@ObfuscatedName("l")
@@ -87,7 +87,7 @@ public class UserComparator9 extends AbstractUserComparator {
VarbitDefinition.indexedSpriteWidths = null;
SecureRandomCallable.indexedSpriteHeights = null;
class328.indexedSpritePalette = null;
- class328.spritePixels = null;
+ class328.spritePixels = (byte[][])null;
return var0;
}
}
diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java
index 85c03c5fcf..f59cddebf6 100644
--- a/runescape-client/src/main/java/UserList.java
+++ b/runescape-client/src/main/java/UserList.java
@@ -165,6 +165,7 @@ public abstract class UserList {
this.arrayRemove(var2);
this.mapRemove(var1);
}
+
}
@ObfuscatedName("v")
diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java
index 190036bd6c..a25988fd6e 100644
--- a/runescape-client/src/main/java/Username.java
+++ b/runescape-client/src/main/java/Username.java
@@ -59,14 +59,7 @@ public class Username implements Comparable {
public boolean __equals_466(Object var1) {
if(var1 instanceof Username) {
Username var2 = (Username)var1;
- if (this.cleanName == null)
- {
- return var2.cleanName == null;
- }
- else
- {
- return var2.cleanName != null && (this.__hashCode_467() == var2.__hashCode_467() && this.cleanName.equals(var2.cleanName));
- }
+ return this.cleanName == null?var2.cleanName == null:var2.cleanName != null && this.__hashCode_467() == var2.__hashCode_467() && this.cleanName.equals(var2.cleanName);
} else {
return false;
}
diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java
index 3734f09ca3..84aa7a3203 100644
--- a/runescape-client/src/main/java/VarbitDefinition.java
+++ b/runescape-client/src/main/java/VarbitDefinition.java
@@ -41,10 +41,6 @@ public class VarbitDefinition extends DualNode {
@Export("highBit")
public int highBit;
- static {
- VarbitDefinition_cached = new EvictingDualNodeHashTable(64);
- }
-
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "(Lgr;I)V",
@@ -94,4 +90,8 @@ public class VarbitDefinition extends DualNode {
return var2.__u_421(var1);
}
+
+ static {
+ VarbitDefinition_cached = new EvictingDualNodeHashTable(64);
+ }
}
diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java
index aa107f00f7..4b8abb9b07 100644
--- a/runescape-client/src/main/java/VarcInt.java
+++ b/runescape-client/src/main/java/VarcInt.java
@@ -23,10 +23,6 @@ public class VarcInt extends DualNode {
@Export("persist")
public boolean persist;
- static {
- __iw_f = new EvictingDualNodeHashTable(64);
- }
-
VarcInt() {
this.persist = false;
}
@@ -79,4 +75,8 @@ public class VarcInt extends DualNode {
public static boolean method4807(char var0) {
return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z';
}
+
+ static {
+ __iw_f = new EvictingDualNodeHashTable(64);
+ }
}
diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java
index c9a3e7e62e..ce995e290e 100644
--- a/runescape-client/src/main/java/Varcs.java
+++ b/runescape-client/src/main/java/Varcs.java
@@ -178,81 +178,73 @@ public class Varcs {
}
}
- Buffer var32 = new Buffer(var2);
- var32.writeByte(2);
- var32.writeShort(var3);
- Iterator var33 = this.map.entrySet().iterator();
+ Buffer var29 = new Buffer(var2);
+ var29.writeByte(2);
+ var29.writeShort(var3);
+ Iterator var30 = this.map.entrySet().iterator();
- label185:
+ label187:
while(true) {
- Entry var20;
- int var21;
+ int var8;
+ Entry var31;
do {
- if(!var33.hasNext()) {
- var1.write(var32.array, 0, var32.index);
- break label185;
+ if(!var30.hasNext()) {
+ var1.write(var29.array, 0, var29.index);
+ break label187;
}
- var20 = (Entry)var33.next();
- var21 = ((Integer)var20.getKey()).intValue();
- } while(!this.intsPersistence[var21]);
+ var31 = (Entry)var30.next();
+ var8 = ((Integer)var31.getKey()).intValue();
+ } while(!this.intsPersistence[var8]);
- var32.writeShort(var21);
- Object var8 = var20.getValue();
- Class var10 = var8.getClass();
+ var29.writeShort(var8);
+ Object var9 = var31.getValue();
+ Class var10 = var9.getClass();
class3[] var11 = class3.method34();
- int var12 = 0;
- class3 var9;
- while(true) {
- if(var12 >= var11.length) {
- var9 = null;
- break;
+ class3 var13;
+ label174: {
+ for(int var12 = 0; var12 < var11.length; ++var12) {
+ class3 var14 = var11[var12];
+ if(var10 == var14.field18) {
+ var13 = var14;
+ break label174;
+ }
}
- class3 var13 = var11[var12];
- if(var10 == var13.field18) {
- var9 = var13;
- break;
- }
-
- ++var12;
+ var13 = null;
}
- var32.writeByte(var9.field17);
- Class var34 = var8.getClass();
+ var29.writeByte(var13.field17);
+ Class var32 = var9.getClass();
class3[] var15 = class3.method34();
- int var16 = 0;
- class3 var14;
- while(true) {
- if(var16 >= var15.length) {
- var14 = null;
- break;
+ class3 var17;
+ label184: {
+ for(int var16 = 0; var16 < var15.length; ++var16) {
+ class3 var18 = var15[var16];
+ if(var32 == var18.field18) {
+ var17 = var18;
+ break label184;
+ }
}
- class3 var17 = var15[var16];
- if(var34 == var17.field18) {
- var14 = var17;
- break;
- }
-
- ++var16;
+ var17 = null;
}
- if(var14 == null) {
+ if(var17 == null) {
throw new IllegalArgumentException();
}
- class0 var22 = var14.field19;
- var22.vmethod44(var8, var32);
+ class0 var33 = var17.field19;
+ var33.vmethod44(var9, var29);
}
- } catch (Exception var30) {
+ } catch (Exception var27) {
;
} finally {
try {
var1.close();
- } catch (Exception var29) {
+ } catch (Exception var26) {
;
}
@@ -271,85 +263,70 @@ public class Varcs {
void read() {
AccessFile var1 = this.getPreferencesFile(false);
- label215: {
- try {
- byte[] var2 = new byte[(int)var1.length()];
+ try {
+ byte[] var2 = new byte[(int)var1.length()];
- int var4;
- for(int var3 = 0; var3 < var2.length; var3 += var4) {
- var4 = var1.read(var2, var3, var2.length - var3);
- if(var4 == -1) {
- throw new EOFException();
- }
+ int var3;
+ for(int var4 = 0; var4 < var2.length; var4 += var3) {
+ var3 = var1.read(var2, var4, var2.length - var4);
+ if(var3 == -1) {
+ throw new EOFException();
}
-
- Buffer var14 = new Buffer(var2);
- if(var14.array.length - var14.index >= 1) {
- int var15 = var14.readUnsignedByte();
- if(var15 < 0 || var15 > 2) {
- return;
- }
-
- int var7;
- int var8;
- int var9;
- int var16;
- if(var15 >= 2) {
- var16 = var14.__ag_302();
- var7 = 0;
-
- while(true) {
- if(var7 >= var16) {
- break label215;
- }
-
- var8 = var14.__ag_302();
- var9 = var14.readUnsignedByte();
- class3 var10 = (class3)ScriptFrame.findEnumerated(class3.method34(), var9);
- Object var11 = var10.method31(var14);
- if(this.intsPersistence[var8]) {
- this.map.put(Integer.valueOf(var8), var11);
- }
-
- ++var7;
- }
- } else {
- var16 = var14.__ag_302();
-
- for(var7 = 0; var7 < var16; ++var7) {
- var8 = var14.__ag_302();
- var9 = var14.readInt();
- if(this.intsPersistence[var8]) {
- this.map.put(Integer.valueOf(var8), Integer.valueOf(var9));
- }
- }
-
- var7 = var14.__ag_302();
- var8 = 0;
-
- while(true) {
- if(var8 >= var7) {
- break label215;
- }
-
- var14.__ag_302();
- var14.readStringCp1252NullTerminated();
- ++var8;
- }
- }
- }
- } catch (Exception var25) {
- break label215;
- } finally {
- try {
- var1.close();
- } catch (Exception var24) {
- ;
- }
-
}
- return;
+ Buffer var25 = new Buffer(var2);
+ if(var25.array.length - var25.index < 1) {
+ return;
+ }
+
+ int var5 = var25.readUnsignedByte();
+ if(var5 < 0 || var5 > 2) {
+ return;
+ }
+
+ int var6;
+ int var7;
+ int var8;
+ int var9;
+ if(var5 >= 2) {
+ var9 = var25.__ag_302();
+
+ for(var6 = 0; var6 < var9; ++var6) {
+ var7 = var25.__ag_302();
+ var8 = var25.readUnsignedByte();
+ class3 var10 = (class3)ScriptFrame.findEnumerated(class3.method34(), var8);
+ Object var11 = var10.method31(var25);
+ if(this.intsPersistence[var7]) {
+ this.map.put(Integer.valueOf(var7), var11);
+ }
+ }
+ } else {
+ var9 = var25.__ag_302();
+
+ for(var6 = 0; var6 < var9; ++var6) {
+ var7 = var25.__ag_302();
+ var8 = var25.readInt();
+ if(this.intsPersistence[var7]) {
+ this.map.put(Integer.valueOf(var7), Integer.valueOf(var8));
+ }
+ }
+
+ var6 = var25.__ag_302();
+
+ for(var7 = 0; var7 < var6; ++var7) {
+ var25.__ag_302();
+ var25.readStringCp1252NullTerminated();
+ }
+ }
+ } catch (Exception var23) {
+ ;
+ } finally {
+ try {
+ var1.close();
+ } catch (Exception var22) {
+ ;
+ }
+
}
this.unwrittenChanges = false;
@@ -393,13 +370,13 @@ public class Varcs {
garbageValue = "1119202993"
)
static final void method2166(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) {
+ int var6;
int var7;
- int var8;
- for(int var6 = 0; var6 < 4; ++var6) {
- for(var7 = 0; var7 < 64; ++var7) {
- for(var8 = 0; var8 < 64; ++var8) {
- if(var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) {
- var5[var6].flags[var7 + var1][var8 + var2] &= -16777217;
+ for(int var8 = 0; var8 < 4; ++var8) {
+ for(var6 = 0; var6 < 64; ++var6) {
+ for(var7 = 0; var7 < 64; ++var7) {
+ if(var6 + var1 > 0 && var6 + var1 < 103 && var7 + var2 > 0 && var7 + var2 < 103) {
+ var5[var8].flags[var6 + var1][var7 + var2] &= -16777217;
}
}
}
@@ -407,10 +384,10 @@ public class Varcs {
Buffer var10 = new Buffer(var0);
- for(var7 = 0; var7 < 4; ++var7) {
- for(var8 = 0; var8 < 64; ++var8) {
+ for(var6 = 0; var6 < 4; ++var6) {
+ for(var7 = 0; var7 < 64; ++var7) {
for(int var9 = 0; var9 < 64; ++var9) {
- TotalQuantityComparator.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0);
+ TotalQuantityComparator.loadTerrain(var10, var6, var7 + var1, var9 + var2, var3, var4, 0);
}
}
}
diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java
index f313cd4d68..010439b717 100644
--- a/runescape-client/src/main/java/VarpDefinition.java
+++ b/runescape-client/src/main/java/VarpDefinition.java
@@ -32,10 +32,6 @@ public class VarpDefinition extends DualNode {
@Export("type")
public int type;
- static {
- VarpDefinition_cached = new EvictingDualNodeHashTable(64);
- }
-
VarpDefinition() {
this.type = 0;
}
@@ -69,4 +65,8 @@ public class VarpDefinition extends DualNode {
}
}
+
+ static {
+ VarpDefinition_cached = new EvictingDualNodeHashTable(64);
+ }
}
diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java
index 44e172eeb8..76de6826e0 100644
--- a/runescape-client/src/main/java/Varps.java
+++ b/runescape-client/src/main/java/Varps.java
@@ -23,19 +23,6 @@ public class Varps {
@Export("__hv_h")
static int __hv_h;
- static {
- Varps_masks = new int[32];
- int var0 = 2;
-
- for(int var1 = 0; var1 < 32; ++var1) {
- Varps_masks[var1] = var0 - 1;
- var0 += var0;
- }
-
- Varps_temp = new int[4000];
- Varps_main = new int[4000];
- }
-
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(Lir;I)V",
@@ -57,5 +44,19 @@ public class Varps {
byte[] var1 = AttackOption.method2032();
var0.__s_297(var1, 0, var1.length);
}
+
+ }
+
+ static {
+ Varps_masks = new int[32];
+ int var0 = 2;
+
+ for(int var1 = 0; var1 < 32; ++var1) {
+ Varps_masks[var1] = var0 - 1;
+ var0 += var0;
+ }
+
+ Varps_temp = new int[4000];
+ Varps_main = new int[4000];
}
}
diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java
index 96659bd75e..2bb23789dd 100644
--- a/runescape-client/src/main/java/VertexNormal.java
+++ b/runescape-client/src/main/java/VertexNormal.java
@@ -66,16 +66,14 @@ public class VertexNormal {
ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0;
} else if(var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) {
ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0;
- } else {
- if(class179.__fe_e != null) {
- for(int var1 = 0; var1 < ByteArrayPool.__gi_g.length; ++var1) {
- if(var0.length == ByteArrayPool.__gi_g[var1] && WorldMapSection2.__ah_l[var1] < class179.__fe_e[var1].length) {
- class179.__fe_e[var1][WorldMapSection2.__ah_l[var1]++] = var0;
- return;
- }
+ } else if(class179.__fe_e != null) {
+ for(int var1 = 0; var1 < ByteArrayPool.__gi_g.length; ++var1) {
+ if(var0.length == ByteArrayPool.__gi_g[var1] && WorldMapSection2.__ah_l[var1] < class179.__fe_e[var1].length) {
+ class179.__fe_e[var1][WorldMapSection2.__ah_l[var1]++] = var0;
+ return;
}
}
-
}
+
}
}
diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java
index 5bd207bddf..50c78d1eca 100644
--- a/runescape-client/src/main/java/ViewportMouse.java
+++ b/runescape-client/src/main/java/ViewportMouse.java
@@ -59,15 +59,6 @@ public class ViewportMouse {
@Export("ViewportMouse_entityTags")
public static long[] ViewportMouse_entityTags;
- static {
- ViewportMouse_isInViewport = false;
- ViewportMouse_x = 0;
- ViewportMouse_y = 0;
- ViewportMouse_false0 = false;
- ViewportMouse_entityCount = 0;
- ViewportMouse_entityTags = new long[1000];
- }
-
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(IB)Lic;",
@@ -151,4 +142,13 @@ public class ViewportMouse {
}
}
}
+
+ static {
+ ViewportMouse_isInViewport = false;
+ ViewportMouse_x = 0;
+ ViewportMouse_y = 0;
+ ViewportMouse_false0 = false;
+ ViewportMouse_entityCount = 0;
+ ViewportMouse_entityTags = new long[1000];
+ }
}
diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java
index b472fef687..34d9bae7e9 100644
--- a/runescape-client/src/main/java/WallDecoration.java
+++ b/runescape-client/src/main/java/WallDecoration.java
@@ -85,14 +85,14 @@ public final class WallDecoration {
garbageValue = "1120739015"
)
public static int method3257(byte[] var0, int var1) {
- int var3 = -1;
+ int var2 = -1;
- for(int var4 = 0; var4 < var1; ++var4) {
- var3 = var3 >>> 8 ^ Buffer.__gr_q[(var3 ^ var0[var4]) & 255];
+ for(int var3 = 0; var3 < var1; ++var3) {
+ var2 = var2 >>> 8 ^ Buffer.__gr_q[(var2 ^ var0[var3]) & 255];
}
- var3 = ~var3;
- return var3;
+ var2 = ~var2;
+ return var2;
}
@ObfuscatedName("t")
diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java
index 0fa2775b3e..ba39a29587 100644
--- a/runescape-client/src/main/java/Widget.java
+++ b/runescape-client/src/main/java/Widget.java
@@ -716,14 +716,6 @@ public class Widget extends Node {
@Export("__fz")
public boolean __fz;
- static {
- widgetSpriteCache = new EvictingDualNodeHashTable(200);
- Widget_cachedModels = new EvictingDualNodeHashTable(50);
- Widget_cachedFonts = new EvictingDualNodeHashTable(20);
- __ho_z = new EvictingDualNodeHashTable(8);
- __ho_j = false;
- }
-
public Widget() {
this.isIf3 = false;
this.id = -1;
@@ -1302,7 +1294,7 @@ public class Widget extends Node {
return null;
} else {
long var3 = ((this.spriteFlipV?1L:0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH?1L:0L) << 39) + ((long)this.spriteShadow << 40);
- Sprite var5 = (Sprite) widgetSpriteCache.get(var3);
+ Sprite var5 = (Sprite)widgetSpriteCache.get(var3);
if(var5 != null) {
return var5;
} else {
@@ -1382,7 +1374,7 @@ public class Widget extends Node {
if(var2 == -1) {
return null;
} else {
- Sprite var3 = (Sprite) widgetSpriteCache.get((long)var2);
+ Sprite var3 = (Sprite)widgetSpriteCache.get((long)var2);
if(var3 != null) {
return var3;
} else {
@@ -1575,11 +1567,13 @@ public class Widget extends Node {
var3.data = var1;
var3.indexStore = var2;
NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
+ NodeDeque var5 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) {
IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3);
}
- Object var9 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
+ Object var10 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
+ Object var6 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) {
if(IndexStoreActionHandler.__iv_q == 0) {
Frames.IndexStoreActionHandler_thread = new Thread(new IndexStoreActionHandler());
@@ -1591,4 +1585,12 @@ public class Widget extends Node {
IndexStoreActionHandler.__iv_q = 600;
}
}
+
+ static {
+ widgetSpriteCache = new EvictingDualNodeHashTable(200);
+ Widget_cachedModels = new EvictingDualNodeHashTable(50);
+ Widget_cachedFonts = new EvictingDualNodeHashTable(20);
+ __ho_z = new EvictingDualNodeHashTable(8);
+ __ho_j = false;
+ }
}
diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java
index 9035ee1dac..713dd07fd8 100644
--- a/runescape-client/src/main/java/World.java
+++ b/runescape-client/src/main/java/World.java
@@ -62,13 +62,6 @@ public class World {
@Export("index")
int index;
- static {
- worldsCount = 0;
- __bt_g = 0;
- __bt_l = new int[]{1, 1, 1, 1};
- __bt_e = new int[]{0, 1, 2, 3};
- }
-
@ObfuscatedName("e")
@ObfuscatedSignature(
signature = "(I)Z",
@@ -143,4 +136,11 @@ public class World {
var0 |= var0 >>> 16;
return var0 + 1;
}
+
+ static {
+ worldsCount = 0;
+ __bt_g = 0;
+ __bt_l = new int[]{1, 1, 1, 1};
+ __bt_e = new int[]{0, 1, 2, 3};
+ }
}
diff --git a/runescape-client/src/main/java/WorldComparator.java b/runescape-client/src/main/java/WorldComparator.java
index e1c685e25d..2e036a7a8d 100644
--- a/runescape-client/src/main/java/WorldComparator.java
+++ b/runescape-client/src/main/java/WorldComparator.java
@@ -72,7 +72,7 @@ final class WorldComparator implements Comparator {
static final void method67(PacketBuffer var0) {
for(int var1 = 0; var1 < Client.__client_fw; ++var1) {
int var2 = Client.__client_fg[var1];
- Npc var3 = Client.npcs[var2];
+ NPC var3 = Client.npcs[var2];
int var4 = var0.readUnsignedByte();
if((var4 & 1) != 0) {
var3.targetIndex = var0.__by_324();
diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java
index 618e8a698e..0a733251bb 100644
--- a/runescape-client/src/main/java/WorldMap.java
+++ b/runescape-client/src/main/java/WorldMap.java
@@ -299,12 +299,6 @@ public class WorldMap {
@Export("__bm")
int __bm;
- static {
- fontNameVerdana11 = FontName.FontName_verdana11;
- fontNameVerdana13 = FontName.FontName_verdana13;
- fontNameVerdana15 = FontName.FontName_verdana15;
- }
-
public WorldMap() {
this.worldMapTargetX = -1;
this.worldMapTargetY = -1;
@@ -432,6 +426,7 @@ public class WorldMap {
this.__bk = var11;
}
}
+
}
@ObfuscatedName("w")
@@ -443,7 +438,9 @@ public class WorldMap {
public void __w_519(int var1, int var2, boolean var3, boolean var4) {
long var5 = class203.currentTimeMs();
this.__o_520(var1, var2, var4, var5);
- if(!this.__x_524() && (var4 || var3)) {
+ if(this.__x_524() || !var4 && !var3) {
+ this.__e_523();
+ } else {
if(var4) {
this.__at = var1;
this.__ad = var2;
@@ -456,8 +453,6 @@ public class WorldMap {
int var8 = var2 - this.__ad;
this.setWorldMapPosition(this.__ab - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.__ae, false);
}
- } else {
- this.__e_523();
}
if(var4) {
@@ -476,32 +471,33 @@ public class WorldMap {
int var7 = (int)((float)this.worldMapY - ((float)(var2 - this.worldMapDisplayY) - (float)this.__as_538() * this.zoom / 2.0F) / this.zoom);
this.mouseCoord = this.currentMapArea0.coord(var6 + this.currentMapArea0.minX() * 64, var7 + this.currentMapArea0.minY() * 64);
if(this.mouseCoord != null && var3) {
+ int var8;
int var9;
- int var10;
+ PacketBufferNode var11;
if(FriendSystem.jmodCheck() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) {
- int var13 = this.mouseCoord.x;
- var9 = this.mouseCoord.y;
- var10 = this.mouseCoord.plane;
- PacketBufferNode var11 = Interpreter.method1915(ClientPacket.__gs_bx, Client.packetWriter.isaacCipher);
+ int var12 = this.mouseCoord.x;
+ var8 = this.mouseCoord.y;
+ var9 = this.mouseCoord.plane;
+ var11 = Interpreter.method1915(ClientPacket.__gs_bx, Client.packetWriter.isaacCipher);
var11.packetBuffer.writeIntME(0);
- var11.packetBuffer.writeShortLE(var9);
- var11.packetBuffer.__ai_315(var10);
- var11.packetBuffer.writeShort(var13);
+ var11.packetBuffer.writeShortLE(var8);
+ var11.packetBuffer.__ai_315(var9);
+ var11.packetBuffer.writeShort(var12);
Client.packetWriter.__q_167(var11);
} else {
- boolean var8 = true;
+ boolean var10 = true;
if(this.__an) {
- var9 = var1 - this.__as;
- var10 = var2 - this.__am;
- if(var4 - this.__ap > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) {
- var8 = false;
+ var8 = var1 - this.__as;
+ var9 = var2 - this.__am;
+ if(var4 - this.__ap > 500L || var8 < -25 || var8 > 25 || var9 < -25 || var9 > 25) {
+ var10 = false;
}
}
- if(var8) {
- PacketBufferNode var12 = Interpreter.method1915(ClientPacket.__gs_az, Client.packetWriter.isaacCipher);
- var12.packetBuffer.writeIntME(this.mouseCoord.packed());
- Client.packetWriter.__q_167(var12);
+ if(var10) {
+ var11 = Interpreter.method1915(ClientPacket.__gs_az, Client.packetWriter.isaacCipher);
+ var11.packetBuffer.writeIntME(this.mouseCoord.packed());
+ Client.packetWriter.__q_167(var11);
this.__ap = 0L;
}
}
@@ -529,8 +525,8 @@ public class WorldMap {
if(this.zoom > this.zoomTarget) {
this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F);
}
-
}
+
}
@ObfuscatedName("g")
@@ -556,8 +552,8 @@ public class WorldMap {
this.worldMapTargetX = -1;
this.worldMapTargetY = -1;
}
-
}
+
}
@ObfuscatedName("l")
@@ -608,16 +604,14 @@ public class WorldMap {
public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) {
Iterator var4 = this.mapAreas.values().iterator();
- WorldMapArea var5;
- do {
- if(!var4.hasNext()) {
- return null;
+ while(var4.hasNext()) {
+ WorldMapArea var5 = (WorldMapArea)var4.next();
+ if(var5.containsCoord(var1, var2, var3)) {
+ return var5;
}
+ }
- var5 = (WorldMapArea)var4.next();
- } while(!var5.containsCoord(var1, var2, var3));
-
- return var5;
+ return null;
}
@ObfuscatedName("a")
@@ -694,6 +688,7 @@ public class WorldMap {
this.initializeWorldMap(var1);
this.jump(-1, -1, -1);
}
+
}
@ObfuscatedName("y")
@@ -725,8 +720,8 @@ public class WorldMap {
} else {
this.jump(var3.plane, var3.x, var3.y);
}
-
}
+
}
@ObfuscatedName("b")
@@ -751,6 +746,7 @@ public class WorldMap {
this.iconIterator = null;
this.worldMapManager.clearIcons();
}
+
}
@ObfuscatedName("c")
@@ -811,6 +807,7 @@ public class WorldMap {
this.worldMapDisplayY = var2;
Rasterizer2D.Rasterizer2D_setClipArray(var6);
}
+
}
@ObfuscatedName("p")
@@ -884,6 +881,7 @@ public class WorldMap {
this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.__al, this.__ay);
}
+
}
@ObfuscatedName("aq")
@@ -961,16 +959,14 @@ public class WorldMap {
public WorldMapArea getMapArea(int var1) {
Iterator var2 = this.mapAreas.values().iterator();
- WorldMapArea var3;
- do {
- if(!var2.hasNext()) {
- return null;
+ while(var2.hasNext()) {
+ WorldMapArea var3 = (WorldMapArea)var2.next();
+ if(var3.id() == var1) {
+ return var3;
}
+ }
- var3 = (WorldMapArea)var2.next();
- } while(var3.id() != var1);
-
- return var3;
+ return null;
}
@ObfuscatedName("ak")
@@ -984,6 +980,7 @@ public class WorldMap {
this.worldMapTargetX = var1 - this.currentMapArea0.minX() * 64;
this.worldMapTargetY = var2 - this.currentMapArea0.minY() * 64;
}
+
}
@ObfuscatedName("aw")
@@ -998,6 +995,7 @@ public class WorldMap {
this.worldMapTargetX = -1;
this.worldMapTargetY = -1;
}
+
}
@ObfuscatedName("al")
@@ -1012,8 +1010,8 @@ public class WorldMap {
if(var4 != null) {
this.setWorldMapPositionTarget(var4[0], var4[1]);
}
-
}
+
}
@ObfuscatedName("ab")
@@ -1028,8 +1026,8 @@ public class WorldMap {
if(var4 != null) {
this.__aw_531(var4[0], var4[1]);
}
-
}
+
}
@ObfuscatedName("ae")
@@ -1289,26 +1287,26 @@ public class WorldMap {
if(!var9.isEmpty()) {
Iterator var10 = var9.iterator();
- boolean var13;
+ boolean var11;
do {
if(!var10.hasNext()) {
return;
}
- AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next();
- WorldMapElement var12 = ViewportMouse.getWorldMapElement(var11.__m_15());
- var13 = false;
+ AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var10.next();
+ WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.__m_15());
+ var11 = false;
for(int var14 = this.__bs.length - 1; var14 >= 0; --var14) {
- if(var12.strings[var14] != null) {
- Tiles.method1106(var12.strings[var14], var12.string1, this.__bs[var14], var11.__m_15(), var11.coord1.packed(), var11.coord2.packed());
- var13 = true;
+ if(var13.strings[var14] != null) {
+ Tiles.method1106(var13.strings[var14], var13.string1, this.__bs[var14], var12.__m_15(), var12.coord1.packed(), var12.coord2.packed());
+ var11 = true;
}
}
- } while(!var13);
-
+ } while(!var11);
}
}
+
}
@ObfuscatedName("bc")
@@ -1332,26 +1330,22 @@ public class WorldMap {
int var6 = -1;
Iterator var7 = var4.iterator();
- while(true) {
- AbstractWorldMapIcon var8;
- int var11;
- do {
- if(!var7.hasNext()) {
- return var5.coord2;
- }
+ while(var7.hasNext()) {
+ AbstractWorldMapIcon var8 = (AbstractWorldMapIcon)var7.next();
+ int var10 = var8.coord2.x - var2.x;
+ int var11 = var8.coord2.y - var2.y;
+ int var9 = var11 * var11 + var10 * var10;
+ if(var9 == 0) {
+ return var8.coord2;
+ }
- var8 = (AbstractWorldMapIcon)var7.next();
- int var9 = var8.coord2.x - var2.x;
- int var10 = var8.coord2.y - var2.y;
- var11 = var10 * var10 + var9 * var9;
- if(var11 == 0) {
- return var8.coord2;
- }
- } while(var11 >= var6 && var5 != null);
-
- var5 = var8;
- var6 = var11;
+ if(var9 < var6 || var5 == null) {
+ var5 = var8;
+ var6 = var9;
+ }
}
+
+ return var5.coord2;
} else {
return null;
}
@@ -1424,16 +1418,20 @@ public class WorldMap {
if(this.iconIterator == null) {
return null;
} else {
- AbstractWorldMapIcon var1;
- do {
- if(!this.iconIterator.hasNext()) {
- return null;
+ while(this.iconIterator.hasNext()) {
+ AbstractWorldMapIcon var1 = (AbstractWorldMapIcon)this.iconIterator.next();
+ if(var1.__m_15() != -1) {
+ return var1;
}
+ }
- var1 = (AbstractWorldMapIcon)this.iconIterator.next();
- } while(var1.__m_15() == -1);
-
- return var1;
+ return null;
}
}
+
+ static {
+ fontNameVerdana11 = FontName.FontName_verdana11;
+ fontNameVerdana13 = FontName.FontName_verdana13;
+ fontNameVerdana15 = FontName.FontName_verdana15;
+ }
}
diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java
index afbfcdb8e0..948667e82a 100644
--- a/runescape-client/src/main/java/WorldMapArea.java
+++ b/runescape-client/src/main/java/WorldMapArea.java
@@ -160,16 +160,14 @@ public class WorldMapArea {
public boolean containsCoord(int var1, int var2, int var3) {
Iterator var4 = this.sections.iterator();
- WorldMapSection var5;
- do {
- if(!var4.hasNext()) {
- return false;
+ while(var4.hasNext()) {
+ WorldMapSection var5 = (WorldMapSection)var4.next();
+ if(var5.containsCoord(var1, var2, var3)) {
+ return true;
}
+ }
- var5 = (WorldMapSection)var4.next();
- } while(!var5.containsCoord(var1, var2, var3));
-
- return true;
+ return false;
}
@ObfuscatedName("w")
@@ -185,16 +183,14 @@ public class WorldMapArea {
if(var4 >= this.minY0 && var4 <= this.maxY0) {
Iterator var5 = this.sections.iterator();
- WorldMapSection var6;
- do {
- if(!var5.hasNext()) {
- return false;
+ while(var5.hasNext()) {
+ WorldMapSection var6 = (WorldMapSection)var5.next();
+ if(var6.containsPosition(var1, var2)) {
+ return true;
}
+ }
- var6 = (WorldMapSection)var5.next();
- } while(!var6.containsPosition(var1, var2));
-
- return true;
+ return false;
} else {
return false;
}
@@ -212,16 +208,14 @@ public class WorldMapArea {
public int[] position(int var1, int var2, int var3) {
Iterator var4 = this.sections.iterator();
- WorldMapSection var5;
- do {
- if(!var4.hasNext()) {
- return null;
+ while(var4.hasNext()) {
+ WorldMapSection var5 = (WorldMapSection)var4.next();
+ if(var5.containsCoord(var1, var2, var3)) {
+ return var5.position(var1, var2, var3);
}
+ }
- var5 = (WorldMapSection)var4.next();
- } while(!var5.containsCoord(var1, var2, var3));
-
- return var5.position(var1, var2, var3);
+ return null;
}
@ObfuscatedName("u")
@@ -233,16 +227,14 @@ public class WorldMapArea {
public TileLocation coord(int var1, int var2) {
Iterator var3 = this.sections.iterator();
- WorldMapSection var4;
- do {
- if(!var3.hasNext()) {
- return null;
+ while(var3.hasNext()) {
+ WorldMapSection var4 = (WorldMapSection)var3.next();
+ if(var4.containsPosition(var1, var2)) {
+ return var4.coord(var1, var2);
}
+ }
- var4 = (WorldMapSection)var3.next();
- } while(!var4.containsPosition(var1, var2));
-
- return var4.coord(var1, var2);
+ return null;
}
@ObfuscatedName("g")
diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java
index fbec90b7d0..e6ead7a5c6 100644
--- a/runescape-client/src/main/java/WorldMapAreaData.java
+++ b/runescape-client/src/main/java/WorldMapAreaData.java
@@ -11,7 +11,7 @@ import net.runelite.mapping.ObfuscatedSignature;
public class WorldMapAreaData extends WorldMapArea {
@ObfuscatedName("n")
@Export("surfaceOffsetY")
- HashSet __n;
+ HashSet surfaceOffsetY;
@ObfuscatedName("i")
@Export("__i")
HashSet __i;
@@ -28,7 +28,7 @@ public class WorldMapAreaData extends WorldMapArea {
void __ce_76(Buffer var1, Buffer var2, int var3, boolean var4) {
this.read(var1, var3);
int var5 = var2.__ag_302();
- this.__n = new HashSet(var5);
+ this.surfaceOffsetY = new HashSet(var5);
int var6;
for(var6 = 0; var6 < var5; ++var6) {
@@ -36,22 +36,22 @@ public class WorldMapAreaData extends WorldMapArea {
try {
var7.method173(var2);
- } catch (IllegalStateException var12) {
+ } catch (IllegalStateException var11) {
continue;
}
- this.__n.add(var7);
+ this.surfaceOffsetY.add(var7);
}
var6 = var2.__ag_302();
this.__i = new HashSet(var6);
- for(int var10 = 0; var10 < var6; ++var10) {
+ for(int var12 = 0; var12 < var6; ++var12) {
class39 var8 = new class39();
try {
var8.method714(var2);
- } catch (IllegalStateException var11) {
+ } catch (IllegalStateException var10) {
continue;
}
@@ -139,11 +139,11 @@ public class WorldMapAreaData extends WorldMapArea {
var4 = var2?WorldMapIcon1.__t_i:class12.__n_n;
}
- int var11;
+ int var5;
if(var0 == 1300) {
- var11 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] - 1;
- if(var11 >= 0 && var11 <= 9) {
- var4.setAction(var11, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] - 1;
+ if(var5 >= 0 && var5 <= 9) {
+ var4.setAction(var5, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
return 1;
} else {
--Interpreter.Interpreter_stringStackSize;
@@ -153,9 +153,9 @@ public class WorldMapAreaData extends WorldMapArea {
int var6;
if(var0 == 1301) {
class179.Interpreter_intStackSize -= 2;
- var11 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
+ var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- var4.parent = class204.getWidgetChild(var11, var6);
+ var4.parent = class204.getWidgetChild(var5, var6);
return 1;
} else if(var0 == 1302) {
var4.isScrollBar = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
@@ -180,52 +180,52 @@ public class WorldMapAreaData extends WorldMapArea {
return 1;
} else {
int var7;
- byte[] var9;
+ byte[] var8;
if(var0 != 1350) {
- byte var5;
+ byte var11;
if(var0 == 1351) {
class179.Interpreter_intStackSize -= 2;
- var5 = 10;
- var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]};
+ var11 = 10;
+ var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]};
byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]};
- BufferedSink.method3595(var4, var5, var9, var10);
+ BufferedSink.method3595(var4, var11, var8, var10);
return 1;
} else if(var0 == 1352) {
class179.Interpreter_intStackSize -= 3;
- var11 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] - 1;
+ var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] - 1;
var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
- if(var11 >= 0 && var11 <= 9) {
- Varcs.method2168(var4, var11, var6, var7);
+ if(var5 >= 0 && var5 <= 9) {
+ Varcs.method2168(var4, var5, var6, var7);
return 1;
} else {
throw new RuntimeException();
}
} else if(var0 == 1353) {
- var5 = 10;
+ var11 = 10;
var6 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- Varcs.method2168(var4, var5, var6, var7);
+ Varcs.method2168(var4, var11, var6, var7);
return 1;
} else if(var0 == 1354) {
--class179.Interpreter_intStackSize;
- var11 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] - 1;
- if(var11 >= 0 && var11 <= 9) {
- WorldMapSection3.method345(var4, var11);
+ var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] - 1;
+ if(var5 >= 0 && var5 <= 9) {
+ WorldMapSection3.method345(var4, var5);
return 1;
} else {
throw new RuntimeException();
}
} else if(var0 == 1355) {
- var5 = 10;
- WorldMapSection3.method345(var4, var5);
+ var11 = 10;
+ WorldMapSection3.method345(var4, var11);
return 1;
} else {
return 2;
}
} else {
- byte[] var8 = null;
- var9 = null;
+ byte[] var9 = null;
+ var8 = null;
if(var3) {
class179.Interpreter_intStackSize -= 10;
@@ -234,23 +234,23 @@ public class WorldMapAreaData extends WorldMapArea {
}
if(var7 > 0) {
- var8 = new byte[var7 / 2];
var9 = new byte[var7 / 2];
+ var8 = new byte[var7 / 2];
for(var7 -= 2; var7 >= 0; var7 -= 2) {
- var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class179.Interpreter_intStackSize];
- var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class179.Interpreter_intStackSize + 1];
+ var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class179.Interpreter_intStackSize];
+ var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class179.Interpreter_intStackSize + 1];
}
}
} else {
class179.Interpreter_intStackSize -= 2;
- var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]};
- var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]};
+ var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]};
+ var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]};
}
var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] - 1;
if(var7 >= 0 && var7 <= 9) {
- BufferedSink.method3595(var4, var7, var8, var9);
+ BufferedSink.method3595(var4, var7, var9, var8);
return 1;
} else {
throw new RuntimeException();
diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java
index 8a0dfcdb3d..865bfdf8c2 100644
--- a/runescape-client/src/main/java/WorldMapCacheName.java
+++ b/runescape-client/src/main/java/WorldMapCacheName.java
@@ -49,14 +49,6 @@ public class WorldMapCacheName {
@Export("name")
public final String name;
- static {
- WorldMapCacheName_details = new WorldMapCacheName("details");
- WorldMapCacheName_compositeMap = new WorldMapCacheName("compositemap");
- WorldMapCacheName_compositeTexture = new WorldMapCacheName("compositetexture");
- WorldMapCacheName_area = new WorldMapCacheName("area");
- WorldMapCacheName_labels = new WorldMapCacheName("labels");
- }
-
WorldMapCacheName(String var1) {
this.name = var1;
}
@@ -75,12 +67,12 @@ public class WorldMapCacheName {
for(int var2 = 0; var2 < ByteArrayPool.__gi_g.length; ++var2) {
class179.__fe_e[var2] = new byte[var1[var2]][];
}
-
} else {
ByteArrayPool.__gi_g = null;
WorldMapSection2.__ah_l = null;
- class179.__fe_e = null;
+ class179.__fe_e = (byte[][][])null;
}
+
}
@ObfuscatedName("m")
@@ -186,4 +178,12 @@ public class WorldMapCacheName {
}
}
+
+ static {
+ WorldMapCacheName_details = new WorldMapCacheName("details");
+ WorldMapCacheName_compositeMap = new WorldMapCacheName("compositemap");
+ WorldMapCacheName_compositeTexture = new WorldMapCacheName("compositetexture");
+ WorldMapCacheName_area = new WorldMapCacheName("area");
+ WorldMapCacheName_labels = new WorldMapCacheName("labels");
+ }
}
diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java
index 906ec39875..b127eb07a1 100644
--- a/runescape-client/src/main/java/WorldMapElement.java
+++ b/runescape-client/src/main/java/WorldMapElement.java
@@ -114,10 +114,6 @@ public class WorldMapElement extends DualNode {
@Export("category")
public int category;
- static {
- WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256);
- }
-
public WorldMapElement(int var1) {
this.sprite1 = -1;
this.sprite2 = -1;
@@ -328,4 +324,8 @@ public class WorldMapElement extends DualNode {
return null;
}
+
+ static {
+ WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256);
+ }
}
diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java
index e264324840..940ca27f8e 100644
--- a/runescape-client/src/main/java/WorldMapEvent.java
+++ b/runescape-client/src/main/java/WorldMapEvent.java
@@ -65,188 +65,188 @@ public class WorldMapEvent {
int var8 = 0;
while(true) {
- int var10 = ViewportMouse.ViewportMouse_entityCount;
- if(var8 >= var10) {
+ int var9 = ViewportMouse.ViewportMouse_entityCount;
+ if(var8 >= var9) {
if(-1L != var4) {
var8 = UnitPriceComparator.method134(var4);
- int var9 = (int)(var4 >>> 7 & 127L);
+ int var29 = (int)(var4 >>> 7 & 127L);
Player var11 = Client.players[Client.combatTargetPlayerIndex];
- TotalQuantityComparator.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var9);
+ TotalQuantityComparator.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var29);
}
return;
}
- long var26 = ViewportMouse.ViewportMouse_entityTags[var8];
- if(var6 != var26) {
- label338: {
- var6 = var26;
- int var15 = method780(var8);
- long var18 = ViewportMouse.ViewportMouse_entityTags[var8];
- int var17 = (int)(var18 >>> 7 & 127L);
- var17 = var17;
- int var28 = GrandExchangeEvent.method80(var8);
- int var19 = ClientPreferences.method1808(var8);
- if(var28 == 2 && class65.scene.getObjectFlags(SoundSystem.plane, var15, var17, var26) >= 0) {
- ObjectDefinition var20 = class50.getObjectDefinition(var19);
- if(var20.transforms != null) {
- var20 = var20.transform();
+ long var10 = ViewportMouse.ViewportMouse_entityTags[var8];
+ if(var6 != var10) {
+ label276: {
+ var6 = var10;
+ int var12 = method780(var8);
+ long var13 = ViewportMouse.ViewportMouse_entityTags[var8];
+ int var15 = (int)(var13 >>> 7 & 127L);
+ var15 = var15;
+ int var16 = GrandExchangeEvent.method80(var8);
+ int var17 = ClientPreferences.method1808(var8);
+ if(var16 == 2 && class65.scene.getObjectFlags(SoundSystem.plane, var12, var15, var10) >= 0) {
+ ObjectDefinition var18 = class50.getObjectDefinition(var17);
+ if(var18.transforms != null) {
+ var18 = var18.transform();
}
- if(var20 == null) {
- break label338;
+ if(var18 == null) {
+ break label276;
}
if(Client.isItemSelected == 1) {
- Tiles.method1106("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(65535) + var20.name, 1, var19, var15, var17);
+ Tiles.method1106("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 1, var17, var12, var15);
} else if(Client.isSpellSelected) {
if((FloorDecoration.selectedSpellFlags & 4) == 4) {
- Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(65535) + var20.name, 2, var19, var15, var17);
+ Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 2, var17, var12, var15);
}
} else {
- String[] var29 = var20.actions;
- if(var29 != null) {
- for(int var30 = 4; var30 >= 0; --var30) {
- if(var29[var30] != null) {
- short var23 = 0;
- if(var30 == 0) {
- var23 = 3;
+ String[] var19 = var18.actions;
+ if(var19 != null) {
+ for(int var20 = 4; var20 >= 0; --var20) {
+ if(var19[var20] != null) {
+ short var21 = 0;
+ if(var20 == 0) {
+ var21 = 3;
}
- if(var30 == 1) {
- var23 = 4;
+ if(var20 == 1) {
+ var21 = 4;
}
- if(var30 == 2) {
- var23 = 5;
+ if(var20 == 2) {
+ var21 = 5;
}
- if(var30 == 3) {
- var23 = 6;
+ if(var20 == 3) {
+ var21 = 6;
}
- if(var30 == 4) {
- var23 = 1001;
+ if(var20 == 4) {
+ var21 = 1001;
}
- Tiles.method1106(var29[var30], BufferedFile.colorStartTag(65535) + var20.name, var23, var19, var15, var17);
+ Tiles.method1106(var19[var20], BufferedFile.colorStartTag(65535) + var18.name, var21, var17, var12, var15);
}
}
}
- Tiles.method1106("Examine", BufferedFile.colorStartTag(65535) + var20.name, 1002, var20.id, var15, var17);
+ Tiles.method1106("Examine", BufferedFile.colorStartTag(65535) + var18.name, 1002, var18.id, var12, var15);
}
}
- int var21;
- Npc var22;
- Player var24;
- int[] var36;
- int var38;
- if(var28 == 1) {
- Npc var33 = Client.npcs[var19];
+ int var22;
+ int var30;
+ NPC var31;
+ Player var32;
+ int[] var34;
+ if(var16 == 1) {
+ NPC var23 = Client.npcs[var17];
+ if(var23 == null) {
+ break label276;
+ }
+
+ if(var23.definition.size == 1 && (var23.x & 127) == 64 && (var23.y & 127) == 64) {
+ for(var30 = 0; var30 < Client.npcCount; ++var30) {
+ var31 = Client.npcs[Client.npcIndices[var30]];
+ if(var31 != null && var23 != var31 && var31.definition.size == 1 && var31.x == var23.x && var31.y == var23.y) {
+ Tile.addNpcToMenu(var31.definition, Client.npcIndices[var30], var12, var15);
+ }
+ }
+
+ var30 = Players.Players_count;
+ var34 = Players.Players_indices;
+
+ for(var22 = 0; var22 < var30; ++var22) {
+ var32 = Client.players[var34[var22]];
+ if(var32 != null && var32.x == var23.x && var32.y == var23.y) {
+ TotalQuantityComparator.addPlayerToMenu(var32, var34[var22], var12, var15);
+ }
+ }
+ }
+
+ Tile.addNpcToMenu(var23.definition, var17, var12, var15);
+ }
+
+ if(var16 == 0) {
+ Player var33 = Client.players[var17];
if(var33 == null) {
- break label338;
+ break label276;
}
- if(var33.definition.size == 1 && (var33.x & 127) == 64 && (var33.y & 127) == 64) {
- for(var21 = 0; var21 < Client.npcCount; ++var21) {
- var22 = Client.npcs[Client.npcIndices[var21]];
- if(var22 != null && var33 != var22 && var22.definition.size == 1 && var22.x == var33.x && var22.y == var33.y) {
- Tile.addNpcToMenu(var22.definition, Client.npcIndices[var21], var15, var17);
+ if((var33.x & 127) == 64 && (var33.y & 127) == 64) {
+ for(var30 = 0; var30 < Client.npcCount; ++var30) {
+ var31 = Client.npcs[Client.npcIndices[var30]];
+ if(var31 != null && var31.definition.size == 1 && var33.x == var31.x && var33.y == var31.y) {
+ Tile.addNpcToMenu(var31.definition, Client.npcIndices[var30], var12, var15);
}
}
- var21 = Players.Players_count;
- var36 = Players.Players_indices;
+ var30 = Players.Players_count;
+ var34 = Players.Players_indices;
- for(var38 = 0; var38 < var21; ++var38) {
- var24 = Client.players[var36[var38]];
- if(var24 != null && var24.x == var33.x && var24.y == var33.y) {
- TotalQuantityComparator.addPlayerToMenu(var24, var36[var38], var15, var17);
+ for(var22 = 0; var22 < var30; ++var22) {
+ var32 = Client.players[var34[var22]];
+ if(var32 != null && var32 != var33 && var32.x == var33.x && var32.y == var33.y) {
+ TotalQuantityComparator.addPlayerToMenu(var32, var34[var22], var12, var15);
}
}
}
- Tile.addNpcToMenu(var33.definition, var19, var15, var17);
- }
-
- if(var28 == 0) {
- Player var34 = Client.players[var19];
- if(var34 == null) {
- break label338;
- }
-
- if((var34.x & 127) == 64 && (var34.y & 127) == 64) {
- for(var21 = 0; var21 < Client.npcCount; ++var21) {
- var22 = Client.npcs[Client.npcIndices[var21]];
- if(var22 != null && var22.definition.size == 1 && var34.x == var22.x && var34.y == var22.y) {
- Tile.addNpcToMenu(var22.definition, Client.npcIndices[var21], var15, var17);
- }
- }
-
- var21 = Players.Players_count;
- var36 = Players.Players_indices;
-
- for(var38 = 0; var38 < var21; ++var38) {
- var24 = Client.players[var36[var38]];
- if(var24 != null && var24 != var34 && var24.x == var34.x && var24.y == var34.y) {
- TotalQuantityComparator.addPlayerToMenu(var24, var36[var38], var15, var17);
- }
- }
- }
-
- if(var19 != Client.combatTargetPlayerIndex) {
- TotalQuantityComparator.addPlayerToMenu(var34, var19, var15, var17);
+ if(var17 != Client.combatTargetPlayerIndex) {
+ TotalQuantityComparator.addPlayerToMenu(var33, var17, var12, var15);
} else {
- var4 = var26;
+ var4 = var10;
}
}
- if(var28 == 3) {
- NodeDeque var35 = Client.groundItems[SoundSystem.plane][var15][var17];
+ if(var16 == 3) {
+ NodeDeque var35 = Client.groundItems[SoundSystem.plane][var12][var15];
if(var35 != null) {
- for(GroundItem var39 = (GroundItem)var35.first(); var39 != null; var39 = (GroundItem)var35.next()) {
- ItemDefinition var37 = Skills.getItemDefinition(var39.id);
+ for(GroundItem var24 = (GroundItem)var35.first(); var24 != null; var24 = (GroundItem)var35.next()) {
+ ItemDefinition var25 = Skills.getItemDefinition(var24.id);
if(Client.isItemSelected == 1) {
- Tiles.method1106("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var37.name, 16, var39.id, var15, var17);
+ Tiles.method1106("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 16, var24.id, var12, var15);
} else if(Client.isSpellSelected) {
if((FloorDecoration.selectedSpellFlags & 1) == 1) {
- Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var37.name, 17, var39.id, var15, var17);
+ Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 17, var24.id, var12, var15);
}
} else {
- String[] var31 = var37.groundActions;
+ String[] var26 = var25.groundActions;
- for(int var32 = 4; var32 >= 0; --var32) {
- if(var31 != null && var31[var32] != null) {
- byte var25 = 0;
- if(var32 == 0) {
- var25 = 18;
+ for(int var27 = 4; var27 >= 0; --var27) {
+ if(var26 != null && var26[var27] != null) {
+ byte var28 = 0;
+ if(var27 == 0) {
+ var28 = 18;
}
- if(var32 == 1) {
- var25 = 19;
+ if(var27 == 1) {
+ var28 = 19;
}
- if(var32 == 2) {
- var25 = 20;
+ if(var27 == 2) {
+ var28 = 20;
}
- if(var32 == 3) {
- var25 = 21;
+ if(var27 == 3) {
+ var28 = 21;
}
- if(var32 == 4) {
- var25 = 22;
+ if(var27 == 4) {
+ var28 = 22;
}
- Tiles.method1106(var31[var32], BufferedFile.colorStartTag(16748608) + var37.name, var25, var39.id, var15, var17);
- } else if(var32 == 2) {
- Tiles.method1106("Take", BufferedFile.colorStartTag(16748608) + var37.name, 20, var39.id, var15, var17);
+ Tiles.method1106(var26[var27], BufferedFile.colorStartTag(16748608) + var25.name, var28, var24.id, var12, var15);
+ } else if(var27 == 2) {
+ Tiles.method1106("Take", BufferedFile.colorStartTag(16748608) + var25.name, 20, var24.id, var12, var15);
}
}
- Tiles.method1106("Examine", BufferedFile.colorStartTag(16748608) + var37.name, 1004, var39.id, var15, var17);
+ Tiles.method1106("Examine", BufferedFile.colorStartTag(16748608) + var25.name, 1004, var24.id, var12, var15);
}
}
}
diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java
index 6d3253c553..e209c1fb14 100644
--- a/runescape-client/src/main/java/WorldMapIcon1.java
+++ b/runescape-client/src/main/java/WorldMapIcon1.java
@@ -131,20 +131,20 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
for(int var0 = 0; var0 < Client.soundEffectCount; ++var0) {
--Client.queuedSoundEffectDelays[var0];
if(Client.queuedSoundEffectDelays[var0] >= -10) {
- SoundEffect var9 = Client.soundEffects[var0];
- if(var9 == null) {
- Object var10000 = null;
- var9 = SoundEffect.readSoundEffect(class25.indexCache4, Client.soundEffectIds[var0], 0);
- if(var9 == null) {
+ SoundEffect var10 = Client.soundEffects[var0];
+ if(var10 == null) {
+ Object var2 = null;
+ var10 = SoundEffect.readSoundEffect(class25.indexCache4, Client.soundEffectIds[var0], 0);
+ if(var10 == null) {
continue;
}
- Client.queuedSoundEffectDelays[var0] += var9.__q_174();
- Client.soundEffects[var0] = var9;
+ Client.queuedSoundEffectDelays[var0] += var10.__q_174();
+ Client.soundEffects[var0] = var10;
}
if(Client.queuedSoundEffectDelays[var0] < 0) {
- int var2;
+ int var11;
if(Client.soundLocations[var0] != 0) {
int var3 = (Client.soundLocations[var0] & 255) * 128;
int var4 = Client.soundLocations[var0] >> 16 & 255;
@@ -169,16 +169,16 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
var8 = 0;
}
- var2 = (var3 - var8) * Client.__client_qc / var3;
+ var11 = (var3 - var8) * Client.__client_qc / var3;
} else {
- var2 = Client.__client_qp;
+ var11 = Client.__client_qp;
}
- if(var2 > 0) {
- RawSound var10 = var9.toRawSound().resample(MilliClock.decimator);
- RawPcmStream var11 = RawPcmStream.method2497(var10, 100, var2);
- var11.__x_181(Client.unknownSoundValues1[var0] - 1);
- TaskHandler.pcmStreamMixer.addSubStream(var11);
+ if(var11 > 0) {
+ RawSound var12 = var10.toRawSound().resample(MilliClock.decimator);
+ RawPcmStream var13 = RawPcmStream.method2497(var12, 100, var11);
+ var13.__x_181(Client.unknownSoundValues1[var0] - 1);
+ TaskHandler.pcmStreamMixer.addSubStream(var13);
}
Client.queuedSoundEffectDelays[var0] = -100;
@@ -199,14 +199,14 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
}
if(Client.__client_qq) {
- boolean var12;
+ boolean var9;
if(class214.__hf_o != 0) {
- var12 = true;
+ var9 = true;
} else {
- var12 = class214.midiPcmStream.isReady();
+ var9 = class214.midiPcmStream.isReady();
}
- if(!var12) {
+ if(!var9) {
if(Client.__client_qf != 0 && Client.__client_qy != -1) {
Login.method2076(UserComparator3.indexCache6, Client.__client_qy, 0, Client.__client_qf, false);
}
diff --git a/runescape-client/src/main/java/WorldMapIcon2.java b/runescape-client/src/main/java/WorldMapIcon2.java
index 46ab9b277f..35843cc50f 100644
--- a/runescape-client/src/main/java/WorldMapIcon2.java
+++ b/runescape-client/src/main/java/WorldMapIcon2.java
@@ -152,13 +152,13 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
class171.__fo_q.put(var0, var2);
return var2;
}
- } catch (Exception var8) {
+ } catch (Exception var7) {
try {
if(var3 != null) {
var3.close();
var3 = null;
}
- } catch (Exception var7) {
+ } catch (Exception var6) {
;
}
@@ -177,22 +177,20 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
int var4 = var0.pathX[0];
int var5 = var0.pathY[0];
int var6 = var0.transformedSize();
- if(var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) {
- if(var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) {
- int var9 = var0.transformedSize();
- Client.field895.field2120 = var1;
- Client.field895.field2121 = var2;
- Client.field895.field2122 = 1;
- Client.field895.field2123 = 1;
- class65 var10 = Client.field895;
- int var11 = NetSocket.method3571(var4, var5, var9, var10, Client.collisionMaps[var0.plane], true, Client.__client_tp, Client.__client_th);
- if(var11 >= 1) {
- for(int var12 = 0; var12 < var11 - 1; ++var12) {
- var0.__a_131(Client.__client_tp[var12], Client.__client_th[var12], var3);
- }
-
+ if(var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6 && var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) {
+ int var7 = var0.transformedSize();
+ Client.field895.field2120 = var1;
+ Client.field895.field2121 = var2;
+ Client.field895.field2122 = 1;
+ Client.field895.field2123 = 1;
+ class65 var8 = Client.field895;
+ int var9 = NetSocket.method3571(var4, var5, var7, var8, Client.collisionMaps[var0.plane], true, Client.__client_tp, Client.__client_th);
+ if(var9 >= 1) {
+ for(int var10 = 0; var10 < var9 - 1; ++var10) {
+ var0.__a_131(Client.__client_tp[var10], Client.__client_th[var10], var3);
}
}
}
+
}
}
diff --git a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java b/runescape-client/src/main/java/WorldMapIndexCacheLoader.java
index 5333cd9d1b..26bfb7875d 100644
--- a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java
+++ b/runescape-client/src/main/java/WorldMapIndexCacheLoader.java
@@ -42,14 +42,13 @@ public class WorldMapIndexCacheLoader {
)
@Export("reset")
void reset(String var1) {
- if(var1 != null && !var1.isEmpty()) {
- if(var1 != this.cacheName) {
- this.cacheName = var1;
- this.percentLoaded0 = 0;
- this.isLoaded0 = false;
- this.load();
- }
+ if(var1 != null && !var1.isEmpty() && var1 != this.cacheName) {
+ this.cacheName = var1;
+ this.percentLoaded0 = 0;
+ this.isLoaded0 = false;
+ this.load();
}
+
}
@ObfuscatedName("f")
diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java
index f73b839a03..8bbcd5a37f 100644
--- a/runescape-client/src/main/java/WorldMapLabel.java
+++ b/runescape-client/src/main/java/WorldMapLabel.java
@@ -90,60 +90,60 @@ public class WorldMapLabel {
var0.writeInt(var6);
}
- Method var25;
+ Method var7;
if(var4 != 3) {
if(var4 == 4) {
- var25 = var1.methods[var3];
- var6 = var25.getModifiers();
+ var7 = var1.methods[var3];
+ var6 = var7.getModifiers();
var0.writeByte(0);
var0.writeInt(var6);
}
} else {
- var25 = var1.methods[var3];
- byte[][] var10 = var1.arguments[var3];
- Object[] var7 = new Object[var10.length];
+ var7 = var1.methods[var3];
+ byte[][] var8 = var1.arguments[var3];
+ Object[] var9 = new Object[var8.length];
- for(int var8 = 0; var8 < var10.length; ++var8) {
- ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8]));
- var7[var8] = var9.readObject();
+ for(int var10 = 0; var10 < var8.length; ++var10) {
+ ObjectInputStream var11 = new ObjectInputStream(new ByteArrayInputStream(var8[var10]));
+ var9[var10] = var11.readObject();
}
- Object var11 = Reflection.invoke(var25, (Object)null, var7);
- if(var11 == null) {
+ Object var24 = Reflection.invoke(var7, (Object)null, var9);
+ if(var24 == null) {
var0.writeByte(0);
- } else if(var11 instanceof Number) {
+ } else if(var24 instanceof Number) {
var0.writeByte(1);
- var0.writeLong(((Number)var11).longValue());
- } else if(var11 instanceof String) {
+ var0.writeLong(((Number)var24).longValue());
+ } else if(var24 instanceof String) {
var0.writeByte(2);
- var0.writeStringCp1252NullTerminated((String)var11);
+ var0.writeStringCp1252NullTerminated((String)var24);
} else {
var0.writeByte(4);
}
}
- } catch (ClassNotFoundException var13) {
+ } catch (ClassNotFoundException var12) {
var0.writeByte(-10);
- } catch (InvalidClassException var14) {
+ } catch (InvalidClassException var13) {
var0.writeByte(-11);
- } catch (StreamCorruptedException var15) {
+ } catch (StreamCorruptedException var14) {
var0.writeByte(-12);
- } catch (OptionalDataException var16) {
+ } catch (OptionalDataException var15) {
var0.writeByte(-13);
- } catch (IllegalAccessException var17) {
+ } catch (IllegalAccessException var16) {
var0.writeByte(-14);
- } catch (IllegalArgumentException var18) {
+ } catch (IllegalArgumentException var17) {
var0.writeByte(-15);
- } catch (InvocationTargetException var19) {
+ } catch (InvocationTargetException var18) {
var0.writeByte(-16);
- } catch (SecurityException var20) {
+ } catch (SecurityException var19) {
var0.writeByte(-17);
- } catch (IOException var21) {
+ } catch (IOException var20) {
var0.writeByte(-18);
- } catch (NullPointerException var22) {
+ } catch (NullPointerException var21) {
var0.writeByte(-19);
- } catch (Exception var23) {
+ } catch (Exception var22) {
var0.writeByte(-20);
- } catch (Throwable var24) {
+ } catch (Throwable var23) {
var0.writeByte(-21);
}
}
@@ -152,6 +152,7 @@ public class WorldMapLabel {
var0.__aa_312(var2);
var1.remove();
}
+
}
@ObfuscatedName("f")
@@ -189,7 +190,7 @@ public class WorldMapLabel {
VarbitDefinition.indexedSpriteWidths = null;
SecureRandomCallable.indexedSpriteHeights = null;
class328.indexedSpritePalette = null;
- class328.spritePixels = null;
+ class328.spritePixels = (byte[][])null;
return var0;
}
@@ -225,8 +226,8 @@ public class WorldMapLabel {
garbageValue = "60"
)
public static void method440() {
- NpcDefinition.NpcDefinition_cached.clear();
- NpcDefinition.NpcDefinition_cachedModels.clear();
+ NPCDefinition.NpcDefinition_cached.clear();
+ NPCDefinition.NpcDefinition_cachedModels.clear();
}
@ObfuscatedName("gx")
@@ -257,10 +258,10 @@ public class WorldMapLabel {
Client.viewportTempX = -1;
Client.viewportTempY = -1;
}
-
} else {
Client.viewportTempX = -1;
Client.viewportTempY = -1;
}
+
}
}
diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java
index 43ffdb668a..1e6b0dc880 100644
--- a/runescape-client/src/main/java/WorldMapLabelSize.java
+++ b/runescape-client/src/main/java/WorldMapLabelSize.java
@@ -62,12 +62,6 @@ public class WorldMapLabelSize {
@Export("__u")
final int __u;
- static {
- WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4);
- WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2);
- WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0);
- }
-
WorldMapLabelSize(int var1, int var2, int var3) {
this.__w = var1;
this.__o = var2;
@@ -132,4 +126,10 @@ public class WorldMapLabelSize {
}
}
+
+ static {
+ WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4);
+ WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2);
+ WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0);
+ }
}
diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java
index ea2c6a1ec9..10f70e41f6 100644
--- a/runescape-client/src/main/java/WorldMapManager.java
+++ b/runescape-client/src/main/java/WorldMapManager.java
@@ -129,7 +129,7 @@ public final class WorldMapManager {
try {
this.mapAreaData.__ce_76(var6, var7, var5, var3);
- } catch (IllegalStateException var19) {
+ } catch (IllegalStateException var16) {
return;
}
@@ -140,17 +140,18 @@ public final class WorldMapManager {
this.surfaceOffsetY = this.mapAreaData.minY() * 64;
this.__i = (this.mapAreaData.maxX() - this.mapAreaData.minX() + 1) * 64;
this.__a = (this.mapAreaData.maxY() - this.mapAreaData.minY() + 1) * 64;
- int var16 = this.mapAreaData.maxX() - this.mapAreaData.minX() + 1;
+ int var8 = this.mapAreaData.maxX() - this.mapAreaData.minX() + 1;
int var9 = this.mapAreaData.maxY() - this.mapAreaData.minY() + 1;
System.nanoTime();
System.nanoTime();
SoundSystem.method2456();
- this.regions = new WorldMapRegion[var16][var9];
- Iterator var10 = this.mapAreaData.__n.iterator();
+ this.regions = new WorldMapRegion[var8][var9];
+ Iterator var10 = this.mapAreaData.surfaceOffsetY.iterator();
+ int var12;
while(var10.hasNext()) {
class15 var11 = (class15)var10.next();
- int var12 = var11.field149;
+ var12 = var11.field149;
int var13 = var11.field146;
int var14 = var12 - this.mapAreaData.minX();
int var15 = var13 - this.mapAreaData.minY();
@@ -158,11 +159,11 @@ public final class WorldMapManager {
this.regions[var14][var15].method447(var11, this.mapAreaData.__a);
}
- for(int var17 = 0; var17 < var16; ++var17) {
- for(int var18 = 0; var18 < var9; ++var18) {
- if(this.regions[var17][var18] == null) {
- this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.minX() + var17, this.mapAreaData.minY() + var18, this.mapAreaData.__a_39(), this.fonts);
- this.regions[var17][var18].__u_41(this.mapAreaData.__i, this.mapAreaData.__a);
+ for(int var17 = 0; var17 < var8; ++var17) {
+ for(var12 = 0; var12 < var9; ++var12) {
+ if(this.regions[var17][var12] == null) {
+ this.regions[var17][var12] = new WorldMapRegion(this.mapAreaData.minX() + var17, this.mapAreaData.minY() + var12, this.mapAreaData.__a_39(), this.fonts);
+ this.regions[var17][var12].__u_41(this.mapAreaData.__i, this.mapAreaData.__a);
}
}
}
@@ -170,8 +171,8 @@ public final class WorldMapManager {
System.nanoTime();
System.nanoTime();
if(var1.__ag_401(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2)) {
- byte[] var20 = var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2);
- this.overviewSprite = class27.method438(var20);
+ byte[] var18 = var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2);
+ this.overviewSprite = class27.method438(var18);
}
System.nanoTime();
@@ -179,6 +180,7 @@ public final class WorldMapManager {
var1.__b_400();
this.isLoaded0 = true;
}
+
}
@ObfuscatedName("f")
@@ -290,27 +292,28 @@ public final class WorldMapManager {
Iterator var8 = var5.iterator();
while(true) {
- List var10;
+ List var9;
do {
if(!var8.hasNext()) {
return;
}
- int var9 = ((Integer)var8.next()).intValue();
- var10 = (List)this.icons.get(Integer.valueOf(var9));
- } while(var10 == null);
+ int var10 = ((Integer)var8.next()).intValue();
+ var9 = (List)this.icons.get(Integer.valueOf(var10));
+ } while(var9 == null);
- Iterator var11 = var10.iterator();
+ Iterator var14 = var9.iterator();
- while(var11.hasNext()) {
- AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next();
- int var13 = var3 * (var12.coord2.x - this.surfaceOffsetX) / this.__i;
- int var14 = var4 - (var12.coord2.y - this.surfaceOffsetY) * var4 / this.__a;
- Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256);
+ while(var14.hasNext()) {
+ AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var14.next();
+ int var12 = var3 * (var11.coord2.x - this.surfaceOffsetX) / this.__i;
+ int var13 = var4 - (var11.coord2.y - this.surfaceOffsetY) * var4 / this.__a;
+ Rasterizer2D.Rasterizer2D_drawCircleAlpha(var12 + var1, var13 + var2, 2, 16776960, 256);
}
}
}
}
+
}
@ObfuscatedName("u")
diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java
index 161d5fa665..7fa8f34d52 100644
--- a/runescape-client/src/main/java/WorldMapRegion.java
+++ b/runescape-client/src/main/java/WorldMapRegion.java
@@ -61,10 +61,6 @@ public class WorldMapRegion {
@Export("fonts")
final HashMap fonts;
- static {
- __av_o = new DemotingHashTable(37748736, 256);
- }
-
WorldMapRegion(int var1, int var2, int var3, HashMap var4) {
this.x = var1;
this.y = var2;
@@ -89,8 +85,8 @@ public class WorldMapRegion {
} else {
var4.__al_517(var1, var2, var3, var3);
}
-
}
+
}
@ObfuscatedName("o")
@@ -133,7 +129,7 @@ public class WorldMapRegion {
this.iconsMap.clear();
for(int var6 = var1; var6 < var3 + var1; ++var6) {
- label75:
+ label66:
for(int var7 = var2; var7 < var2 + var4; ++var7) {
for(int var8 = 0; var8 < var5.field156; ++var8) {
class25[] var9 = var5.field144[var8][var6][var7];
@@ -141,33 +137,33 @@ public class WorldMapRegion {
class25[] var10 = var9;
for(int var11 = 0; var11 < var10.length; ++var11) {
- ObjectDefinition var13;
- boolean var14;
- label66: {
- class25 var12 = var10[var11];
- var13 = class50.getObjectDefinition(var12.field199);
- if(var13.transforms != null) {
- int[] var15 = var13.transforms;
+ ObjectDefinition var12;
+ boolean var13;
+ label57: {
+ class25 var14 = var10[var11];
+ var12 = class50.getObjectDefinition(var14.field199);
+ if(var12.transforms != null) {
+ int[] var15 = var12.transforms;
for(int var16 = 0; var16 < var15.length; ++var16) {
int var17 = var15[var16];
ObjectDefinition var18 = class50.getObjectDefinition(var17);
if(var18.mapIconId != -1) {
- var14 = true;
- break label66;
+ var13 = true;
+ break label57;
}
}
- } else if(var13.mapIconId != -1) {
- var14 = true;
- break label66;
+ } else if(var12.mapIconId != -1) {
+ var13 = true;
+ break label57;
}
- var14 = false;
+ var13 = false;
}
- if(var14) {
- this.method479(var13, var8, var6, var7, var5);
- continue label75;
+ if(var13) {
+ this.method479(var12, var8, var6, var7, var5);
+ continue label66;
}
}
}
@@ -305,37 +301,36 @@ public class WorldMapRegion {
)
void method455(int var1, class40 var2, IndexedSprite[] var3, AbstractIndexCache var4, AbstractIndexCache var5) {
this.__d = var1;
- if(this.field239 != null || !this.__e.isEmpty()) {
- if(class13.method164(this.x, this.y, var1) == null) {
- boolean var6 = true;
- var6 &= this.__a_45(var4);
- int var8;
+ if((this.field239 != null || !this.__e.isEmpty()) && class13.method164(this.x, this.y, var1) == null) {
+ boolean var6 = true;
+ var6 &= this.__a_45(var4);
+ int var7;
+ if(this.field239 != null) {
+ var7 = this.field239.field150;
+ } else {
+ var7 = ((class21)this.__e.getFirst()).field150;
+ }
+
+ var6 &= var5.tryLoadArchive(var7);
+ if(var6) {
+ byte[] var8 = var5.takeRecordFlat(var7);
+ class27 var9 = SecureRandomCallable.method1145(var8);
+ Sprite var10 = new Sprite(this.__d * 64, this.__d * 64);
+ var10.setRaster();
if(this.field239 != null) {
- var8 = this.field239.field150;
+ this.method546(var2, var3, var9);
} else {
- var8 = ((class21)this.__e.getFirst()).field150;
+ this.method459(var2, var3, var9);
}
- var6 &= var5.tryLoadArchive(var8);
- if(var6) {
- byte[] var7 = var5.takeRecordFlat(var8);
- class27 var9 = SecureRandomCallable.method1145(var7);
- Sprite var10 = new Sprite(this.__d * 64, this.__d * 64);
- var10.setRaster();
- if(this.field239 != null) {
- this.method546(var2, var3, var9);
- } else {
- this.method459(var2, var3, var9);
- }
-
- int var11 = this.x;
- int var12 = this.y;
- int var13 = this.__d;
- __av_o.put(var10, MouseHandler.method1083(var11, var12, var13), var10.pixels.length * 4);
- this.__d_44();
- }
+ int var11 = this.x;
+ int var12 = this.y;
+ int var13 = this.__d;
+ __av_o.put(var10, MouseHandler.method1083(var11, var12, var13), var10.pixels.length * 4);
+ this.__d_44();
}
}
+
}
@ObfuscatedName("j")
@@ -461,80 +456,83 @@ public class WorldMapRegion {
int var9;
if(var7 != -1) {
int var10 = this.__x;
- OverlayDefinition var12 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var7);
- OverlayDefinition var11;
- if(var12 != null) {
- var11 = var12;
+ OverlayDefinition var11 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var7);
+ OverlayDefinition var12;
+ if(var11 != null) {
+ var12 = var11;
} else {
byte[] var13 = OverlayDefinition.__jf_m.takeRecord(4, var7);
- var12 = new OverlayDefinition();
+ var11 = new OverlayDefinition();
if(var13 != null) {
- var12.read(new Buffer(var13), var7);
+ var11.read(new Buffer(var13), var7);
}
- var12.init();
- OverlayDefinition.__jf_f.put(var12, (long)var7);
- var11 = var12;
+ var11.init();
+ OverlayDefinition.__jf_f.put(var11, (long)var7);
+ var12 = var11;
}
- if(var11 == null) {
- var9 = var10;
- } else if(var11.rgb2 >= 0) {
- var9 = var11.rgb2 | -16777216;
- } else if(var11.texture >= 0) {
- int var21 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var11.texture), 96);
- var9 = Rasterizer3D.Rasterizer3D_colorPalette[var21] | -16777216;
- } else if(var11.rgb == 16711935) {
+ if(var12 == null) {
var9 = var10;
+ } else if(var12.rgb2 >= 0) {
+ var9 = var12.rgb2 | -16777216;
} else {
- int var14 = var11.hue;
- int var15 = var11.saturation;
- int var16 = var11.lightness;
- if(var16 > 179) {
- var15 /= 2;
- }
-
- if(var16 > 192) {
- var15 /= 2;
- }
-
- if(var16 > 217) {
- var15 /= 2;
- }
-
- if(var16 > 243) {
- var15 /= 2;
- }
-
- int var17 = (var15 / 32 << 7) + var16 / 2 + (var14 / 4 << 10);
- byte var19 = 96;
- int var18;
- if(var17 == -2) {
- var18 = 12345678;
+ int var20;
+ if(var12.texture >= 0) {
+ var20 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var12.texture), 96);
+ var9 = Rasterizer3D.Rasterizer3D_colorPalette[var20] | -16777216;
+ } else if(var12.rgb == 16711935) {
+ var9 = var10;
} else {
- int var22;
- if(var17 == -1) {
- if(var19 < 0) {
- var19 = 0;
- } else if(var19 > 127) {
- var19 = 127;
- }
-
- var22 = 127 - var19;
- var18 = var22;
- } else {
- var22 = var19 * (var17 & 127) / 128;
- if(var22 < 2) {
- var22 = 2;
- } else if(var22 > 126) {
- var22 = 126;
- }
-
- var18 = var22 + (var17 & 65408);
+ var20 = var12.hue;
+ int var14 = var12.saturation;
+ int var15 = var12.lightness;
+ if(var15 > 179) {
+ var14 /= 2;
}
- }
- var9 = Rasterizer3D.Rasterizer3D_colorPalette[var18] | -16777216;
+ if(var15 > 192) {
+ var14 /= 2;
+ }
+
+ if(var15 > 217) {
+ var14 /= 2;
+ }
+
+ if(var15 > 243) {
+ var14 /= 2;
+ }
+
+ int var16 = (var14 / 32 << 7) + var15 / 2 + (var20 / 4 << 10);
+ byte var17 = 96;
+ int var18;
+ if(var16 == -2) {
+ var18 = 12345678;
+ } else {
+ int var19;
+ if(var16 == -1) {
+ if(var17 < 0) {
+ var17 = 0;
+ } else if(var17 > 127) {
+ var17 = 127;
+ }
+
+ var19 = 127 - var17;
+ var18 = var19;
+ } else {
+ var19 = var17 * (var16 & 127) / 128;
+ if(var19 < 2) {
+ var19 = 2;
+ } else if(var19 > 126) {
+ var19 = 126;
+ }
+
+ var18 = var19 + (var16 & 65408);
+ }
+ }
+
+ var9 = Rasterizer3D.Rasterizer3D_colorPalette[var18] | -16777216;
+ }
}
var8 = var9;
@@ -550,6 +548,7 @@ public class WorldMapRegion {
var4.method743(this.__d * var1, this.__d * (63 - var2), var9, var8, this.__d, this.__d, var3.field154[0][var1][var2], var3.field155[0][var1][var2]);
}
}
+
}
@ObfuscatedName("c")
@@ -561,88 +560,91 @@ public class WorldMapRegion {
for(int var5 = 1; var5 < var3.field156; ++var5) {
int var6 = var3.field145[var5][var1][var2] - 1;
if(var6 > -1) {
- int var8 = this.__x;
- OverlayDefinition var10 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var6);
+ int var7 = this.__x;
+ OverlayDefinition var8 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var6);
OverlayDefinition var9;
- if(var10 != null) {
- var9 = var10;
+ if(var8 != null) {
+ var9 = var8;
} else {
- byte[] var11 = OverlayDefinition.__jf_m.takeRecord(4, var6);
- var10 = new OverlayDefinition();
- if(var11 != null) {
- var10.read(new Buffer(var11), var6);
+ byte[] var10 = OverlayDefinition.__jf_m.takeRecord(4, var6);
+ var8 = new OverlayDefinition();
+ if(var10 != null) {
+ var8.read(new Buffer(var10), var6);
}
- var10.init();
- OverlayDefinition.__jf_f.put(var10, (long)var6);
- var9 = var10;
+ var8.init();
+ OverlayDefinition.__jf_f.put(var8, (long)var6);
+ var9 = var8;
}
- int var7;
+ int var18;
if(var9 == null) {
- var7 = var8;
+ var18 = var7;
} else if(var9.rgb2 >= 0) {
- var7 = var9.rgb2 | -16777216;
- } else if(var9.texture >= 0) {
- int var20 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var9.texture), 96);
- var7 = Rasterizer3D.Rasterizer3D_colorPalette[var20] | -16777216;
- } else if(var9.rgb == 16711935) {
- var7 = var8;
+ var18 = var9.rgb2 | -16777216;
} else {
- int var12 = var9.hue;
- int var13 = var9.saturation;
- int var14 = var9.lightness;
- if(var14 > 179) {
- var13 /= 2;
- }
-
- if(var14 > 192) {
- var13 /= 2;
- }
-
- if(var14 > 217) {
- var13 /= 2;
- }
-
- if(var14 > 243) {
- var13 /= 2;
- }
-
- int var15 = (var13 / 32 << 7) + var14 / 2 + (var12 / 4 << 10);
- byte var17 = 96;
- int var16;
- if(var15 == -2) {
- var16 = 12345678;
+ int var11;
+ if(var9.texture >= 0) {
+ var11 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var9.texture), 96);
+ var18 = Rasterizer3D.Rasterizer3D_colorPalette[var11] | -16777216;
+ } else if(var9.rgb == 16711935) {
+ var18 = var7;
} else {
- int var21;
- if(var15 == -1) {
- if(var17 < 0) {
- var17 = 0;
- } else if(var17 > 127) {
- var17 = 127;
- }
-
- var21 = 127 - var17;
- var16 = var21;
- } else {
- var21 = var17 * (var15 & 127) / 128;
- if(var21 < 2) {
- var21 = 2;
- } else if(var21 > 126) {
- var21 = 126;
- }
-
- var16 = var21 + (var15 & 65408);
+ var11 = var9.hue;
+ int var12 = var9.saturation;
+ int var13 = var9.lightness;
+ if(var13 > 179) {
+ var12 /= 2;
}
- }
- var7 = Rasterizer3D.Rasterizer3D_colorPalette[var16] | -16777216;
+ if(var13 > 192) {
+ var12 /= 2;
+ }
+
+ if(var13 > 217) {
+ var12 /= 2;
+ }
+
+ if(var13 > 243) {
+ var12 /= 2;
+ }
+
+ int var14 = (var12 / 32 << 7) + var13 / 2 + (var11 / 4 << 10);
+ byte var15 = 96;
+ int var16;
+ if(var14 == -2) {
+ var16 = 12345678;
+ } else {
+ int var17;
+ if(var14 == -1) {
+ if(var15 < 0) {
+ var15 = 0;
+ } else if(var15 > 127) {
+ var15 = 127;
+ }
+
+ var17 = 127 - var15;
+ var16 = var17;
+ } else {
+ var17 = var15 * (var14 & 127) / 128;
+ if(var17 < 2) {
+ var17 = 2;
+ } else if(var17 > 126) {
+ var17 = 126;
+ }
+
+ var16 = var17 + (var14 & 65408);
+ }
+ }
+
+ var18 = Rasterizer3D.Rasterizer3D_colorPalette[var16] | -16777216;
+ }
}
if(var3.field154[var5][var1][var2] == 0) {
- Rasterizer2D.Rasterizer2D_fillRectangle(this.__d * var1, this.__d * (63 - var2), this.__d, this.__d, var7);
+ Rasterizer2D.Rasterizer2D_fillRectangle(this.__d * var1, this.__d * (63 - var2), this.__d, this.__d, var18);
} else {
- var4.method743(this.__d * var1, this.__d * (63 - var2), 0, var7, this.__d, this.__d, var3.field154[var5][var1][var2], var3.field155[var5][var1][var2]);
+ var4.method743(this.__d * var1, this.__d * (63 - var2), 0, var18, this.__d, this.__d, var3.field154[var5][var1][var2], var3.field155[var5][var1][var2]);
}
}
}
@@ -700,9 +702,9 @@ public class WorldMapRegion {
for(int var7 = 0; var7 < var6.length; ++var7) {
class25 var8 = var6[var7];
- int var10 = var8.field198;
- boolean var9 = var10 >= class231.field2805.field2820 && var10 <= class231.field2804.field2820 || var10 == class231.field2806.field2820;
- if(var9) {
+ int var9 = var8.field198;
+ boolean var10 = var9 >= class231.field2805.field2820 && var9 <= class231.field2804.field2820 || var9 == class231.field2806.field2820;
+ if(var10) {
ObjectDefinition var11 = class50.getObjectDefinition(var8.field199);
int var12 = var11.int1 != 0?-3407872:-3355444;
if(var8.field198 == class231.field2805.field2820) {
@@ -816,8 +818,8 @@ public class WorldMapRegion {
Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128);
Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256);
}
-
}
+
}
@ObfuscatedName("ar")
@@ -856,12 +858,11 @@ public class WorldMapRegion {
@Export("__ay_53")
void __ay_53(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) {
WorldMapLabel var6 = var1.__f_16();
- if(var6 != null) {
- if(var6.size.__f_14(var5)) {
- Font var7 = (Font)this.fonts.get(var6.size);
- var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.__e, 0, 1, 0, var7.ascent / 2);
- }
+ if(var6 != null && var6.size.__f_14(var5)) {
+ Font var7 = (Font)this.fonts.get(var6.size);
+ var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.__e, 0, 1, 0, var7.ascent / 2);
}
+
}
@ObfuscatedName("ah")
@@ -1072,47 +1073,45 @@ public class WorldMapRegion {
garbageValue = "597"
)
static final void method567(Widget var0, int var1, int var2) {
- if(Client.minimapState == 0 || Client.minimapState == 3) {
- if(!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.__lp_ca && MouseHandler.MouseHandler_lastButton == 4)) {
- SpriteMask var3 = var0.getSpriteMask(true);
- if(var3 == null) {
- return;
- }
-
- int var4 = MouseHandler.MouseHandler_lastPressedX - var1;
- int var5 = MouseHandler.MouseHandler_lastPressedY - var2;
- if(var3.contains(var4, var5)) {
- var4 -= var3.width / 2;
- var5 -= var3.height / 2;
- int var6 = Client.minimapOrientation & 2047;
- int var7 = Rasterizer3D.Rasterizer3D_sine[var6];
- int var8 = Rasterizer3D.Rasterizer3D_cosine[var6];
- int var9 = var4 * var8 + var7 * var5 >> 11;
- int var10 = var5 * var8 - var4 * var7 >> 11;
- int var11 = var9 + Canvas.localPlayer.x >> 7;
- int var12 = Canvas.localPlayer.y - var10 >> 7;
- PacketBufferNode var13 = Interpreter.method1915(ClientPacket.__gs_ba, Client.packetWriter.isaacCipher);
- var13.packetBuffer.writeByte(18);
- var13.packetBuffer.__bo_322(var12 + GraphicsObject.baseY);
- var13.packetBuffer.__bo_322(var11 + class50.baseX);
- var13.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?(KeyHandler.KeyHandler_pressedKeys[81]?2:1):0);
- var13.packetBuffer.writeByte(var4);
- var13.packetBuffer.writeByte(var5);
- var13.packetBuffer.writeShort(Client.minimapOrientation);
- var13.packetBuffer.writeByte(57);
- var13.packetBuffer.writeByte(0);
- var13.packetBuffer.writeByte(0);
- var13.packetBuffer.writeByte(89);
- var13.packetBuffer.writeShort(Canvas.localPlayer.x);
- var13.packetBuffer.writeShort(Canvas.localPlayer.y);
- var13.packetBuffer.writeByte(63);
- Client.packetWriter.__q_167(var13);
- Client.destinationX = var11;
- Client.destinationY = var12;
- }
+ if((Client.minimapState == 0 || Client.minimapState == 3) && !Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.__lp_ca && MouseHandler.MouseHandler_lastButton == 4)) {
+ SpriteMask var3 = var0.getSpriteMask(true);
+ if(var3 == null) {
+ return;
}
+ int var4 = MouseHandler.MouseHandler_lastPressedX - var1;
+ int var5 = MouseHandler.MouseHandler_lastPressedY - var2;
+ if(var3.contains(var4, var5)) {
+ var4 -= var3.width / 2;
+ var5 -= var3.height / 2;
+ int var6 = Client.minimapOrientation & 2047;
+ int var7 = Rasterizer3D.Rasterizer3D_sine[var6];
+ int var8 = Rasterizer3D.Rasterizer3D_cosine[var6];
+ int var9 = var4 * var8 + var7 * var5 >> 11;
+ int var10 = var5 * var8 - var4 * var7 >> 11;
+ int var11 = var9 + Canvas.localPlayer.x >> 7;
+ int var12 = Canvas.localPlayer.y - var10 >> 7;
+ PacketBufferNode var13 = Interpreter.method1915(ClientPacket.__gs_ba, Client.packetWriter.isaacCipher);
+ var13.packetBuffer.writeByte(18);
+ var13.packetBuffer.__bo_322(var12 + GraphicsObject.baseY);
+ var13.packetBuffer.__bo_322(var11 + class50.baseX);
+ var13.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?(KeyHandler.KeyHandler_pressedKeys[81]?2:1):0);
+ var13.packetBuffer.writeByte(var4);
+ var13.packetBuffer.writeByte(var5);
+ var13.packetBuffer.writeShort(Client.minimapOrientation);
+ var13.packetBuffer.writeByte(57);
+ var13.packetBuffer.writeByte(0);
+ var13.packetBuffer.writeByte(0);
+ var13.packetBuffer.writeByte(89);
+ var13.packetBuffer.writeShort(Canvas.localPlayer.x);
+ var13.packetBuffer.writeShort(Canvas.localPlayer.y);
+ var13.packetBuffer.writeByte(63);
+ Client.packetWriter.__q_167(var13);
+ Client.destinationX = var11;
+ Client.destinationY = var12;
+ }
}
+
}
@ObfuscatedName("ix")
@@ -1150,4 +1149,8 @@ public class WorldMapRegion {
}
}
+
+ static {
+ __av_o = new DemotingHashTable(37748736, 256);
+ }
}
diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java
index 1d42429f3e..aa5de8e756 100644
--- a/runescape-client/src/main/java/WorldMapSection0.java
+++ b/runescape-client/src/main/java/WorldMapSection0.java
@@ -93,7 +93,7 @@ public class WorldMapSection0 implements WorldMapSection {
intValue = -1657956317
)
@Export("surfaceOffsetY")
- int __n;
+ int surfaceOffsetY;
@ObfuscatedName("i")
@ObfuscatedGetter(
intValue = 1345061881
@@ -140,7 +140,7 @@ public class WorldMapSection0 implements WorldMapSection {
garbageValue = "4"
)
public boolean containsPosition(int var1, int var2) {
- return var1 >= (this.__o << 6) + (this.__d << 3) && var1 <= (this.__o << 6) + (this.__n << 3) + 7 && var2 >= (this.__u << 6) + (this.__k << 3) && var2 <= (this.__u << 6) + (this.__i << 3) + 7;
+ return var1 >= (this.__o << 6) + (this.__d << 3) && var1 <= (this.__o << 6) + (this.surfaceOffsetY << 3) + 7 && var2 >= (this.__u << 6) + (this.__k << 3) && var2 <= (this.__u << 6) + (this.__i << 3) + 7;
}
@ObfuscatedName("w")
@@ -188,7 +188,7 @@ public class WorldMapSection0 implements WorldMapSection {
this.__x = var1.readUnsignedByte();
this.__o = var1.__ag_302();
this.__d = var1.readUnsignedByte();
- this.__n = var1.readUnsignedByte();
+ this.surfaceOffsetY = var1.readUnsignedByte();
this.__u = var1.__ag_302();
this.__k = var1.readUnsignedByte();
this.__i = var1.readUnsignedByte();
@@ -245,6 +245,7 @@ public class WorldMapSection0 implements WorldMapSection {
String var6 = Client.menuTargetNames[var0];
Actor.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
}
+
}
@ObfuscatedName("io")
diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java
index 6cab7970dc..dd57ed69f6 100644
--- a/runescape-client/src/main/java/WorldMapSection1.java
+++ b/runescape-client/src/main/java/WorldMapSection1.java
@@ -226,7 +226,7 @@ public class WorldMapSection1 implements WorldMapSection {
Client.packetWriter.packetBuffer.index = 0;
Client.packetWriter.serverPacket0 = null;
Client.packetWriter.__k = null;
- Client.packetWriter.__n = null;
+ Client.packetWriter.surfaceOffsetY = null;
Client.packetWriter.__i = null;
Client.packetWriter.serverPacket0Length = 0;
Client.packetWriter.__x = 0;
diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java
index 759a22446e..826b1e390b 100644
--- a/runescape-client/src/main/java/WorldMapSection2.java
+++ b/runescape-client/src/main/java/WorldMapSection2.java
@@ -177,88 +177,87 @@ public class WorldMapSection2 implements WorldMapSection {
byte var10 = 0;
int var11 = 0;
class178.__fi_l[var10] = var0;
- byte var10001 = var10;
- int var18 = var10 + 1;
- class178.__fi_e[var10001] = var1;
- int[][] var12 = var3.flags;
+ int var13 = var10 + 1;
+ class178.__fi_e[var10] = var1;
+ int[][] var14 = var3.flags;
- while(var18 != var11) {
+ while(var13 != var11) {
var4 = class178.__fi_l[var11];
var5 = class178.__fi_e[var11];
var11 = var11 + 1 & 4095;
- int var16 = var4 - var8;
- int var17 = var5 - var9;
- int var13 = var4 - var3.xInset;
- int var14 = var5 - var3.yInset;
+ int var15 = var4 - var8;
+ int var16 = var5 - var9;
+ int var17 = var4 - var3.xInset;
+ int var18 = var5 - var3.yInset;
if(var2.vmethod3644(2, var4, var5, var3)) {
WidgetGroupParent.__bx_o = var4;
UrlRequester.__eo_u = var5;
return true;
}
- int var15 = class178.__fi_w[var16][var17] + 1;
- if(var16 > 0 && class178.__fi_q[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) {
- class178.__fi_l[var18] = var4 - 1;
- class178.__fi_e[var18] = var5;
- var18 = var18 + 1 & 4095;
- class178.__fi_q[var16 - 1][var17] = 2;
- class178.__fi_w[var16 - 1][var17] = var15;
+ int var19 = class178.__fi_w[var15][var16] + 1;
+ if(var15 > 0 && class178.__fi_q[var15 - 1][var16] == 0 && (var14[var17 - 1][var18] & 19136782) == 0 && (var14[var17 - 1][var18 + 1] & 19136824) == 0) {
+ class178.__fi_l[var13] = var4 - 1;
+ class178.__fi_e[var13] = var5;
+ var13 = var13 + 1 & 4095;
+ class178.__fi_q[var15 - 1][var16] = 2;
+ class178.__fi_w[var15 - 1][var16] = var19;
}
- if(var16 < 126 && class178.__fi_q[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) {
- class178.__fi_l[var18] = var4 + 1;
- class178.__fi_e[var18] = var5;
- var18 = var18 + 1 & 4095;
- class178.__fi_q[var16 + 1][var17] = 8;
- class178.__fi_w[var16 + 1][var17] = var15;
+ if(var15 < 126 && class178.__fi_q[var15 + 1][var16] == 0 && (var14[var17 + 2][var18] & 19136899) == 0 && (var14[var17 + 2][var18 + 1] & 19136992) == 0) {
+ class178.__fi_l[var13] = var4 + 1;
+ class178.__fi_e[var13] = var5;
+ var13 = var13 + 1 & 4095;
+ class178.__fi_q[var15 + 1][var16] = 8;
+ class178.__fi_w[var15 + 1][var16] = var19;
}
- if(var17 > 0 && class178.__fi_q[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) {
- class178.__fi_l[var18] = var4;
- class178.__fi_e[var18] = var5 - 1;
- var18 = var18 + 1 & 4095;
- class178.__fi_q[var16][var17 - 1] = 1;
- class178.__fi_w[var16][var17 - 1] = var15;
+ if(var16 > 0 && class178.__fi_q[var15][var16 - 1] == 0 && (var14[var17][var18 - 1] & 19136782) == 0 && (var14[var17 + 1][var18 - 1] & 19136899) == 0) {
+ class178.__fi_l[var13] = var4;
+ class178.__fi_e[var13] = var5 - 1;
+ var13 = var13 + 1 & 4095;
+ class178.__fi_q[var15][var16 - 1] = 1;
+ class178.__fi_w[var15][var16 - 1] = var19;
}
- if(var17 < 126 && class178.__fi_q[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) {
- class178.__fi_l[var18] = var4;
- class178.__fi_e[var18] = var5 + 1;
- var18 = var18 + 1 & 4095;
- class178.__fi_q[var16][var17 + 1] = 4;
- class178.__fi_w[var16][var17 + 1] = var15;
+ if(var16 < 126 && class178.__fi_q[var15][var16 + 1] == 0 && (var14[var17][var18 + 2] & 19136824) == 0 && (var14[var17 + 1][var18 + 2] & 19136992) == 0) {
+ class178.__fi_l[var13] = var4;
+ class178.__fi_e[var13] = var5 + 1;
+ var13 = var13 + 1 & 4095;
+ class178.__fi_q[var15][var16 + 1] = 4;
+ class178.__fi_w[var15][var16 + 1] = var19;
}
- if(var16 > 0 && var17 > 0 && class178.__fi_q[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14] & 19136830) == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13][var14 - 1] & 19136911) == 0) {
- class178.__fi_l[var18] = var4 - 1;
- class178.__fi_e[var18] = var5 - 1;
- var18 = var18 + 1 & 4095;
- class178.__fi_q[var16 - 1][var17 - 1] = 3;
- class178.__fi_w[var16 - 1][var17 - 1] = var15;
+ if(var15 > 0 && var16 > 0 && class178.__fi_q[var15 - 1][var16 - 1] == 0 && (var14[var17 - 1][var18] & 19136830) == 0 && (var14[var17 - 1][var18 - 1] & 19136782) == 0 && (var14[var17][var18 - 1] & 19136911) == 0) {
+ class178.__fi_l[var13] = var4 - 1;
+ class178.__fi_e[var13] = var5 - 1;
+ var13 = var13 + 1 & 4095;
+ class178.__fi_q[var15 - 1][var16 - 1] = 3;
+ class178.__fi_w[var15 - 1][var16 - 1] = var19;
}
- if(var16 < 126 && var17 > 0 && class178.__fi_q[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136911) == 0 && (var12[var13 + 2][var14 - 1] & 19136899) == 0 && (var12[var13 + 2][var14] & 19136995) == 0) {
- class178.__fi_l[var18] = var4 + 1;
- class178.__fi_e[var18] = var5 - 1;
- var18 = var18 + 1 & 4095;
- class178.__fi_q[var16 + 1][var17 - 1] = 9;
- class178.__fi_w[var16 + 1][var17 - 1] = var15;
+ if(var15 < 126 && var16 > 0 && class178.__fi_q[var15 + 1][var16 - 1] == 0 && (var14[var17 + 1][var18 - 1] & 19136911) == 0 && (var14[var17 + 2][var18 - 1] & 19136899) == 0 && (var14[var17 + 2][var18] & 19136995) == 0) {
+ class178.__fi_l[var13] = var4 + 1;
+ class178.__fi_e[var13] = var5 - 1;
+ var13 = var13 + 1 & 4095;
+ class178.__fi_q[var15 + 1][var16 - 1] = 9;
+ class178.__fi_w[var15 + 1][var16 - 1] = var19;
}
- if(var16 > 0 && var17 < 126 && class178.__fi_q[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136830) == 0 && (var12[var13 - 1][var14 + 2] & 19136824) == 0 && (var12[var13][var14 + 2] & 19137016) == 0) {
- class178.__fi_l[var18] = var4 - 1;
- class178.__fi_e[var18] = var5 + 1;
- var18 = var18 + 1 & 4095;
- class178.__fi_q[var16 - 1][var17 + 1] = 6;
- class178.__fi_w[var16 - 1][var17 + 1] = var15;
+ if(var15 > 0 && var16 < 126 && class178.__fi_q[var15 - 1][var16 + 1] == 0 && (var14[var17 - 1][var18 + 1] & 19136830) == 0 && (var14[var17 - 1][var18 + 2] & 19136824) == 0 && (var14[var17][var18 + 2] & 19137016) == 0) {
+ class178.__fi_l[var13] = var4 - 1;
+ class178.__fi_e[var13] = var5 + 1;
+ var13 = var13 + 1 & 4095;
+ class178.__fi_q[var15 - 1][var16 + 1] = 6;
+ class178.__fi_w[var15 - 1][var16 + 1] = var19;
}
- if(var16 < 126 && var17 < 126 && class178.__fi_q[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 2] & 19137016) == 0 && (var12[var13 + 2][var14 + 2] & 19136992) == 0 && (var12[var13 + 2][var14 + 1] & 19136995) == 0) {
- class178.__fi_l[var18] = var4 + 1;
- class178.__fi_e[var18] = var5 + 1;
- var18 = var18 + 1 & 4095;
- class178.__fi_q[var16 + 1][var17 + 1] = 12;
- class178.__fi_w[var16 + 1][var17 + 1] = var15;
+ if(var15 < 126 && var16 < 126 && class178.__fi_q[var15 + 1][var16 + 1] == 0 && (var14[var17 + 1][var18 + 2] & 19137016) == 0 && (var14[var17 + 2][var18 + 2] & 19136992) == 0 && (var14[var17 + 2][var18 + 1] & 19136995) == 0) {
+ class178.__fi_l[var13] = var4 + 1;
+ class178.__fi_e[var13] = var5 + 1;
+ var13 = var13 + 1 & 4095;
+ class178.__fi_q[var15 + 1][var16 + 1] = 12;
+ class178.__fi_w[var15 + 1][var16 + 1] = var19;
}
}
diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java
index 41bd777ed2..bc5b9bce6c 100644
--- a/runescape-client/src/main/java/WorldMapSection3.java
+++ b/runescape-client/src/main/java/WorldMapSection3.java
@@ -206,22 +206,20 @@ public class WorldMapSection3 implements WorldMapSection {
)
@Export("runWidgetOnLoadListener")
static void runWidgetOnLoadListener(int var0) {
- if(var0 != -1) {
- if(GroundItemPile.loadWidgetGroup(var0)) {
- Widget[] var1 = Widget.widgets[var0];
+ if(var0 != -1 && GroundItemPile.loadWidgetGroup(var0)) {
+ Widget[] var1 = Widget.widgets[var0];
- for(int var2 = 0; var2 < var1.length; ++var2) {
- Widget var3 = var1[var2];
- if(var3.onLoad != null) {
- ScriptEvent var4 = new ScriptEvent();
- var4.widget = var3;
- var4.args0 = var3.onLoad;
- GrandExchangeEvent.runScript0(var4, 5000000);
- }
+ for(int var2 = 0; var2 < var1.length; ++var2) {
+ Widget var3 = var1[var2];
+ if(var3.onLoad != null) {
+ ScriptEvent var4 = new ScriptEvent();
+ var4.widget = var3;
+ var4.args0 = var3.onLoad;
+ GrandExchangeEvent.runScript0(var4, 5000000);
}
-
}
}
+
}
@ObfuscatedName("ic")
diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java
index 4c5e3bc70d..b2d1ce7dc9 100644
--- a/runescape-client/src/main/java/WorldMapSectionType.java
+++ b/runescape-client/src/main/java/WorldMapSectionType.java
@@ -13,7 +13,7 @@ public enum WorldMapSectionType implements Enumerated {
signature = "Lh;"
)
@Export("__h_m")
- __h_m(1, (byte)0),
+ __h_m(1, (byte)0),
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "Lh;"
@@ -32,6 +32,7 @@ public enum WorldMapSectionType implements Enumerated {
)
@Export("__h_w")
__h_w(2, (byte)3);
+
@ObfuscatedName("e")
@ObfuscatedSignature(
signature = "Llq;"
@@ -57,7 +58,7 @@ public enum WorldMapSectionType implements Enumerated {
@Export("id")
final byte id;
- WorldMapSectionType(int var3, byte var4) {
+ private WorldMapSectionType(int var3, byte var4) {
this.type = var3;
this.id = var4;
}
diff --git a/runescape-client/src/main/java/class102.java b/runescape-client/src/main/java/class102.java
index 0d10655c77..099fe13552 100644
--- a/runescape-client/src/main/java/class102.java
+++ b/runescape-client/src/main/java/class102.java
@@ -33,11 +33,6 @@ public class class102 {
@ObfuscatedName("e")
int[][] field1359;
- static {
- __ca_m = new int[]{256, 128, 86, 64};
- __ca_f = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F};
- }
-
class102() {
int var1 = MusicSample.method2352(16);
if(var1 != 1) {
@@ -62,7 +57,7 @@ public class class102 {
this.field1358 = new int[var3];
this.field1359 = new int[var3][];
- int var7;
+ int var6;
for(var4 = 0; var4 < var3; ++var4) {
this.field1352[var4] = MusicSample.method2352(3) + 1;
var5 = this.field1356[var4] = MusicSample.method2352(2);
@@ -71,11 +66,11 @@ public class class102 {
}
var5 = 1 << var5;
- int[] var6 = new int[var5];
- this.field1359[var4] = var6;
+ int[] var7 = new int[var5];
+ this.field1359[var4] = var7;
- for(var7 = 0; var7 < var5; ++var7) {
- var6[var7] = MusicSample.method2352(8) - 1;
+ for(var6 = 0; var6 < var5; ++var6) {
+ var7[var6] = MusicSample.method2352(8) - 1;
}
}
@@ -94,9 +89,9 @@ public class class102 {
var5 = 2;
for(var9 = 0; var9 < var2; ++var9) {
- var7 = this.field1357[var9];
+ var6 = this.field1357[var9];
- for(int var8 = 0; var8 < this.field1352[var7]; ++var8) {
+ for(int var8 = 0; var8 < this.field1352[var6]; ++var8) {
this.field1353[var5++] = MusicSample.method2352(var4);
}
}
@@ -176,6 +171,7 @@ public class class102 {
this.method2366(var1, var3 - 1);
this.method2366(var3 + 1, var2);
}
+
}
@ObfuscatedName("u")
@@ -237,13 +233,13 @@ public class class102 {
var9 = this.method2379(__ca_x[var7], __ca_d[var7], __ca_x[var8], __ca_d[var8], __ca_x[var6]);
var10 = __ca_d[var6];
int var11 = var4 - var9;
- int var13 = (var11 < var9?var11:var9) << 1;
+ int var12 = (var11 < var9?var11:var9) << 1;
if(var10 != 0) {
- boolean[] var14 = __ca_k;
+ boolean[] var13 = __ca_k;
__ca_k[var8] = true;
- var14[var7] = true;
+ var13[var7] = true;
__ca_k[var6] = true;
- if(var10 >= var13) {
+ if(var10 >= var12) {
__ca_d[var6] = var11 > var9?var9 + (var10 - var9):var11 + (var9 - var10) - 1;
} else {
__ca_d[var6] = (var10 & 1) != 0?var9 - (var10 + 1) / 2:var10 / 2 + var9;
@@ -272,10 +268,10 @@ public class class102 {
}
}
- float var16 = __ca_f[var7];
+ float var14 = __ca_f[var7];
for(var9 = var6; var9 < var2; ++var9) {
- var1[var9] *= var16;
+ var1[var9] *= var14;
}
}
@@ -313,4 +309,9 @@ public class class102 {
return var3;
}
+
+ static {
+ __ca_m = new int[]{256, 128, 86, 64};
+ __ca_f = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F};
+ }
}
diff --git a/runescape-client/src/main/java/class109.java b/runescape-client/src/main/java/class109.java
index aa4195a34b..27de982a98 100644
--- a/runescape-client/src/main/java/class109.java
+++ b/runescape-client/src/main/java/class109.java
@@ -87,21 +87,21 @@ public class class109 {
if(this.field1409 == 0) {
var15 = this.field1408 / var14.field1306;
- for(int var16 = 0; var16 < var15; ++var16) {
- float[] var17 = var14.method2307();
+ for(int var19 = 0; var19 < var15; ++var19) {
+ float[] var20 = var14.method2307();
for(int var18 = 0; var18 < var14.field1306; ++var18) {
- var1[var13 + var16 + var18 * var15] += var17[var18];
+ var1[var13 + var19 + var18 * var15] += var20[var18];
}
}
} else {
var15 = 0;
while(var15 < this.field1408) {
- float[] var19 = var14.method2307();
+ float[] var16 = var14.method2307();
- for(int var20 = 0; var20 < var14.field1306; ++var20) {
- var1[var13 + var15] += var19[var20];
+ for(int var17 = 0; var17 < var14.field1306; ++var17) {
+ var1[var13 + var15] += var16[var17];
++var15;
}
}
@@ -115,7 +115,7 @@ public class class109 {
}
}
}
-
}
+
}
}
diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java
index a8a3033982..1b05635890 100644
--- a/runescape-client/src/main/java/class11.java
+++ b/runescape-client/src/main/java/class11.java
@@ -209,9 +209,9 @@ final class class11 implements Comparator {
return 1;
} else if(var0 == 2702) {
- int var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var5);
- if(var4 != null) {
+ int var4 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ WidgetGroupParent var5 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var4);
+ if(var5 != null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 1;
} else {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java
index 6ef8c64f1f..c6d32b0349 100644
--- a/runescape-client/src/main/java/class15.java
+++ b/runescape-client/src/main/java/class15.java
@@ -182,7 +182,6 @@ public class class15 extends class21 {
} else {
var0.spriteId2 = Client.__client_sl;
}
-
} else if(var1 == 325) {
if(Client.__client_sd == -1) {
Client.__client_sd = var0.spriteId2;
@@ -194,7 +193,6 @@ public class class15 extends class21 {
} else {
var0.spriteId2 = Client.__client_sd;
}
-
} else if(var1 == 327) {
var0.modelAngleX = 150;
var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047;
@@ -206,5 +204,6 @@ public class class15 extends class21 {
var0.modelType = 5;
var0.modelId = 1;
}
+
}
}
diff --git a/runescape-client/src/main/java/class159.java b/runescape-client/src/main/java/class159.java
index 8018fc0c88..da245945ca 100644
--- a/runescape-client/src/main/java/class159.java
+++ b/runescape-client/src/main/java/class159.java
@@ -36,7 +36,7 @@ public enum class159 implements Enumerated {
)
final int field1981;
- class159(int var3, int var4) {
+ private class159(int var3, int var4) {
this.field1984 = var3;
this.field1981 = var4;
}
diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java
index c9eeee21fa..f575af41af 100644
--- a/runescape-client/src/main/java/class16.java
+++ b/runescape-client/src/main/java/class16.java
@@ -96,44 +96,44 @@ public class class16 {
)
static final void method189(class190 var0) {
PacketBuffer var1 = Client.packetWriter.packetBuffer;
+ int var2;
int var3;
+ int var4;
int var5;
int var6;
int var7;
int var8;
int var9;
- int var10;
- int var12;
- byte var13;
- int var14;
+ byte var10;
+ int var11;
if(class190.field2342 == var0) {
- byte var2 = var1.__bk_320();
- var3 = var1.__bm_326();
- byte var4 = var1.__bk_320();
- var5 = var1.__bu_325();
- var6 = var1.__ag_302();
- var7 = var1.__bb_317();
- var8 = var7 >> 2;
- var9 = var7 & 3;
- var10 = Client.__client_gd[var8];
- byte var11 = var1.__bn_319();
- var12 = var1.__by_324();
- var13 = var1.__bk_320();
- var14 = var1.readUnsignedByteNegate();
- int var15 = (var14 >> 4 & 7) + WorldMapSection3.__p_go;
- int var16 = (var14 & 7) + Canvas.__ao_gk;
+ byte var12 = var1.__bk_320();
+ var2 = var1.__bm_326();
+ byte var13 = var1.__bk_320();
+ var3 = var1.__bu_325();
+ var4 = var1.__ag_302();
+ var5 = var1.__bb_317();
+ var6 = var5 >> 2;
+ var7 = var5 & 3;
+ var8 = Client.__client_gd[var6];
+ byte var14 = var1.__bn_319();
+ var9 = var1.__by_324();
+ var10 = var1.__bk_320();
+ var11 = var1.readUnsignedByteNegate();
+ int var15 = (var11 >> 4 & 7) + WorldMapSection3.__p_go;
+ int var16 = (var11 & 7) + Canvas.__ao_gk;
Player var17;
- if(var12 == Client.localPlayerIndex) {
+ if(var9 == Client.localPlayerIndex) {
var17 = Canvas.localPlayer;
} else {
- var17 = Client.players[var12];
+ var17 = Client.players[var9];
}
if(var17 != null) {
- ObjectDefinition var18 = class50.getObjectDefinition(var5);
+ ObjectDefinition var18 = class50.getObjectDefinition(var3);
int var19;
int var20;
- if(var9 != 1 && var9 != 3) {
+ if(var7 != 1 && var7 != 3) {
var19 = var18.sizeX;
var20 = var18.sizeY;
} else {
@@ -149,259 +149,253 @@ public class class16 {
int var26 = var25[var22][var23] + var25[var21][var23] + var25[var21][var24] + var25[var22][var24] >> 2;
int var27 = (var15 << 7) + (var19 << 6);
int var28 = (var16 << 7) + (var20 << 6);
- Model var29 = var18.getModel(var8, var9, var25, var27, var26, var28);
+ Model var29 = var18.getModel(var6, var7, var25, var27, var26, var28);
if(var29 != null) {
- class258.method4898(SoundSystem.plane, var15, var16, var10, -1, 0, 0, var6 + 1, var3 + 1);
- var17.animationCycleStart = var6 + Client.cycle;
- var17.animationCycleEnd = var3 + Client.cycle;
+ class258.method4898(SoundSystem.plane, var15, var16, var8, -1, 0, 0, var4 + 1, var2 + 1);
+ var17.animationCycleStart = var4 + Client.cycle;
+ var17.animationCycleEnd = var2 + Client.cycle;
var17.model0 = var29;
var17.__k = var15 * 128 + var19 * 64;
var17.__i = var16 * 128 + var20 * 64;
var17.tileHeight2 = var26;
byte var30;
- if(var2 > var13) {
- var30 = var2;
- var2 = var13;
+ if(var12 > var10) {
+ var30 = var12;
+ var12 = var10;
+ var10 = var30;
+ }
+
+ if(var14 > var13) {
+ var30 = var14;
+ var14 = var13;
var13 = var30;
}
- if(var11 > var4) {
- var30 = var11;
- var11 = var4;
- var4 = var30;
- }
-
- var17.__z = var15 + var2;
- var17.__s = var13 + var15;
- var17.__j = var11 + var16;
- var17.__t = var4 + var16;
+ var17.__z = var15 + var12;
+ var17.__s = var10 + var15;
+ var17.__j = var14 + var16;
+ var17.__t = var13 + var16;
}
}
}
- int var37;
- int var38;
+ int var31;
+ int var32;
if(class190.field2349 == var0) {
- var37 = var1.__bb_317();
- var3 = (var37 >> 4 & 7) + WorldMapSection3.__p_go;
- var38 = (var37 & 7) + Canvas.__ao_gk;
- var5 = var1.__bq_318();
- var6 = var5 >> 2;
- var7 = var5 & 3;
- var8 = Client.__client_gd[var6];
- var9 = var1.__bu_325();
- if(var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) {
- class258.method4898(SoundSystem.plane, var3, var38, var8, var9, var6, var7, 0, -1);
+ var31 = var1.__bb_317();
+ var2 = (var31 >> 4 & 7) + WorldMapSection3.__p_go;
+ var32 = (var31 & 7) + Canvas.__ao_gk;
+ var3 = var1.__bq_318();
+ var4 = var3 >> 2;
+ var5 = var3 & 3;
+ var6 = Client.__client_gd[var4];
+ var7 = var1.__bu_325();
+ if(var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) {
+ class258.method4898(SoundSystem.plane, var2, var32, var6, var7, var4, var5, 0, -1);
}
-
} else {
if(class190.field2345 == var0) {
- var37 = var1.readUnsignedByte();
- var3 = (var37 >> 4 & 7) + WorldMapSection3.__p_go;
- var38 = (var37 & 7) + Canvas.__ao_gk;
- var5 = var1.__bq_318();
- var6 = var1.__bb_317();
- var7 = var6 >> 4 & 15;
- var8 = var6 & 7;
- var9 = var1.__bm_326();
- if(var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) {
- var10 = var7 + 1;
- if(Canvas.localPlayer.pathX[0] >= var3 - var10 && Canvas.localPlayer.pathX[0] <= var10 + var3 && Canvas.localPlayer.pathY[0] >= var38 - var10 && Canvas.localPlayer.pathY[0] <= var10 + var38 && Client.__client_qc != 0 && var8 > 0 && Client.soundEffectCount < 50) {
- Client.soundEffectIds[Client.soundEffectCount] = var9;
- Client.unknownSoundValues1[Client.soundEffectCount] = var8;
- Client.queuedSoundEffectDelays[Client.soundEffectCount] = var5;
+ var31 = var1.readUnsignedByte();
+ var2 = (var31 >> 4 & 7) + WorldMapSection3.__p_go;
+ var32 = (var31 & 7) + Canvas.__ao_gk;
+ var3 = var1.__bq_318();
+ var4 = var1.__bb_317();
+ var5 = var4 >> 4 & 15;
+ var6 = var4 & 7;
+ var7 = var1.__bm_326();
+ if(var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) {
+ var8 = var5 + 1;
+ if(Canvas.localPlayer.pathX[0] >= var2 - var8 && Canvas.localPlayer.pathX[0] <= var8 + var2 && Canvas.localPlayer.pathY[0] >= var32 - var8 && Canvas.localPlayer.pathY[0] <= var8 + var32 && Client.__client_qc != 0 && var6 > 0 && Client.soundEffectCount < 50) {
+ Client.soundEffectIds[Client.soundEffectCount] = var7;
+ Client.unknownSoundValues1[Client.soundEffectCount] = var6;
+ Client.queuedSoundEffectDelays[Client.soundEffectCount] = var3;
Client.soundEffects[Client.soundEffectCount] = null;
- Client.soundLocations[Client.soundEffectCount] = var7 + (var38 << 8) + (var3 << 16);
+ Client.soundLocations[Client.soundEffectCount] = var5 + (var32 << 8) + (var2 << 16);
++Client.soundEffectCount;
}
}
}
if(class190.field2341 == var0) {
- var37 = var1.__ag_302();
- var3 = var1.__bb_317();
- var38 = var1.__bu_325();
- var5 = var1.readUnsignedByte();
- var6 = (var5 >> 4 & 7) + WorldMapSection3.__p_go;
- var7 = (var5 & 7) + Canvas.__ao_gk;
- if(var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) {
- var6 = var6 * 128 + 64;
- var7 = var7 * 128 + 64;
- GraphicsObject var42 = new GraphicsObject(var37, SoundSystem.plane, var6, var7, class32.getTileHeight(var6, var7, SoundSystem.plane) - var3, var38, Client.cycle);
- Client.graphicsObjects.addFirst(var42);
+ var31 = var1.__ag_302();
+ var2 = var1.__bb_317();
+ var32 = var1.__bu_325();
+ var3 = var1.readUnsignedByte();
+ var4 = (var3 >> 4 & 7) + WorldMapSection3.__p_go;
+ var5 = (var3 & 7) + Canvas.__ao_gk;
+ if(var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) {
+ var4 = var4 * 128 + 64;
+ var5 = var5 * 128 + 64;
+ GraphicsObject var33 = new GraphicsObject(var31, SoundSystem.plane, var4, var5, class32.getTileHeight(var4, var5, SoundSystem.plane) - var2, var32, Client.cycle);
+ Client.graphicsObjects.addFirst(var33);
}
-
} else {
- int var39;
+ int var35;
if(class190.field2344 == var0) {
- var37 = var1.__bq_318();
- var3 = var37 >> 2;
- var38 = var37 & 3;
- var5 = Client.__client_gd[var3];
- var6 = var1.readUnsignedByteNegate();
- var7 = (var6 >> 4 & 7) + WorldMapSection3.__p_go;
- var8 = (var6 & 7) + Canvas.__ao_gk;
- var9 = var1.__ag_302();
- if(var7 >= 0 && var8 >= 0 && var7 < 103 && var8 < 103) {
- if(var5 == 0) {
- BoundaryObject var32 = class65.scene.getBoundaryObject(SoundSystem.plane, var7, var8);
- if(var32 != null) {
- var39 = HitSplatDefinition.method4972(var32.tag);
- if(var3 == 2) {
- var32.entity1 = new DynamicObject(var39, 2, var38 + 4, SoundSystem.plane, var7, var8, var9, false, var32.entity1);
- var32.entity2 = new DynamicObject(var39, 2, var38 + 1 & 3, SoundSystem.plane, var7, var8, var9, false, var32.entity2);
+ var31 = var1.__bq_318();
+ var2 = var31 >> 2;
+ var32 = var31 & 3;
+ var3 = Client.__client_gd[var2];
+ var4 = var1.readUnsignedByteNegate();
+ var5 = (var4 >> 4 & 7) + WorldMapSection3.__p_go;
+ var6 = (var4 & 7) + Canvas.__ao_gk;
+ var7 = var1.__ag_302();
+ if(var5 >= 0 && var6 >= 0 && var5 < 103 && var6 < 103) {
+ if(var3 == 0) {
+ BoundaryObject var34 = class65.scene.getBoundaryObject(SoundSystem.plane, var5, var6);
+ if(var34 != null) {
+ var35 = HitSplatDefinition.method4972(var34.tag);
+ if(var2 == 2) {
+ var34.entity1 = new DynamicObject(var35, 2, var32 + 4, SoundSystem.plane, var5, var6, var7, false, var34.entity1);
+ var34.entity2 = new DynamicObject(var35, 2, var32 + 1 & 3, SoundSystem.plane, var5, var6, var7, false, var34.entity2);
} else {
- var32.entity1 = new DynamicObject(var39, var3, var38, SoundSystem.plane, var7, var8, var9, false, var32.entity1);
+ var34.entity1 = new DynamicObject(var35, var2, var32, SoundSystem.plane, var5, var6, var7, false, var34.entity1);
}
}
}
- if(var5 == 1) {
- WallDecoration var43 = class65.scene.getWallDecoration(SoundSystem.plane, var7, var8);
- if(var43 != null) {
- var39 = HitSplatDefinition.method4972(var43.tag);
- if(var3 != 4 && var3 != 5) {
- if(var3 == 6) {
- var43.entity1 = new DynamicObject(var39, 4, var38 + 4, SoundSystem.plane, var7, var8, var9, false, var43.entity1);
- } else if(var3 == 7) {
- var43.entity1 = new DynamicObject(var39, 4, (var38 + 2 & 3) + 4, SoundSystem.plane, var7, var8, var9, false, var43.entity1);
- } else if(var3 == 8) {
- var43.entity1 = new DynamicObject(var39, 4, var38 + 4, SoundSystem.plane, var7, var8, var9, false, var43.entity1);
- var43.entity2 = new DynamicObject(var39, 4, (var38 + 2 & 3) + 4, SoundSystem.plane, var7, var8, var9, false, var43.entity2);
+ if(var3 == 1) {
+ WallDecoration var36 = class65.scene.getWallDecoration(SoundSystem.plane, var5, var6);
+ if(var36 != null) {
+ var35 = HitSplatDefinition.method4972(var36.tag);
+ if(var2 != 4 && var2 != 5) {
+ if(var2 == 6) {
+ var36.entity1 = new DynamicObject(var35, 4, var32 + 4, SoundSystem.plane, var5, var6, var7, false, var36.entity1);
+ } else if(var2 == 7) {
+ var36.entity1 = new DynamicObject(var35, 4, (var32 + 2 & 3) + 4, SoundSystem.plane, var5, var6, var7, false, var36.entity1);
+ } else if(var2 == 8) {
+ var36.entity1 = new DynamicObject(var35, 4, var32 + 4, SoundSystem.plane, var5, var6, var7, false, var36.entity1);
+ var36.entity2 = new DynamicObject(var35, 4, (var32 + 2 & 3) + 4, SoundSystem.plane, var5, var6, var7, false, var36.entity2);
}
} else {
- var43.entity1 = new DynamicObject(var39, 4, var38, SoundSystem.plane, var7, var8, var9, false, var43.entity1);
+ var36.entity1 = new DynamicObject(var35, 4, var32, SoundSystem.plane, var5, var6, var7, false, var36.entity1);
}
}
}
- if(var5 == 2) {
- GameObject var44 = class65.scene.__aj_243(SoundSystem.plane, var7, var8);
- if(var3 == 11) {
- var3 = 10;
+ if(var3 == 2) {
+ GameObject var37 = class65.scene.__aj_243(SoundSystem.plane, var5, var6);
+ if(var2 == 11) {
+ var2 = 10;
}
- if(var44 != null) {
- var44.entity = new DynamicObject(HitSplatDefinition.method4972(var44.tag), var3, var38, SoundSystem.plane, var7, var8, var9, false, var44.entity);
+ if(var37 != null) {
+ var37.entity = new DynamicObject(HitSplatDefinition.method4972(var37.tag), var2, var32, SoundSystem.plane, var5, var6, var7, false, var37.entity);
}
}
- if(var5 == 3) {
- FloorDecoration var45 = class65.scene.getFloorDecoration(SoundSystem.plane, var7, var8);
- if(var45 != null) {
- var45.entity = new DynamicObject(HitSplatDefinition.method4972(var45.tag), 22, var38, SoundSystem.plane, var7, var8, var9, false, var45.entity);
+ if(var3 == 3) {
+ FloorDecoration var39 = class65.scene.getFloorDecoration(SoundSystem.plane, var5, var6);
+ if(var39 != null) {
+ var39.entity = new DynamicObject(HitSplatDefinition.method4972(var39.tag), 22, var32, SoundSystem.plane, var5, var6, var7, false, var39.entity);
}
}
}
-
} else {
- GroundItem var34;
+ NodeDeque var38;
+ GroundItem var41;
if(class190.field2347 == var0) {
- var37 = var1.__bb_317();
- var3 = (var37 >> 4 & 7) + WorldMapSection3.__p_go;
- var38 = (var37 & 7) + Canvas.__ao_gk;
- var5 = var1.__bm_326();
- if(var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) {
- NodeDeque var33 = Client.groundItems[SoundSystem.plane][var3][var38];
- if(var33 != null) {
- for(var34 = (GroundItem)var33.last(); var34 != null; var34 = (GroundItem)var33.previous()) {
- if((var5 & 32767) == var34.id) {
- var34.remove();
+ var31 = var1.__bb_317();
+ var2 = (var31 >> 4 & 7) + WorldMapSection3.__p_go;
+ var32 = (var31 & 7) + Canvas.__ao_gk;
+ var3 = var1.__bm_326();
+ if(var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) {
+ var38 = Client.groundItems[SoundSystem.plane][var2][var32];
+ if(var38 != null) {
+ for(var41 = (GroundItem)var38.last(); var41 != null; var41 = (GroundItem)var38.previous()) {
+ if((var3 & 32767) == var41.id) {
+ var41.remove();
break;
}
}
- if(var33.last() == null) {
- Client.groundItems[SoundSystem.plane][var3][var38] = null;
+ if(var38.last() == null) {
+ Client.groundItems[SoundSystem.plane][var2][var32] = null;
}
- TilePaint.method3061(var3, var38);
+ TilePaint.method3061(var2, var32);
}
}
-
} else if(class190.field2350 == var0) {
- var37 = var1.__bq_318();
- var3 = var37 >> 2;
- var38 = var37 & 3;
- var5 = Client.__client_gd[var3];
- var6 = var1.__bq_318();
- var7 = (var6 >> 4 & 7) + WorldMapSection3.__p_go;
- var8 = (var6 & 7) + Canvas.__ao_gk;
- if(var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) {
- class258.method4898(SoundSystem.plane, var7, var8, var5, -1, var3, var38, 0, -1);
+ var31 = var1.__bq_318();
+ var2 = var31 >> 2;
+ var32 = var31 & 3;
+ var3 = Client.__client_gd[var2];
+ var4 = var1.__bq_318();
+ var5 = (var4 >> 4 & 7) + WorldMapSection3.__p_go;
+ var6 = (var4 & 7) + Canvas.__ao_gk;
+ if(var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
+ class258.method4898(SoundSystem.plane, var5, var6, var3, -1, var2, var32, 0, -1);
}
-
} else if(class190.field2352 == var0) {
- var37 = var1.__bq_318() * 4;
- var3 = var1.__ag_302();
- var38 = var1.__bu_325();
- var5 = var1.__bq_318() * 4;
- var6 = var1.__bl_327();
- var7 = var1.readUnsignedByte();
- var8 = var1.__bq_318();
- var9 = var1.__by_324();
- var10 = var1.__bb_317();
- var39 = (var10 >> 4 & 7) + WorldMapSection3.__p_go;
- var12 = (var10 & 7) + Canvas.__ao_gk;
- var13 = var1.__bn_319();
+ var31 = var1.__bq_318() * 4;
+ var2 = var1.__ag_302();
+ var32 = var1.__bu_325();
+ var3 = var1.__bq_318() * 4;
+ var4 = var1.__bl_327();
+ var5 = var1.readUnsignedByte();
+ var6 = var1.__bq_318();
+ var7 = var1.__by_324();
+ var8 = var1.__bb_317();
+ var35 = (var8 >> 4 & 7) + WorldMapSection3.__p_go;
+ var9 = (var8 & 7) + Canvas.__ao_gk;
+ var10 = var1.__bn_319();
byte var40 = var1.__bk_320();
- var14 = var40 + var39;
- int var41 = var13 + var12;
- if(var39 >= 0 && var12 >= 0 && var39 < 104 && var12 < 104 && var14 >= 0 && var41 >= 0 && var14 < 104 && var41 < 104 && var38 != 65535) {
- var39 = var39 * 128 + 64;
- var12 = var12 * 128 + 64;
- var14 = var14 * 128 + 64;
- var41 = var41 * 128 + 64;
- Projectile var35 = new Projectile(var38, SoundSystem.plane, var39, var12, class32.getTileHeight(var39, var12, SoundSystem.plane) - var5, var9 + Client.cycle, var3 + Client.cycle, var7, var8, var6, var37);
- var35.setDestination(var14, var41, class32.getTileHeight(var14, var41, SoundSystem.plane) - var37, var9 + Client.cycle);
- Client.projectiles.addFirst(var35);
+ var11 = var40 + var35;
+ int var42 = var10 + var9;
+ if(var35 >= 0 && var9 >= 0 && var35 < 104 && var9 < 104 && var11 >= 0 && var42 >= 0 && var11 < 104 && var42 < 104 && var32 != 65535) {
+ var35 = var35 * 128 + 64;
+ var9 = var9 * 128 + 64;
+ var11 = var11 * 128 + 64;
+ var42 = var42 * 128 + 64;
+ Projectile var43 = new Projectile(var32, SoundSystem.plane, var35, var9, class32.getTileHeight(var35, var9, SoundSystem.plane) - var3, var7 + Client.cycle, var2 + Client.cycle, var5, var6, var4, var31);
+ var43.setDestination(var11, var42, class32.getTileHeight(var11, var42, SoundSystem.plane) - var31, var7 + Client.cycle);
+ Client.projectiles.addFirst(var43);
}
-
} else if(class190.field2346 != var0) {
if(class190.field2343 == var0) {
- var37 = var1.__bu_325();
- var3 = var1.__bm_326();
- var38 = var1.__bb_317();
- var5 = (var38 >> 4 & 7) + WorldMapSection3.__p_go;
- var6 = (var38 & 7) + Canvas.__ao_gk;
- if(var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
- var34 = new GroundItem();
- var34.id = var3;
- var34.quantity = var37;
- if(Client.groundItems[SoundSystem.plane][var5][var6] == null) {
- Client.groundItems[SoundSystem.plane][var5][var6] = new NodeDeque();
+ var31 = var1.__bu_325();
+ var2 = var1.__bm_326();
+ var32 = var1.__bb_317();
+ var3 = (var32 >> 4 & 7) + WorldMapSection3.__p_go;
+ var4 = (var32 & 7) + Canvas.__ao_gk;
+ if(var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) {
+ var41 = new GroundItem();
+ var41.id = var2;
+ var41.quantity = var31;
+ if(Client.groundItems[SoundSystem.plane][var3][var4] == null) {
+ Client.groundItems[SoundSystem.plane][var3][var4] = new NodeDeque();
}
- Client.groundItems[SoundSystem.plane][var5][var6].addFirst(var34);
- TilePaint.method3061(var5, var6);
+ Client.groundItems[SoundSystem.plane][var3][var4].addFirst(var41);
+ TilePaint.method3061(var3, var4);
}
-
}
} else {
- var37 = var1.__by_324();
- var3 = var1.__bm_326();
- var38 = var1.__by_324();
- var5 = var1.__bb_317();
- var6 = (var5 >> 4 & 7) + WorldMapSection3.__p_go;
- var7 = (var5 & 7) + Canvas.__ao_gk;
- if(var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) {
- NodeDeque var31 = Client.groundItems[SoundSystem.plane][var6][var7];
- if(var31 != null) {
- for(GroundItem var36 = (GroundItem)var31.last(); var36 != null; var36 = (GroundItem)var31.previous()) {
- if((var37 & 32767) == var36.id && var38 == var36.quantity) {
- var36.quantity = var3;
+ var31 = var1.__by_324();
+ var2 = var1.__bm_326();
+ var32 = var1.__by_324();
+ var3 = var1.__bb_317();
+ var4 = (var3 >> 4 & 7) + WorldMapSection3.__p_go;
+ var5 = (var3 & 7) + Canvas.__ao_gk;
+ if(var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) {
+ var38 = Client.groundItems[SoundSystem.plane][var4][var5];
+ if(var38 != null) {
+ for(GroundItem var44 = (GroundItem)var38.last(); var44 != null; var44 = (GroundItem)var38.previous()) {
+ if((var31 & 32767) == var44.id && var32 == var44.quantity) {
+ var44.quantity = var2;
break;
}
}
- TilePaint.method3061(var6, var7);
+ TilePaint.method3061(var4, var5);
}
}
-
}
}
}
}
+
}
@ObfuscatedName("il")
@@ -411,19 +405,17 @@ public class class16 {
)
@Export("insertMenuItem")
static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
- if(!Client.isMenuOpen) {
- if(Client.menuOptionsCount < 500) {
- Client.menuActions[Client.menuOptionsCount] = var0;
- Client.menuTargetNames[Client.menuOptionsCount] = var1;
- Client.menuOpcodes[Client.menuOptionsCount] = var2;
- Client.menuArguments0[Client.menuOptionsCount] = var3;
- Client.menuArguments1[Client.menuOptionsCount] = var4;
- Client.menuArguments2[Client.menuOptionsCount] = var5;
- Client.menuShiftClick[Client.menuOptionsCount] = var6;
- ++Client.menuOptionsCount;
- }
-
+ if(!Client.isMenuOpen && Client.menuOptionsCount < 500) {
+ Client.menuActions[Client.menuOptionsCount] = var0;
+ Client.menuTargetNames[Client.menuOptionsCount] = var1;
+ Client.menuOpcodes[Client.menuOptionsCount] = var2;
+ Client.menuArguments0[Client.menuOptionsCount] = var3;
+ Client.menuArguments1[Client.menuOptionsCount] = var4;
+ Client.menuArguments2[Client.menuOptionsCount] = var5;
+ Client.menuShiftClick[Client.menuOptionsCount] = var6;
+ ++Client.menuOptionsCount;
}
+
}
@ObfuscatedName("ii")
diff --git a/runescape-client/src/main/java/class168.java b/runescape-client/src/main/java/class168.java
index 6a3f422952..0f626829ab 100644
--- a/runescape-client/src/main/java/class168.java
+++ b/runescape-client/src/main/java/class168.java
@@ -40,12 +40,6 @@ public class class168 {
@Export("__fs_au")
static int __fs_au;
- static {
- randomDat = null;
- dat2File = null;
- idx255File = null;
- }
-
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "(II)Z",
@@ -69,4 +63,10 @@ public class class168 {
return new String(var2);
}
+
+ static {
+ randomDat = null;
+ dat2File = null;
+ idx255File = null;
+ }
}
diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java
index b05c100bf3..a39e8003f3 100644
--- a/runescape-client/src/main/java/class171.java
+++ b/runescape-client/src/main/java/class171.java
@@ -23,11 +23,6 @@ public class class171 {
@Export("__fo_q")
static Hashtable __fo_q;
- static {
- __fo_m = false;
- __fo_q = new Hashtable(16);
- }
-
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(B)V",
@@ -35,29 +30,30 @@ public class class171 {
)
public static void method3498() {
KeyHandler var0 = KeyHandler.KeyHandler_instance;
+ KeyHandler var1 = KeyHandler.KeyHandler_instance;
synchronized(KeyHandler.KeyHandler_instance) {
++KeyHandler.KeyHandler_idleCycles;
KeyHandler.__an_ct = KeyHandler.__an_cc;
KeyHandler.__an_cl = 0;
- int var1;
+ int var2;
if(KeyHandler.__an_cw < 0) {
- for(var1 = 0; var1 < 112; ++var1) {
- KeyHandler.KeyHandler_pressedKeys[var1] = false;
+ for(var2 = 0; var2 < 112; ++var2) {
+ KeyHandler.KeyHandler_pressedKeys[var2] = false;
}
KeyHandler.__an_cw = KeyHandler.__an_ch;
} else {
while(KeyHandler.__an_cw != KeyHandler.__an_ch) {
- var1 = KeyHandler.__an_cq[KeyHandler.__an_ch];
+ var2 = KeyHandler.__an_cq[KeyHandler.__an_ch];
KeyHandler.__an_ch = KeyHandler.__an_ch + 1 & 127;
- if(var1 < 0) {
- KeyHandler.KeyHandler_pressedKeys[~var1] = false;
+ if(var2 < 0) {
+ KeyHandler.KeyHandler_pressedKeys[~var2] = false;
} else {
- if(!KeyHandler.KeyHandler_pressedKeys[var1] && KeyHandler.__an_cl < KeyHandler.__an_cp.length - 1) {
- KeyHandler.__an_cp[++KeyHandler.__an_cl - 1] = var1;
+ if(!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.__an_cl < KeyHandler.__an_cp.length - 1) {
+ KeyHandler.__an_cp[++KeyHandler.__an_cl - 1] = var2;
}
- KeyHandler.KeyHandler_pressedKeys[var1] = true;
+ KeyHandler.KeyHandler_pressedKeys[var2] = true;
}
}
}
@@ -133,8 +129,8 @@ public class class171 {
Login.Login_loadingPercent = 20;
Client.titleLoadingStage = 40;
} else if(Client.titleLoadingStage == 40) {
- byte var33 = 0;
- var0 = var33 + AbstractIndexCache.indexCache0.__ca_405() * 4 / 100;
+ byte var1 = 0;
+ var0 = var1 + AbstractIndexCache.indexCache0.__ca_405() * 4 / 100;
var0 += Skeleton.indexCache1.__ca_405() * 4 / 100;
var0 += ObjectSound.indexCache2.__ca_405() * 2 / 100;
var0 += WorldMapIcon1.indexCache3.__ca_405() * 2 / 100;
@@ -182,11 +178,11 @@ public class class171 {
}
} else if(Client.titleLoadingStage == 45) {
Tiles.method1097(22050, !Client.isLowDetail, 2);
- MidiPcmStream var36 = new MidiPcmStream();
- var36.__j_342(9, 128);
+ MidiPcmStream var28 = new MidiPcmStream();
+ var28.__j_342(9, 128);
WorldMapCacheName.pcmPlayer0 = Players.newPcmPlayer(GameShell.taskHandler, 0, 22050);
- WorldMapCacheName.pcmPlayer0.setStream(var36);
- NetSocket.method3537(WorldMapSection1.indexCache15, class2.indexCache14, class25.indexCache4, var36);
+ WorldMapCacheName.pcmPlayer0.setStream(var28);
+ NetSocket.method3537(WorldMapSection1.indexCache15, class2.indexCache14, class25.indexCache4, var28);
AbstractIndexCache.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048);
TaskHandler.pcmStreamMixer = new PcmStreamMixer();
AbstractIndexCache.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer);
@@ -196,15 +192,15 @@ public class class171 {
Client.titleLoadingStage = 50;
WorldMapElement.fonts = new Fonts(WorldMapSection3.indexCache8, ByteArrayPool.indexCache13);
} else {
- int var1;
+ int var29;
if(Client.titleLoadingStage == 50) {
- FontName[] var35 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13};
- var1 = var35.length;
- Fonts var32 = WorldMapElement.fonts;
- FontName[] var31 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13};
- Client.fontsMap = var32.createMap(var31);
- if(Client.fontsMap.size() < var1) {
- Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%";
+ FontName[] var2 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13};
+ var29 = var2.length;
+ Fonts var3 = WorldMapElement.fonts;
+ FontName[] var4 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13};
+ Client.fontsMap = var3.createMap(var4);
+ if(Client.fontsMap.size() < var29) {
+ Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var29 + "%";
Login.Login_loadingPercent = 40;
} else {
ScriptEvent.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11);
@@ -217,9 +213,9 @@ public class class171 {
}
} else if(Client.titleLoadingStage == 60) {
var0 = FloorDecoration.method2853(class16.indexCache10, WorldMapSection3.indexCache8);
- var1 = class3.method36();
- if(var0 < var1) {
- Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var1 + "%";
+ var29 = class3.method36();
+ if(var0 < var29) {
+ Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var29 + "%";
Login.Login_loadingPercent = 50;
} else {
Login.Login_loadingText = "Loaded title screen";
@@ -228,7 +224,7 @@ public class class171 {
Client.titleLoadingStage = 70;
}
} else {
- IndexCache var2;
+ IndexCache var30;
if(Client.titleLoadingStage == 70) {
if(!ObjectSound.indexCache2.__l_394()) {
Login.Login_loadingText = "Loading config - " + ObjectSound.indexCache2.loadPercent() + "%";
@@ -236,74 +232,74 @@ public class class171 {
} else {
Varcs.method2160(ObjectSound.indexCache2);
Varps.method4393(ObjectSound.indexCache2);
- IndexCache var34 = ObjectSound.indexCache2;
- IndexCache var38 = class40.indexCache7;
- KitDefinition.KitDefinition_indexCache = var34;
- KitDefinition.__im_f = var38;
+ IndexCache var31 = ObjectSound.indexCache2;
+ IndexCache var33 = class40.indexCache7;
+ KitDefinition.KitDefinition_indexCache = var31;
+ KitDefinition.__im_f = var33;
KitDefinition.__im_q = KitDefinition.KitDefinition_indexCache.__s_396(3);
RectangleMode.method6028(ObjectSound.indexCache2, class40.indexCache7, Client.isLowDetail);
IsaacCipher.method4082(ObjectSound.indexCache2, class40.indexCache7);
- var2 = ObjectSound.indexCache2;
- StructDefinition.__jq_m = var2;
- IndexCache var3 = ObjectSound.indexCache2;
- IndexCache var4 = class40.indexCache7;
- boolean var5 = Client.isMembersWorld;
- Font var6 = ScriptEvent.fontPlain11;
- ItemDefinition.ItemDefinition_indexCache = var3;
- ItemDefinition.ItemDefinition_modelIndexCache = var4;
- class30.inMembersWorld = var5;
+ var30 = ObjectSound.indexCache2;
+ StructDefinition.__jq_m = var30;
+ IndexCache var5 = ObjectSound.indexCache2;
+ IndexCache var6 = class40.indexCache7;
+ boolean var7 = Client.isMembersWorld;
+ Font var8 = ScriptEvent.fontPlain11;
+ ItemDefinition.ItemDefinition_indexCache = var5;
+ ItemDefinition.ItemDefinition_modelIndexCache = var6;
+ class30.inMembersWorld = var7;
class83.__cm_e = ItemDefinition.ItemDefinition_indexCache.__s_396(10);
- class204.__gx_n = var6;
- IndexCache var7 = ObjectSound.indexCache2;
- IndexCache var8 = AbstractIndexCache.indexCache0;
- IndexCache var9 = Skeleton.indexCache1;
- SequenceDefinition.SequenceDefinition_indexCache = var7;
- SequenceDefinition.__jh_f = var8;
- SequenceDefinition.__jh_q = var9;
- IndexCache var10 = ObjectSound.indexCache2;
- IndexCache var11 = class40.indexCache7;
- SpotAnimationDefinition.SpotAnimationDefinition_indexCache = var10;
- SpotAnimationDefinition.SpotAnimationDefinition_modelIndexCache = var11;
- UnitPriceComparator.method135(ObjectSound.indexCache2);
+ class204.__gx_n = var8;
+ IndexCache var9 = ObjectSound.indexCache2;
+ IndexCache var10 = AbstractIndexCache.indexCache0;
+ IndexCache var11 = Skeleton.indexCache1;
+ SequenceDefinition.SequenceDefinition_indexCache = var9;
+ SequenceDefinition.__jh_f = var10;
+ SequenceDefinition.__jh_q = var11;
IndexCache var12 = ObjectSound.indexCache2;
- VarpDefinition.__ix_m = var12;
+ IndexCache var13 = class40.indexCache7;
+ SpotAnimationDefinition.SpotAnimationDefinition_indexCache = var12;
+ SpotAnimationDefinition.SpotAnimationDefinition_modelIndexCache = var13;
+ UnitPriceComparator.method135(ObjectSound.indexCache2);
+ IndexCache var14 = ObjectSound.indexCache2;
+ VarpDefinition.__ix_m = var14;
VarpDefinition.__ix_f = VarpDefinition.__ix_m.__s_396(16);
- IndexCache var13 = WorldMapIcon1.indexCache3;
- IndexCache var14 = class40.indexCache7;
- IndexCache var15 = WorldMapSection3.indexCache8;
- IndexCache var16 = ByteArrayPool.indexCache13;
- Widget.Widget_indexCache = var13;
- BufferedSource.__fh_x = var14;
- Widget.__ho_d = var15;
- class27.__aq_k = var16;
+ IndexCache var15 = WorldMapIcon1.indexCache3;
+ IndexCache var16 = class40.indexCache7;
+ IndexCache var17 = WorldMapSection3.indexCache8;
+ IndexCache var18 = ByteArrayPool.indexCache13;
+ Widget.Widget_indexCache = var15;
+ BufferedSource.__fh_x = var16;
+ Widget.__ho_d = var17;
+ class27.__aq_k = var18;
Widget.widgets = new Widget[Widget.Widget_indexCache.__t_397()][];
Widget.loadedWidgetGroups = new boolean[Widget.Widget_indexCache.__t_397()];
- IndexCache var17 = ObjectSound.indexCache2;
- class4.__o_m = var17;
- IndexCache var18 = ObjectSound.indexCache2;
- EnumDefinition.EnumDefinition_indexCache = var18;
- Frames.method3241(ObjectSound.indexCache2);
IndexCache var19 = ObjectSound.indexCache2;
- ParamKeyDefinition.__jb_m = var19;
+ class4.__o_m = var19;
+ IndexCache var20 = ObjectSound.indexCache2;
+ EnumDefinition.EnumDefinition_indexCache = var20;
+ Frames.method3241(ObjectSound.indexCache2);
+ IndexCache var21 = ObjectSound.indexCache2;
+ ParamKeyDefinition.__jb_m = var21;
class196.varcs = new Varcs();
class60.method1172(ObjectSound.indexCache2, WorldMapSection3.indexCache8, ByteArrayPool.indexCache13);
- IndexCache var20 = ObjectSound.indexCache2;
- IndexCache var21 = WorldMapSection3.indexCache8;
- HealthBarDefinition.__ii_m = var20;
- HealthBarDefinition.__ii_f = var21;
IndexCache var22 = ObjectSound.indexCache2;
IndexCache var23 = WorldMapSection3.indexCache8;
- WorldMapElement.__ic_m = var23;
- if(var22.__l_394()) {
- UserComparator4.WorldMapElement_count = var22.__s_396(35);
+ HealthBarDefinition.__ii_m = var22;
+ HealthBarDefinition.__ii_f = var23;
+ IndexCache var24 = ObjectSound.indexCache2;
+ IndexCache var25 = WorldMapSection3.indexCache8;
+ WorldMapElement.__ic_m = var25;
+ if(var24.__l_394()) {
+ UserComparator4.WorldMapElement_count = var24.__s_396(35);
Widget.WorldMapElement_cached = new WorldMapElement[UserComparator4.WorldMapElement_count];
- for(int var24 = 0; var24 < UserComparator4.WorldMapElement_count; ++var24) {
- byte[] var25 = var22.takeRecord(35, var24);
- Widget.WorldMapElement_cached[var24] = new WorldMapElement(var24);
- if(var25 != null) {
- Widget.WorldMapElement_cached[var24].read(new Buffer(var25));
- Widget.WorldMapElement_cached[var24].__w_409();
+ for(int var26 = 0; var26 < UserComparator4.WorldMapElement_count; ++var26) {
+ byte[] var27 = var24.takeRecord(35, var26);
+ Widget.WorldMapElement_cached[var26] = new WorldMapElement(var26);
+ if(var27 != null) {
+ Widget.WorldMapElement_cached[var26].read(new Buffer(var27));
+ Widget.WorldMapElement_cached[var26].__w_409();
}
}
}
@@ -326,131 +322,131 @@ public class class171 {
++var0;
}
- IndexedSprite[] var27;
- int var28;
+ IndexedSprite[] var32;
+ int var34;
if(class192.mapSceneSprites == null) {
- var2 = WorldMapSection3.indexCache8;
- var28 = class211.spriteIds.mapScenes;
- if(!SpriteMask.method4392(var2, var28, 0)) {
- var27 = null;
+ var30 = WorldMapSection3.indexCache8;
+ var34 = class211.spriteIds.mapScenes;
+ if(!SpriteMask.method4392(var30, var34, 0)) {
+ var32 = null;
} else {
- var27 = WorldMapLabel.method444();
+ var32 = WorldMapLabel.method444();
}
- class192.mapSceneSprites = var27;
+ class192.mapSceneSprites = var32;
} else {
++var0;
}
- Sprite[] var37;
+ Sprite[] var35;
if(class15.headIconPkSprites == null) {
- var2 = WorldMapSection3.indexCache8;
- var28 = class211.spriteIds.headIconsPk;
- if(!SpriteMask.method4392(var2, var28, 0)) {
- var37 = null;
+ var30 = WorldMapSection3.indexCache8;
+ var34 = class211.spriteIds.headIconsPk;
+ if(!SpriteMask.method4392(var30, var34, 0)) {
+ var35 = null;
} else {
- var37 = UserComparator9.method3344();
+ var35 = UserComparator9.method3344();
}
- class15.headIconPkSprites = var37;
+ class15.headIconPkSprites = var35;
} else {
++var0;
}
if(ClientPreferences.headIconPrayerSprites == null) {
- var2 = WorldMapSection3.indexCache8;
- var28 = class211.spriteIds.headIconsPrayer;
- if(!SpriteMask.method4392(var2, var28, 0)) {
- var37 = null;
+ var30 = WorldMapSection3.indexCache8;
+ var34 = class211.spriteIds.headIconsPrayer;
+ if(!SpriteMask.method4392(var30, var34, 0)) {
+ var35 = null;
} else {
- var37 = UserComparator9.method3344();
+ var35 = UserComparator9.method3344();
}
- ClientPreferences.headIconPrayerSprites = var37;
+ ClientPreferences.headIconPrayerSprites = var35;
} else {
++var0;
}
if(Player.headIconHintSprites == null) {
- var2 = WorldMapSection3.indexCache8;
- var28 = class211.spriteIds.headIconsHint;
- if(!SpriteMask.method4392(var2, var28, 0)) {
- var37 = null;
+ var30 = WorldMapSection3.indexCache8;
+ var34 = class211.spriteIds.headIconsHint;
+ if(!SpriteMask.method4392(var30, var34, 0)) {
+ var35 = null;
} else {
- var37 = UserComparator9.method3344();
+ var35 = UserComparator9.method3344();
}
- Player.headIconHintSprites = var37;
+ Player.headIconHintSprites = var35;
} else {
++var0;
}
if(class16.mapMarkerSprites == null) {
- var2 = WorldMapSection3.indexCache8;
- var28 = class211.spriteIds.mapMarkers;
- if(!SpriteMask.method4392(var2, var28, 0)) {
- var37 = null;
+ var30 = WorldMapSection3.indexCache8;
+ var34 = class211.spriteIds.mapMarkers;
+ if(!SpriteMask.method4392(var30, var34, 0)) {
+ var35 = null;
} else {
- var37 = UserComparator9.method3344();
+ var35 = UserComparator9.method3344();
}
- class16.mapMarkerSprites = var37;
+ class16.mapMarkerSprites = var35;
} else {
++var0;
}
if(KeyHandler.crossSprites == null) {
- var2 = WorldMapSection3.indexCache8;
- var28 = class211.spriteIds.crosses;
- if(!SpriteMask.method4392(var2, var28, 0)) {
- var37 = null;
+ var30 = WorldMapSection3.indexCache8;
+ var34 = class211.spriteIds.crosses;
+ if(!SpriteMask.method4392(var30, var34, 0)) {
+ var35 = null;
} else {
- var37 = UserComparator9.method3344();
+ var35 = UserComparator9.method3344();
}
- KeyHandler.crossSprites = var37;
+ KeyHandler.crossSprites = var35;
} else {
++var0;
}
if(class39.mapDotSprites == null) {
- var2 = WorldMapSection3.indexCache8;
- var28 = class211.spriteIds.mapDots;
- if(!SpriteMask.method4392(var2, var28, 0)) {
- var37 = null;
+ var30 = WorldMapSection3.indexCache8;
+ var34 = class211.spriteIds.mapDots;
+ if(!SpriteMask.method4392(var30, var34, 0)) {
+ var35 = null;
} else {
- var37 = UserComparator9.method3344();
+ var35 = UserComparator9.method3344();
}
- class39.mapDotSprites = var37;
+ class39.mapDotSprites = var35;
} else {
++var0;
}
if(class32.scrollBarSprites == null) {
- var2 = WorldMapSection3.indexCache8;
- var28 = class211.spriteIds.scrollBars;
- if(!SpriteMask.method4392(var2, var28, 0)) {
- var27 = null;
+ var30 = WorldMapSection3.indexCache8;
+ var34 = class211.spriteIds.scrollBars;
+ if(!SpriteMask.method4392(var30, var34, 0)) {
+ var32 = null;
} else {
- var27 = WorldMapLabel.method444();
+ var32 = WorldMapLabel.method444();
}
- class32.scrollBarSprites = var27;
+ class32.scrollBarSprites = var32;
} else {
++var0;
}
if(WorldMapSectionType.modIconSprites == null) {
- var2 = WorldMapSection3.indexCache8;
- var28 = class211.spriteIds.modIcons;
- if(!SpriteMask.method4392(var2, var28, 0)) {
- var27 = null;
+ var30 = WorldMapSection3.indexCache8;
+ var34 = class211.spriteIds.modIcons;
+ if(!SpriteMask.method4392(var30, var34, 0)) {
+ var32 = null;
} else {
- var27 = WorldMapLabel.method444();
+ var32 = WorldMapLabel.method444();
}
- WorldMapSectionType.modIconSprites = var27;
+ WorldMapSectionType.modIconSprites = var32;
} else {
++var0;
}
@@ -461,18 +457,18 @@ public class class171 {
} else {
AbstractFont.AbstractFont_modIconSprites = WorldMapSectionType.modIconSprites;
FaceNormal.__el_gm.normalize();
- var1 = (int)(Math.random() * 21.0D) - 10;
- int var29 = (int)(Math.random() * 21.0D) - 10;
- var28 = (int)(Math.random() * 21.0D) - 10;
- int var30 = (int)(Math.random() * 41.0D) - 20;
- class192.mapSceneSprites[0].shiftColors(var30 + var1, var30 + var29, var30 + var28);
+ var29 = (int)(Math.random() * 21.0D) - 10;
+ int var36 = (int)(Math.random() * 21.0D) - 10;
+ var34 = (int)(Math.random() * 21.0D) - 10;
+ int var38 = (int)(Math.random() * 41.0D) - 20;
+ class192.mapSceneSprites[0].shiftColors(var38 + var29, var38 + var36, var38 + var34);
Login.Login_loadingText = "Loaded sprites";
Login.Login_loadingPercent = 70;
Client.titleLoadingStage = 90;
}
} else if(Client.titleLoadingStage == 90) {
if(!class238.indexCache9.__l_394()) {
- Login.Login_loadingText = "Loading textures - " + "0%";
+ Login.Login_loadingText = "Loading textures - 0%";
Login.Login_loadingPercent = 90;
} else {
SecureRandomFuture.textureProvider = new TextureProvider(class238.indexCache9, WorldMapSection3.indexCache8, 20, 0.8D, Client.isLowDetail?64:128);
@@ -498,11 +494,11 @@ public class class171 {
Client.titleLoadingStage = 120;
} else if(Client.titleLoadingStage == 120) {
if(!class16.indexCache10.tryLoadRecordByNames("huffman", "")) {
- Login.Login_loadingText = "Loading wordpack - " + 0 + "%";
+ Login.Login_loadingText = "Loading wordpack - 0%";
Login.Login_loadingPercent = 94;
} else {
- Huffman var26 = new Huffman(class16.indexCache10.takeRecordByNames("huffman", ""));
- class303.huffman = var26;
+ Huffman var37 = new Huffman(class16.indexCache10.takeRecordByNames("huffman", ""));
+ class303.huffman = var37;
Login.Login_loadingText = "Loaded wordpack";
Login.Login_loadingPercent = 94;
Client.titleLoadingStage = 130;
@@ -540,6 +536,7 @@ public class class171 {
}
}
}
+
}
@ObfuscatedName("ie")
@@ -565,10 +562,10 @@ public class class171 {
}
if(var11) {
- int var8 = class1.getWidgetClickMask(var5);
- int var9 = var0 - 1;
- boolean var7 = (var8 >> var9 + 1 & 1) != 0;
- if(var7) {
+ int var7 = class1.getWidgetClickMask(var5);
+ int var8 = var0 - 1;
+ boolean var9 = (var7 >> var8 + 1 & 1) != 0;
+ if(var9) {
PacketBufferNode var10;
if(var0 == 1) {
var10 = Interpreter.method1915(ClientPacket.__gs_bi, Client.packetWriter.isaacCipher);
@@ -649,9 +646,14 @@ public class class171 {
var10.packetBuffer.writeShort(var3);
Client.packetWriter.__q_167(var10);
}
-
}
}
}
+
+ }
+
+ static {
+ __fo_m = false;
+ __fo_q = new Hashtable(16);
}
}
diff --git a/runescape-client/src/main/java/class190.java b/runescape-client/src/main/java/class190.java
index b36e1c9dfa..115c23dab5 100644
--- a/runescape-client/src/main/java/class190.java
+++ b/runescape-client/src/main/java/class190.java
@@ -58,19 +58,6 @@ public class class190 {
@Export("xteaKeys")
static int[][] xteaKeys;
- static {
- field2346 = new class190(7);
- field2352 = new class190(15);
- field2342 = new class190(14);
- field2341 = new class190(6);
- field2344 = new class190(4);
- field2345 = new class190(5);
- field2350 = new class190(2);
- field2347 = new class190(3);
- field2343 = new class190(5);
- field2349 = new class190(4);
- }
-
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "7"
@@ -131,5 +118,19 @@ public class class190 {
Rasterizer3D.method2985(var17, var19, var20);
Rasterizer3D.method3020(var21, var23, var24, var17, var19, var20, var4);
}
+
+ }
+
+ static {
+ field2346 = new class190(7);
+ field2352 = new class190(15);
+ field2342 = new class190(14);
+ field2341 = new class190(6);
+ field2344 = new class190(4);
+ field2345 = new class190(5);
+ field2350 = new class190(2);
+ field2347 = new class190(3);
+ field2343 = new class190(5);
+ field2349 = new class190(4);
}
}
diff --git a/runescape-client/src/main/java/class196.java b/runescape-client/src/main/java/class196.java
index 750c5159bc..bbc7500519 100644
--- a/runescape-client/src/main/java/class196.java
+++ b/runescape-client/src/main/java/class196.java
@@ -12,10 +12,6 @@ public class class196 {
@Export("varcs")
static Varcs varcs;
- static {
- new HashMap();
- }
-
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "(ILcg;ZB)I",
@@ -45,6 +41,10 @@ public class class196 {
garbageValue = "1247389467"
)
static final String method3735(int var0) {
- return var0 < 100000?"" + var0 + "":(var0 < 10000000?"" + var0 / 1000 + "K" + "":"" + var0 / 1000000 + "M" + "");
+ return var0 < 100000?"" + var0 + "":(var0 < 10000000?"" + var0 / 1000 + "K":"" + var0 / 1000000 + "M");
+ }
+
+ static {
+ new HashMap();
}
}
diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java
index 9b9c0e10ea..99c109f88b 100644
--- a/runescape-client/src/main/java/class2.java
+++ b/runescape-client/src/main/java/class2.java
@@ -61,7 +61,6 @@ final class class2 implements class0 {
if(var3 == 4) {
Login.loginIndex = 4;
}
-
} else {
Login.loginIndex = var3;
Rasterizer2D.Rasterizer2D_clear();
@@ -76,20 +75,20 @@ final class class2 implements class0 {
Login.__cu_o = MenuAction.method2025(var1, "titlebox", "");
IndexCacheLoader.__bd_u = MenuAction.method2025(var1, "titlebutton", "");
- int var6 = var1.getArchiveId("runes");
- int var7 = var1.getRecordId(var6, "");
- IndexedSprite[] var8;
- if(!SpriteMask.method4392(var1, var6, var7)) {
- var8 = null;
+ int var5 = var1.getArchiveId("runes");
+ int var6 = var1.getRecordId(var5, "");
+ IndexedSprite[] var7;
+ if(!SpriteMask.method4392(var1, var5, var6)) {
+ var7 = null;
} else {
- var8 = WorldMapLabel.method444();
+ var7 = WorldMapLabel.method444();
}
- WorldMapEvent.__ap_w = var8;
- var7 = var1.getArchiveId("title_mute");
- int var10 = var1.getRecordId(var7, "");
+ WorldMapEvent.__ap_w = var7;
+ var6 = var1.getArchiveId("title_mute");
+ int var8 = var1.getRecordId(var6, "");
IndexedSprite[] var9;
- if(!SpriteMask.method4392(var1, var7, var10)) {
+ if(!SpriteMask.method4392(var1, var6, var8)) {
var9 = null;
} else {
var9 = WorldMapLabel.method444();
@@ -127,6 +126,7 @@ final class class2 implements class0 {
Fonts.__kz_l.drawAt(Login.__cu_q + 382, 0);
WorldMapSectionType.__h_e.__q_496(Login.__cu_q + 382 - WorldMapSectionType.__h_e.subWidth / 2, 18);
}
+
}
@ObfuscatedName("w")
diff --git a/runescape-client/src/main/java/class203.java b/runescape-client/src/main/java/class203.java
index 57b042deea..7bd6fe55ae 100644
--- a/runescape-client/src/main/java/class203.java
+++ b/runescape-client/src/main/java/class203.java
@@ -42,24 +42,24 @@ public class class203 {
try {
Thread.sleep(var2);
- } catch (InterruptedException var8) {
+ } catch (InterruptedException var7) {
;
}
try {
Thread.sleep(1L);
- } catch (InterruptedException var7) {
+ } catch (InterruptedException var6) {
;
}
} else {
try {
Thread.sleep(var0);
- } catch (InterruptedException var6) {
+ } catch (InterruptedException var5) {
;
}
}
-
}
+
}
@ObfuscatedName("w")
diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java
index f648d1f2b2..1f64921851 100644
--- a/runescape-client/src/main/java/class204.java
+++ b/runescape-client/src/main/java/class204.java
@@ -17,18 +17,6 @@ public class class204 {
@Export("__gx_n")
public static Font __gx_n;
- static {
- __gx_x = new int[2048];
- __gx_d = new int[2048];
- double var0 = 0.0030679615757712823D;
-
- for(int var2 = 0; var2 < 2048; ++var2) {
- __gx_x[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2));
- __gx_d[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2));
- }
-
- }
-
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "(III)Lho;",
@@ -57,43 +45,55 @@ public class class204 {
garbageValue = "64"
)
static final void method4013(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) {
- int var10;
- for(int var9 = 0; var9 < 8; ++var9) {
- for(var10 = 0; var10 < 8; ++var10) {
- if(var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) {
- var8[var1].flags[var9 + var2][var3 + var10] &= -16777217;
+ int var9;
+ for(int var10 = 0; var10 < 8; ++var10) {
+ for(var9 = 0; var9 < 8; ++var9) {
+ if(var10 + var2 > 0 && var10 + var2 < 103 && var3 + var9 > 0 && var3 + var9 < 103) {
+ var8[var1].flags[var10 + var2][var3 + var9] &= -16777217;
}
}
}
- Buffer var21 = new Buffer(var0);
+ Buffer var18 = new Buffer(var0);
- for(var10 = 0; var10 < 4; ++var10) {
+ for(var9 = 0; var9 < 4; ++var9) {
for(int var11 = 0; var11 < 64; ++var11) {
for(int var12 = 0; var12 < 64; ++var12) {
- if(var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) {
- int var15 = var2 + CollisionMap.method3632(var11 & 7, var12 & 7, var7);
- int var18 = var11 & 7;
- int var19 = var12 & 7;
- int var20 = var7 & 3;
+ if(var9 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) {
+ int var13 = var2 + CollisionMap.method3632(var11 & 7, var12 & 7, var7);
+ int var14 = var11 & 7;
+ int var15 = var12 & 7;
+ int var16 = var7 & 3;
int var17;
- if(var20 == 0) {
- var17 = var19;
- } else if(var20 == 1) {
- var17 = 7 - var18;
- } else if(var20 == 2) {
- var17 = 7 - var19;
+ if(var16 == 0) {
+ var17 = var15;
+ } else if(var16 == 1) {
+ var17 = 7 - var14;
+ } else if(var16 == 2) {
+ var17 = 7 - var15;
} else {
- var17 = var18;
+ var17 = var14;
}
- TotalQuantityComparator.loadTerrain(var21, var1, var15, var3 + var17, 0, 0, var7);
+ TotalQuantityComparator.loadTerrain(var18, var1, var13, var3 + var17, 0, 0, var7);
} else {
- TotalQuantityComparator.loadTerrain(var21, 0, -1, -1, 0, 0, 0);
+ TotalQuantityComparator.loadTerrain(var18, 0, -1, -1, 0, 0, 0);
}
}
}
}
}
+
+ static {
+ __gx_x = new int[2048];
+ __gx_d = new int[2048];
+ double var0 = 0.0030679615757712823D;
+
+ for(int var2 = 0; var2 < 2048; ++var2) {
+ __gx_x[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2));
+ __gx_d[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2));
+ }
+
+ }
}
diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java
index 259d966766..526eaf7922 100644
--- a/runescape-client/src/main/java/class21.java
+++ b/runescape-client/src/main/java/class21.java
@@ -104,8 +104,8 @@ public abstract class class21 {
this.field157 = true;
this.field153 = true;
}
-
}
+
}
@ObfuscatedName("x")
@@ -114,11 +114,11 @@ public abstract class class21 {
garbageValue = "-2111523326"
)
void method282() {
- this.field151 = null;
- this.field145 = null;
- this.field154 = null;
- this.field155 = null;
- this.field144 = null;
+ this.field151 = (short[][][])null;
+ this.field145 = (short[][][])null;
+ this.field154 = (byte[][][])null;
+ this.field155 = (byte[][][])null;
+ this.field144 = (class25[][][][])null;
this.field157 = false;
this.field153 = false;
}
@@ -136,8 +136,8 @@ public abstract class class21 {
} else {
this.method257(var1, var2, var3, var4);
}
-
}
+
}
@ObfuscatedName("a")
@@ -166,17 +166,17 @@ public abstract class class21 {
this.field151[0][var1][var2] = (short)var3.readUnsignedByte();
int var8;
int var9;
- int var11;
+ int var10;
if(var6) {
var8 = var3.readUnsignedByte();
for(var9 = 0; var9 < var8; ++var9) {
- int var10 = var3.readUnsignedByte();
- if(var10 != 0) {
- this.field145[var9][var1][var2] = (short)var10;
- var11 = var3.readUnsignedByte();
- this.field154[var9][var1][var2] = (byte)(var11 >> 2);
- this.field155[var9][var1][var2] = (byte)(var11 & 3);
+ int var11 = var3.readUnsignedByte();
+ if(var11 != 0) {
+ this.field145[var9][var1][var2] = (short)var11;
+ var10 = var3.readUnsignedByte();
+ this.field154[var9][var1][var2] = (byte)(var10 >> 2);
+ this.field155[var9][var1][var2] = (byte)(var10 & 3);
}
}
}
@@ -187,10 +187,10 @@ public abstract class class21 {
if(var9 != 0) {
class25[] var14 = this.field144[var8][var1][var2] = new class25[var9];
- for(var11 = 0; var11 < var9; ++var11) {
+ for(var10 = 0; var10 < var9; ++var10) {
int var12 = var3.__ap_310();
int var13 = var3.readUnsignedByte();
- var14[var11] = new class25(var12, var13 >> 2, var13 & 3);
+ var14[var10] = new class25(var12, var13 >> 2, var13 & 3);
}
}
}
@@ -233,48 +233,48 @@ public abstract class class21 {
byte var5 = -1;
int var6;
int var7;
+ int var8;
int var9;
int var10;
- int var13;
if((var4 & 64) != 0) {
var6 = var0.__bb_317();
- int var8;
int var11;
int var12;
+ int var13;
if(var6 > 0) {
for(var7 = 0; var7 < var6; ++var7) {
+ var8 = -1;
var9 = -1;
- var10 = -1;
- var11 = -1;
- var8 = var0.__ae_307();
- if(var8 == 32767) {
- var8 = var0.__ae_307();
- var10 = var0.__ae_307();
- var9 = var0.__ae_307();
+ var12 = -1;
+ var11 = var0.__ae_307();
+ if(var11 == 32767) {
var11 = var0.__ae_307();
- } else if(var8 != 32766) {
- var10 = var0.__ae_307();
+ var9 = var0.__ae_307();
+ var8 = var0.__ae_307();
+ var12 = var0.__ae_307();
+ } else if(var11 != 32766) {
+ var9 = var0.__ae_307();
} else {
- var8 = -1;
+ var11 = -1;
}
- var12 = var0.__ae_307();
- var3.addHitSplat(var8, var10, var9, var11, Client.cycle, var12);
+ var13 = var0.__ae_307();
+ var3.addHitSplat(var11, var9, var8, var12, Client.cycle, var13);
}
}
var7 = var0.readUnsignedByteNegate();
if(var7 > 0) {
- for(var8 = 0; var8 < var7; ++var8) {
+ for(var11 = 0; var11 < var7; ++var11) {
+ var8 = var0.__ae_307();
var9 = var0.__ae_307();
- var10 = var0.__ae_307();
- if(var10 != 32767) {
- var11 = var0.__ae_307();
- var12 = var0.__bb_317();
- var13 = var10 > 0?var0.readUnsignedByte():var12;
- var3.addHealthBar(var9, Client.cycle, var10, var11, var12, var13);
+ if(var9 != 32767) {
+ var12 = var0.__ae_307();
+ var13 = var0.__bb_317();
+ var10 = var9 > 0?var0.readUnsignedByte():var13;
+ var3.addHealthBar(var8, Client.cycle, var9, var12, var13, var10);
} else {
- var3.removeHealthBar(var9);
+ var3.removeHealthBar(var8);
}
}
}
@@ -350,11 +350,11 @@ public abstract class class21 {
if((var4 & 1) != 0) {
var6 = var0.__bq_318();
- byte[] var14 = new byte[var6];
- Buffer var15 = new Buffer(var14);
- var0.__bh_333(var14, 0, var6);
- Players.__cq_o[var2] = var15;
- var3.read(var15);
+ byte[] var15 = new byte[var6];
+ Buffer var16 = new Buffer(var15);
+ var0.__bh_333(var15, 0, var6);
+ Players.__cq_o[var2] = var16;
+ var3.read(var16);
}
if((var4 & 2) != 0) {
@@ -370,42 +370,42 @@ public abstract class class21 {
if((var4 & 16) != 0) {
var6 = var0.__bu_325();
- PlayerType var20 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var0.readUnsignedByte());
+ PlayerType var17 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var0.readUnsignedByte());
boolean var18 = var0.readUnsignedByteNegate() == 1;
- var9 = var0.readUnsignedByte();
- var10 = var0.index;
+ var8 = var0.readUnsignedByte();
+ var9 = var0.index;
if(var3.username != null && var3.appearance != null) {
boolean var19 = false;
- if(var20.isUser && WorldMapArea.friendSystem.isIgnored(var3.username)) {
+ if(var17.isUser && WorldMapArea.friendSystem.isIgnored(var3.username)) {
var19 = true;
}
if(!var19 && Client.__client_jc == 0 && !var3.isHidden) {
Players.__cq_a.index = 0;
- var0.__al_305(Players.__cq_a.array, 0, var9);
+ var0.__al_305(Players.__cq_a.array, 0, var8);
Players.__cq_a.index = 0;
- String var16 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(Players.__cq_a)));
- var3.overheadText = var16.trim();
+ String var14 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(Players.__cq_a)));
+ var3.overheadText = var14.trim();
var3.overheadTextColor = var6 >> 8;
var3.overheadTextEffect = var6 & 255;
var3.overheadTextCyclesRemaining = 150;
var3.isAutoChatting = var18;
- var3.__az = var3 != Canvas.localPlayer && var20.isUser && "" != Client.__client_pz && var16.toLowerCase().indexOf(Client.__client_pz) == -1;
- if(var20.isPrivileged) {
- var13 = var18?91:1;
+ var3.__az = var3 != Canvas.localPlayer && var17.isUser && "" != Client.__client_pz && var14.toLowerCase().indexOf(Client.__client_pz) == -1;
+ if(var17.isPrivileged) {
+ var10 = var18?91:1;
} else {
- var13 = var18?90:2;
+ var10 = var18?90:2;
}
- if(var20.modIcon != -1) {
- WorldMapIcon1.method219(var13, ItemContainer.method1170(var20.modIcon) + var3.username.getName(), var16);
+ if(var17.modIcon != -1) {
+ WorldMapIcon1.method219(var10, ItemContainer.method1170(var17.modIcon) + var3.username.getName(), var14);
} else {
- WorldMapIcon1.method219(var13, var3.username.getName(), var16);
+ WorldMapIcon1.method219(var10, var3.username.getName(), var14);
}
}
}
- var0.index = var10 + var9;
+ var0.index = var9 + var8;
}
if((var4 & 256) != 0) {
@@ -428,14 +428,14 @@ public abstract class class21 {
if(var5 == 127) {
var3.resetPath(var3.tileX, var3.tileY);
} else {
- byte var17;
+ byte var20;
if(var5 != -1) {
- var17 = var5;
+ var20 = var5;
} else {
- var17 = Players.__cq_w[var2];
+ var20 = Players.__cq_w[var2];
}
- var3.__x_130(var3.tileX, var3.tileY, var17);
+ var3.__x_130(var3.tileX, var3.tileY, var20);
}
}
}
diff --git a/runescape-client/src/main/java/class210.java b/runescape-client/src/main/java/class210.java
index ea27bac5c4..7df641b515 100644
--- a/runescape-client/src/main/java/class210.java
+++ b/runescape-client/src/main/java/class210.java
@@ -27,9 +27,11 @@ public class class210 {
if(var3 == 0) {
if(var2) {
var4.__ag = false;
- } else if(Client.localPlayerIndex == var1) {
- throw new RuntimeException();
} else {
+ if(Client.localPlayerIndex == var1) {
+ throw new RuntimeException();
+ }
+
Players.Players_regions[var1] = (var4.plane << 28) + (GraphicsObject.baseY + var4.pathY[0] >> 13) + (class50.baseX + var4.pathX[0] >> 13 << 14);
if(var4.__bc != -1) {
Players.Players_orientations[var1] = var4.__bc;
@@ -42,7 +44,6 @@ public class class210 {
if(var0.readBits(1) != 0) {
class236.updateExternalPlayer(var0, var1);
}
-
}
} else {
int var5;
@@ -74,18 +75,19 @@ public class class210 {
++var7;
}
- if(Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
+ if(Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) {
+ if(var2) {
+ var4.__ag = true;
+ var4.tileX = var6;
+ var4.tileY = var7;
+ } else {
+ var4.__ag = false;
+ var4.__x_130(var6, var7, Players.__cq_w[var1]);
+ }
+ } else {
var4.resetPath(var6, var7);
var4.__ag = false;
- } else if(var2) {
- var4.__ag = true;
- var4.tileX = var6;
- var4.tileY = var7;
- } else {
- var4.__ag = false;
- var4.__x_130(var6, var7, Players.__cq_w[var1]);
}
-
} else if(var3 == 2) {
var5 = var0.readBits(4);
var6 = var4.pathX[0];
@@ -136,18 +138,19 @@ public class class210 {
var7 += 2;
}
- if(Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
+ if(Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) {
+ if(var2) {
+ var4.__ag = true;
+ var4.tileX = var6;
+ var4.tileY = var7;
+ } else {
+ var4.__ag = false;
+ var4.__x_130(var6, var7, Players.__cq_w[var1]);
+ }
+ } else {
var4.resetPath(var6, var7);
var4.__ag = false;
- } else if(var2) {
- var4.__ag = true;
- var4.tileX = var6;
- var4.tileY = var7;
- } else {
- var4.__ag = false;
- var4.__x_130(var6, var7, Players.__cq_w[var1]);
}
-
} else {
var5 = var0.readBits(1);
int var8;
@@ -187,7 +190,6 @@ public class class210 {
if(Client.localPlayerIndex == var1) {
SoundSystem.plane = var4.plane;
}
-
} else {
var6 = var0.readBits(30);
var7 = var6 >> 28;
@@ -211,9 +213,9 @@ public class class210 {
if(Client.localPlayerIndex == var1) {
SoundSystem.plane = var4.plane;
}
-
}
}
}
+
}
}
diff --git a/runescape-client/src/main/java/class211.java b/runescape-client/src/main/java/class211.java
index 14dd76547b..ae5c111f7f 100644
--- a/runescape-client/src/main/java/class211.java
+++ b/runescape-client/src/main/java/class211.java
@@ -23,13 +23,6 @@ public class class211 {
@Export("spriteIds")
static SpriteIds spriteIds;
- static {
- __hg_m = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}};
- __hg_f = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
- Calendar.getInstance(TimeZone.getTimeZone("Europe/London"));
- __hg_q = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
- }
-
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(II)I",
@@ -53,12 +46,12 @@ public class class211 {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4;
return 1;
} else {
- String var9;
+ String var5;
if(var0 == 4101) {
Interpreter.Interpreter_stringStackSize -= 2;
var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
- var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var9;
+ var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var5;
return 1;
} else if(var0 == 4102) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
@@ -71,55 +64,55 @@ public class class211 {
return 1;
} else {
int var6;
- int var10;
+ int var7;
if(var0 == 4104) {
- var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- long var11 = ((long)var10 + 11745L) * 86400000L;
- Interpreter.Interpreter_calendar.setTime(new Date(var11));
+ var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ long var14 = ((long)var7 + 11745L) * 86400000L;
+ Interpreter.Interpreter_calendar.setTime(new Date(var14));
var6 = Interpreter.Interpreter_calendar.get(5);
- int var16 = Interpreter.Interpreter_calendar.get(2);
- int var8 = Interpreter.Interpreter_calendar.get(1);
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.__bv_z[var16] + "-" + var8;
+ int var15 = Interpreter.Interpreter_calendar.get(2);
+ int var16 = Interpreter.Interpreter_calendar.get(1);
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.__bv_z[var15] + "-" + var16;
return 1;
} else if(var0 != 4105) {
if(var0 == 4106) {
- var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var10);
+ var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var7);
return 1;
} else if(var0 == 4107) {
Interpreter.Interpreter_stringStackSize -= 2;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WallDecoration.method3256(AttackOption.method2033(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], Client.language));
return 1;
} else {
- int var5;
- byte[] var13;
- Font var14;
+ int var8;
+ byte[] var9;
+ Font var10;
if(var0 == 4108) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
class179.Interpreter_intStackSize -= 2;
var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- var13 = ByteArrayPool.indexCache13.takeRecord(var5, 0);
- var14 = new Font(var13);
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4);
+ var8 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
+ var9 = ByteArrayPool.indexCache13.takeRecord(var8, 0);
+ var10 = new Font(var9);
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var10.lineCount(var3, var4);
return 1;
} else if(var0 == 4109) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
class179.Interpreter_intStackSize -= 2;
var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- var13 = ByteArrayPool.indexCache13.takeRecord(var5, 0);
- var14 = new Font(var13);
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4);
+ var8 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
+ var9 = ByteArrayPool.indexCache13.takeRecord(var8, 0);
+ var10 = new Font(var9);
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var10.lineWidth(var3, var4);
return 1;
} else if(var0 == 4110) {
Interpreter.Interpreter_stringStackSize -= 2;
var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
- var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+ var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
if(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
} else {
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9;
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5;
}
return 1;
@@ -133,20 +126,20 @@ public class class211 {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + (char)var4;
return 1;
} else if(var0 == 4113) {
- var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ChatChannel.method2238((char)var10)?1:0;
+ var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ChatChannel.method2238((char)var7)?1:0;
return 1;
} else if(var0 == 4114) {
- var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = VarcInt.method4807((char)var10)?1:0;
+ var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = VarcInt.method4807((char)var7)?1:0;
return 1;
} else if(var0 == 4115) {
- var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = UrlRequest.method3271((char)var10)?1:0;
+ var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = UrlRequest.method3271((char)var7)?1:0;
return 1;
} else if(var0 == 4116) {
- var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class159.method3394((char)var10)?1:0;
+ var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class159.method3394((char)var7)?1:0;
return 1;
} else if(var0 == 4117) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
@@ -161,26 +154,26 @@ public class class211 {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
class179.Interpreter_intStackSize -= 2;
var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var4, var5);
+ var8 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var4, var8);
return 1;
} else if(var0 == 4119) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- StringBuilder var17 = new StringBuilder(var3.length());
- boolean var15 = false;
+ StringBuilder var11 = new StringBuilder(var3.length());
+ boolean var12 = false;
for(var6 = 0; var6 < var3.length(); ++var6) {
- char var7 = var3.charAt(var6);
- if(var7 == '<') {
- var15 = true;
- } else if(var7 == '>') {
- var15 = false;
- } else if(!var15) {
- var17.append(var7);
+ char var13 = var3.charAt(var6);
+ if(var13 == '<') {
+ var12 = true;
+ } else if(var13 == '>') {
+ var12 = false;
+ } else if(!var12) {
+ var11.append(var13);
}
}
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var17.toString();
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.toString();
return 1;
} else if(var0 == 4120) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
@@ -190,9 +183,9 @@ public class class211 {
} else if(var0 == 4121) {
Interpreter.Interpreter_stringStackSize -= 2;
var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
- var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
- var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5);
+ var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+ var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.indexOf(var5, var8);
return 1;
} else if(var0 == 4122) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
@@ -205,9 +198,9 @@ public class class211 {
} else {
Interpreter.Interpreter_stringStackSize -= 2;
var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
- var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+ var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
if(Canvas.localPlayer.appearance != null && Canvas.localPlayer.appearance.isFemale) {
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9;
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5;
} else {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
}
@@ -217,4 +210,11 @@ public class class211 {
}
}
}
+
+ static {
+ __hg_m = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}};
+ __hg_f = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
+ Calendar.getInstance(TimeZone.getTimeZone("Europe/London"));
+ __hg_q = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+ }
}
diff --git a/runescape-client/src/main/java/class214.java b/runescape-client/src/main/java/class214.java
index fb35600fda..433c26cdb6 100644
--- a/runescape-client/src/main/java/class214.java
+++ b/runescape-client/src/main/java/class214.java
@@ -45,10 +45,6 @@ public class class214 {
@Export("menuWidth")
static int menuWidth;
- static {
- __hf_o = 0;
- }
-
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "(Ljava/lang/CharSequence;IZI)Z",
@@ -74,33 +70,33 @@ public class class214 {
}
}
- int var10;
+ int var9;
if(var8 >= '0' && var8 <= '9') {
- var10 = var8 - '0';
+ var9 = var8 - '0';
} else if(var8 >= 'A' && var8 <= 'Z') {
- var10 = var8 - '7';
+ var9 = var8 - '7';
} else {
if(var8 < 'a' || var8 > 'z') {
return false;
}
- var10 = var8 - 'W';
+ var9 = var8 - 'W';
}
- if(var10 >= var1) {
+ if(var9 >= var1) {
return false;
}
if(var3) {
- var10 = -var10;
+ var9 = -var9;
}
- int var9 = var5 * var1 + var10;
- if(var9 / var1 != var5) {
+ int var10 = var5 * var1 + var9;
+ if(var10 / var1 != var5) {
return false;
}
- var5 = var9;
+ var5 = var10;
var4 = true;
}
@@ -118,4 +114,8 @@ public class class214 {
public static int method4157(CharSequence var0, int var1) {
return IgnoreList.method5438(var0, var1, true);
}
+
+ static {
+ __hf_o = 0;
+ }
}
diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java
index abedb5af5a..bb9e87a429 100644
--- a/runescape-client/src/main/java/class22.java
+++ b/runescape-client/src/main/java/class22.java
@@ -43,7 +43,6 @@ public final class class22 {
intValue = 2138505015
)
int field167;
- // $FF: synthetic field
@ObfuscatedSignature(
signature = "Lal;"
)
@@ -71,10 +70,10 @@ public final class class22 {
garbageValue = "61"
)
static final void method294(String var0) {
- StringBuilder var10000 = (new StringBuilder()).append(var0);
- Object var10001 = null;
- String var1 = var10000.append(" is already on your ignore list").toString();
- WorldMapIcon1.method219(30, "", var1);
+ StringBuilder var1 = (new StringBuilder()).append(var0);
+ Object var2 = null;
+ String var3 = var1.append(" is already on your ignore list").toString();
+ WorldMapIcon1.method219(30, "", var3);
}
@ObfuscatedName("fw")
@@ -117,7 +116,7 @@ public final class class22 {
} else {
Rasterizer2D.method5948(var1, var2, 0, var4.xStarts, var4.xWidths);
}
-
}
+
}
}
diff --git a/runescape-client/src/main/java/class226.java b/runescape-client/src/main/java/class226.java
index c4c22c4f78..fafb196080 100644
--- a/runescape-client/src/main/java/class226.java
+++ b/runescape-client/src/main/java/class226.java
@@ -17,13 +17,6 @@ public class class226 {
@Export("__ht_w")
public static final short[][] __ht_w;
- static {
- __ht_m = new short[]{(short)6798, (short)8741, (short)25238, (short)4626, (short)4550};
- __ht_f = new short[][]{{(short)6798, (short)107, (short)10283, (short)16, (short)4797, (short)7744, (short)5799, (short)4634, (short)-31839, (short)22433, (short)2983, (short)-11343, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)8741, (short)12, (short)-1506, (short)-22374, (short)7735, (short)8404, (short)1701, (short)-27106, (short)24094, (short)10153, (short)-8915, (short)4783, (short)1341, (short)16578, (short)-30533, (short)25239, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)25238, (short)8742, (short)12, (short)-1506, (short)-22374, (short)7735, (short)8404, (short)1701, (short)-27106, (short)24094, (short)10153, (short)-8915, (short)4783, (short)1341, (short)16578, (short)-30533, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)4626, (short)11146, (short)6439, (short)12, (short)4758, (short)10270}, {(short)4550, (short)4537, (short)5681, (short)5673, (short)5790, (short)6806, (short)8076, (short)4574, (short)17050, (short)0, (short)127, (short)-31821, (short)-17991}};
- __ht_q = new short[]{(short)-10304, (short)9104, (short)-1, (short)-1, (short)-1};
- __ht_w = new short[][]{{(short)6554, (short)115, (short)10304, (short)28, (short)5702, (short)7756, (short)5681, (short)4510, (short)-31835, (short)22437, (short)2859, (short)-11339, (short)16, (short)5157, (short)10446, (short)3658, (short)-27314, (short)-21965, (short)472, (short)580, (short)784, (short)21966, (short)28950, (short)-15697, (short)-14002}, {(short)9104, (short)10275, (short)7595, (short)3610, (short)7975, (short)8526, (short)918, (short)-26734, (short)24466, (short)10145, (short)-6882, (short)5027, (short)1457, (short)16565, (short)-30545, (short)25486, (short)24, (short)5392, (short)10429, (short)3673, (short)-27335, (short)-21957, (short)192, (short)687, (short)412, (short)21821, (short)28835, (short)-15460, (short)-14019}, new short[0], new short[0], new short[0]};
- }
-
@ObfuscatedName("d")
@ObfuscatedSignature(
signature = "(IIIIIZI)Lln;",
@@ -145,4 +138,11 @@ public class class226 {
return var8;
}
}
+
+ static {
+ __ht_m = new short[]{(short)6798, (short)8741, (short)25238, (short)4626, (short)4550};
+ __ht_f = new short[][]{{(short)6798, (short)107, (short)10283, (short)16, (short)4797, (short)7744, (short)5799, (short)4634, (short)-31839, (short)22433, (short)2983, (short)-11343, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)8741, (short)12, (short)-1506, (short)-22374, (short)7735, (short)8404, (short)1701, (short)-27106, (short)24094, (short)10153, (short)-8915, (short)4783, (short)1341, (short)16578, (short)-30533, (short)25239, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)25238, (short)8742, (short)12, (short)-1506, (short)-22374, (short)7735, (short)8404, (short)1701, (short)-27106, (short)24094, (short)10153, (short)-8915, (short)4783, (short)1341, (short)16578, (short)-30533, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)4626, (short)11146, (short)6439, (short)12, (short)4758, (short)10270}, {(short)4550, (short)4537, (short)5681, (short)5673, (short)5790, (short)6806, (short)8076, (short)4574, (short)17050, (short)0, (short)127, (short)-31821, (short)-17991}};
+ __ht_q = new short[]{(short)-10304, (short)9104, (short)-1, (short)-1, (short)-1};
+ __ht_w = new short[][]{{(short)6554, (short)115, (short)10304, (short)28, (short)5702, (short)7756, (short)5681, (short)4510, (short)-31835, (short)22437, (short)2859, (short)-11339, (short)16, (short)5157, (short)10446, (short)3658, (short)-27314, (short)-21965, (short)472, (short)580, (short)784, (short)21966, (short)28950, (short)-15697, (short)-14002}, {(short)9104, (short)10275, (short)7595, (short)3610, (short)7975, (short)8526, (short)918, (short)-26734, (short)24466, (short)10145, (short)-6882, (short)5027, (short)1457, (short)16565, (short)-30545, (short)25486, (short)24, (short)5392, (short)10429, (short)3673, (short)-27335, (short)-21957, (short)192, (short)687, (short)412, (short)21821, (short)28835, (short)-15460, (short)-14019}, new short[0], new short[0], new short[0]};
+ }
}
diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java
index 9b08e368b6..e7cf228952 100644
--- a/runescape-client/src/main/java/class227.java
+++ b/runescape-client/src/main/java/class227.java
@@ -60,176 +60,113 @@ public class class227 {
var21 += 256;
}
+ int var22;
int var23;
- int var24;
if(var8.__t_424()) {
- ObjectSound var22 = new ObjectSound();
- var22.__f = var0;
- var22.__q = var1 * 128;
- var22.__w = var2 * 128;
- var23 = var8.sizeX;
- var24 = var8.sizeY;
+ ObjectSound var24 = new ObjectSound();
+ var24.__f = var0;
+ var24.__q = var1 * 128;
+ var24.__w = var2 * 128;
+ var22 = var8.sizeX;
+ var23 = var8.sizeY;
if(var4 == 1 || var4 == 3) {
- var23 = var8.sizeY;
- var24 = var8.sizeX;
+ var22 = var8.sizeY;
+ var23 = var8.sizeX;
}
- var22.__o = (var23 + var1) * 128;
- var22.__u = (var24 + var2) * 128;
- var22.soundEffectId = var8.ambientSoundId;
- var22.__g = var8.int4 * 128;
- var22.__x = var8.int5;
- var22.__d = var8.int6;
- var22.soundEffectIds = var8.__ax;
+ var24.__o = (var22 + var1) * 128;
+ var24.__u = (var23 + var2) * 128;
+ var24.soundEffectId = var8.ambientSoundId;
+ var24.__g = var8.int4 * 128;
+ var24.__x = var8.int5;
+ var24.__d = var8.int6;
+ var24.soundEffectIds = var8.__ax;
if(var8.transforms != null) {
- var22.obj = var8;
- var22.set();
+ var24.obj = var8;
+ var24.set();
}
- ObjectSound.objectSounds.addFirst(var22);
- if(var22.soundEffectIds != null) {
- var22.__n = var22.__x + (int)(Math.random() * (double)(var22.__d - var22.__x));
+ ObjectSound.objectSounds.addFirst(var24);
+ if(var24.soundEffectIds != null) {
+ var24.surfaceOffsetY = var24.__x + (int)(Math.random() * (double)(var24.__d - var24.__x));
}
}
- Object var34;
+ Object var31;
if(var5 == 22) {
if(!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) {
if(var8.animationId == -1 && var8.transforms == null) {
- var34 = var8.__l_423(22, var4, var15, var17, var16, var18);
+ var31 = var8.__l_423(22, var4, var15, var17, var16, var18);
} else {
- var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+ var31 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
- var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var34, var19, var21);
+ var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var31, var19, var21);
if(var8.interactType == 1 && var7 != null) {
var7.__o_286(var1, var2);
}
-
}
- } else if(var5 != 10 && var5 != 11) {
- if(var5 >= 12) {
- if(var8.animationId == -1 && var8.transforms == null) {
- var34 = var8.__l_423(var5, var4, var15, var17, var16, var18);
- } else {
- var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
- }
-
- var6.__d_238(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21);
- if(var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) {
- Tiles.__bq_a[var0][var1][var2] |= 2340;
- }
-
- if(var8.interactType != 0 && var7 != null) {
- var7.__q_284(var1, var2, var9, var10, var8.boolean1);
- }
-
- } else if(var5 == 0) {
- if(var8.animationId == -1 && var8.transforms == null) {
- var34 = var8.__l_423(0, var4, var15, var17, var16, var18);
- } else {
- var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
- }
-
- var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.__bq_t[var4], 0, var19, var21);
- if(var4 == 0) {
- if(var8.clipped) {
- Tiles.__bq_l[var0][var1][var2] = 50;
- Tiles.__bq_l[var0][var1][var2 + 1] = 50;
- }
-
- if(var8.modelClipped) {
- Tiles.__bq_a[var0][var1][var2] |= 585;
- }
- } else if(var4 == 1) {
- if(var8.clipped) {
- Tiles.__bq_l[var0][var1][var2 + 1] = 50;
- Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50;
- }
-
- if(var8.modelClipped) {
- Tiles.__bq_a[var0][var1][1 + var2] |= 1170;
- }
- } else if(var4 == 2) {
- if(var8.clipped) {
- Tiles.__bq_l[var0][var1 + 1][var2] = 50;
- Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50;
- }
-
- if(var8.modelClipped) {
- Tiles.__bq_a[var0][var1 + 1][var2] |= 585;
- }
- } else if(var4 == 3) {
- if(var8.clipped) {
- Tiles.__bq_l[var0][var1][var2] = 50;
- Tiles.__bq_l[var0][var1 + 1][var2] = 50;
- }
-
- if(var8.modelClipped) {
- Tiles.__bq_a[var0][var1][var2] |= 1170;
- }
- }
-
- if(var8.interactType != 0 && var7 != null) {
- var7.__f_283(var1, var2, var5, var4, var8.boolean1);
- }
-
- if(var8.int2 != 16) {
- var6.__y_241(var0, var1, var2, var8.int2);
- }
-
- } else if(var5 == 1) {
- if(var8.animationId == -1 && var8.transforms == null) {
- var34 = var8.__l_423(1, var4, var15, var17, var16, var18);
- } else {
- var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
- }
-
- var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.__bq_y[var4], 0, var19, var21);
- if(var8.clipped) {
- if(var4 == 0) {
- Tiles.__bq_l[var0][var1][var2 + 1] = 50;
- } else if(var4 == 1) {
- Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50;
- } else if(var4 == 2) {
- Tiles.__bq_l[var0][var1 + 1][var2] = 50;
- } else if(var4 == 3) {
- Tiles.__bq_l[var0][var1][var2] = 50;
- }
- }
-
- if(var8.interactType != 0 && var7 != null) {
- var7.__f_283(var1, var2, var5, var4, var8.boolean1);
- }
-
- } else {
- int var28;
- if(var5 == 2) {
- var28 = var4 + 1 & 3;
- Object var29;
- Object var30;
+ } else {
+ int var25;
+ if(var5 != 10 && var5 != 11) {
+ if(var5 >= 12) {
if(var8.animationId == -1 && var8.transforms == null) {
- var29 = var8.__l_423(2, var4 + 4, var15, var17, var16, var18);
- var30 = var8.__l_423(2, var28, var15, var17, var16, var18);
+ var31 = var8.__l_423(var5, var4, var15, var17, var16, var18);
} else {
- var29 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
- var30 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, true, (Entity)null);
+ var31 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
- var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)var30, Tiles.__bq_t[var4], Tiles.__bq_t[var28], var19, var21);
- if(var8.modelClipped) {
- if(var4 == 0) {
+ var6.__d_238(var0, var1, var2, var16, 1, 1, (Entity)var31, 0, var19, var21);
+ if(var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) {
+ Tiles.__bq_a[var0][var1][var2] |= 2340;
+ }
+
+ if(var8.interactType != 0 && var7 != null) {
+ var7.__q_284(var1, var2, var9, var10, var8.boolean1);
+ }
+ } else if(var5 == 0) {
+ if(var8.animationId == -1 && var8.transforms == null) {
+ var31 = var8.__l_423(0, var4, var15, var17, var16, var18);
+ } else {
+ var31 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+ }
+
+ var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.__bq_t[var4], 0, var19, var21);
+ if(var4 == 0) {
+ if(var8.clipped) {
+ Tiles.__bq_l[var0][var1][var2] = 50;
+ Tiles.__bq_l[var0][var1][var2 + 1] = 50;
+ }
+
+ if(var8.modelClipped) {
Tiles.__bq_a[var0][var1][var2] |= 585;
+ }
+ } else if(var4 == 1) {
+ if(var8.clipped) {
+ Tiles.__bq_l[var0][var1][var2 + 1] = 50;
+ Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50;
+ }
+
+ if(var8.modelClipped) {
Tiles.__bq_a[var0][var1][1 + var2] |= 1170;
- } else if(var4 == 1) {
- Tiles.__bq_a[var0][var1][1 + var2] |= 1170;
- Tiles.__bq_a[var0][var1 + 1][var2] |= 585;
- } else if(var4 == 2) {
+ }
+ } else if(var4 == 2) {
+ if(var8.clipped) {
+ Tiles.__bq_l[var0][var1 + 1][var2] = 50;
+ Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50;
+ }
+
+ if(var8.modelClipped) {
Tiles.__bq_a[var0][var1 + 1][var2] |= 585;
+ }
+ } else if(var4 == 3) {
+ if(var8.clipped) {
+ Tiles.__bq_l[var0][var1][var2] = 50;
+ Tiles.__bq_l[var0][var1 + 1][var2] = 50;
+ }
+
+ if(var8.modelClipped) {
Tiles.__bq_a[var0][var1][var2] |= 1170;
- } else if(var4 == 3) {
- Tiles.__bq_a[var0][var1][var2] |= 1170;
- Tiles.__bq_a[var0][var1][var2] |= 585;
}
}
@@ -240,15 +177,14 @@ public class class227 {
if(var8.int2 != 16) {
var6.__y_241(var0, var1, var2, var8.int2);
}
-
- } else if(var5 == 3) {
+ } else if(var5 == 1) {
if(var8.animationId == -1 && var8.transforms == null) {
- var34 = var8.__l_423(3, var4, var15, var17, var16, var18);
+ var31 = var8.__l_423(1, var4, var15, var17, var16, var18);
} else {
- var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+ var31 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
- var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.__bq_y[var4], 0, var19, var21);
+ var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.__bq_y[var4], 0, var19, var21);
if(var8.clipped) {
if(var4 == 0) {
Tiles.__bq_l[var0][var1][var2 + 1] = 50;
@@ -264,15 +200,73 @@ public class class227 {
if(var8.interactType != 0 && var7 != null) {
var7.__f_283(var1, var2, var5, var4, var8.boolean1);
}
-
- } else if(var5 == 9) {
+ } else if(var5 == 2) {
+ var25 = var4 + 1 & 3;
+ Object var26;
+ Object var27;
if(var8.animationId == -1 && var8.transforms == null) {
- var34 = var8.__l_423(var5, var4, var15, var17, var16, var18);
+ var26 = var8.__l_423(2, var4 + 4, var15, var17, var16, var18);
+ var27 = var8.__l_423(2, var25, var15, var17, var16, var18);
} else {
- var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+ var26 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+ var27 = new DynamicObject(var3, 2, var25, var0, var1, var2, var8.animationId, true, (Entity)null);
}
- var6.__d_238(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21);
+ var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var26, (Entity)var27, Tiles.__bq_t[var4], Tiles.__bq_t[var25], var19, var21);
+ if(var8.modelClipped) {
+ if(var4 == 0) {
+ Tiles.__bq_a[var0][var1][var2] |= 585;
+ Tiles.__bq_a[var0][var1][1 + var2] |= 1170;
+ } else if(var4 == 1) {
+ Tiles.__bq_a[var0][var1][1 + var2] |= 1170;
+ Tiles.__bq_a[var0][var1 + 1][var2] |= 585;
+ } else if(var4 == 2) {
+ Tiles.__bq_a[var0][var1 + 1][var2] |= 585;
+ Tiles.__bq_a[var0][var1][var2] |= 1170;
+ } else if(var4 == 3) {
+ Tiles.__bq_a[var0][var1][var2] |= 1170;
+ Tiles.__bq_a[var0][var1][var2] |= 585;
+ }
+ }
+
+ if(var8.interactType != 0 && var7 != null) {
+ var7.__f_283(var1, var2, var5, var4, var8.boolean1);
+ }
+
+ if(var8.int2 != 16) {
+ var6.__y_241(var0, var1, var2, var8.int2);
+ }
+ } else if(var5 == 3) {
+ if(var8.animationId == -1 && var8.transforms == null) {
+ var31 = var8.__l_423(3, var4, var15, var17, var16, var18);
+ } else {
+ var31 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+ }
+
+ var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.__bq_y[var4], 0, var19, var21);
+ if(var8.clipped) {
+ if(var4 == 0) {
+ Tiles.__bq_l[var0][var1][var2 + 1] = 50;
+ } else if(var4 == 1) {
+ Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50;
+ } else if(var4 == 2) {
+ Tiles.__bq_l[var0][var1 + 1][var2] = 50;
+ } else if(var4 == 3) {
+ Tiles.__bq_l[var0][var1][var2] = 50;
+ }
+ }
+
+ if(var8.interactType != 0 && var7 != null) {
+ var7.__f_283(var1, var2, var5, var4, var8.boolean1);
+ }
+ } else if(var5 == 9) {
+ if(var8.animationId == -1 && var8.transforms == null) {
+ var31 = var8.__l_423(var5, var4, var15, var17, var16, var18);
+ } else {
+ var31 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+ }
+
+ var6.__d_238(var0, var1, var2, var16, 1, 1, (Entity)var31, 0, var19, var21);
if(var8.interactType != 0 && var7 != null) {
var7.__q_284(var1, var2, var9, var10, var8.boolean1);
}
@@ -280,106 +274,105 @@ public class class227 {
if(var8.int2 != 16) {
var6.__y_241(var0, var1, var2, var8.int2);
}
-
} else if(var5 == 4) {
if(var8.animationId == -1 && var8.transforms == null) {
- var34 = var8.__l_423(4, var4, var15, var17, var16, var18);
+ var31 = var8.__l_423(4, var4, var15, var17, var16, var18);
} else {
- var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+ var31 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
- var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.__bq_t[var4], 0, 0, 0, var19, var21);
+ var6.newWallDecoration(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.__bq_t[var4], 0, 0, 0, var19, var21);
} else {
- long var31;
- Object var33;
+ Object var28;
+ long var32;
if(var5 == 5) {
- var28 = 16;
- var31 = var6.__ar_244(var0, var1, var2);
- if(var31 != 0L) {
- var28 = class50.getObjectDefinition(HitSplatDefinition.method4972(var31)).int2;
+ var25 = 16;
+ var32 = var6.__ar_244(var0, var1, var2);
+ if(var32 != 0L) {
+ var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var32)).int2;
}
if(var8.animationId == -1 && var8.transforms == null) {
- var33 = var8.__l_423(4, var4, var15, var17, var16, var18);
+ var28 = var8.__l_423(4, var4, var15, var17, var16, var18);
} else {
- var33 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+ var28 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
- var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, Tiles.__bq_t[var4], 0, var28 * Tiles.__bq_h[var4], var28 * Tiles.__bq_b[var4], var19, var21);
+ var6.newWallDecoration(var0, var1, var2, var16, (Entity)var28, (Entity)null, Tiles.__bq_t[var4], 0, var25 * Tiles.__bq_h[var4], var25 * Tiles.__bq_b[var4], var19, var21);
} else if(var5 == 6) {
- var28 = 8;
- var31 = var6.__ar_244(var0, var1, var2);
- if(var31 != 0L) {
- var28 = class50.getObjectDefinition(HitSplatDefinition.method4972(var31)).int2 / 2;
+ var25 = 8;
+ var32 = var6.__ar_244(var0, var1, var2);
+ if(var32 != 0L) {
+ var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var32)).int2 / 2;
}
if(var8.animationId == -1 && var8.transforms == null) {
- var33 = var8.__l_423(4, var4 + 4, var15, var17, var16, var18);
+ var28 = var8.__l_423(4, var4 + 4, var15, var17, var16, var18);
} else {
- var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+ var28 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
- var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, 256, var4, var28 * Tiles.__bq_c[var4], var28 * Tiles.__bq_r[var4], var19, var21);
+ var6.newWallDecoration(var0, var1, var2, var16, (Entity)var28, (Entity)null, 256, var4, var25 * Tiles.__bq_c[var4], var25 * Tiles.__bq_r[var4], var19, var21);
} else if(var5 == 7) {
- var23 = var4 + 2 & 3;
+ var22 = var4 + 2 & 3;
if(var8.animationId == -1 && var8.transforms == null) {
- var34 = var8.__l_423(4, var23 + 4, var15, var17, var16, var18);
+ var31 = var8.__l_423(4, var22 + 4, var15, var17, var16, var18);
} else {
- var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+ var31 = new DynamicObject(var3, 4, var22 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
- var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, 256, var23, 0, 0, var19, var21);
+ var6.newWallDecoration(var0, var1, var2, var16, (Entity)var31, (Entity)null, 256, var22, 0, 0, var19, var21);
} else if(var5 == 8) {
- var28 = 8;
- var31 = var6.__ar_244(var0, var1, var2);
- if(var31 != 0L) {
- var28 = class50.getObjectDefinition(HitSplatDefinition.method4972(var31)).int2 / 2;
+ var25 = 8;
+ var32 = var6.__ar_244(var0, var1, var2);
+ if(var32 != 0L) {
+ var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var32)).int2 / 2;
}
- int var27 = var4 + 2 & 3;
- Object var26;
+ int var29 = var4 + 2 & 3;
+ Object var30;
if(var8.animationId == -1 && var8.transforms == null) {
- var33 = var8.__l_423(4, var4 + 4, var15, var17, var16, var18);
- var26 = var8.__l_423(4, var27 + 4, var15, var17, var16, var18);
+ var28 = var8.__l_423(4, var4 + 4, var15, var17, var16, var18);
+ var30 = var8.__l_423(4, var29 + 4, var15, var17, var16, var18);
} else {
- var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
- var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+ var28 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+ var30 = new DynamicObject(var3, 4, var29 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
- var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)var26, 256, var4, var28 * Tiles.__bq_c[var4], var28 * Tiles.__bq_r[var4], var19, var21);
+ var6.newWallDecoration(var0, var1, var2, var16, (Entity)var28, (Entity)var30, 256, var4, var25 * Tiles.__bq_c[var4], var25 * Tiles.__bq_r[var4], var19, var21);
}
}
- }
- } else {
- if(var8.animationId == -1 && var8.transforms == null) {
- var34 = var8.__l_423(10, var4, var15, var17, var16, var18);
} else {
- var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
- }
-
- if(var34 != null && var6.__d_238(var0, var1, var2, var16, var9, var10, (Entity)var34, var5 == 11?256:0, var19, var21) && var8.clipped) {
- var23 = 15;
- if(var34 instanceof Model) {
- var23 = ((Model)var34).__l_233() / 4;
- if(var23 > 30) {
- var23 = 30;
- }
+ if(var8.animationId == -1 && var8.transforms == null) {
+ var31 = var8.__l_423(10, var4, var15, var17, var16, var18);
+ } else {
+ var31 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
- for(var24 = 0; var24 <= var9; ++var24) {
- for(int var25 = 0; var25 <= var10; ++var25) {
- if(var23 > Tiles.__bq_l[var0][var24 + var1][var25 + var2]) {
- Tiles.__bq_l[var0][var24 + var1][var25 + var2] = (byte)var23;
+ if(var31 != null && var6.__d_238(var0, var1, var2, var16, var9, var10, (Entity)var31, var5 == 11?256:0, var19, var21) && var8.clipped) {
+ var22 = 15;
+ if(var31 instanceof Model) {
+ var22 = ((Model)var31).__l_233() / 4;
+ if(var22 > 30) {
+ var22 = 30;
+ }
+ }
+
+ for(var23 = 0; var23 <= var9; ++var23) {
+ for(var25 = 0; var25 <= var10; ++var25) {
+ if(var22 > Tiles.__bq_l[var0][var23 + var1][var25 + var2]) {
+ Tiles.__bq_l[var0][var23 + var1][var25 + var2] = (byte)var22;
+ }
}
}
}
- }
- if(var8.interactType != 0 && var7 != null) {
- var7.__q_284(var1, var2, var9, var10, var8.boolean1);
+ if(var8.interactType != 0 && var7 != null) {
+ var7.__q_284(var1, var2, var9, var10, var8.boolean1);
+ }
}
-
}
}
+
}
}
diff --git a/runescape-client/src/main/java/class230.java b/runescape-client/src/main/java/class230.java
index 45abced5f0..fc62146132 100644
--- a/runescape-client/src/main/java/class230.java
+++ b/runescape-client/src/main/java/class230.java
@@ -19,64 +19,66 @@ public class class230 {
for(int var3 = 0; var3 < var1; ++var3) {
char var4 = var0.charAt(var3);
- if(var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) {
- var2[var3] = (byte)var4;
- } else if(var4 == 8364) {
- var2[var3] = -128;
- } else if(var4 == 8218) {
- var2[var3] = -126;
- } else if(var4 == 402) {
- var2[var3] = -125;
- } else if(var4 == 8222) {
- var2[var3] = -124;
- } else if(var4 == 8230) {
- var2[var3] = -123;
- } else if(var4 == 8224) {
- var2[var3] = -122;
- } else if(var4 == 8225) {
- var2[var3] = -121;
- } else if(var4 == 710) {
- var2[var3] = -120;
- } else if(var4 == 8240) {
- var2[var3] = -119;
- } else if(var4 == 352) {
- var2[var3] = -118;
- } else if(var4 == 8249) {
- var2[var3] = -117;
- } else if(var4 == 338) {
- var2[var3] = -116;
- } else if(var4 == 381) {
- var2[var3] = -114;
- } else if(var4 == 8216) {
- var2[var3] = -111;
- } else if(var4 == 8217) {
- var2[var3] = -110;
- } else if(var4 == 8220) {
- var2[var3] = -109;
- } else if(var4 == 8221) {
- var2[var3] = -108;
- } else if(var4 == 8226) {
- var2[var3] = -107;
- } else if(var4 == 8211) {
- var2[var3] = -106;
- } else if(var4 == 8212) {
- var2[var3] = -105;
- } else if(var4 == 732) {
- var2[var3] = -104;
- } else if(var4 == 8482) {
- var2[var3] = -103;
- } else if(var4 == 353) {
- var2[var3] = -102;
- } else if(var4 == 8250) {
- var2[var3] = -101;
- } else if(var4 == 339) {
- var2[var3] = -100;
- } else if(var4 == 382) {
- var2[var3] = -98;
- } else if(var4 == 376) {
- var2[var3] = -97;
+ if((var4 <= 0 || var4 >= 128) && (var4 < 160 || var4 > 255)) {
+ if(var4 == 8364) {
+ var2[var3] = -128;
+ } else if(var4 == 8218) {
+ var2[var3] = -126;
+ } else if(var4 == 402) {
+ var2[var3] = -125;
+ } else if(var4 == 8222) {
+ var2[var3] = -124;
+ } else if(var4 == 8230) {
+ var2[var3] = -123;
+ } else if(var4 == 8224) {
+ var2[var3] = -122;
+ } else if(var4 == 8225) {
+ var2[var3] = -121;
+ } else if(var4 == 710) {
+ var2[var3] = -120;
+ } else if(var4 == 8240) {
+ var2[var3] = -119;
+ } else if(var4 == 352) {
+ var2[var3] = -118;
+ } else if(var4 == 8249) {
+ var2[var3] = -117;
+ } else if(var4 == 338) {
+ var2[var3] = -116;
+ } else if(var4 == 381) {
+ var2[var3] = -114;
+ } else if(var4 == 8216) {
+ var2[var3] = -111;
+ } else if(var4 == 8217) {
+ var2[var3] = -110;
+ } else if(var4 == 8220) {
+ var2[var3] = -109;
+ } else if(var4 == 8221) {
+ var2[var3] = -108;
+ } else if(var4 == 8226) {
+ var2[var3] = -107;
+ } else if(var4 == 8211) {
+ var2[var3] = -106;
+ } else if(var4 == 8212) {
+ var2[var3] = -105;
+ } else if(var4 == 732) {
+ var2[var3] = -104;
+ } else if(var4 == 8482) {
+ var2[var3] = -103;
+ } else if(var4 == 353) {
+ var2[var3] = -102;
+ } else if(var4 == 8250) {
+ var2[var3] = -101;
+ } else if(var4 == 339) {
+ var2[var3] = -100;
+ } else if(var4 == 382) {
+ var2[var3] = -98;
+ } else if(var4 == 376) {
+ var2[var3] = -97;
+ } else {
+ var2[var3] = 63;
+ }
} else {
- var2[var3] = 63;
+ var2[var3] = (byte)var4;
}
}
diff --git a/runescape-client/src/main/java/class236.java b/runescape-client/src/main/java/class236.java
index 77d9f09cf7..a86f8ab11c 100644
--- a/runescape-client/src/main/java/class236.java
+++ b/runescape-client/src/main/java/class236.java
@@ -14,10 +14,10 @@ public class class236 {
int var2 = var0.readBits(2);
int var3;
int var4;
+ int var5;
+ int var6;
int var7;
int var8;
- int var9;
- int var10;
if(var2 == 0) {
if(var0.readBits(1) != 0) {
updateExternalPlayer(var0, var1);
@@ -25,30 +25,30 @@ public class class236 {
var3 = var0.readBits(13);
var4 = var0.readBits(13);
- boolean var12 = var0.readBits(1) == 1;
- if(var12) {
+ boolean var11 = var0.readBits(1) == 1;
+ if(var11) {
Players.__cq_i[++Players.__cq_n - 1] = var1;
}
if(Client.players[var1] != null) {
throw new RuntimeException();
} else {
- Player var6 = Client.players[var1] = new Player();
- var6.index = var1;
+ Player var12 = Client.players[var1] = new Player();
+ var12.index = var1;
if(Players.__cq_o[var1] != null) {
- var6.read(Players.__cq_o[var1]);
+ var12.read(Players.__cq_o[var1]);
}
- var6.orientation = Players.Players_orientations[var1];
- var6.targetIndex = Players.Players_targetIndices[var1];
- var7 = Players.Players_regions[var1];
- var8 = var7 >> 28;
- var9 = var7 >> 14 & 255;
- var10 = var7 & 255;
- var6.pathTraversed[0] = Players.__cq_w[var1];
- var6.plane = (byte)var8;
- var6.resetPath((var9 << 13) + var3 - class50.baseX, (var10 << 13) + var4 - GraphicsObject.baseY);
- var6.__ag = false;
+ var12.orientation = Players.Players_orientations[var1];
+ var12.targetIndex = Players.Players_targetIndices[var1];
+ var5 = Players.Players_regions[var1];
+ var6 = var5 >> 28;
+ var7 = var5 >> 14 & 255;
+ var8 = var5 & 255;
+ var12.pathTraversed[0] = Players.__cq_w[var1];
+ var12.plane = (byte)var6;
+ var12.resetPath((var7 << 13) + var3 - class50.baseX, (var8 << 13) + var4 - GraphicsObject.baseY);
+ var12.__ag = false;
return true;
}
} else if(var2 == 1) {
@@ -57,64 +57,64 @@ public class class236 {
Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455);
return false;
} else {
- int var5;
- int var11;
+ int var9;
+ int var10;
if(var2 == 2) {
var3 = var0.readBits(5);
var4 = var3 >> 3;
- var5 = var3 & 7;
- var11 = Players.Players_regions[var1];
- var7 = (var11 >> 28) + var4 & 3;
- var8 = var11 >> 14 & 255;
- var9 = var11 & 255;
- if(var5 == 0) {
- --var8;
- --var9;
+ var9 = var3 & 7;
+ var10 = Players.Players_regions[var1];
+ var5 = (var10 >> 28) + var4 & 3;
+ var6 = var10 >> 14 & 255;
+ var7 = var10 & 255;
+ if(var9 == 0) {
+ --var6;
+ --var7;
}
- if(var5 == 1) {
- --var9;
+ if(var9 == 1) {
+ --var7;
}
- if(var5 == 2) {
- ++var8;
- --var9;
+ if(var9 == 2) {
+ ++var6;
+ --var7;
}
- if(var5 == 3) {
- --var8;
+ if(var9 == 3) {
+ --var6;
}
- if(var5 == 4) {
- ++var8;
+ if(var9 == 4) {
+ ++var6;
}
- if(var5 == 5) {
- --var8;
- ++var9;
+ if(var9 == 5) {
+ --var6;
+ ++var7;
}
- if(var5 == 6) {
- ++var9;
+ if(var9 == 6) {
+ ++var7;
}
- if(var5 == 7) {
- ++var8;
- ++var9;
+ if(var9 == 7) {
+ ++var6;
+ ++var7;
}
- Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28);
+ Players.Players_regions[var1] = (var6 << 14) + var7 + (var5 << 28);
return false;
} else {
var3 = var0.readBits(18);
var4 = var3 >> 16;
- var5 = var3 >> 8 & 255;
- var11 = var3 & 255;
- var7 = Players.Players_regions[var1];
- var8 = (var7 >> 28) + var4 & 3;
- var9 = var5 + (var7 >> 14) & 255;
- var10 = var7 + var11 & 255;
- Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28);
+ var9 = var3 >> 8 & 255;
+ var10 = var3 & 255;
+ var5 = Players.Players_regions[var1];
+ var6 = (var5 >> 28) + var4 & 3;
+ var7 = var9 + (var5 >> 14) & 255;
+ var8 = var5 + var10 & 255;
+ Players.Players_regions[var1] = (var7 << 14) + var8 + (var6 << 28);
return false;
}
}
diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java
index a556c08699..d405b2696f 100644
--- a/runescape-client/src/main/java/class238.java
+++ b/runescape-client/src/main/java/class238.java
@@ -69,43 +69,43 @@ public final class class238 {
int var13;
int var14;
int var15;
+ int var16;
int var17;
- int var18;
if(var9.type == 2) {
var12 = var2;
var13 = var3;
var14 = var4;
var15 = var5;
} else {
- int var16;
+ int var18;
if(var9.type == 9) {
- var16 = var10;
- var17 = var11;
- var18 = var10 + var9.width;
+ var18 = var10;
+ var16 = var11;
+ var17 = var10 + var9.width;
int var19 = var11 + var9.height;
- if(var18 < var10) {
- var16 = var18;
- var18 = var10;
+ if(var17 < var10) {
+ var18 = var17;
+ var17 = var10;
}
if(var19 < var11) {
- var17 = var19;
+ var16 = var19;
var19 = var11;
}
- ++var18;
+ ++var17;
++var19;
- var12 = var16 > var2?var16:var2;
- var13 = var17 > var3?var17:var3;
- var14 = var18 < var4?var18:var4;
+ var12 = var18 > var2?var18:var2;
+ var13 = var16 > var3?var16:var3;
+ var14 = var17 < var4?var17:var4;
var15 = var19 < var5?var19:var5;
} else {
- var16 = var10 + var9.width;
- var17 = var11 + var9.height;
+ var18 = var10 + var9.width;
+ var16 = var11 + var9.height;
var12 = var10 > var2?var10:var2;
var13 = var11 > var3?var11:var3;
- var14 = var16 < var4?var16:var4;
- var15 = var17 < var5?var17:var5;
+ var14 = var18 < var4?var18:var4;
+ var15 = var16 < var5?var16:var5;
}
}
@@ -115,35 +115,35 @@ public final class class238 {
Client.__client_np = var11;
}
- boolean var32 = false;
+ boolean var28 = false;
if(var9.__cg) {
switch(Client.__client_mf) {
case 0:
- var32 = true;
+ var28 = true;
case 1:
default:
break;
case 2:
if(Client.__client_ms == var9.id >>> 16) {
- var32 = true;
+ var28 = true;
}
break;
case 3:
if(var9.id == Client.__client_ms) {
- var32 = true;
+ var28 = true;
}
}
}
- if(var32 || !var9.isIf3 || var12 < var14 && var13 < var15) {
+ if(var28 || !var9.isIf3 || var12 < var14 && var13 < var15) {
if(var9.isIf3) {
- ScriptEvent var26;
+ ScriptEvent var29;
if(var9.noClickThrough) {
if(MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
- for(var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) {
- if(var26.boolean1) {
- var26.remove();
- var26.widget.__fq = false;
+ for(var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) {
+ if(var29.boolean1) {
+ var29.remove();
+ var29.widget.__fq = false;
}
}
@@ -157,73 +157,73 @@ public final class class238 {
}
}
} else if(var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
- for(var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) {
- if(var26.boolean1 && var26.widget.onScroll == var26.args0) {
- var26.remove();
+ for(var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) {
+ if(var29.boolean1 && var29.widget.onScroll == var29.args0) {
+ var29.remove();
}
}
}
}
- var17 = MouseHandler.MouseHandler_x;
- var18 = MouseHandler.MouseHandler_y;
+ var16 = MouseHandler.MouseHandler_x;
+ var17 = MouseHandler.MouseHandler_y;
if(MouseHandler.MouseHandler_lastButton != 0) {
- var17 = MouseHandler.MouseHandler_lastPressedX;
- var18 = MouseHandler.MouseHandler_lastPressedY;
+ var16 = MouseHandler.MouseHandler_lastPressedX;
+ var17 = MouseHandler.MouseHandler_lastPressedY;
}
- boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15;
+ boolean var30 = var16 >= var12 && var17 >= var13 && var16 < var14 && var17 < var15;
if(var9.contentType == 1337) {
- if(!Client.isLoading && !Client.isMenuOpen && var33) {
- WorldMapEvent.method781(var17, var18, var12, var13);
+ if(!Client.isLoading && !Client.isMenuOpen && var30) {
+ WorldMapEvent.method781(var16, var17, var12, var13);
}
} else if(var9.contentType == 1338) {
WorldMapRegion.method567(var9, var10, var11);
} else {
if(var9.contentType == 1400) {
- class60.worldMap0.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height);
+ class60.worldMap0.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var30, var10, var11, var9.width, var9.height);
}
- if(!Client.isMenuOpen && var33) {
+ if(!Client.isMenuOpen && var30) {
if(var9.contentType == 1400) {
- class60.worldMap0.__bd_544(var10, var11, var9.width, var9.height, var17, var18);
+ class60.worldMap0.__bd_544(var10, var11, var9.width, var9.height, var16, var17);
} else {
- ChatChannel.method2237(var9, var17 - var10, var18 - var11);
+ ChatChannel.method2237(var9, var16 - var10, var17 - var11);
}
}
- boolean var21;
- int var23;
- if(var32) {
- for(int var20 = 0; var20 < var9.__cf.length; ++var20) {
- var21 = false;
- boolean var22 = false;
- if(!var21 && var9.__cf[var20] != null) {
- for(var23 = 0; var23 < var9.__cf[var20].length; ++var23) {
+ boolean var20;
+ int var21;
+ if(var28) {
+ for(int var22 = 0; var22 < var9.__cf.length; ++var22) {
+ var20 = false;
+ boolean var23 = false;
+ if(!var20 && var9.__cf[var22] != null) {
+ for(var21 = 0; var21 < var9.__cf[var22].length; ++var21) {
boolean var24 = false;
if(var9.__fh != null) {
- var24 = KeyHandler.KeyHandler_pressedKeys[var9.__cf[var20][var23]];
+ var24 = KeyHandler.KeyHandler_pressedKeys[var9.__cf[var22][var21]];
}
- if(class1.method15(var9.__cf[var20][var23]) || var24) {
- var21 = true;
- if(var9.__fh != null && var9.__fh[var20] > Client.cycle) {
+ if(class1.method15(var9.__cf[var22][var21]) || var24) {
+ var20 = true;
+ if(var9.__fh != null && var9.__fh[var22] > Client.cycle) {
break;
}
- byte var25 = var9.__cp[var20][var23];
+ byte var25 = var9.__cp[var22][var21];
if(var25 == 0 || ((var25 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var25 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var25 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var25 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) {
- var22 = true;
+ var23 = true;
break;
}
}
}
}
- if(var22) {
- if(var20 < 10) {
- class171.method3494(var20 + 1, var9.id, var9.childIndex, var9.itemId, "");
- } else if(var20 == 10) {
+ if(var23) {
+ if(var22 < 10) {
+ class171.method3494(var22 + 1, var9.id, var9.childIndex, var9.itemId, "");
+ } else if(var22 == 10) {
Player.method1281();
class25.method350(var9.id, var9.childIndex, class211.method4107(class1.getWidgetClickMask(var9)), var9.itemId);
Client.selectedSpellActionName = class198.method3745(var9);
@@ -234,7 +234,7 @@ public final class class238 {
Client.selectedSpellName = var9.dataText + BufferedFile.colorStartTag(16777215);
}
- var23 = var9.__cc[var20];
+ var21 = var9.__cc[var22];
if(var9.__fh == null) {
var9.__fh = new int[var9.__cf.length];
}
@@ -243,49 +243,50 @@ public final class class238 {
var9.__ci = new int[var9.__cf.length];
}
- if(var23 != 0) {
- if(var9.__fh[var20] == 0) {
- var9.__fh[var20] = var23 + Client.cycle + var9.__ci[var20];
+ if(var21 != 0) {
+ if(var9.__fh[var22] == 0) {
+ var9.__fh[var22] = var21 + Client.cycle + var9.__ci[var22];
} else {
- var9.__fh[var20] = var23 + Client.cycle;
+ var9.__fh[var22] = var21 + Client.cycle;
}
} else {
- var9.__fh[var20] = Integer.MAX_VALUE;
+ var9.__fh[var22] = Integer.MAX_VALUE;
}
}
- if(!var21 && var9.__fh != null) {
- var9.__fh[var20] = 0;
+ if(!var20 && var9.__fh != null) {
+ var9.__fh[var22] = 0;
}
}
}
+ ScriptEvent var32;
if(var9.isIf3) {
if(MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
- var33 = true;
+ var30 = true;
} else {
- var33 = false;
+ var30 = false;
}
- boolean var34 = false;
- if((MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.__lp_ca && MouseHandler.MouseHandler_currentButton == 4) && var33) {
- var34 = true;
+ boolean var31 = false;
+ if((MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.__lp_ca && MouseHandler.MouseHandler_currentButton == 4) && var30) {
+ var31 = true;
}
- var21 = false;
+ var20 = false;
if((MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.__lp_ca && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) {
- var21 = true;
+ var20 = true;
}
- if(var21) {
+ if(var20) {
Players.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11);
}
if(var9.contentType == 1400) {
- class60.worldMap0.__w_519(var17, var18, var33 & var34, var33 & var21);
+ class60.worldMap0.__w_519(var16, var17, var30 & var31, var30 & var20);
}
- if(Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && class54.method1090(class1.getWidgetClickMask(var9))) {
+ if(Client.clickedWidget != null && var9 != Client.clickedWidget && var30 && class54.method1090(class1.getWidgetClickMask(var9))) {
Client.draggedOnWidget = var9;
}
@@ -296,135 +297,134 @@ public final class class238 {
}
if(var9.hasListener) {
- ScriptEvent var27;
- if(var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) {
- var27 = new ScriptEvent();
- var27.boolean1 = true;
- var27.widget = var9;
- var27.mouseY = Client.mouseWheelRotation;
- var27.args0 = var9.onScroll;
- Client.scriptEvents.addFirst(var27);
+ if(var30 && Client.mouseWheelRotation != 0 && var9.onScroll != null) {
+ var32 = new ScriptEvent();
+ var32.boolean1 = true;
+ var32.widget = var9;
+ var32.mouseY = Client.mouseWheelRotation;
+ var32.args0 = var9.onScroll;
+ Client.scriptEvents.addFirst(var32);
}
if(Client.clickedWidget != null || DevicePcmPlayerProvider.dragInventoryWidget != null || Client.isMenuOpen) {
- var21 = false;
- var34 = false;
- var33 = false;
+ var20 = false;
+ var31 = false;
+ var30 = false;
}
- if(!var9.__fw && var21) {
+ if(!var9.__fw && var20) {
var9.__fw = true;
if(var9.onClick != null) {
- var27 = new ScriptEvent();
- var27.boolean1 = true;
- var27.widget = var9;
- var27.mouseX = MouseHandler.MouseHandler_lastPressedX - var10;
- var27.mouseY = MouseHandler.MouseHandler_lastPressedY - var11;
- var27.args0 = var9.onClick;
- Client.scriptEvents.addFirst(var27);
+ var32 = new ScriptEvent();
+ var32.boolean1 = true;
+ var32.widget = var9;
+ var32.mouseX = MouseHandler.MouseHandler_lastPressedX - var10;
+ var32.mouseY = MouseHandler.MouseHandler_lastPressedY - var11;
+ var32.args0 = var9.onClick;
+ Client.scriptEvents.addFirst(var32);
}
}
- if(var9.__fw && var34 && var9.onClickRepeat != null) {
- var27 = new ScriptEvent();
- var27.boolean1 = true;
- var27.widget = var9;
- var27.mouseX = MouseHandler.MouseHandler_x - var10;
- var27.mouseY = MouseHandler.MouseHandler_y - var11;
- var27.args0 = var9.onClickRepeat;
- Client.scriptEvents.addFirst(var27);
+ if(var9.__fw && var31 && var9.onClickRepeat != null) {
+ var32 = new ScriptEvent();
+ var32.boolean1 = true;
+ var32.widget = var9;
+ var32.mouseX = MouseHandler.MouseHandler_x - var10;
+ var32.mouseY = MouseHandler.MouseHandler_y - var11;
+ var32.args0 = var9.onClickRepeat;
+ Client.scriptEvents.addFirst(var32);
}
- if(var9.__fw && !var34) {
+ if(var9.__fw && !var31) {
var9.__fw = false;
if(var9.onRelease != null) {
- var27 = new ScriptEvent();
- var27.boolean1 = true;
- var27.widget = var9;
- var27.mouseX = MouseHandler.MouseHandler_x - var10;
- var27.mouseY = MouseHandler.MouseHandler_y - var11;
- var27.args0 = var9.onRelease;
- Client.__client_oc.addFirst(var27);
+ var32 = new ScriptEvent();
+ var32.boolean1 = true;
+ var32.widget = var9;
+ var32.mouseX = MouseHandler.MouseHandler_x - var10;
+ var32.mouseY = MouseHandler.MouseHandler_y - var11;
+ var32.args0 = var9.onRelease;
+ Client.__client_oc.addFirst(var32);
}
}
- if(var34 && var9.onHold != null) {
- var27 = new ScriptEvent();
- var27.boolean1 = true;
- var27.widget = var9;
- var27.mouseX = MouseHandler.MouseHandler_x - var10;
- var27.mouseY = MouseHandler.MouseHandler_y - var11;
- var27.args0 = var9.onHold;
- Client.scriptEvents.addFirst(var27);
+ if(var31 && var9.onHold != null) {
+ var32 = new ScriptEvent();
+ var32.boolean1 = true;
+ var32.widget = var9;
+ var32.mouseX = MouseHandler.MouseHandler_x - var10;
+ var32.mouseY = MouseHandler.MouseHandler_y - var11;
+ var32.args0 = var9.onHold;
+ Client.scriptEvents.addFirst(var32);
}
- if(!var9.__fq && var33) {
+ if(!var9.__fq && var30) {
var9.__fq = true;
if(var9.onMouseOver != null) {
- var27 = new ScriptEvent();
- var27.boolean1 = true;
- var27.widget = var9;
- var27.mouseX = MouseHandler.MouseHandler_x - var10;
- var27.mouseY = MouseHandler.MouseHandler_y - var11;
- var27.args0 = var9.onMouseOver;
- Client.scriptEvents.addFirst(var27);
+ var32 = new ScriptEvent();
+ var32.boolean1 = true;
+ var32.widget = var9;
+ var32.mouseX = MouseHandler.MouseHandler_x - var10;
+ var32.mouseY = MouseHandler.MouseHandler_y - var11;
+ var32.args0 = var9.onMouseOver;
+ Client.scriptEvents.addFirst(var32);
}
}
- if(var9.__fq && var33 && var9.onMouseRepeat != null) {
- var27 = new ScriptEvent();
- var27.boolean1 = true;
- var27.widget = var9;
- var27.mouseX = MouseHandler.MouseHandler_x - var10;
- var27.mouseY = MouseHandler.MouseHandler_y - var11;
- var27.args0 = var9.onMouseRepeat;
- Client.scriptEvents.addFirst(var27);
+ if(var9.__fq && var30 && var9.onMouseRepeat != null) {
+ var32 = new ScriptEvent();
+ var32.boolean1 = true;
+ var32.widget = var9;
+ var32.mouseX = MouseHandler.MouseHandler_x - var10;
+ var32.mouseY = MouseHandler.MouseHandler_y - var11;
+ var32.args0 = var9.onMouseRepeat;
+ Client.scriptEvents.addFirst(var32);
}
- if(var9.__fq && !var33) {
+ if(var9.__fq && !var30) {
var9.__fq = false;
if(var9.onMouseLeave != null) {
- var27 = new ScriptEvent();
- var27.boolean1 = true;
- var27.widget = var9;
- var27.mouseX = MouseHandler.MouseHandler_x - var10;
- var27.mouseY = MouseHandler.MouseHandler_y - var11;
- var27.args0 = var9.onMouseLeave;
- Client.__client_oc.addFirst(var27);
+ var32 = new ScriptEvent();
+ var32.boolean1 = true;
+ var32.widget = var9;
+ var32.mouseX = MouseHandler.MouseHandler_x - var10;
+ var32.mouseY = MouseHandler.MouseHandler_y - var11;
+ var32.args0 = var9.onMouseLeave;
+ Client.__client_oc.addFirst(var32);
}
}
if(var9.onTimer != null) {
- var27 = new ScriptEvent();
- var27.widget = var9;
- var27.args0 = var9.onTimer;
- Client.__client_oh.addFirst(var27);
+ var32 = new ScriptEvent();
+ var32.widget = var9;
+ var32.args0 = var9.onTimer;
+ Client.__client_oh.addFirst(var32);
}
- ScriptEvent var30;
+ int var26;
+ ScriptEvent var34;
int var35;
- int var36;
if(var9.onVarTransmit != null && Client.__client_nd > var9.__fc) {
if(var9.varTransmitTriggers != null && Client.__client_nd - var9.__fc <= 32) {
- label887:
+ label590:
for(var35 = var9.__fc; var35 < Client.__client_nd; ++var35) {
- var23 = Client.__client_nr[var35 & 31];
+ var21 = Client.__client_nr[var35 & 31];
- for(var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) {
- if(var23 == var9.varTransmitTriggers[var36]) {
- var30 = new ScriptEvent();
- var30.widget = var9;
- var30.args0 = var9.onVarTransmit;
- Client.scriptEvents.addFirst(var30);
- break label887;
+ for(var26 = 0; var26 < var9.varTransmitTriggers.length; ++var26) {
+ if(var21 == var9.varTransmitTriggers[var26]) {
+ var34 = new ScriptEvent();
+ var34.widget = var9;
+ var34.args0 = var9.onVarTransmit;
+ Client.scriptEvents.addFirst(var34);
+ break label590;
}
}
}
} else {
- var27 = new ScriptEvent();
- var27.widget = var9;
- var27.args0 = var9.onVarTransmit;
- Client.scriptEvents.addFirst(var27);
+ var32 = new ScriptEvent();
+ var32.widget = var9;
+ var32.args0 = var9.onVarTransmit;
+ Client.scriptEvents.addFirst(var32);
}
var9.__fc = Client.__client_nd;
@@ -432,25 +432,25 @@ public final class class238 {
if(var9.onInvTransmit != null && Client.__client_ns > var9.__fl) {
if(var9.invTransmitTriggers != null && Client.__client_ns - var9.__fl <= 32) {
- label863:
+ label566:
for(var35 = var9.__fl; var35 < Client.__client_ns; ++var35) {
- var23 = Client.__client_nz[var35 & 31];
+ var21 = Client.__client_nz[var35 & 31];
- for(var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) {
- if(var23 == var9.invTransmitTriggers[var36]) {
- var30 = new ScriptEvent();
- var30.widget = var9;
- var30.args0 = var9.onInvTransmit;
- Client.scriptEvents.addFirst(var30);
- break label863;
+ for(var26 = 0; var26 < var9.invTransmitTriggers.length; ++var26) {
+ if(var21 == var9.invTransmitTriggers[var26]) {
+ var34 = new ScriptEvent();
+ var34.widget = var9;
+ var34.args0 = var9.onInvTransmit;
+ Client.scriptEvents.addFirst(var34);
+ break label566;
}
}
}
} else {
- var27 = new ScriptEvent();
- var27.widget = var9;
- var27.args0 = var9.onInvTransmit;
- Client.scriptEvents.addFirst(var27);
+ var32 = new ScriptEvent();
+ var32.widget = var9;
+ var32.args0 = var9.onInvTransmit;
+ Client.scriptEvents.addFirst(var32);
}
var9.__fl = Client.__client_ns;
@@ -458,81 +458,81 @@ public final class class238 {
if(var9.onStatTransmit != null && Client.changedSkillsCount > var9.__fj) {
if(var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.__fj <= 32) {
- label839:
+ label542:
for(var35 = var9.__fj; var35 < Client.changedSkillsCount; ++var35) {
- var23 = Client.changedSkills[var35 & 31];
+ var21 = Client.changedSkills[var35 & 31];
- for(var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) {
- if(var23 == var9.statTransmitTriggers[var36]) {
- var30 = new ScriptEvent();
- var30.widget = var9;
- var30.args0 = var9.onStatTransmit;
- Client.scriptEvents.addFirst(var30);
- break label839;
+ for(var26 = 0; var26 < var9.statTransmitTriggers.length; ++var26) {
+ if(var21 == var9.statTransmitTriggers[var26]) {
+ var34 = new ScriptEvent();
+ var34.widget = var9;
+ var34.args0 = var9.onStatTransmit;
+ Client.scriptEvents.addFirst(var34);
+ break label542;
}
}
}
} else {
- var27 = new ScriptEvent();
- var27.widget = var9;
- var27.args0 = var9.onStatTransmit;
- Client.scriptEvents.addFirst(var27);
+ var32 = new ScriptEvent();
+ var32.widget = var9;
+ var32.args0 = var9.onStatTransmit;
+ Client.scriptEvents.addFirst(var32);
}
var9.__fj = Client.changedSkillsCount;
}
if(Client.chatCycle > var9.__fg && var9.__em != null) {
- var27 = new ScriptEvent();
- var27.widget = var9;
- var27.args0 = var9.__em;
- Client.scriptEvents.addFirst(var27);
+ var32 = new ScriptEvent();
+ var32.widget = var9;
+ var32.args0 = var9.__em;
+ Client.scriptEvents.addFirst(var32);
}
if(Client.__client_na > var9.__fg && var9.__ex != null) {
- var27 = new ScriptEvent();
- var27.widget = var9;
- var27.args0 = var9.__ex;
- Client.scriptEvents.addFirst(var27);
+ var32 = new ScriptEvent();
+ var32.widget = var9;
+ var32.args0 = var9.__ex;
+ Client.scriptEvents.addFirst(var32);
}
if(Client.__client_nh > var9.__fg && var9.__ej != null) {
- var27 = new ScriptEvent();
- var27.widget = var9;
- var27.args0 = var9.__ej;
- Client.scriptEvents.addFirst(var27);
+ var32 = new ScriptEvent();
+ var32.widget = var9;
+ var32.args0 = var9.__ej;
+ Client.scriptEvents.addFirst(var32);
}
if(Client.__client_nv > var9.__fg && var9.__eq != null) {
- var27 = new ScriptEvent();
- var27.widget = var9;
- var27.args0 = var9.__eq;
- Client.scriptEvents.addFirst(var27);
+ var32 = new ScriptEvent();
+ var32.widget = var9;
+ var32.args0 = var9.__eq;
+ Client.scriptEvents.addFirst(var32);
}
if(Client.__client_nc > var9.__fg && var9.__eh != null) {
- var27 = new ScriptEvent();
- var27.widget = var9;
- var27.args0 = var9.__eh;
- Client.scriptEvents.addFirst(var27);
+ var32 = new ScriptEvent();
+ var32.widget = var9;
+ var32.args0 = var9.__eh;
+ Client.scriptEvents.addFirst(var32);
}
if(Client.__client_ni > var9.__fg && var9.__el != null) {
- var27 = new ScriptEvent();
- var27.widget = var9;
- var27.args0 = var9.__el;
- Client.scriptEvents.addFirst(var27);
+ var32 = new ScriptEvent();
+ var32.widget = var9;
+ var32.args0 = var9.__el;
+ Client.scriptEvents.addFirst(var32);
}
var9.__fg = Client.cycleCntr;
if(var9.onKeyListener != null) {
for(var35 = 0; var35 < Client.__client_pm; ++var35) {
- ScriptEvent var31 = new ScriptEvent();
- var31.widget = var9;
- var31.keyTyped = Client.__client_pn[var35];
- var31.keyPressed = Client.__client_pq[var35];
- var31.args0 = var9.onKeyListener;
- Client.scriptEvents.addFirst(var31);
+ ScriptEvent var27 = new ScriptEvent();
+ var27.widget = var9;
+ var27.keyTyped = Client.__client_pn[var35];
+ var27.keyPressed = Client.__client_pq[var35];
+ var27.args0 = var9.onKeyListener;
+ Client.scriptEvents.addFirst(var27);
}
}
}
@@ -566,13 +566,13 @@ public final class class238 {
updateWidgetGroup(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
}
- WidgetGroupParent var28 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var9.id);
- if(var28 != null) {
- if(var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) {
- for(ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) {
- if(var29.boolean1) {
- var29.remove();
- var29.widget.__fq = false;
+ WidgetGroupParent var33 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var9.id);
+ if(var33 != null) {
+ if(var33.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) {
+ for(var32 = (ScriptEvent)Client.scriptEvents.last(); var32 != null; var32 = (ScriptEvent)Client.scriptEvents.previous()) {
+ if(var32.boolean1) {
+ var32.remove();
+ var32.widget.__fq = false;
}
}
@@ -586,7 +586,7 @@ public final class class238 {
}
}
- class231.method4517(var28.group, var12, var13, var14, var15, var10, var11);
+ class231.method4517(var33.group, var12, var13, var14, var15, var10, var11);
}
}
}
diff --git a/runescape-client/src/main/java/class248.java b/runescape-client/src/main/java/class248.java
index 272be7ca32..74a79fe26e 100644
--- a/runescape-client/src/main/java/class248.java
+++ b/runescape-client/src/main/java/class248.java
@@ -90,6 +90,7 @@ public class class248 {
this.field3262[this.field3266] = var2;
++this.field3266;
}
+
}
@ObfuscatedName("o")
@@ -174,15 +175,15 @@ public class class248 {
for(int var8 = 0; var8 < var3.__w; ++var8) {
for(int var9 = 0; var9 < var3.__q; ++var9) {
- int var10001 = var7++;
- var2.pixels[var10001] += var1.pixels[var6++];
+ int var10 = var7++;
+ var2.pixels[var10] += var1.pixels[var6++];
}
var6 += var1.subWidth - var3.__q;
var7 += var2.subWidth - var3.__q;
}
-
}
+
}
@ObfuscatedName("ar")
@@ -217,64 +218,64 @@ public class class248 {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice;
return 1;
} else {
- int var12;
+ int var4;
if(var0 == 3910) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var12 = Client.grandExchangeOffers[var3].status();
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var12 == 0?1:0;
+ var4 = Client.grandExchangeOffers[var3].status();
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var4 == 0?1:0;
return 1;
} else if(var0 == 3911) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var12 = Client.grandExchangeOffers[var3].status();
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var12 == 2?1:0;
+ var4 = Client.grandExchangeOffers[var3].status();
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var4 == 2?1:0;
return 1;
} else if(var0 == 3912) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var12 = Client.grandExchangeOffers[var3].status();
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var12 == 5?1:0;
+ var4 = Client.grandExchangeOffers[var3].status();
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var4 == 5?1:0;
return 1;
} else if(var0 == 3913) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var12 = Client.grandExchangeOffers[var3].status();
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var12 == 1?1:0;
+ var4 = Client.grandExchangeOffers[var3].status();
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var4 == 1?1:0;
return 1;
} else {
- boolean var13;
+ boolean var5;
if(var0 == 3914) {
- var13 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(FloorDecoration.grandExchangeEvents != null) {
- FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_w, var13);
+ FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_w, var5);
}
return 1;
} else if(var0 == 3915) {
- var13 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(FloorDecoration.grandExchangeEvents != null) {
- FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_q, var13);
+ FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_q, var5);
}
return 1;
} else if(var0 == 3916) {
class179.Interpreter_intStackSize -= 2;
- var13 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] == 1;
- boolean var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1] == 1;
+ var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] == 1;
+ boolean var13 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1] == 1;
if(FloorDecoration.grandExchangeEvents != null) {
- Client.__client_sj.__m = var4;
- FloorDecoration.grandExchangeEvents.sort(Client.__client_sj, var13);
+ Client.__client_sj.__m = var13;
+ FloorDecoration.grandExchangeEvents.sort(Client.__client_sj, var5);
}
return 1;
} else if(var0 == 3917) {
- var13 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(FloorDecoration.grandExchangeEvents != null) {
- FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_f, var13);
+ FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_f, var5);
}
return 1;
} else if(var0 == 3918) {
- var13 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(FloorDecoration.grandExchangeEvents != null) {
- FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_o, var13);
+ FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_o, var5);
}
return 1;
@@ -282,46 +283,46 @@ public class class248 {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = FloorDecoration.grandExchangeEvents == null?0:FloorDecoration.grandExchangeEvents.events.size();
return 1;
} else {
- GrandExchangeEvent var11;
+ GrandExchangeEvent var6;
if(var0 == 3920) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.world;
+ var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.world;
return 1;
} else if(var0 == 3921) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.__m_3();
+ var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.__m_3();
return 1;
} else if(var0 == 3922) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.__f_4();
+ var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.__f_4();
return 1;
} else if(var0 == 3923) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
- long var5 = class203.currentTimeMs() - class15.__z_si - var11.__f;
- 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[++Interpreter.Interpreter_stringStackSize - 1] = var10;
+ var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+ long var7 = class203.currentTimeMs() - class15.__z_si - var6.__f;
+ int var9 = (int)(var7 / 3600000L);
+ int var10 = (int)((var7 - (long)(var9 * 3600000)) / 60000L);
+ int var11 = (int)((var7 - (long)(var9 * 3600000) - (long)(var10 * 60000)) / 1000L);
+ String var12 = var9 + ":" + var10 / 10 + var10 % 10 + ":" + var11 / 10 + var11 % 10;
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12;
return 1;
} else if(var0 == 3924) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity;
+ var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.totalQuantity;
return 1;
} else if(var0 == 3925) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice;
+ var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.unitPrice;
return 1;
} else if(var0 == 3926) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id;
+ var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.id;
return 1;
} else {
return 2;
diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/class249.java
index e6ba48a937..fe09959eee 100644
--- a/runescape-client/src/main/java/class249.java
+++ b/runescape-client/src/main/java/class249.java
@@ -31,7 +31,7 @@ public enum class249 implements Enumerated {
)
final int field3276;
- class249(int var3, int var4) {
+ private class249(int var3, int var4) {
this.field3275 = var3;
this.field3276 = var4;
}
diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java
index 94185ddd44..aca6f74ae4 100644
--- a/runescape-client/src/main/java/class258.java
+++ b/runescape-client/src/main/java/class258.java
@@ -29,7 +29,7 @@ public class class258 {
VarbitDefinition.indexedSpriteWidths = null;
SecureRandomCallable.indexedSpriteHeights = null;
class328.indexedSpritePalette = null;
- class328.spritePixels = null;
+ class328.spritePixels = (byte[][])null;
return var0;
}
diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java
index 7881dd6794..1aec094a03 100644
--- a/runescape-client/src/main/java/class266.java
+++ b/runescape-client/src/main/java/class266.java
@@ -35,7 +35,7 @@ public enum class266 implements Enumerated {
)
final int field3530;
- class266(int var3, int var4) {
+ private class266(int var3, int var4) {
this.field3528 = var3;
this.field3530 = var4;
}
diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java
index 7acd856783..8b998d490e 100644
--- a/runescape-client/src/main/java/class27.java
+++ b/runescape-client/src/main/java/class27.java
@@ -60,9 +60,9 @@ public final class class27 {
PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2);
var5.grabPixels();
return new Sprite(var4, var2, var3);
- } catch (IOException var7) {
+ } catch (IOException var6) {
;
- } catch (InterruptedException var8) {
+ } catch (InterruptedException var7) {
;
}
diff --git a/runescape-client/src/main/java/class277.java b/runescape-client/src/main/java/class277.java
index 2a92e19d7a..7e3fdf3f99 100644
--- a/runescape-client/src/main/java/class277.java
+++ b/runescape-client/src/main/java/class277.java
@@ -30,9 +30,9 @@ public class class277 {
--var16;
}
- double var20 = var0 - 0.3333333333333333D;
- if(var20 < 0.0D) {
- ++var20;
+ double var18 = var0 - 0.3333333333333333D;
+ if(var18 < 0.0D) {
+ ++var18;
}
if(6.0D * var16 < 1.0D) {
@@ -55,21 +55,21 @@ public class class277 {
var8 = var14;
}
- if(var20 * 6.0D < 1.0D) {
- var10 = var20 * 6.0D * (var12 - var14) + var14;
- } else if(2.0D * var20 < 1.0D) {
+ if(var18 * 6.0D < 1.0D) {
+ var10 = var18 * 6.0D * (var12 - var14) + var14;
+ } else if(2.0D * var18 < 1.0D) {
var10 = var12;
- } else if(var20 * 3.0D < 2.0D) {
- var10 = var14 + 6.0D * (0.6666666666666666D - var20) * (var12 - var14);
+ } else if(var18 * 3.0D < 2.0D) {
+ var10 = var14 + 6.0D * (0.6666666666666666D - var18) * (var12 - var14);
} else {
var10 = var14;
}
}
- int var22 = (int)(256.0D * var6);
+ int var20 = (int)(256.0D * var6);
int var13 = (int)(var8 * 256.0D);
- int var23 = (int)(var10 * 256.0D);
- int var15 = var23 + (var13 << 8) + (var22 << 16);
+ int var21 = (int)(var10 * 256.0D);
+ int var15 = var21 + (var13 << 8) + (var20 << 16);
return var15;
}
@@ -82,13 +82,13 @@ public class class277 {
if(var2 == 0) {
return "";
} else if(var2 == 1) {
- CharSequence var3 = var0[var1];
- return var3 == null?"null":var3.toString();
+ CharSequence var8 = var0[var1];
+ return var8 == null?"null":var8.toString();
} else {
- int var8 = var2 + var1;
+ int var3 = var2 + var1;
int var4 = 0;
- for(int var5 = var1; var5 < var8; ++var5) {
+ for(int var5 = var1; var5 < var3; ++var5) {
CharSequence var6 = var0[var5];
if(var6 == null) {
var4 += 4;
@@ -99,7 +99,7 @@ public class class277 {
StringBuilder var9 = new StringBuilder(var4);
- for(int var10 = var1; var10 < var8; ++var10) {
+ for(int var10 = var1; var10 < var3; ++var10) {
CharSequence var7 = var0[var10];
if(var7 == null) {
var9.append("null");
diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java
index 826ab81db7..d1cccbdb19 100644
--- a/runescape-client/src/main/java/class3.java
+++ b/runescape-client/src/main/java/class3.java
@@ -44,12 +44,6 @@ public class class3 implements Enumerated {
)
public final class0 field19;
- static {
- field20 = new class3(2, 0, Integer.class, new class1());
- field14 = new class3(0, 1, Long.class, new class2());
- field15 = new class3(1, 2, String.class, new class4());
- }
-
@ObfuscatedSignature(
signature = "(IILjava/lang/Class;Lm;)V"
)
@@ -65,7 +59,7 @@ public class class3 implements Enumerated {
signature = "(B)I",
garbageValue = "83"
)
- public int rsOrdinal() {
+ public int ordinal() {
return this.field17;
}
@@ -103,17 +97,18 @@ public class class3 implements Enumerated {
)
public static void method41() {
while(true) {
- NodeDeque var1 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
- IndexStoreAction var0;
+ NodeDeque var0 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
+ NodeDeque var2 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
+ IndexStoreAction var1;
synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) {
- var0 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_responseQueue.removeLast();
+ var1 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_responseQueue.removeLast();
}
- if(var0 == null) {
+ if(var1 == null) {
return;
}
- var0.indexCache.load(var0.indexStore, (int)var0.key, var0.data, false);
+ var1.indexCache.load(var1.indexStore, (int)var1.key, var1.data, false);
}
}
@@ -131,27 +126,27 @@ public class class3 implements Enumerated {
ItemContainer.worlds[var1] = var8;
for(int var9 = var0; var9 < var1; ++var9) {
- World var11 = ItemContainer.worlds[var9];
- int var12 = WorldMapLabel.compareWorlds(var11, var8, var2, var3);
- int var10;
- if(var12 != 0) {
+ World var10 = ItemContainer.worlds[var9];
+ int var11 = WorldMapLabel.compareWorlds(var10, var8, var2, var3);
+ int var12;
+ if(var11 != 0) {
if(var3) {
- var10 = -var12;
+ var12 = -var11;
} else {
- var10 = var12;
+ var12 = var11;
}
} else if(var4 == -1) {
- var10 = 0;
+ var12 = 0;
} else {
- int var13 = WorldMapLabel.compareWorlds(var11, var8, var4, var5);
+ int var13 = WorldMapLabel.compareWorlds(var10, var8, var4, var5);
if(var5) {
- var10 = -var13;
+ var12 = -var13;
} else {
- var10 = var13;
+ var12 = var13;
}
}
- if(var10 <= 0) {
+ if(var12 <= 0) {
World var14 = ItemContainer.worlds[var9];
ItemContainer.worlds[var9] = ItemContainer.worlds[var7];
ItemContainer.worlds[var7++] = var14;
@@ -191,67 +186,67 @@ public class class3 implements Enumerated {
Client.npcCount = 0;
int var5;
+ int var6;
int var7;
int var8;
- int var9;
for(var4 = 0; var4 < var3; ++var4) {
var5 = Client.npcIndices[var4];
- Npc var6 = Client.npcs[var5];
- var7 = var2.readBits(1);
- if(var7 == 0) {
+ NPC var9 = Client.npcs[var5];
+ var6 = var2.readBits(1);
+ if(var6 == 0) {
Client.npcIndices[++Client.npcCount - 1] = var5;
- var6.npcCycle = Client.cycle;
+ var9.npcCycle = Client.cycle;
} else {
- var8 = var2.readBits(2);
- if(var8 == 0) {
+ var7 = var2.readBits(2);
+ if(var7 == 0) {
Client.npcIndices[++Client.npcCount - 1] = var5;
- var6.npcCycle = Client.cycle;
+ var9.npcCycle = Client.cycle;
Client.__client_fg[++Client.__client_fw - 1] = var5;
} else {
int var10;
- if(var8 == 1) {
+ if(var7 == 1) {
Client.npcIndices[++Client.npcCount - 1] = var5;
- var6.npcCycle = Client.cycle;
- var9 = var2.readBits(3);
- var6.__m_162(var9, (byte)1);
+ var9.npcCycle = Client.cycle;
+ var8 = var2.readBits(3);
+ var9.__m_162(var8, (byte)1);
var10 = var2.readBits(1);
if(var10 == 1) {
Client.__client_fg[++Client.__client_fw - 1] = var5;
}
- } else if(var8 == 2) {
+ } else if(var7 == 2) {
Client.npcIndices[++Client.npcCount - 1] = var5;
- var6.npcCycle = Client.cycle;
- var9 = var2.readBits(3);
- var6.__m_162(var9, (byte)2);
+ var9.npcCycle = Client.cycle;
+ var8 = var2.readBits(3);
+ var9.__m_162(var8, (byte)2);
var10 = var2.readBits(3);
- var6.__m_162(var10, (byte)2);
+ var9.__m_162(var10, (byte)2);
int var11 = var2.readBits(1);
if(var11 == 1) {
Client.__client_fg[++Client.__client_fw - 1] = var5;
}
- } else if(var8 == 3) {
+ } else if(var7 == 3) {
Client.__client_kd[++Client.__client_ky - 1] = var5;
}
}
}
}
- int var12;
+ int var13;
while(var1.bitsRemaining(Client.packetWriter.serverPacket0Length) >= 27) {
- var12 = var1.readBits(15);
- if(var12 == 32767) {
+ var13 = var1.readBits(15);
+ if(var13 == 32767) {
break;
}
- boolean var15 = false;
- if(Client.npcs[var12] == null) {
- Client.npcs[var12] = new Npc();
- var15 = true;
+ boolean var14 = false;
+ if(Client.npcs[var13] == null) {
+ Client.npcs[var13] = new NPC();
+ var14 = true;
}
- Npc var13 = Client.npcs[var12];
- Client.npcIndices[++Client.npcCount - 1] = var12;
- var13.npcCycle = Client.cycle;
+ NPC var15 = Client.npcs[var13];
+ Client.npcIndices[++Client.npcCount - 1] = var13;
+ var15.npcCycle = Client.cycle;
if(var0) {
var5 = var1.readBits(8);
if(var5 > 127) {
@@ -264,51 +259,51 @@ public class class3 implements Enumerated {
}
}
- int var14 = var1.readBits(1);
- var7 = Client.__client_kn[var1.readBits(3)];
- if(var15) {
- var13.orientation = var13.__ac = var7;
+ int var12 = var1.readBits(1);
+ var6 = Client.__client_kn[var1.readBits(3)];
+ if(var14) {
+ var15.orientation = var15.__ac = var6;
}
- var8 = var1.readBits(1);
- if(var8 == 1) {
- Client.__client_fg[++Client.__client_fw - 1] = var12;
+ var7 = var1.readBits(1);
+ if(var7 == 1) {
+ Client.__client_fg[++Client.__client_fw - 1] = var13;
}
if(var0) {
- var9 = var1.readBits(8);
- if(var9 > 127) {
- var9 -= 256;
+ var8 = var1.readBits(8);
+ if(var8 > 127) {
+ var8 -= 256;
}
} else {
- var9 = var1.readBits(5);
- if(var9 > 15) {
- var9 -= 32;
+ var8 = var1.readBits(5);
+ if(var8 > 15) {
+ var8 -= 32;
}
}
- var13.definition = ObjectDefinition.getNpcDefinition(var1.readBits(14));
- var13.size = var13.definition.size;
- var13.__cj = var13.definition.__av;
- if(var13.__cj == 0) {
- var13.__ac = 0;
+ var15.definition = ObjectDefinition.getNpcDefinition(var1.readBits(14));
+ var15.size = var15.definition.size;
+ var15.__cj = var15.definition.__av;
+ if(var15.__cj == 0) {
+ var15.__ac = 0;
}
- var13.walkSequence = var13.definition.walkSequence;
- var13.walkTurnSequence = var13.definition.walkTurnSequence;
- var13.walkTurnLeftSequence = var13.definition.walkTurnLeftSequence;
- var13.walkTurnRightSequence = var13.definition.walkTurnRightSequence;
- var13.idleSequence = var13.definition.idleSequence;
- var13.turnLeftSequence = var13.definition.turnLeftSequence;
- var13.turnRightSequence = var13.definition.turnRightSequence;
- var13.__f_163(Canvas.localPlayer.pathX[0] + var5, Canvas.localPlayer.pathY[0] + var9, var14 == 1);
+ var15.walkSequence = var15.definition.walkSequence;
+ var15.walkTurnSequence = var15.definition.walkTurnSequence;
+ var15.walkTurnLeftSequence = var15.definition.walkTurnLeftSequence;
+ var15.walkTurnRightSequence = var15.definition.walkTurnRightSequence;
+ var15.idleSequence = var15.definition.idleSequence;
+ var15.turnLeftSequence = var15.definition.turnLeftSequence;
+ var15.turnRightSequence = var15.definition.turnRightSequence;
+ var15.__f_163(Canvas.localPlayer.pathX[0] + var5, Canvas.localPlayer.pathY[0] + var8, var12 == 1);
}
var1.exportIndex();
WorldComparator.method67(var1);
- for(var12 = 0; var12 < Client.__client_ky; ++var12) {
- var3 = Client.__client_kd[var12];
+ for(var13 = 0; var13 < Client.__client_ky; ++var13) {
+ var3 = Client.__client_kd[var13];
if(Client.npcs[var3].npcCycle != Client.cycle) {
Client.npcs[var3].definition = null;
Client.npcs[var3] = null;
@@ -318,13 +313,19 @@ public class class3 implements Enumerated {
if(var1.index != Client.packetWriter.serverPacket0Length) {
throw new RuntimeException(var1.index + "," + Client.packetWriter.serverPacket0Length);
} else {
- for(var12 = 0; var12 < Client.npcCount; ++var12) {
- if(Client.npcs[Client.npcIndices[var12]] == null) {
- throw new RuntimeException(var12 + "," + Client.npcCount);
+ for(var13 = 0; var13 < Client.npcCount; ++var13) {
+ if(Client.npcs[Client.npcIndices[var13]] == null) {
+ throw new RuntimeException(var13 + "," + Client.npcCount);
}
}
}
}
}
+
+ static {
+ field20 = new class3(2, 0, Integer.class, new class1());
+ field14 = new class3(0, 1, Long.class, new class2());
+ field15 = new class3(1, 2, String.class, new class4());
+ }
}
diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java
index 5e56ee55cb..0eec338331 100644
--- a/runescape-client/src/main/java/class30.java
+++ b/runescape-client/src/main/java/class30.java
@@ -42,11 +42,6 @@ public class class30 {
)
final int field248;
- static {
- field246 = new class30(0);
- field247 = new class30(1);
- }
-
class30(int var1) {
this.field248 = var1;
}
@@ -95,29 +90,34 @@ public class class30 {
}
}
- ScriptEvent var5;
+ ScriptEvent var6;
if(var1 == 0 && var3.onDialogAbortListener != null) {
- var5 = new ScriptEvent();
- var5.widget = var3;
- var5.args0 = var3.onDialogAbortListener;
- AbstractIndexCache.runScript(var5);
+ var6 = new ScriptEvent();
+ var6.widget = var3;
+ var6.args0 = var3.onDialogAbortListener;
+ AbstractIndexCache.runScript(var6);
}
if(var1 == 1 && var3.__ei != null) {
if(var3.childIndex >= 0) {
- Widget var6 = Huffman.getWidget(var3.id);
- if(var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) {
+ Widget var5 = Huffman.getWidget(var3.id);
+ if(var5 == null || var5.children == null || var3.childIndex >= var5.children.length || var3 != var5.children[var3.childIndex]) {
continue;
}
}
- var5 = new ScriptEvent();
- var5.widget = var3;
- var5.args0 = var3.__ei;
- AbstractIndexCache.runScript(var5);
+ var6 = new ScriptEvent();
+ var6.widget = var3;
+ var6.args0 = var3.__ei;
+ AbstractIndexCache.runScript(var6);
}
}
}
}
+
+ static {
+ field246 = new class30(0);
+ field247 = new class30(1);
+ }
}
diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java
index 060ec01941..b481cbf6cc 100644
--- a/runescape-client/src/main/java/class307.java
+++ b/runescape-client/src/main/java/class307.java
@@ -94,11 +94,11 @@ public class class307 {
__kc_w[var0] = var0 - 48 + 52;
}
- int[] var2 = __kc_w;
- __kc_w[43] = 62;
- var2[42] = 62;
int[] var1 = __kc_w;
+ __kc_w[43] = 62;
+ var1[42] = 62;
+ int[] var2 = __kc_w;
__kc_w[47] = 63;
- var1[45] = 63;
+ var2[45] = 63;
}
}
diff --git a/runescape-client/src/main/java/class31.java b/runescape-client/src/main/java/class31.java
index 58fb9b20d4..1675a16369 100644
--- a/runescape-client/src/main/java/class31.java
+++ b/runescape-client/src/main/java/class31.java
@@ -21,11 +21,6 @@ public class class31 {
)
final int field255;
- static {
- field259 = new class31(0);
- field254 = new class31(1);
- }
-
class31(int var1) {
this.field255 = var1;
}
@@ -106,13 +101,13 @@ public class class31 {
} else {
World var4;
int var5;
- int var7;
+ int var6;
if(var0 == 6506) {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ var6 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var4 = null;
for(var5 = 0; var5 < World.worldsCount; ++var5) {
- if(var7 == ItemContainer.worlds[var5].id) {
+ if(var6 == ItemContainer.worlds[var5].id) {
var4 = ItemContainer.worlds[var5];
break;
}
@@ -137,64 +132,64 @@ public class class31 {
return 1;
} else if(var0 == 6507) {
class179.Interpreter_intStackSize -= 4;
- var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- boolean var10 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1] == 1;
+ var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
+ boolean var9 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1] == 1;
var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
- boolean var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3] == 1;
- WorldMapSectionType.method248(var7, var10, var5, var6);
+ boolean var10 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3] == 1;
+ WorldMapSectionType.method248(var6, var9, var5, var10);
return 1;
} else if(var0 != 6511) {
if(var0 == 6512) {
Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
return 1;
} else {
- int var8;
- ParamKeyDefinition var9;
+ int var7;
+ ParamKeyDefinition var8;
if(var0 == 6513) {
class179.Interpreter_intStackSize -= 2;
- var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var8 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- var9 = class229.getParamKeyDefinition(var8);
- if(var9.isString()) {
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ObjectDefinition.getNpcDefinition(var7).getStringParam(var8, var9.keyString);
+ var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
+ var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
+ var8 = class229.getParamKeyDefinition(var7);
+ if(var8.isString()) {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getStringParam(var7, var8.keyString);
} else {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var7).getIntParam(var8, var9.keyInt);
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getIntParam(var7, var8.keyInt);
}
return 1;
} else if(var0 == 6514) {
class179.Interpreter_intStackSize -= 2;
- var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var8 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- var9 = class229.getParamKeyDefinition(var8);
- if(var9.isString()) {
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class50.getObjectDefinition(var7).getStringParam(var8, var9.keyString);
+ var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
+ var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
+ var8 = class229.getParamKeyDefinition(var7);
+ if(var8.isString()) {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class50.getObjectDefinition(var6).getStringParam(var7, var8.keyString);
} else {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var7).getIntParam(var8, var9.keyInt);
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var6).getIntParam(var7, var8.keyInt);
}
return 1;
} else if(var0 == 6515) {
class179.Interpreter_intStackSize -= 2;
- var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var8 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- var9 = class229.getParamKeyDefinition(var8);
- if(var9.isString()) {
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var7).getStringParam(var8, var9.keyString);
+ var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
+ var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
+ var8 = class229.getParamKeyDefinition(var7);
+ if(var8.isString()) {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var6).getStringParam(var7, var8.keyString);
} else {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var7).getIntParam(var8, var9.keyInt);
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var6).getIntParam(var7, var8.keyInt);
}
return 1;
} else if(var0 == 6516) {
class179.Interpreter_intStackSize -= 2;
- var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var8 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- var9 = class229.getParamKeyDefinition(var8);
- if(var9.isString()) {
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.method3702(var7).getStringParam(var8, var9.keyString);
+ var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
+ var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
+ var8 = class229.getParamKeyDefinition(var7);
+ if(var8.isString()) {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.method3702(var6).getStringParam(var7, var8.keyString);
} else {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var7).getIntParam(var8, var9.keyInt);
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var6).getIntParam(var7, var8.keyInt);
}
return 1;
@@ -230,9 +225,9 @@ public class class31 {
}
}
} else {
- var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- if(var7 >= 0 && var7 < World.worldsCount) {
- var4 = ItemContainer.worlds[var7];
+ var6 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ if(var6 >= 0 && var6 < World.worldsCount) {
+ var4 = ItemContainer.worlds[var6];
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var4.id;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var4.properties;
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.activity;
@@ -266,5 +261,11 @@ public class class31 {
var1.packetBuffer.writeStringCp1252NullTerminated(var0);
Client.packetWriter.__q_167(var1);
}
+
+ }
+
+ static {
+ field259 = new class31(0);
+ field254 = new class31(1);
}
}
diff --git a/runescape-client/src/main/java/class310.java b/runescape-client/src/main/java/class310.java
index 49b9df7811..d853fd44c9 100644
--- a/runescape-client/src/main/java/class310.java
+++ b/runescape-client/src/main/java/class310.java
@@ -25,13 +25,13 @@ public class class310 {
)
public final int field3804;
+ class310(int var1) {
+ this.field3804 = var1;
+ }
+
static {
field3806 = new class310(0);
field3805 = new class310(1);
field3807 = new class310(2);
}
-
- class310(int var1) {
- this.field3804 = var1;
- }
}
diff --git a/runescape-client/src/main/java/class311.java b/runescape-client/src/main/java/class311.java
index da433a2eab..d9ed28b225 100644
--- a/runescape-client/src/main/java/class311.java
+++ b/runescape-client/src/main/java/class311.java
@@ -22,10 +22,6 @@ public class class311 {
)
final int field3809;
- static {
- field3810 = new class311(3);
- }
-
class311(int var1) {
this.field3809 = var1;
}
@@ -38,4 +34,8 @@ public class class311 {
public static RectangleMode[] method5822() {
return new RectangleMode[]{RectangleMode.__lj_f, RectangleMode.__lj_m, RectangleMode.__lj_q};
}
+
+ static {
+ field3810 = new class311(3);
+ }
}
diff --git a/runescape-client/src/main/java/class313.java b/runescape-client/src/main/java/class313.java
index 5dd381a8f5..b624a3e0ab 100644
--- a/runescape-client/src/main/java/class313.java
+++ b/runescape-client/src/main/java/class313.java
@@ -61,7 +61,7 @@ public enum class313 implements Enumerated {
)
final int field3827;
- class313(int var3, int var4) {
+ private class313(int var3, int var4) {
this.field3833 = var3;
this.field3827 = var4;
}
diff --git a/runescape-client/src/main/java/class322.java b/runescape-client/src/main/java/class322.java
index 7b7f01256e..e24f58dd0c 100644
--- a/runescape-client/src/main/java/class322.java
+++ b/runescape-client/src/main/java/class322.java
@@ -11,10 +11,6 @@ public class class322 {
@Export("reflectionChecks")
public static IterableNodeDeque reflectionChecks;
- static {
- reflectionChecks = new IterableNodeDeque();
- }
-
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(Lir;III)Lln;",
@@ -24,4 +20,8 @@ public class class322 {
public static Sprite readSprite(AbstractIndexCache var0, int var1, int var2) {
return !SpriteMask.method4392(var0, var1, var2)?null:class258.method4900();
}
+
+ static {
+ reflectionChecks = new IterableNodeDeque();
+ }
}
diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java
index d9e1f40ec8..c56a452215 100644
--- a/runescape-client/src/main/java/class39.java
+++ b/runescape-client/src/main/java/class39.java
@@ -147,8 +147,8 @@ public class class39 extends class21 {
@Export("drawActor2d")
static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) {
if(var0 != null && var0.isVisible()) {
- if(var0 instanceof Npc) {
- NpcDefinition var6 = ((Npc)var0).definition;
+ if(var0 instanceof NPC) {
+ NPCDefinition var6 = ((NPC)var0).definition;
if(var6.transforms != null) {
var6 = var6.transform();
}
@@ -158,158 +158,158 @@ public class class39 extends class21 {
}
}
- int var75 = Players.Players_count;
+ int var77 = Players.Players_count;
int[] var7 = Players.Players_indices;
byte var8 = 0;
- Player var10;
- if(var1 < var75 && var0.playerCycle == Client.cycle) {
- var10 = (Player)var0;
- boolean var9;
+ Player var9;
+ if(var1 < var77 && var0.playerCycle == Client.cycle) {
+ var9 = (Player)var0;
+ boolean var10;
if(Client.__client_ke == 0) {
- var9 = false;
- } else if(var10 != Canvas.localPlayer) {
- boolean var77 = (Client.__client_ke & 4) != 0;
- boolean var78 = var77;
+ var10 = false;
+ } else if(var9 != Canvas.localPlayer) {
+ boolean var11 = (Client.__client_ke & 4) != 0;
+ boolean var12 = var11;
boolean var13;
- if(!var77) {
+ if(!var11) {
var13 = (Client.__client_ke & 1) != 0;
- var78 = var13 && var10.isFriend();
+ var12 = var13 && var9.isFriend();
}
- var13 = var78;
- if(!var78) {
- boolean var79 = (Client.__client_ke & 2) != 0;
- var13 = var79 && var10.isClanMember();
+ var13 = var12;
+ if(!var12) {
+ boolean var14 = (Client.__client_ke & 2) != 0;
+ var13 = var14 && var9.isClanMember();
}
- var9 = var13;
+ var10 = var13;
} else {
- var9 = class14.method169();
+ var10 = class14.method169();
}
- if(var9) {
- Player var11 = (Player)var0;
- if(var1 < var75) {
+ if(var10) {
+ Player var79 = (Player)var0;
+ if(var1 < var77) {
DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
- AbstractFont var12 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12);
- byte var92 = 9;
- var12.drawCentered(var11.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var92, 16777215, 0);
+ AbstractFont var81 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12);
+ byte var84 = 9;
+ var81.drawCentered(var79.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var84, 16777215, 0);
var8 = 18;
}
}
}
- int var87 = -2;
- int var15;
- int var22;
- int var23;
+ int var78 = -2;
+ int var24;
+ int var25;
+ int var80;
+ int var82;
+ int var85;
if(!var0.healthBars.isEmpty()) {
DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
- for(HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) {
- HealthBarUpdate var89 = var88.get(Client.cycle);
- if(var89 == null) {
- if(var88.isEmpty()) {
- var88.remove();
+ for(HealthBar var83 = (HealthBar)var0.healthBars.last(); var83 != null; var83 = (HealthBar)var0.healthBars.previous()) {
+ HealthBarUpdate var15 = var83.get(Client.cycle);
+ if(var15 == null) {
+ if(var83.isEmpty()) {
+ var83.remove();
}
} else {
- HealthBarDefinition var91 = var88.definition;
- Sprite var76 = var91.getSprite2();
- Sprite var14 = var91.getSprite1();
- int var16 = 0;
- if(var76 != null && var14 != null) {
- if(var91.widthPadding * 2 < var14.subWidth) {
- var16 = var91.widthPadding;
+ HealthBarDefinition var16 = var83.definition;
+ Sprite var17 = var16.getSprite2();
+ Sprite var18 = var16.getSprite1();
+ int var19 = 0;
+ if(var17 != null && var18 != null) {
+ if(var16.widthPadding * 2 < var18.subWidth) {
+ var19 = var16.widthPadding;
}
- var15 = var14.subWidth - var16 * 2;
+ var80 = var18.subWidth - var19 * 2;
} else {
- var15 = var91.width;
+ var80 = var16.width;
}
- int var17 = 255;
- boolean var18 = true;
- int var19 = Client.cycle - var89.cycle;
- int var20 = var15 * var89.health2 / var91.width;
- int var21;
- int var93;
- if(var89.cycleOffset > var19) {
- var21 = var91.int4 == 0?0:var91.int4 * (var19 / var91.int4);
- var22 = var15 * var89.health / var91.width;
- var93 = var21 * (var20 - var22) / var89.cycleOffset + var22;
+ int var20 = 255;
+ boolean var21 = true;
+ int var22 = Client.cycle - var15.cycle;
+ int var23 = var80 * var15.health2 / var16.width;
+ if(var15.cycleOffset > var22) {
+ var24 = var16.int4 == 0?0:var16.int4 * (var22 / var16.int4);
+ var82 = var80 * var15.health / var16.width;
+ var25 = var24 * (var23 - var82) / var15.cycleOffset + var82;
} else {
- var93 = var20;
- var21 = var89.cycleOffset + var91.int5 - var19;
- if(var91.int3 >= 0) {
- var17 = (var21 << 8) / (var91.int5 - var91.int3);
+ var25 = var23;
+ var24 = var15.cycleOffset + var16.int5 - var22;
+ if(var16.int3 >= 0) {
+ var20 = (var24 << 8) / (var16.int5 - var16.int3);
}
}
- if(var89.health2 > 0 && var93 < 1) {
- var93 = 1;
+ if(var15.health2 > 0 && var25 < 1) {
+ var25 = 1;
}
- if(var76 != null && var14 != null) {
- if(var15 == var93) {
- var93 += var16 * 2;
+ if(var17 != null && var18 != null) {
+ if(var80 == var25) {
+ var25 += var19 * 2;
} else {
- var93 += var16;
+ var25 += var19;
}
- var21 = var76.subHeight;
- var87 += var21;
- var22 = var2 + Client.viewportTempX - (var15 >> 1);
- var23 = var3 + Client.viewportTempY - var87;
- var22 -= var16;
- if(var17 >= 0 && var17 < 255) {
- var76.__h_508(var22, var23, var17);
- Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var93, var23 + var21);
- var14.__h_508(var22, var23, var17);
+ var24 = var17.subHeight;
+ var78 += var24;
+ var82 = var2 + Client.viewportTempX - (var80 >> 1);
+ var85 = var3 + Client.viewportTempY - var78;
+ var82 -= var19;
+ if(var20 >= 0 && var20 < 255) {
+ var17.__h_508(var82, var85, var20);
+ Rasterizer2D.Rasterizer2D_expandClip(var82, var85, var82 + var25, var85 + var24);
+ var18.__h_508(var82, var85, var20);
} else {
- var76.drawAt2(var22, var23);
- Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var93 + var22, var21 + var23);
- var14.drawAt2(var22, var23);
+ var17.drawAt2(var82, var85);
+ Rasterizer2D.Rasterizer2D_expandClip(var82, var85, var25 + var82, var24 + var85);
+ var18.drawAt2(var82, var85);
}
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5);
- var87 += 2;
+ var78 += 2;
} else {
- var87 += 5;
+ var78 += 5;
if(Client.viewportTempX > -1) {
- var21 = var2 + Client.viewportTempX - (var15 >> 1);
- var22 = var3 + Client.viewportTempY - var87;
- Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var93, 5, 65280);
- Rasterizer2D.Rasterizer2D_fillRectangle(var21 + var93, var22, var15 - var93, 5, 16711680);
+ var24 = var2 + Client.viewportTempX - (var80 >> 1);
+ var82 = var3 + Client.viewportTempY - var78;
+ Rasterizer2D.Rasterizer2D_fillRectangle(var24, var82, var25, 5, 65280);
+ Rasterizer2D.Rasterizer2D_fillRectangle(var24 + var25, var82, var80 - var25, 5, 16711680);
}
- var87 += 2;
+ var78 += 2;
}
}
}
}
- if(var87 == -2) {
- var87 += 7;
+ if(var78 == -2) {
+ var78 += 7;
}
- var87 += var8;
- if(var1 < var75) {
- var10 = (Player)var0;
- if(var10.isHidden) {
+ var78 += var8;
+ if(var1 < var77) {
+ var9 = (Player)var0;
+ if(var9.isHidden) {
return;
}
- if(var10.headIconPk != -1 || var10.headIconPrayer != -1) {
+ if(var9.headIconPk != -1 || var9.headIconPrayer != -1) {
DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
if(Client.viewportTempX > -1) {
- if(var10.headIconPk != -1) {
- var87 += 25;
- class15.headIconPkSprites[var10.headIconPk].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
+ if(var9.headIconPk != -1) {
+ var78 += 25;
+ class15.headIconPkSprites[var9.headIconPk].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var78);
}
- if(var10.headIconPrayer != -1) {
- var87 += 25;
- ClientPreferences.headIconPrayerSprites[var10.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
+ if(var9.headIconPrayer != -1) {
+ var78 += 25;
+ ClientPreferences.headIconPrayerSprites[var9.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var78);
}
}
}
@@ -317,24 +317,24 @@ public class class39 extends class21 {
if(var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) {
DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
if(Client.viewportTempX > -1) {
- var87 += Player.headIconHintSprites[1].subHeight;
- Player.headIconHintSprites[1].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
+ var78 += Player.headIconHintSprites[1].subHeight;
+ Player.headIconHintSprites[1].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var78);
}
}
} else {
- NpcDefinition var90 = ((Npc)var0).definition;
- if(var90.transforms != null) {
- var90 = var90.transform();
+ NPCDefinition var86 = ((NPC)var0).definition;
+ if(var86.transforms != null) {
+ var86 = var86.transform();
}
- if(var90.headIconPrayer >= 0 && var90.headIconPrayer < ClientPreferences.headIconPrayerSprites.length) {
+ if(var86.headIconPrayer >= 0 && var86.headIconPrayer < ClientPreferences.headIconPrayerSprites.length) {
DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
if(Client.viewportTempX > -1) {
- ClientPreferences.headIconPrayerSprites[var90.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30);
+ ClientPreferences.headIconPrayerSprites[var86.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30);
}
}
- if(Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) {
+ if(Client.hintArrowType == 1 && Client.npcIndices[var1 - var77] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) {
DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
if(Client.viewportTempX > -1) {
Player.headIconHintSprites[0].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28);
@@ -342,7 +342,7 @@ public class class39 extends class21 {
}
}
- if(var0.overheadText != null && (var1 >= var75 || !var0.__az && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) {
+ if(var0.overheadText != null && (var1 >= var77 || !var0.__az && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) {
DevicePcmPlayerProvider.method840(var0, var0.defaultHeight);
if(Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) {
Client.overheadTextXOffsets[Client.overheadTextCount] = class2.fontBold12.stringWidth(var0.overheadText) / 2;
@@ -357,66 +357,66 @@ public class class39 extends class21 {
}
}
- for(int var80 = 0; var80 < 4; ++var80) {
- int var96 = var0.hitSplatCycles[var80];
- int var97 = var0.hitSplatTypes[var80];
- HitSplatDefinition var95 = null;
- int var98 = 0;
- if(var97 >= 0) {
- if(var96 <= Client.cycle) {
+ for(int var88 = 0; var88 < 4; ++var88) {
+ int var87 = var0.hitSplatCycles[var88];
+ int var89 = var0.hitSplatTypes[var88];
+ HitSplatDefinition var90 = null;
+ int var91 = 0;
+ if(var89 >= 0) {
+ if(var87 <= Client.cycle) {
continue;
}
- var95 = class72.getHitSplatDefinition(var0.hitSplatTypes[var80]);
- var98 = var95.__i;
- if(var95 != null && var95.transforms != null) {
- var95 = var95.transform();
- if(var95 == null) {
- var0.hitSplatCycles[var80] = -1;
+ var90 = class72.getHitSplatDefinition(var0.hitSplatTypes[var88]);
+ var91 = var90.__i;
+ if(var90 != null && var90.transforms != null) {
+ var90 = var90.transform();
+ if(var90 == null) {
+ var0.hitSplatCycles[var88] = -1;
continue;
}
}
- } else if(var96 < 0) {
+ } else if(var87 < 0) {
continue;
}
- var15 = var0.hitSplatTypes2[var80];
- HitSplatDefinition var81 = null;
- if(var15 >= 0) {
- var81 = class72.getHitSplatDefinition(var15);
- if(var81 != null && var81.transforms != null) {
- var81 = var81.transform();
+ var80 = var0.hitSplatTypes2[var88];
+ HitSplatDefinition var92 = null;
+ if(var80 >= 0) {
+ var92 = class72.getHitSplatDefinition(var80);
+ if(var92 != null && var92.transforms != null) {
+ var92 = var92.transform();
}
}
- if(var96 - var98 <= Client.cycle) {
- if(var95 == null) {
- var0.hitSplatCycles[var80] = -1;
+ if(var87 - var91 <= Client.cycle) {
+ if(var90 == null) {
+ var0.hitSplatCycles[var88] = -1;
} else {
DevicePcmPlayerProvider.method840(var0, var0.defaultHeight / 2);
if(Client.viewportTempX > -1) {
- if(var80 == 1) {
+ if(var88 == 1) {
Client.viewportTempY -= 20;
}
- if(var80 == 2) {
+ if(var88 == 2) {
Client.viewportTempX -= 15;
Client.viewportTempY -= 10;
}
- if(var80 == 3) {
+ if(var88 == 3) {
Client.viewportTempX += 15;
Client.viewportTempY -= 10;
}
- Sprite var82 = null;
- Sprite var83 = null;
- Sprite var84 = null;
- Sprite var85 = null;
- var22 = 0;
- var23 = 0;
- int var24 = 0;
- int var25 = 0;
+ Sprite var93 = null;
+ Sprite var94 = null;
+ Sprite var95 = null;
+ Sprite var96 = null;
+ var82 = 0;
+ var85 = 0;
+ var24 = 0;
+ var25 = 0;
int var26 = 0;
int var27 = 0;
int var28 = 0;
@@ -434,53 +434,53 @@ public class class39 extends class21 {
int var40 = 0;
int var41 = 0;
int var42 = 0;
- var82 = var95.__g_417();
+ var93 = var90.__g_417();
int var43;
- if(var82 != null) {
- var22 = var82.subWidth;
- var43 = var82.subHeight;
+ if(var93 != null) {
+ var82 = var93.subWidth;
+ var43 = var93.subHeight;
if(var43 > var42) {
var42 = var43;
}
- var26 = var82.yOffset;
+ var26 = var93.yOffset;
}
- var83 = var95.__l_418();
- if(var83 != null) {
- var23 = var83.subWidth;
- var43 = var83.subHeight;
+ var94 = var90.__l_418();
+ if(var94 != null) {
+ var85 = var94.subWidth;
+ var43 = var94.subHeight;
if(var43 > var42) {
var42 = var43;
}
- var27 = var83.yOffset;
+ var27 = var94.yOffset;
}
- var84 = var95.__e_419();
- if(var84 != null) {
- var24 = var84.subWidth;
- var43 = var84.subHeight;
+ var95 = var90.__e_419();
+ if(var95 != null) {
+ var24 = var95.subWidth;
+ var43 = var95.subHeight;
if(var43 > var42) {
var42 = var43;
}
- var28 = var84.yOffset;
+ var28 = var95.yOffset;
}
- var85 = var95.__x_420();
- if(var85 != null) {
- var25 = var85.subWidth;
- var43 = var85.subHeight;
+ var96 = var90.__x_420();
+ if(var96 != null) {
+ var25 = var96.subWidth;
+ var43 = var96.subHeight;
if(var43 > var42) {
var42 = var43;
}
- var29 = var85.yOffset;
+ var29 = var96.yOffset;
}
- if(var81 != null) {
- var30 = var81.__g_417();
+ if(var92 != null) {
+ var30 = var92.__g_417();
if(var30 != null) {
var34 = var30.subWidth;
var43 = var30.subHeight;
@@ -491,7 +491,7 @@ public class class39 extends class21 {
var38 = var30.yOffset;
}
- var31 = var81.__l_418();
+ var31 = var92.__l_418();
if(var31 != null) {
var35 = var31.subWidth;
var43 = var31.subHeight;
@@ -502,7 +502,7 @@ public class class39 extends class21 {
var39 = var31.yOffset;
}
- var32 = var81.__e_419();
+ var32 = var92.__e_419();
if(var32 != null) {
var36 = var32.subWidth;
var43 = var32.subHeight;
@@ -513,7 +513,7 @@ public class class39 extends class21 {
var40 = var32.yOffset;
}
- var33 = var81.__x_420();
+ var33 = var92.__x_420();
if(var33 != null) {
var37 = var33.subWidth;
var43 = var33.subHeight;
@@ -525,241 +525,241 @@ public class class39 extends class21 {
}
}
- Font var86 = var95.getFont();
- if(var86 == null) {
- var86 = ScriptEvent.fontPlain11;
- }
-
- Font var44;
- if(var81 != null) {
- var44 = var81.getFont();
- if(var44 == null) {
- var44 = ScriptEvent.fontPlain11;
- }
- } else {
+ Font var44 = var90.getFont();
+ if(var44 == null) {
var44 = ScriptEvent.fontPlain11;
}
- String var45 = null;
+ Font var45;
+ if(var92 != null) {
+ var45 = var92.getFont();
+ if(var45 == null) {
+ var45 = ScriptEvent.fontPlain11;
+ }
+ } else {
+ var45 = ScriptEvent.fontPlain11;
+ }
+
String var46 = null;
- boolean var47 = false;
- int var48 = 0;
- var45 = var95.getString(var0.hitSplatValues[var80]);
- int var94 = var86.stringWidth(var45);
- if(var81 != null) {
- var46 = var81.getString(var0.hitSplatValues2[var80]);
- var48 = var44.stringWidth(var46);
- }
-
+ String var47 = null;
+ boolean var48 = false;
int var49 = 0;
- int var50 = 0;
- if(var23 > 0) {
- if(var84 == null && var85 == null) {
- var49 = 1;
- } else {
- var49 = var94 / var23 + 1;
- }
- }
-
- if(var81 != null && var35 > 0) {
- if(var32 == null && var33 == null) {
- var50 = 1;
- } else {
- var50 = var48 / var35 + 1;
- }
+ var46 = var90.getString(var0.hitSplatValues[var88]);
+ int var50 = var44.stringWidth(var46);
+ if(var92 != null) {
+ var47 = var92.getString(var0.hitSplatValues2[var88]);
+ var49 = var45.stringWidth(var47);
}
int var51 = 0;
- int var52 = var51;
- if(var22 > 0) {
- var51 += var22;
+ int var52 = 0;
+ if(var85 > 0) {
+ if(var95 == null && var96 == null) {
+ var51 = 1;
+ } else {
+ var51 = var50 / var85 + 1;
+ }
}
- var51 += 2;
- int var53 = var51;
+ if(var92 != null && var35 > 0) {
+ if(var32 == null && var33 == null) {
+ var52 = 1;
+ } else {
+ var52 = var49 / var35 + 1;
+ }
+ }
+
+ int var53 = 0;
+ int var54 = var53;
+ if(var82 > 0) {
+ var53 += var82;
+ }
+
+ var53 += 2;
+ int var55 = var53;
if(var24 > 0) {
- var51 += var24;
+ var53 += var24;
}
- int var54 = var51;
- int var55 = var51;
- int var56;
- if(var23 > 0) {
- var56 = var23 * var49;
- var51 += var56;
- var55 += (var56 - var94) / 2;
+ int var56 = var53;
+ int var57 = var53;
+ int var58;
+ if(var85 > 0) {
+ var58 = var85 * var51;
+ var53 += var58;
+ var57 += (var58 - var50) / 2;
} else {
- var51 += var94;
+ var53 += var50;
}
- var56 = var51;
+ var58 = var53;
if(var25 > 0) {
- var51 += var25;
+ var53 += var25;
}
- int var57 = 0;
- int var58 = 0;
int var59 = 0;
int var60 = 0;
int var61 = 0;
- int var62;
- if(var81 != null) {
- var51 += 2;
- var57 = var51;
+ int var62 = 0;
+ int var63 = 0;
+ int var64;
+ if(var92 != null) {
+ var53 += 2;
+ var59 = var53;
if(var34 > 0) {
- var51 += var34;
+ var53 += var34;
}
- var51 += 2;
- var58 = var51;
+ var53 += 2;
+ var60 = var53;
if(var36 > 0) {
- var51 += var36;
+ var53 += var36;
}
- var59 = var51;
- var61 = var51;
+ var61 = var53;
+ var63 = var53;
if(var35 > 0) {
- var62 = var35 * var50;
- var51 += var62;
- var61 += (var62 - var48) / 2;
+ var64 = var35 * var52;
+ var53 += var64;
+ var63 += (var64 - var49) / 2;
} else {
- var51 += var48;
+ var53 += var49;
}
- var60 = var51;
+ var62 = var53;
if(var37 > 0) {
- var51 += var37;
+ var53 += var37;
}
}
- var62 = var0.hitSplatCycles[var80] - Client.cycle;
- int var63 = var95.__t - var62 * var95.__t / var95.__i;
- int var64 = var62 * var95.__y / var95.__i + -var95.__y;
- int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1));
- int var66 = var64 + (var3 + Client.viewportTempY - 12);
- int var67 = var66;
- int var68 = var42 + var66;
- int var69 = var66 + var95.__r + 15;
- int var70 = var69 - var86.maxAscent;
- int var71 = var69 + var86.maxDescent;
- if(var70 < var66) {
- var67 = var70;
+ var64 = var0.hitSplatCycles[var88] - Client.cycle;
+ int var65 = var90.__t - var64 * var90.__t / var90.__i;
+ int var66 = var64 * var90.__y / var90.__i + -var90.__y;
+ int var67 = var65 + (var2 + Client.viewportTempX - (var53 >> 1));
+ int var68 = var66 + (var3 + Client.viewportTempY - 12);
+ int var69 = var68;
+ int var70 = var42 + var68;
+ int var71 = var68 + var90.__r + 15;
+ int var72 = var71 - var44.maxAscent;
+ int var73 = var71 + var44.maxDescent;
+ if(var72 < var68) {
+ var69 = var72;
}
- if(var71 > var68) {
- var68 = var71;
+ if(var73 > var70) {
+ var70 = var73;
}
- int var72 = 0;
- int var73;
- int var74;
- if(var81 != null) {
- var72 = var66 + var81.__r + 15;
- var73 = var72 - var44.maxAscent;
- var74 = var72 + var44.maxDescent;
- if(var73 < var67) {
+ int var74 = 0;
+ int var75;
+ int var76;
+ if(var92 != null) {
+ var74 = var68 + var92.__r + 15;
+ var75 = var74 - var45.maxAscent;
+ var76 = var74 + var45.maxDescent;
+ if(var75 < var69) {
;
}
- if(var74 > var68) {
+ if(var76 > var70) {
;
}
}
- var73 = 255;
- if(var95.__h >= 0) {
- var73 = (var62 << 8) / (var95.__i - var95.__h);
+ var75 = 255;
+ if(var90.__h >= 0) {
+ var75 = (var64 << 8) / (var90.__i - var90.__h);
}
- if(var73 >= 0 && var73 < 255) {
- if(var82 != null) {
- var82.__h_508(var52 + var65 - var26, var66, var73);
+ if(var75 >= 0 && var75 < 255) {
+ if(var93 != null) {
+ var93.__h_508(var54 + var67 - var26, var68, var75);
}
- if(var84 != null) {
- var84.__h_508(var65 + var53 - var28, var66, var73);
+ if(var95 != null) {
+ var95.__h_508(var67 + var55 - var28, var68, var75);
}
- if(var83 != null) {
- for(var74 = 0; var74 < var49; ++var74) {
- var83.__h_508(var23 * var74 + (var65 + var54 - var27), var66, var73);
+ if(var94 != null) {
+ for(var76 = 0; var76 < var51; ++var76) {
+ var94.__h_508(var85 * var76 + (var67 + var56 - var27), var68, var75);
}
}
- if(var85 != null) {
- var85.__h_508(var56 + var65 - var29, var66, var73);
+ if(var96 != null) {
+ var96.__h_508(var58 + var67 - var29, var68, var75);
}
- var86.drawAlpha(var45, var55 + var65, var69, var95.__n, 0, var73);
- if(var81 != null) {
+ var44.drawAlpha(var46, var57 + var67, var71, var90.surfaceOffsetY, 0, var75);
+ if(var92 != null) {
if(var30 != null) {
- var30.__h_508(var65 + var57 - var38, var66, var73);
+ var30.__h_508(var67 + var59 - var38, var68, var75);
}
if(var32 != null) {
- var32.__h_508(var65 + var58 - var40, var66, var73);
+ var32.__h_508(var67 + var60 - var40, var68, var75);
}
if(var31 != null) {
- for(var74 = 0; var74 < var50; ++var74) {
- var31.__h_508(var74 * var35 + (var59 + var65 - var39), var66, var73);
+ for(var76 = 0; var76 < var52; ++var76) {
+ var31.__h_508(var76 * var35 + (var61 + var67 - var39), var68, var75);
}
}
if(var33 != null) {
- var33.__h_508(var60 + var65 - var41, var66, var73);
+ var33.__h_508(var62 + var67 - var41, var68, var75);
}
- var44.drawAlpha(var46, var61 + var65, var72, var81.__n, 0, var73);
+ var45.drawAlpha(var47, var63 + var67, var74, var92.surfaceOffsetY, 0, var75);
}
} else {
- if(var82 != null) {
- var82.drawAt2(var52 + var65 - var26, var66);
+ if(var93 != null) {
+ var93.drawAt2(var54 + var67 - var26, var68);
}
- if(var84 != null) {
- var84.drawAt2(var65 + var53 - var28, var66);
+ if(var95 != null) {
+ var95.drawAt2(var67 + var55 - var28, var68);
}
- if(var83 != null) {
- for(var74 = 0; var74 < var49; ++var74) {
- var83.drawAt2(var23 * var74 + (var54 + var65 - var27), var66);
+ if(var94 != null) {
+ for(var76 = 0; var76 < var51; ++var76) {
+ var94.drawAt2(var85 * var76 + (var56 + var67 - var27), var68);
}
}
- if(var85 != null) {
- var85.drawAt2(var56 + var65 - var29, var66);
+ if(var96 != null) {
+ var96.drawAt2(var58 + var67 - var29, var68);
}
- var86.draw(var45, var55 + var65, var69, var95.__n | -16777216, 0);
- if(var81 != null) {
+ var44.draw(var46, var57 + var67, var71, var90.surfaceOffsetY | -16777216, 0);
+ if(var92 != null) {
if(var30 != null) {
- var30.drawAt2(var65 + var57 - var38, var66);
+ var30.drawAt2(var67 + var59 - var38, var68);
}
if(var32 != null) {
- var32.drawAt2(var58 + var65 - var40, var66);
+ var32.drawAt2(var60 + var67 - var40, var68);
}
if(var31 != null) {
- for(var74 = 0; var74 < var50; ++var74) {
- var31.drawAt2(var74 * var35 + (var65 + var59 - var39), var66);
+ for(var76 = 0; var76 < var52; ++var76) {
+ var31.drawAt2(var76 * var35 + (var67 + var61 - var39), var68);
}
}
if(var33 != null) {
- var33.drawAt2(var60 + var65 - var41, var66);
+ var33.drawAt2(var62 + var67 - var41, var68);
}
- var44.draw(var46, var61 + var65, var72, var81.__n | -16777216, 0);
+ var45.draw(var47, var63 + var67, var74, var92.surfaceOffsetY | -16777216, 0);
}
}
}
}
}
}
-
}
+
}
@ObfuscatedName("hv")
@@ -769,34 +769,33 @@ public class class39 extends class21 {
)
@Export("drawMenuActionTextAt")
static final void drawMenuActionTextAt(int var0, int var1) {
- if(Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) {
- if(Client.showMouseOverText) {
- int var2 = Client.menuOptionsCount - 1;
+ if((Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) && Client.showMouseOverText) {
+ int var2 = Client.menuOptionsCount - 1;
+ String var3;
+ if(Client.isItemSelected == 1 && Client.menuOptionsCount < 2) {
+ var3 = "Use " + Client.selectedItemName + " ->";
+ } else if(Client.isSpellSelected && Client.menuOptionsCount < 2) {
+ var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " ->";
+ } else {
String var4;
- if(Client.isItemSelected == 1 && Client.menuOptionsCount < 2) {
- var4 = "Use" + " " + Client.selectedItemName + " " + "->";
- } else if(Client.isSpellSelected && Client.menuOptionsCount < 2) {
- var4 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->";
+ if(var2 < 0) {
+ var4 = "";
+ } else if(Client.menuTargetNames[var2].length() > 0) {
+ var4 = Client.menuActions[var2] + " " + Client.menuTargetNames[var2];
} else {
- String var5;
- if(var2 < 0) {
- var5 = "";
- } else if(Client.menuTargetNames[var2].length() > 0) {
- var5 = Client.menuActions[var2] + " " + Client.menuTargetNames[var2];
- } else {
- var5 = Client.menuActions[var2];
- }
-
- var4 = var5;
+ var4 = Client.menuActions[var2];
}
- if(Client.menuOptionsCount > 2) {
- var4 = var4 + BufferedFile.colorStartTag(0xffffff) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options";
- }
-
- class2.fontBold12.drawRandomAlphaAndSpacing(var4, var0 + 4, var1 + 15, 0xffffff, 0, Client.cycle / 1000);
+ var3 = var4;
}
+
+ if(Client.menuOptionsCount > 2) {
+ var3 = var3 + BufferedFile.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options";
+ }
+
+ class2.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000);
}
+
}
@ObfuscatedName("ib")
diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java
index a52dce6aa4..64b35505bb 100644
--- a/runescape-client/src/main/java/class4.java
+++ b/runescape-client/src/main/java/class4.java
@@ -78,94 +78,95 @@ final class class4 implements class0 {
return 1;
} else {
- int var10;
+ int var4;
+ PacketBufferNode var5;
if(var0 == 3104) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- var10 = 0;
+ var4 = 0;
if(UserComparator4.method3336(var3)) {
- var10 = MouseHandler.method1085(var3);
+ var4 = MouseHandler.method1085(var3);
}
- PacketBufferNode var12 = Interpreter.method1915(ClientPacket.__gs_s, Client.packetWriter.isaacCipher);
- var12.packetBuffer.writeInt(var10);
- Client.packetWriter.__q_167(var12);
+ var5 = Interpreter.method1915(ClientPacket.__gs_s, Client.packetWriter.isaacCipher);
+ var5.packetBuffer.writeInt(var4);
+ Client.packetWriter.__q_167(var5);
+ return 1;
+ } else if(var0 == 3105) {
+ var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ var5 = Interpreter.method1915(ClientPacket.__gs_cl, Client.packetWriter.isaacCipher);
+ var5.packetBuffer.writeByte(var3.length() + 1);
+ var5.packetBuffer.writeStringCp1252NullTerminated(var3);
+ Client.packetWriter.__q_167(var5);
+ return 1;
+ } else if(var0 == 3106) {
+ var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ var5 = Interpreter.method1915(ClientPacket.__gs_e, Client.packetWriter.isaacCipher);
+ var5.packetBuffer.writeByte(var3.length() + 1);
+ var5.packetBuffer.writeStringCp1252NullTerminated(var3);
+ Client.packetWriter.__q_167(var5);
return 1;
} else {
- PacketBufferNode var14;
- if(var0 == 3105) {
- var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- var14 = Interpreter.method1915(ClientPacket.__gs_cl, Client.packetWriter.isaacCipher);
- var14.packetBuffer.writeByte(var3.length() + 1);
- var14.packetBuffer.writeStringCp1252NullTerminated(var3);
- Client.packetWriter.__q_167(var14);
+ String var6;
+ int var7;
+ if(var0 == 3107) {
+ var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ var6 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ WorldMapSection2.method583(var7, var6);
return 1;
- } else if(var0 == 3106) {
- var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- var14 = Interpreter.method1915(ClientPacket.__gs_e, Client.packetWriter.isaacCipher);
- var14.packetBuffer.writeByte(var3.length() + 1);
- var14.packetBuffer.writeStringCp1252NullTerminated(var3);
- Client.packetWriter.__q_167(var14);
+ } else if(var0 == 3108) {
+ class179.Interpreter_intStackSize -= 3;
+ var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
+ var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
+ int var13 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
+ Widget var11 = Huffman.getWidget(var13);
+ Players.clickWidget(var11, var7, var4);
+ return 1;
+ } else if(var0 == 3109) {
+ class179.Interpreter_intStackSize -= 2;
+ var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
+ var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
+ Widget var12 = var2?WorldMapIcon1.__t_i:class12.__n_n;
+ Players.clickWidget(var12, var7, var4);
+ return 1;
+ } else if(var0 == 3110) {
+ AbstractRasterProvider.__lp_ca = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ return 1;
+ } else if(var0 == 3111) {
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.roofsHidden?1:0;
+ return 1;
+ } else if(var0 == 3112) {
+ ReflectionCheck.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ WorldMapSection0.method247();
return 1;
} else {
- String var7;
- int var15;
- if(var0 == 3107) {
- var15 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- WorldMapSection2.method583(var15, var7);
- return 1;
- } else if(var0 == 3108) {
- class179.Interpreter_intStackSize -= 3;
- var15 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var10 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- int var9 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
- Widget var13 = Huffman.getWidget(var9);
- Players.clickWidget(var13, var15, var10);
- return 1;
- } else if(var0 == 3109) {
- class179.Interpreter_intStackSize -= 2;
- var15 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var10 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
- Widget var11 = var2?WorldMapIcon1.__t_i:class12.__n_n;
- Players.clickWidget(var11, var15, var10);
- return 1;
- } else if(var0 == 3110) {
- AbstractRasterProvider.__lp_ca = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- return 1;
- } else if(var0 == 3111) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.roofsHidden?1:0;
- return 1;
- } else if(var0 == 3112) {
- ReflectionCheck.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- WorldMapSection0.method247();
- return 1;
- } else if(var0 == 3113) {
+ boolean var8;
+ if(var0 == 3113) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
- boolean var4 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- WorldMapCacheName.method635(var3, var4, false);
+ var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ WorldMapCacheName.method635(var3, var8, false);
return 1;
} else if(var0 == 3115) {
- var15 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var14 = Interpreter.method1915(ClientPacket.__gs_as, Client.packetWriter.isaacCipher);
- var14.packetBuffer.writeShort(var15);
- Client.packetWriter.__q_167(var14);
+ var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ var5 = Interpreter.method1915(ClientPacket.__gs_as, Client.packetWriter.isaacCipher);
+ var5.packetBuffer.writeShort(var7);
+ Client.packetWriter.__q_167(var5);
return 1;
} else if(var0 == 3116) {
- var15 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
+ var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
Interpreter.Interpreter_stringStackSize -= 2;
- var7 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
- String var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
- if(var7.length() > 500) {
+ var6 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
+ String var10 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+ if(var6.length() > 500) {
return 1;
- } else if(var5.length() > 500) {
+ } else if(var10.length() > 500) {
return 1;
} else {
- PacketBufferNode var6 = Interpreter.method1915(ClientPacket.__gs_j, Client.packetWriter.isaacCipher);
- var6.packetBuffer.writeShort(1 + WorldMapRegion.method550(var7) + WorldMapRegion.method550(var5));
- var6.packetBuffer.writeStringCp1252NullTerminated(var7);
- var6.packetBuffer.writeByte(var15);
- var6.packetBuffer.writeStringCp1252NullTerminated(var5);
- Client.packetWriter.__q_167(var6);
+ PacketBufferNode var9 = Interpreter.method1915(ClientPacket.__gs_j, Client.packetWriter.isaacCipher);
+ var9.packetBuffer.writeShort(1 + WorldMapRegion.method550(var6) + WorldMapRegion.method550(var10));
+ var9.packetBuffer.writeStringCp1252NullTerminated(var6);
+ var9.packetBuffer.writeByte(var7);
+ var9.packetBuffer.writeStringCp1252NullTerminated(var10);
+ Client.packetWriter.__q_167(var9);
return 1;
}
} else if(var0 == 3117) {
@@ -265,64 +266,61 @@ final class class4 implements class0 {
Client.__client_mf = 3;
Client.__client_ms = var2?WorldMapIcon1.__t_i.id:class12.__n_n.id;
return 1;
- } else {
- boolean var8;
- if(var0 == 3141) {
- var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- ReflectionCheck.clientPreferences.hideUsername = var8;
+ } else if(var0 == 3141) {
+ var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ ReflectionCheck.clientPreferences.hideUsername = var8;
+ WorldMapSection0.method247();
+ return 1;
+ } else if(var0 == 3142) {
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.hideUsername?1:0;
+ return 1;
+ } else if(var0 == 3143) {
+ var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ Client.Login_isUsernameRemembered = var8;
+ if(!var8) {
+ ReflectionCheck.clientPreferences.rememberedUsername = "";
WorldMapSection0.method247();
- return 1;
- } else if(var0 == 3142) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.hideUsername?1:0;
- return 1;
- } else if(var0 == 3143) {
- var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- Client.Login_isUsernameRemembered = var8;
- if(!var8) {
- ReflectionCheck.clientPreferences.rememberedUsername = "";
- WorldMapSection0.method247();
- }
-
- return 1;
- } else if(var0 == 3144) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered?1:0;
- return 1;
- } else if(var0 == 3145) {
- return 1;
- } else if(var0 == 3146) {
- var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- if(var8 == ReflectionCheck.clientPreferences.titleMusicDisabled) {
- ReflectionCheck.clientPreferences.titleMusicDisabled = !var8;
- WorldMapSection0.method247();
- }
-
- return 1;
- } else if(var0 == 3147) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.titleMusicDisabled?0:1;
- return 1;
- } else if(var0 == 3148) {
- return 1;
- } else if(var0 == 3149) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
- return 1;
- } else if(var0 == 3150) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
- return 1;
- } else if(var0 == 3151) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
- return 1;
- } else if(var0 == 3152) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
- return 1;
- } else if(var0 == 3153) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Login.Login_loadingPercent;
- return 1;
- } else if(var0 == 3154) {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = GrandExchangeOffer.method101();
- return 1;
- } else {
- return 2;
}
+
+ return 1;
+ } else if(var0 == 3144) {
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered?1:0;
+ return 1;
+ } else if(var0 == 3145) {
+ return 1;
+ } else if(var0 == 3146) {
+ var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ if(var8 == ReflectionCheck.clientPreferences.titleMusicDisabled) {
+ ReflectionCheck.clientPreferences.titleMusicDisabled = !var8;
+ WorldMapSection0.method247();
+ }
+
+ return 1;
+ } else if(var0 == 3147) {
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.titleMusicDisabled?0:1;
+ return 1;
+ } else if(var0 == 3148) {
+ return 1;
+ } else if(var0 == 3149) {
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
+ return 1;
+ } else if(var0 == 3150) {
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
+ return 1;
+ } else if(var0 == 3151) {
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
+ return 1;
+ } else if(var0 == 3152) {
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
+ return 1;
+ } else if(var0 == 3153) {
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Login.Login_loadingPercent;
+ return 1;
+ } else if(var0 == 3154) {
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = GrandExchangeOffer.method101();
+ return 1;
+ } else {
+ return 2;
}
}
}
diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java
index ad1e35f2a5..aad784ce1b 100644
--- a/runescape-client/src/main/java/class40.java
+++ b/runescape-client/src/main/java/class40.java
@@ -654,7 +654,7 @@ public class class40 {
if(var20.plane == SoundSystem.plane && Client.cycle <= var20.cycleEnd) {
if(Client.cycle >= var20.cycleStart) {
if(var20.targetIndex > 0) {
- Npc var22 = Client.npcs[var20.targetIndex - 1];
+ NPC var22 = Client.npcs[var20.targetIndex - 1];
if(var22 != null && var22.x >= 0 && var22.x < 13312 && var22.y >= 0 && var22.y < 13312) {
var20.setDestination(var22.x, var22.y, class32.getTileHeight(var22.x, var22.y, var20.plane) - var20.endHeight, Client.cycle);
}
diff --git a/runescape-client/src/main/java/class48.java b/runescape-client/src/main/java/class48.java
index fbbac8a5e6..e6090c3939 100644
--- a/runescape-client/src/main/java/class48.java
+++ b/runescape-client/src/main/java/class48.java
@@ -4,10 +4,6 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("aa")
public class class48 {
- static {
- ImageIO.setUseCache(false);
- }
-
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(I)[Lij;",
@@ -31,6 +27,7 @@ public class class48 {
ClientParameter.__ji_fp = Client.packetWriter.getSocket();
Client.packetWriter.removeSocket();
}
+
}
@ObfuscatedName("je")
@@ -39,35 +36,34 @@ public class class48 {
garbageValue = "-1926681563"
)
static Widget method869(Widget var0) {
- Widget var2 = var0;
- int var3 = WorldMapRegion.method568(class1.getWidgetClickMask(var0));
- Widget var1;
- if(var3 == 0) {
- var1 = null;
+ Widget var1 = var0;
+ int var2 = WorldMapRegion.method568(class1.getWidgetClickMask(var0));
+ Widget var3;
+ if(var2 == 0) {
+ var3 = null;
} else {
- int var4 = 0;
-
- while(true) {
- if(var4 >= var3) {
- var1 = var2;
- break;
+ label29: {
+ for(int var4 = 0; var4 < var2; ++var4) {
+ var1 = Huffman.getWidget(var1.parentId);
+ if(var1 == null) {
+ var3 = null;
+ break label29;
+ }
}
- var2 = Huffman.getWidget(var2.parentId);
- if(var2 == null) {
- var1 = null;
- break;
- }
-
- ++var4;
+ var3 = var1;
}
}
- Widget var5 = var1;
- if(var1 == null) {
+ Widget var5 = var3;
+ if(var3 == null) {
var5 = var0.parent;
}
return var5;
}
+
+ static {
+ ImageIO.setUseCache(false);
+ }
}
diff --git a/runescape-client/src/main/java/class50.java b/runescape-client/src/main/java/class50.java
index 41a84cb467..a855b7ce80 100644
--- a/runescape-client/src/main/java/class50.java
+++ b/runescape-client/src/main/java/class50.java
@@ -22,11 +22,6 @@ public class class50 {
@Export("baseX")
static int baseX;
- static {
- __af_m = null;
- __af_f = "";
- }
-
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(IB)Lio;",
@@ -89,14 +84,73 @@ public class class50 {
Client.isInInstance = var0;
int var2;
int var3;
+ int var4;
int var5;
int var6;
int var7;
- int var8;
if(!Client.isInInstance) {
var2 = var1.__bm_326();
var3 = var1.__bu_325();
- int var4 = var1.__ag_302();
+ int var8 = var1.__ag_302();
+ class190.xteaKeys = new int[var8][4];
+
+ for(var4 = 0; var4 < var8; ++var4) {
+ for(var5 = 0; var5 < 4; ++var5) {
+ class190.xteaKeys[var4][var5] = var1.readInt();
+ }
+ }
+
+ class308.regions = new int[var8];
+ IndexCacheLoader.regionMapArchiveIds = new int[var8];
+ MouseHandler.regionLandArchiveIds = new int[var8];
+ class40.regionLandArchives = new byte[var8][];
+ HealthBarUpdate.regionMapArchives = new byte[var8][];
+ boolean var9 = false;
+ if((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) {
+ var9 = true;
+ }
+
+ if(var3 / 8 == 48 && var2 / 8 == 148) {
+ var9 = true;
+ }
+
+ var8 = 0;
+
+ for(var5 = (var3 - 6) / 8; var5 <= (var3 + 6) / 8; ++var5) {
+ for(var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) {
+ var7 = var6 + (var5 << 8);
+ if(!var9 || var6 != 49 && var6 != 149 && var6 != 147 && var5 != 50 && (var5 != 49 || var6 != 47)) {
+ class308.regions[var8] = var7;
+ IndexCacheLoader.regionMapArchiveIds[var8] = SecureRandomFuture.indexCache5.getArchiveId("m" + var5 + "_" + var6);
+ MouseHandler.regionLandArchiveIds[var8] = SecureRandomFuture.indexCache5.getArchiveId("l" + var5 + "_" + var6);
+ ++var8;
+ }
+ }
+ }
+
+ DynamicObject.method2224(var3, var2, true);
+ } else {
+ var2 = var1.__bu_325();
+ var3 = var1.__bm_326();
+ boolean var15 = var1.readUnsignedByte() == 1;
+ var4 = var1.__ag_302();
+ var1.importIndex();
+
+ int var16;
+ for(var5 = 0; var5 < 4; ++var5) {
+ for(var6 = 0; var6 < 13; ++var6) {
+ for(var7 = 0; var7 < 13; ++var7) {
+ var16 = var1.readBits(1);
+ if(var16 == 1) {
+ Client.instanceChunkTemplates[var5][var6][var7] = var1.readBits(26);
+ } else {
+ Client.instanceChunkTemplates[var5][var6][var7] = -1;
+ }
+ }
+ }
+ }
+
+ var1.exportIndex();
class190.xteaKeys = new int[var4][4];
for(var5 = 0; var5 < var4; ++var5) {
@@ -110,78 +164,19 @@ public class class50 {
MouseHandler.regionLandArchiveIds = new int[var4];
class40.regionLandArchives = new byte[var4][];
HealthBarUpdate.regionMapArchives = new byte[var4][];
- boolean var16 = false;
- if((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) {
- var16 = true;
- }
-
- if(var3 / 8 == 48 && var2 / 8 == 148) {
- var16 = true;
- }
-
var4 = 0;
- for(var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) {
- for(var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) {
- var8 = var7 + (var6 << 8);
- if(!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) {
- class308.regions[var4] = var8;
- IndexCacheLoader.regionMapArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("m" + var6 + "_" + var7);
- MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("l" + var6 + "_" + var7);
- ++var4;
- }
- }
- }
-
- DynamicObject.method2224(var3, var2, true);
- } else {
- var2 = var1.__bu_325();
- var3 = var1.__bm_326();
- boolean var15 = var1.readUnsignedByte() == 1;
- var5 = var1.__ag_302();
- var1.importIndex();
-
- int var9;
- for(var6 = 0; var6 < 4; ++var6) {
- for(var7 = 0; var7 < 13; ++var7) {
- for(var8 = 0; var8 < 13; ++var8) {
- var9 = var1.readBits(1);
- if(var9 == 1) {
- Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26);
- } else {
- Client.instanceChunkTemplates[var6][var7][var8] = -1;
- }
- }
- }
- }
-
- var1.exportIndex();
- class190.xteaKeys = new int[var5][4];
-
- for(var6 = 0; var6 < var5; ++var6) {
- for(var7 = 0; var7 < 4; ++var7) {
- class190.xteaKeys[var6][var7] = var1.readInt();
- }
- }
-
- class308.regions = new int[var5];
- IndexCacheLoader.regionMapArchiveIds = new int[var5];
- MouseHandler.regionLandArchiveIds = new int[var5];
- class40.regionLandArchives = new byte[var5][];
- HealthBarUpdate.regionMapArchives = new byte[var5][];
- var5 = 0;
-
- for(var6 = 0; var6 < 4; ++var6) {
- for(var7 = 0; var7 < 13; ++var7) {
- for(var8 = 0; var8 < 13; ++var8) {
- var9 = Client.instanceChunkTemplates[var6][var7][var8];
- if(var9 != -1) {
- int var10 = var9 >> 14 & 1023;
- int var11 = var9 >> 3 & 2047;
+ for(var5 = 0; var5 < 4; ++var5) {
+ for(var6 = 0; var6 < 13; ++var6) {
+ for(var7 = 0; var7 < 13; ++var7) {
+ var16 = Client.instanceChunkTemplates[var5][var6][var7];
+ if(var16 != -1) {
+ int var10 = var16 >> 14 & 1023;
+ int var11 = var16 >> 3 & 2047;
int var12 = (var10 / 8 << 8) + var11 / 8;
int var13;
- for(var13 = 0; var13 < var5; ++var13) {
+ for(var13 = 0; var13 < var4; ++var13) {
if(class308.regions[var13] == var12) {
var12 = -1;
break;
@@ -189,12 +184,12 @@ public class class50 {
}
if(var12 != -1) {
- class308.regions[var5] = var12;
+ class308.regions[var4] = var12;
var13 = var12 >> 8 & 255;
int var14 = var12 & 255;
- IndexCacheLoader.regionMapArchiveIds[var5] = SecureRandomFuture.indexCache5.getArchiveId("m" + var13 + "_" + var14);
- MouseHandler.regionLandArchiveIds[var5] = SecureRandomFuture.indexCache5.getArchiveId("l" + var13 + "_" + var14);
- ++var5;
+ IndexCacheLoader.regionMapArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("m" + var13 + "_" + var14);
+ MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("l" + var13 + "_" + var14);
+ ++var4;
}
}
}
@@ -263,4 +258,9 @@ public class class50 {
class212.method4109(var0, var1, Client.__client_ev, 0, 24);
}
+
+ static {
+ __af_m = null;
+ __af_f = "";
+ }
}
diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java
index 3f50d0a947..047d21bb5f 100644
--- a/runescape-client/src/main/java/class54.java
+++ b/runescape-client/src/main/java/class54.java
@@ -37,95 +37,9 @@ public final class class54 {
garbageValue = "-603753561"
)
static void method1092(GameShell var0) {
- int var3;
- int var15;
- if(Login.__cu_bk) {
- while(true) {
- if(!Decimator.method2490()) {
- if(MouseHandler.MouseHandler_lastButton != 1 && (AbstractRasterProvider.__lp_ca || MouseHandler.MouseHandler_lastButton != 4)) {
- break;
- }
-
- int var1 = Login.__cu_q + 280;
- if(MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
- Interpreter.method1975(0, 0);
- break;
- }
-
- if(MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
- Interpreter.method1975(0, 1);
- break;
- }
-
- int var2 = Login.__cu_q + 390;
- if(MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
- Interpreter.method1975(1, 0);
- break;
- }
-
- if(MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
- Interpreter.method1975(1, 1);
- break;
- }
-
- var3 = Login.__cu_q + 500;
- if(MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
- Interpreter.method1975(2, 0);
- break;
- }
-
- if(MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
- Interpreter.method1975(2, 1);
- break;
- }
-
- var15 = Login.__cu_q + 610;
- if(MouseHandler.MouseHandler_lastPressedX >= var15 && MouseHandler.MouseHandler_lastPressedX <= var15 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
- Interpreter.method1975(3, 0);
- break;
- }
-
- if(MouseHandler.MouseHandler_lastPressedX >= var15 + 15 && MouseHandler.MouseHandler_lastPressedX <= var15 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
- Interpreter.method1975(3, 1);
- break;
- }
-
- if(MouseHandler.MouseHandler_lastPressedX >= Login.__cu_q + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.__cu_q + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) {
- FontName.method5636();
- break;
- }
-
- if(Login.__cu_bl != -1) {
- World var13 = ItemContainer.worlds[Login.__cu_bl];
- class31.changeWorld(var13);
- FontName.method5636();
- } else {
- if(Login.__cu_br > 0 && SecureRandomFuture.__cn_bu != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= SecureRandomFuture.__cn_bu.subWidth && MouseHandler.MouseHandler_lastPressedY >= Huffman.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Huffman.canvasHeight / 2 + 50) {
- --Login.__cu_br;
- }
-
- if(Login.__cu_br < Login.__cu_bj && NetSocket.__fb_bm != null && MouseHandler.MouseHandler_lastPressedX >= SoundCache.canvasWidth - NetSocket.__fb_bm.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= SoundCache.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= Huffman.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Huffman.canvasHeight / 2 + 50) {
- ++Login.__cu_br;
- }
- }
- break;
- }
-
- if(IndexStoreAction.__ik_cn == 13) {
- FontName.method5636();
- break;
- }
-
- if(IndexStoreAction.__ik_cn == 96) {
- if(Login.__cu_br > 0 && SecureRandomFuture.__cn_bu != null) {
- --Login.__cu_br;
- }
- } else if(IndexStoreAction.__ik_cn == 97 && Login.__cu_br < Login.__cu_bj && NetSocket.__fb_bm != null) {
- ++Login.__cu_br;
- }
- }
-
- } else {
+ int var1;
+ int var2;
+ if(!Login.__cu_bk) {
if((MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.__lp_ca && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.__cu_q + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) {
ReflectionCheck.clientPreferences.titleMusicDisabled = !ReflectionCheck.clientPreferences.titleMusicDisabled;
WorldMapSection0.method247();
@@ -143,9 +57,9 @@ public final class class54 {
Login.__cu_bi = class203.currentTimeMs() + 1000L;
}
- long var11 = class203.currentTimeMs();
+ long var15 = class203.currentTimeMs();
if(AbstractIndexCache.method4585() && -1L == Login.__cu_bz) {
- Login.__cu_bz = var11;
+ Login.__cu_bz = var15;
if(Login.__cu_bz > Login.__cu_bi) {
Login.__cu_bi = Login.__cu_bz;
}
@@ -154,11 +68,11 @@ public final class class54 {
if(Client.gameState == 10 || Client.gameState == 11) {
if(Client.language == 0) {
if(MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.__lp_ca && MouseHandler.MouseHandler_lastButton == 4) {
- var3 = Login.__cu_q + 5;
- short var4 = 463;
- byte var5 = 100;
- byte var6 = 35;
- if(MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + var5 && MouseHandler.MouseHandler_lastPressedY >= var4 && MouseHandler.MouseHandler_lastPressedY <= var6 + var4) {
+ var1 = Login.__cu_q + 5;
+ short var16 = 463;
+ byte var6 = 100;
+ byte var7 = 35;
+ if(MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + var6 && MouseHandler.MouseHandler_lastPressedY >= var16 && MouseHandler.MouseHandler_lastPressedY <= var7 + var16) {
if(ClientParameter.loadWorlds()) {
Login.__cu_bk = true;
Login.__cu_br = 0;
@@ -176,37 +90,37 @@ public final class class54 {
}
}
- var3 = MouseHandler.MouseHandler_lastButton;
- var15 = MouseHandler.MouseHandler_lastPressedX;
- int var16 = MouseHandler.MouseHandler_lastPressedY;
- if(var3 == 0) {
- var15 = MouseHandler.MouseHandler_x;
- var16 = MouseHandler.MouseHandler_y;
+ var1 = MouseHandler.MouseHandler_lastButton;
+ var2 = MouseHandler.MouseHandler_lastPressedX;
+ int var17 = MouseHandler.MouseHandler_lastPressedY;
+ if(var1 == 0) {
+ var2 = MouseHandler.MouseHandler_x;
+ var17 = MouseHandler.MouseHandler_y;
}
- if(!AbstractRasterProvider.__lp_ca && var3 == 4) {
- var3 = 1;
+ if(!AbstractRasterProvider.__lp_ca && var1 == 4) {
+ var1 = 1;
}
- int var7;
- short var8;
+ int var18;
+ short var19;
if(Login.loginIndex == 0) {
- boolean var17 = false;
+ boolean var8 = false;
while(Decimator.method2490()) {
if(IndexStoreAction.__ik_cn == 84) {
- var17 = true;
+ var8 = true;
}
}
- var7 = Varps.__hv_h - 80;
- var8 = 291;
- if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
+ var18 = Varps.__hv_h - 80;
+ var19 = 291;
+ if(var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) {
WorldMapCacheName.method635(Message.method1227("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false);
}
- var7 = Varps.__hv_h + 80;
- if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20 || var17) {
+ var18 = Varps.__hv_h + 80;
+ if(var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20 || var8) {
if((Client.worldProperties & 33554432) != 0) {
Login.Login_response0 = "";
Login.Login_response1 = "This is a Beta world.";
@@ -240,29 +154,29 @@ public final class class54 {
}
}
} else {
- int var18;
- short var20;
+ short var9;
+ int var20;
if(Login.loginIndex != 1) {
- boolean var9;
- int var10;
- short var19;
+ boolean var10;
+ int var11;
+ short var12;
if(Login.loginIndex == 2) {
- var19 = 201;
- var18 = var19 + 52;
- if(var3 == 1 && var16 >= var18 - 12 && var16 < var18 + 2) {
+ var12 = 201;
+ var20 = var12 + 52;
+ if(var1 == 1 && var17 >= var20 - 12 && var17 < var20 + 2) {
Login.currentLoginField = 0;
}
- var18 += 15;
- if(var3 == 1 && var16 >= var18 - 12 && var16 < var18 + 2) {
+ var20 += 15;
+ if(var1 == 1 && var17 >= var20 - 12 && var17 < var20 + 2) {
Login.currentLoginField = 1;
}
- var18 += 15;
- var19 = 361;
+ var20 += 15;
+ var12 = 361;
if(TilePaint.__eb_ah != null) {
- var7 = TilePaint.__eb_ah.__q / 2;
- if(var3 == 1 && var15 >= TilePaint.__eb_ah.__m - var7 && var15 <= var7 + TilePaint.__eb_ah.__m && var16 >= var19 - 15 && var16 < var19) {
+ var18 = TilePaint.__eb_ah.__q / 2;
+ if(var1 == 1 && var2 >= TilePaint.__eb_ah.__m - var18 && var2 <= var18 + TilePaint.__eb_ah.__m && var17 >= var12 - 15 && var17 < var12) {
switch(Login.__cu_ac) {
case 1:
method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
@@ -274,9 +188,9 @@ public final class class54 {
}
}
- var7 = Varps.__hv_h - 80;
- var8 = 321;
- if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
+ var18 = Varps.__hv_h - 80;
+ var19 = 321;
+ if(var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) {
Login.Login_username = Login.Login_username.trim();
if(Login.Login_username.length() == 0) {
method1089("", "Please enter your username/email address.", "");
@@ -294,8 +208,8 @@ public final class class54 {
return;
}
- var7 = Login.__cu_y + 180 + 80;
- if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
+ var18 = Login.__cu_y + 180 + 80;
+ if(var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) {
Login.loginIndex = 0;
Login.Login_username = "";
Login.Login_password = "";
@@ -304,10 +218,10 @@ public final class class54 {
Login.__cu_ba = true;
}
- var7 = Varps.__hv_h + -117;
- var8 = 277;
- Login.__cu_aa = var15 >= var7 && var15 < var7 + class168.__fs_au && var16 >= var8 && var16 < var8 + GroundItemPile.__dr_ao;
- if(var3 == 1 && Login.__cu_aa) {
+ var18 = Varps.__hv_h + -117;
+ var19 = 277;
+ Login.__cu_aa = var2 >= var18 && var2 < var18 + class168.__fs_au && var17 >= var19 && var17 < var19 + GroundItemPile.__dr_ao;
+ if(var1 == 1 && Login.__cu_aa) {
Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered;
if(!Client.Login_isUsernameRemembered && ReflectionCheck.clientPreferences.rememberedUsername != null) {
ReflectionCheck.clientPreferences.rememberedUsername = null;
@@ -315,10 +229,10 @@ public final class class54 {
}
}
- var7 = Varps.__hv_h + 24;
- var8 = 277;
- Login.__cu_ax = var15 >= var7 && var15 < var7 + class168.__fs_au && var16 >= var8 && var16 < var8 + GroundItemPile.__dr_ao;
- if(var3 == 1 && Login.__cu_ax) {
+ var18 = Varps.__hv_h + 24;
+ var19 = 277;
+ Login.__cu_ax = var2 >= var18 && var2 < var18 + class168.__fs_au && var17 >= var19 && var17 < var19 + GroundItemPile.__dr_ao;
+ if(var1 == 1 && Login.__cu_ax) {
ReflectionCheck.clientPreferences.hideUsername = !ReflectionCheck.clientPreferences.hideUsername;
if(!ReflectionCheck.clientPreferences.hideUsername) {
Login.Login_username = "";
@@ -331,11 +245,11 @@ public final class class54 {
while(true) {
while(Decimator.method2490()) {
- var9 = false;
+ var10 = false;
- for(var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".length(); ++var10) {
- if(GzipDecompressor.__go_ck == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".charAt(var10)) {
- var9 = true;
+ for(var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".length(); ++var11) {
+ if(GzipDecompressor.__go_ck == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".charAt(var11)) {
+ var10 = true;
break;
}
}
@@ -356,7 +270,7 @@ public final class class54 {
Login.currentLoginField = 1;
}
- if(var9 && Login.Login_username.length() < 320) {
+ if(var10 && Login.Login_username.length() < 320) {
Login.Login_username = Login.Login_username + GzipDecompressor.__go_ck;
}
} else if(Login.currentLoginField == 1) {
@@ -386,7 +300,7 @@ public final class class54 {
return;
}
- if(var9 && Login.Login_password.length() < 20) {
+ if(var10 && Login.Login_password.length() < 20) {
Login.Login_password = Login.Login_password + GzipDecompressor.__go_ck;
}
}
@@ -394,26 +308,28 @@ public final class class54 {
return;
}
- } else if(Login.loginIndex == 3) {
- var18 = Login.__cu_y + 180;
- var20 = 276;
- if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+ }
+
+ if(Login.loginIndex == 3) {
+ var20 = Login.__cu_y + 180;
+ var9 = 276;
+ if(var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
MouseHandler.method1084(false);
}
- var18 = Login.__cu_y + 180;
- var20 = 326;
- if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+ var20 = Login.__cu_y + 180;
+ var9 = 326;
+ if(var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
Login.loginIndex = 5;
return;
}
} else {
- int var22;
+ int var13;
if(Login.loginIndex == 4) {
- var18 = Login.__cu_y + 180 - 80;
- var20 = 321;
- if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+ var20 = Login.__cu_y + 180 - 80;
+ var9 = 321;
+ if(var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
Login.otp.trim();
if(Login.otp.length() != 6) {
method1089("", "Please enter a 6-digit PIN.", "");
@@ -428,16 +344,16 @@ public final class class54 {
return;
}
- if(var3 == 1 && var15 >= Login.__cu_y + 180 - 9 && var15 <= Login.__cu_y + 180 + 130 && var16 >= 263 && var16 <= 296) {
+ if(var1 == 1 && var2 >= Login.__cu_y + 180 - 9 && var2 <= Login.__cu_y + 180 + 130 && var17 >= 263 && var17 <= 296) {
Login.__cu_ba = !Login.__cu_ba;
}
- if(var3 == 1 && var15 >= Login.__cu_y + 180 - 34 && var15 <= Login.__cu_y + 34 + 180 && var16 >= 351 && var16 <= 363) {
+ if(var1 == 1 && var2 >= Login.__cu_y + 180 - 34 && var2 <= Login.__cu_y + 34 + 180 && var17 >= 351 && var17 <= 363) {
WorldMapCacheName.method635(Message.method1227("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false);
}
- var18 = Login.__cu_y + 180 + 80;
- if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+ var20 = Login.__cu_y + 180 + 80;
+ if(var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
Login.loginIndex = 0;
Login.Login_username = "";
Login.Login_password = "";
@@ -446,11 +362,11 @@ public final class class54 {
}
while(Decimator.method2490()) {
- boolean var21 = false;
+ boolean var14 = false;
- for(var22 = 0; var22 < "1234567890".length(); ++var22) {
- if(GzipDecompressor.__go_ck == "1234567890".charAt(var22)) {
- var21 = true;
+ for(var13 = 0; var13 < "1234567890".length(); ++var13) {
+ if(GzipDecompressor.__go_ck == "1234567890".charAt(var13)) {
+ var14 = true;
break;
}
}
@@ -481,38 +397,38 @@ public final class class54 {
return;
}
- if(var21 && Login.otp.length() < 6) {
+ if(var14 && Login.otp.length() < 6) {
Login.otp = Login.otp + GzipDecompressor.__go_ck;
}
}
}
} else if(Login.loginIndex == 5) {
- var18 = Login.__cu_y + 180 - 80;
- var20 = 321;
- if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
- NpcDefinition.method5162();
+ var20 = Login.__cu_y + 180 - 80;
+ var9 = 321;
+ if(var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
+ NPCDefinition.method5162();
return;
}
- var18 = Login.__cu_y + 180 + 80;
- if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+ var20 = Login.__cu_y + 180 + 80;
+ if(var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
MouseHandler.method1084(true);
}
- var8 = 361;
+ var19 = 361;
if(UrlRequester.__eo_ak != null) {
- var22 = UrlRequester.__eo_ak.__q / 2;
- if(var3 == 1 && var15 >= UrlRequester.__eo_ak.__m - var22 && var15 <= var22 + UrlRequester.__eo_ak.__m && var16 >= var8 - 15 && var16 < var8) {
+ var13 = UrlRequester.__eo_ak.__q / 2;
+ if(var1 == 1 && var2 >= UrlRequester.__eo_ak.__m - var13 && var2 <= var13 + UrlRequester.__eo_ak.__m && var17 >= var19 - 15 && var17 < var19) {
WorldMapCacheName.method635(Message.method1227("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false);
}
}
while(Decimator.method2490()) {
- var9 = false;
+ var10 = false;
- for(var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".length(); ++var10) {
- if(GzipDecompressor.__go_ck == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".charAt(var10)) {
- var9 = true;
+ for(var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".length(); ++var11) {
+ if(GzipDecompressor.__go_ck == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".charAt(var11)) {
+ var10 = true;
break;
}
}
@@ -525,84 +441,88 @@ public final class class54 {
}
if(IndexStoreAction.__ik_cn == 84) {
- NpcDefinition.method5162();
+ NPCDefinition.method5162();
return;
}
- if(var9 && Login.Login_username.length() < 320) {
+ if(var10 && Login.Login_username.length() < 320) {
Login.Login_username = Login.Login_username + GzipDecompressor.__go_ck;
}
}
}
- } else if(Login.loginIndex == 6) {
- while(true) {
- do {
- if(!Decimator.method2490()) {
- var19 = 321;
- if(var3 == 1 && var16 >= var19 - 20 && var16 <= var19 + 20) {
- MouseHandler.method1084(true);
+ } else {
+ if(Login.loginIndex == 6) {
+ while(true) {
+ do {
+ if(!Decimator.method2490()) {
+ var12 = 321;
+ if(var1 == 1 && var17 >= var12 - 20 && var17 <= var12 + 20) {
+ MouseHandler.method1084(true);
+ }
+
+ return;
}
+ } while(IndexStoreAction.__ik_cn != 84 && IndexStoreAction.__ik_cn != 13);
- return;
- }
- } while(IndexStoreAction.__ik_cn != 84 && IndexStoreAction.__ik_cn != 13);
-
- MouseHandler.method1084(true);
- }
- } else if(Login.loginIndex == 7) {
- var18 = Login.__cu_y + 180 - 80;
- var20 = 321;
- if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
- WorldMapCacheName.method635(Message.method1227("secure", true) + "m=dob/set_dob.ws", true, false);
- method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
- Login.loginIndex = 6;
- return;
+ MouseHandler.method1084(true);
+ }
}
- var18 = Login.__cu_y + 180 + 80;
- if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
- MouseHandler.method1084(true);
- }
- } else if(Login.loginIndex == 8) {
- var18 = Login.__cu_y + 180 - 80;
- var20 = 321;
- if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
- WorldMapCacheName.method635("https://www.jagex.com/terms/privacy/#eight", true, false);
- method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
- Login.loginIndex = 6;
- return;
- }
+ if(Login.loginIndex == 7) {
+ var20 = Login.__cu_y + 180 - 80;
+ var9 = 321;
+ if(var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
+ WorldMapCacheName.method635(Message.method1227("secure", true) + "m=dob/set_dob.ws", true, false);
+ method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
+ Login.loginIndex = 6;
+ return;
+ }
- var18 = Login.__cu_y + 180 + 80;
- if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
- MouseHandler.method1084(true);
- }
- } else if(Login.loginIndex == 12) {
- String var14 = "";
- switch(Login.__cu_aj) {
- case 0:
- var14 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans";
- break;
- case 1:
- var14 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked";
- break;
- default:
- MouseHandler.method1084(false);
- }
+ var20 = Login.__cu_y + 180 + 80;
+ if(var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
+ MouseHandler.method1084(true);
+ }
+ } else if(Login.loginIndex == 8) {
+ var20 = Login.__cu_y + 180 - 80;
+ var9 = 321;
+ if(var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
+ WorldMapCacheName.method635("https://www.jagex.com/terms/privacy/#eight", true, false);
+ method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
+ Login.loginIndex = 6;
+ return;
+ }
- var7 = Login.__cu_y + 180;
- var8 = 276;
- if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
- WorldMapCacheName.method635(var14, true, false);
- method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
- Login.loginIndex = 6;
- return;
- }
+ var20 = Login.__cu_y + 180 + 80;
+ if(var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
+ MouseHandler.method1084(true);
+ }
+ } else if(Login.loginIndex == 12) {
+ String var21 = "";
+ switch(Login.__cu_aj) {
+ case 0:
+ var21 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans";
+ break;
+ case 1:
+ var21 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked";
+ break;
+ default:
+ MouseHandler.method1084(false);
+ }
- var7 = Login.__cu_y + 180;
- var8 = 326;
- if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
- MouseHandler.method1084(false);
+ var18 = Login.__cu_y + 180;
+ var19 = 276;
+ if(var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) {
+ WorldMapCacheName.method635(var21, true, false);
+ method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
+ Login.loginIndex = 6;
+ return;
+ }
+
+ var18 = Login.__cu_y + 180;
+ var19 = 326;
+ if(var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) {
+ MouseHandler.method1084(false);
+ }
}
}
}
@@ -615,22 +535,84 @@ public final class class54 {
}
}
- var18 = Varps.__hv_h - 80;
- var20 = 321;
- if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+ var20 = Varps.__hv_h - 80;
+ var9 = 321;
+ if(var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
MouseHandler.method1084(false);
}
- var18 = Varps.__hv_h + 80;
- if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+ var20 = Varps.__hv_h + 80;
+ if(var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
Login.loginIndex = 0;
}
}
}
+ }
+ }
+ } else {
+ while(true) {
+ if(!Decimator.method2490()) {
+ if(MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.__lp_ca && MouseHandler.MouseHandler_lastButton == 4) {
+ int var3 = Login.__cu_q + 280;
+ if(MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+ Interpreter.method1975(0, 0);
+ } else if(MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+ Interpreter.method1975(0, 1);
+ } else {
+ int var4 = Login.__cu_q + 390;
+ if(MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+ Interpreter.method1975(1, 0);
+ } else if(MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+ Interpreter.method1975(1, 1);
+ } else {
+ var1 = Login.__cu_q + 500;
+ if(MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+ Interpreter.method1975(2, 0);
+ } else if(MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+ Interpreter.method1975(2, 1);
+ } else {
+ var2 = Login.__cu_q + 610;
+ if(MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+ Interpreter.method1975(3, 0);
+ } else if(MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+ Interpreter.method1975(3, 1);
+ } else if(MouseHandler.MouseHandler_lastPressedX >= Login.__cu_q + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.__cu_q + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) {
+ FontName.method5636();
+ } else if(Login.__cu_bl != -1) {
+ World var5 = ItemContainer.worlds[Login.__cu_bl];
+ class31.changeWorld(var5);
+ FontName.method5636();
+ } else {
+ if(Login.__cu_br > 0 && SecureRandomFuture.__cn_bu != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= SecureRandomFuture.__cn_bu.subWidth && MouseHandler.MouseHandler_lastPressedY >= Huffman.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Huffman.canvasHeight / 2 + 50) {
+ --Login.__cu_br;
+ }
+ if(Login.__cu_br < Login.__cu_bj && NetSocket.__fb_bm != null && MouseHandler.MouseHandler_lastPressedX >= SoundCache.canvasWidth - NetSocket.__fb_bm.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= SoundCache.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= Huffman.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Huffman.canvasHeight / 2 + 50) {
+ ++Login.__cu_br;
+ }
+ }
+ }
+ }
+ }
+ }
+ break;
+ }
+
+ if(IndexStoreAction.__ik_cn == 13) {
+ FontName.method5636();
+ break;
+ }
+
+ if(IndexStoreAction.__ik_cn == 96) {
+ if(Login.__cu_br > 0 && SecureRandomFuture.__cn_bu != null) {
+ --Login.__cu_br;
+ }
+ } else if(IndexStoreAction.__ik_cn == 97 && Login.__cu_br < Login.__cu_bj && NetSocket.__fb_bm != null) {
+ ++Login.__cu_br;
}
}
}
+
}
@ObfuscatedName("d")
@@ -653,21 +635,21 @@ public final class class54 {
int var3;
if(var0 == 6600) {
var3 = SoundSystem.plane;
- int var9 = (Canvas.localPlayer.x >> 7) + class50.baseX;
- int var5 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
- BufferedFile.worldMap().__a_525(var3, var9, var5, true);
+ int var13 = (Canvas.localPlayer.x >> 7) + class50.baseX;
+ int var16 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
+ BufferedFile.worldMap().__a_525(var3, var13, var16, true);
return 1;
} else {
- WorldMapArea var11;
+ WorldMapArea var4;
if(var0 == 6601) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- String var16 = "";
- var11 = BufferedFile.worldMap().getMapArea(var3);
- if(var11 != null) {
- var16 = var11.name();
+ String var14 = "";
+ var4 = BufferedFile.worldMap().getMapArea(var3);
+ if(var4 != null) {
+ var14 = var4.name();
}
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16;
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var14;
return 1;
} else if(var0 == 6602) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
@@ -684,85 +666,85 @@ public final class class54 {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCacheLoaded()?1:0;
return 1;
} else {
- TileLocation var15;
+ TileLocation var5;
if(var0 == 6606) {
- var15 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
- BufferedFile.worldMap().setWorldMapPositionTarget(var15.x, var15.y);
+ var5 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
+ BufferedFile.worldMap().setWorldMapPositionTarget(var5.x, var5.y);
return 1;
} else if(var0 == 6607) {
- var15 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
- BufferedFile.worldMap().__aw_531(var15.x, var15.y);
+ var5 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
+ BufferedFile.worldMap().__aw_531(var5.x, var5.y);
return 1;
} else if(var0 == 6608) {
- var15 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
- BufferedFile.worldMap().__al_532(var15.plane, var15.x, var15.y);
+ var5 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
+ BufferedFile.worldMap().__al_532(var5.plane, var5.x, var5.y);
return 1;
} else if(var0 == 6609) {
- var15 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
- BufferedFile.worldMap().__ab_533(var15.plane, var15.x, var15.y);
+ var5 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
+ BufferedFile.worldMap().__ab_533(var5.plane, var5.x, var5.y);
return 1;
} else if(var0 == 6610) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__ae_534();
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__at_535();
return 1;
} else {
- WorldMapArea var13;
+ WorldMapArea var6;
if(var0 == 6611) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var13 = BufferedFile.worldMap().getMapArea(var3);
- if(var13 == null) {
+ var6 = BufferedFile.worldMap().getMapArea(var3);
+ if(var6 == null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
} else {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var13.origin().packed();
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.origin().packed();
}
return 1;
} else if(var0 == 6612) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var13 = BufferedFile.worldMap().getMapArea(var3);
- if(var13 == null) {
+ var6 = BufferedFile.worldMap().getMapArea(var3);
+ if(var6 == null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
} else {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (var13.maxX() - var13.minX() + 1) * 64;
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (var13.maxY() - var13.minY() + 1) * 64;
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (var6.maxX() - var6.minX() + 1) * 64;
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (var6.maxY() - var6.minY() + 1) * 64;
}
return 1;
} else if(var0 == 6613) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var13 = BufferedFile.worldMap().getMapArea(var3);
- if(var13 == null) {
+ var6 = BufferedFile.worldMap().getMapArea(var3);
+ if(var6 == null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
} else {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var13.minX() * 64;
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var13.minY() * 64;
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var13.maxX() * 64 + 64 - 1;
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var13.maxY() * 64 + 64 - 1;
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.minX() * 64;
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.minY() * 64;
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.maxX() * 64 + 64 - 1;
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.maxY() * 64 + 64 - 1;
}
return 1;
} else if(var0 == 6614) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var13 = BufferedFile.worldMap().getMapArea(var3);
- if(var13 == null) {
+ var6 = BufferedFile.worldMap().getMapArea(var3);
+ if(var6 == null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
} else {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var13.zoom();
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.zoom();
}
return 1;
} else if(var0 == 6615) {
- var15 = BufferedFile.worldMap().__ad_536();
- if(var15 == null) {
+ var5 = BufferedFile.worldMap().__ad_536();
+ if(var5 == null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
} else {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var15.x;
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var15.y;
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var5.x;
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var5.y;
}
return 1;
@@ -770,20 +752,20 @@ public final class class54 {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = BufferedFile.worldMap().currentMapAreaId();
return 1;
} else if(var0 == 6617) {
- var15 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
- var13 = BufferedFile.worldMap().getCurrentMapArea();
- if(var13 == null) {
+ var5 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
+ var6 = BufferedFile.worldMap().getCurrentMapArea();
+ if(var6 == null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
return 1;
} else {
- int[] var14 = var13.position(var15.plane, var15.x, var15.y);
- if(var14 == null) {
+ int[] var15 = var6.position(var5.plane, var5.x, var5.y);
+ if(var15 == null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
} else {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var14[0];
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var14[1];
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var15[0];
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var15[1];
}
return 1;
@@ -791,14 +773,14 @@ public final class class54 {
} else {
TileLocation var7;
if(var0 == 6618) {
- var15 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
- var13 = BufferedFile.worldMap().getCurrentMapArea();
- if(var13 == null) {
+ var5 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
+ var6 = BufferedFile.worldMap().getCurrentMapArea();
+ if(var6 == null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
return 1;
} else {
- var7 = var13.coord(var15.x, var15.y);
+ var7 = var6.coord(var5.x, var5.y);
if(var7 == null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
} else {
@@ -808,29 +790,29 @@ public final class class54 {
return 1;
}
} else {
- TileLocation var12;
+ TileLocation var8;
if(var0 == 6619) {
class179.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var12 = new TileLocation(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]);
- TotalQuantityComparator.method96(var3, var12, false);
+ var8 = new TileLocation(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]);
+ TotalQuantityComparator.method96(var3, var8, false);
return 1;
} else if(var0 == 6620) {
class179.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var12 = new TileLocation(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]);
- TotalQuantityComparator.method96(var3, var12, true);
+ var8 = new TileLocation(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]);
+ TotalQuantityComparator.method96(var3, var8, true);
return 1;
} else if(var0 == 6621) {
class179.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var12 = new TileLocation(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]);
- var11 = BufferedFile.worldMap().getMapArea(var3);
- if(var11 == null) {
+ var8 = new TileLocation(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]);
+ var4 = BufferedFile.worldMap().getMapArea(var3);
+ if(var4 == null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
return 1;
} else {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y)?1:0;
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var4.containsCoord(var8.plane, var8.x, var8.y)?1:0;
return 1;
}
} else if(var0 == 6622) {
@@ -838,12 +820,12 @@ public final class class54 {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__as_538();
return 1;
} else if(var0 == 6623) {
- var15 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
- var13 = BufferedFile.worldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y);
- if(var13 == null) {
+ var5 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
+ var6 = BufferedFile.worldMap().mapAreaAtCoord(var5.plane, var5.x, var5.y);
+ if(var6 == null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
} else {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var13.id();
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.id();
}
return 1;
@@ -860,10 +842,10 @@ public final class class54 {
BufferedFile.worldMap().__au_542();
return 1;
} else {
- boolean var10;
+ boolean var9;
if(var0 == 6628) {
- var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- BufferedFile.worldMap().perpetualFlash(var10);
+ var9 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ BufferedFile.worldMap().perpetualFlash(var9);
return 1;
} else if(var0 == 6629) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
@@ -877,22 +859,22 @@ public final class class54 {
BufferedFile.worldMap().stopCurrentFlashes();
return 1;
} else if(var0 == 6632) {
- var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
- BufferedFile.worldMap().setElementsEnabled(var10);
+ var9 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
+ BufferedFile.worldMap().setElementsEnabled(var9);
return 1;
} else {
- boolean var4;
+ boolean var10;
if(var0 == 6633) {
class179.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1] == 1;
- BufferedFile.worldMap().disableElement(var3, var4);
+ var10 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1] == 1;
+ BufferedFile.worldMap().disableElement(var3, var10);
return 1;
} else if(var0 == 6634) {
class179.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1] == 1;
- BufferedFile.worldMap().disableCategory(var3, var4);
+ var10 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1] == 1;
+ BufferedFile.worldMap().disableCategory(var3, var10);
return 1;
} else if(var0 == 6635) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getElementsEnabled()?1:0;
@@ -908,8 +890,8 @@ public final class class54 {
} else if(var0 == 6638) {
class179.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
- var12 = new TileLocation(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]);
- var7 = BufferedFile.worldMap().__bc_545(var3, var12);
+ var8 = new TileLocation(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]);
+ var7 = BufferedFile.worldMap().__bc_545(var3, var8);
if(var7 == null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
} else {
@@ -918,63 +900,63 @@ public final class class54 {
return 1;
} else {
- AbstractWorldMapIcon var8;
+ AbstractWorldMapIcon var11;
if(var0 == 6639) {
- var8 = BufferedFile.worldMap().iconStart();
- if(var8 == null) {
+ var11 = BufferedFile.worldMap().iconStart();
+ if(var11 == null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
} else {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var8.__m_15();
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var8.coord2.packed();
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.__m_15();
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.coord2.packed();
}
return 1;
} else if(var0 == 6640) {
- var8 = BufferedFile.worldMap().iconNext();
- if(var8 == null) {
+ var11 = BufferedFile.worldMap().iconNext();
+ if(var11 == null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
} else {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var8.__m_15();
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var8.coord2.packed();
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.__m_15();
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.coord2.packed();
}
return 1;
} else {
- WorldMapElement var6;
+ WorldMapElement var12;
if(var0 == 6693) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var6 = ViewportMouse.getWorldMapElement(var3);
- if(var6.__l == null) {
+ var12 = ViewportMouse.getWorldMapElement(var3);
+ if(var12.__l == null) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
} else {
- Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.__l;
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12.__l;
}
return 1;
} else if(var0 == 6694) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var6 = ViewportMouse.getWorldMapElement(var3);
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.textSize;
+ var12 = ViewportMouse.getWorldMapElement(var3);
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var12.textSize;
return 1;
} else if(var0 == 6695) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var6 = ViewportMouse.getWorldMapElement(var3);
- if(var6 == null) {
+ var12 = ViewportMouse.getWorldMapElement(var3);
+ if(var12 == null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
} else {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.category;
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var12.category;
}
return 1;
} else if(var0 == 6696) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
- var6 = ViewportMouse.getWorldMapElement(var3);
- if(var6 == null) {
+ var12 = ViewportMouse.getWorldMapElement(var3);
+ if(var12 == null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
} else {
- Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.sprite1;
+ Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var12.sprite1;
}
return 1;
@@ -1082,44 +1064,44 @@ public final class class54 {
}
}
- short var10 = -1;
+ short var11 = -1;
if(KeyHandler.KeyHandler_pressedKeys[33]) {
- var10 = 0;
+ var11 = 0;
} else if(KeyHandler.KeyHandler_pressedKeys[49]) {
- var10 = 1024;
+ var11 = 1024;
}
if(KeyHandler.KeyHandler_pressedKeys[48]) {
- if(var10 == 0) {
- var10 = 1792;
- } else if(var10 == 1024) {
- var10 = 1280;
+ if(var11 == 0) {
+ var11 = 1792;
+ } else if(var11 == 1024) {
+ var11 = 1280;
} else {
- var10 = 1536;
+ var11 = 1536;
}
} else if(KeyHandler.KeyHandler_pressedKeys[50]) {
- if(var10 == 0) {
- var10 = 256;
- } else if(var10 == 1024) {
- var10 = 768;
+ if(var11 == 0) {
+ var11 = 256;
+ } else if(var11 == 1024) {
+ var11 = 768;
} else {
- var10 = 512;
+ var11 = 512;
}
}
- byte var11 = 0;
+ byte var10 = 0;
if(KeyHandler.KeyHandler_pressedKeys[35]) {
- var11 = -1;
+ var10 = -1;
} else if(KeyHandler.KeyHandler_pressedKeys[51]) {
- var11 = 1;
+ var10 = 1;
}
var2 = 0;
- if(var10 >= 0 || var11 != 0) {
+ if(var11 >= 0 || var10 != 0) {
var2 = KeyHandler.KeyHandler_pressedKeys[81]?Client.__client_in:Client.oculusOrbNormalSpeed;
var2 *= 16;
- Client.__client_hk = var10;
- Client.__client_if = var11;
+ Client.__client_hk = var11;
+ Client.__client_if = var10;
}
if(Client.__client_hc < var2) {
diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java
index d42b1a1296..7b1b5a7db0 100644
--- a/runescape-client/src/main/java/class65.java
+++ b/runescape-client/src/main/java/class65.java
@@ -39,17 +39,17 @@ public class class65 extends class179 {
int var3;
int var4;
int var5;
- int var7;
+ int var6;
if(var0.__cr >= Client.cycle) {
if(var0.__cr == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > WorldMapAreaData.getSequenceDefinition(var0.sequence).frameLengths[var0.sequenceFrame]) {
var2 = var0.__cr - var0.__bw;
var3 = Client.cycle - var0.__bw;
var4 = var0.__bf * 128 + var0.size * 64;
var5 = var0.__be * 128 + var0.size * 64;
- int var6 = var0.__bh * 128 + var0.size * 64;
- var7 = var0.__bv * 128 + var0.size * 64;
- var0.x = (var3 * var6 + var4 * (var2 - var3)) / var2;
- var0.y = (var3 * var7 + var5 * (var2 - var3)) / var2;
+ int var7 = var0.__bh * 128 + var0.size * 64;
+ var6 = var0.__bv * 128 + var0.size * 64;
+ var0.x = (var3 * var7 + var4 * (var2 - var3)) / var2;
+ var0.y = (var3 * var6 + var5 * (var2 - var3)) / var2;
}
var0.__cq = 0;
@@ -60,17 +60,17 @@ public class class65 extends class179 {
if(var0.pathLength == 0) {
var0.__cq = 0;
} else {
- label310: {
+ label225: {
if(var0.sequence != -1 && var0.sequenceDelay == 0) {
SequenceDefinition var11 = WorldMapAreaData.getSequenceDefinition(var0.sequence);
if(var0.__ch > 0 && var11.__j == 0) {
++var0.__cq;
- break label310;
+ break label225;
}
if(var0.__ch <= 0 && var11.__s == 0) {
++var0.__cq;
- break label310;
+ break label225;
}
}
@@ -102,17 +102,17 @@ public class class65 extends class179 {
byte var12 = var0.pathTraversed[var0.pathLength - 1];
if(var4 - var2 <= 256 && var4 - var2 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) {
- var7 = var0.orientation - var0.__ac & 2047;
- if(var7 > 1024) {
- var7 -= 2048;
+ var6 = var0.orientation - var0.__ac & 2047;
+ if(var6 > 1024) {
+ var6 -= 2048;
}
int var8 = var0.walkTurnSequence;
- if(var7 >= -256 && var7 <= 256) {
+ if(var6 >= -256 && var6 <= 256) {
var8 = var0.walkSequence;
- } else if(var7 >= 256 && var7 < 768) {
+ } else if(var6 >= 256 && var6 < 768) {
var8 = var0.walkTurnRightSequence;
- } else if(var7 >= -768 && var7 <= -256) {
+ } else if(var6 >= -768 && var6 <= -256) {
var8 = var0.walkTurnLeftSequence;
}
@@ -123,8 +123,8 @@ public class class65 extends class179 {
var0.movementSequence = var8;
int var9 = 4;
boolean var10 = true;
- if(var0 instanceof Npc) {
- var10 = ((Npc)var0).definition.isClickable;
+ if(var0 instanceof NPC) {
+ var10 = ((NPC)var0).definition.isClickable;
}
if(var10) {
diff --git a/runescape-client/src/main/java/class68.java b/runescape-client/src/main/java/class68.java
index b72668100c..0700d0f805 100644
--- a/runescape-client/src/main/java/class68.java
+++ b/runescape-client/src/main/java/class68.java
@@ -130,7 +130,7 @@ public final class class68 extends Node {
}
}
}
-
}
+
}
}
diff --git a/runescape-client/src/main/java/class72.java b/runescape-client/src/main/java/class72.java
index e93de12f7d..227853bb12 100644
--- a/runescape-client/src/main/java/class72.java
+++ b/runescape-client/src/main/java/class72.java
@@ -142,11 +142,11 @@ public class class72 {
this.field1013 = new int[256];
this.field1010 = 0;
- this.field1004 = new int['耀'];
- this.field1018 = new int['耀'];
+ this.field1004 = new int[32768];
+ this.field1018 = new int[32768];
this.method1779((IndexedSprite)null);
- this.field1011 = new int['耀'];
- this.field1012 = new int['耀'];
+ this.field1011 = new int[32768];
+ this.field1012 = new int[32768];
}
@ObfuscatedName("f")
@@ -212,30 +212,30 @@ public class class72 {
int var3 = var1 * 128;
int var4 = (256 - var1) * 128;
- int var6;
- for(int var5 = 0; var5 < var4; ++var5) {
- var6 = this.field1011[var3 + var2] - this.field1004[var2 + this.field1010 & this.field1004.length - 1] * var1 / 6;
- if(var6 < 0) {
- var6 = 0;
+ int var5;
+ for(int var6 = 0; var6 < var4; ++var6) {
+ var5 = this.field1011[var3 + var2] - this.field1004[var2 + this.field1010 & this.field1004.length - 1] * var1 / 6;
+ if(var5 < 0) {
+ var5 = 0;
}
- this.field1011[var2++] = var6;
+ this.field1011[var2++] = var5;
}
byte var15 = 10;
- var6 = 128 - var15;
+ var5 = 128 - var15;
int var7;
- int var10;
+ int var8;
for(var7 = 256 - var1; var7 < 256; ++var7) {
- int var8 = var7 * 128;
+ int var9 = var7 * 128;
- for(int var9 = 0; var9 < 128; ++var9) {
- var10 = (int)(Math.random() * 100.0D);
- if(var10 < 50 && var9 > var15 && var9 < var6) {
- this.field1011[var9 + var8] = 255;
+ for(int var10 = 0; var10 < 128; ++var10) {
+ var8 = (int)(Math.random() * 100.0D);
+ if(var8 < 50 && var10 > var15 && var10 < var5) {
+ this.field1011[var10 + var9] = 255;
} else {
- this.field1011[var9 + var8] = 0;
+ this.field1011[var10 + var9] = 0;
}
}
}
@@ -273,13 +273,13 @@ public class class72 {
if(var7 > 0) {
short var16 = 128;
byte var17 = 2;
- var10 = 128 - var17 - var17;
+ var8 = 128 - var17 - var17;
int var11;
int var12;
int var13;
for(var11 = 0; var11 < this.field1016 * 100; ++var11) {
- var12 = (int)(Math.random() * (double)var10) + var17;
+ var12 = (int)(Math.random() * (double)var8) + var17;
var13 = (int)(Math.random() * (double)var16) + var16;
this.field1011[var12 + (var13 << 7)] = 192;
}
@@ -449,9 +449,9 @@ public class class72 {
}
}
- int[] var8 = this.field1004;
+ int[] var6 = this.field1004;
this.field1004 = this.field1018;
- this.field1018 = var8;
+ this.field1018 = var6;
}
if(var1 != null) {
@@ -461,8 +461,8 @@ public class class72 {
for(var4 = 0; var4 < var1.subWidth; ++var4) {
if(var1.pixels[var2++] != 0) {
var5 = var4 + var1.xOffset + 16;
- int var6 = var3 + var1.yOffset + 16;
- int var7 = var5 + (var6 << 7);
+ int var8 = var3 + var1.yOffset + 16;
+ int var7 = var5 + (var8 << 7);
this.field1004[var7] = 0;
}
}
@@ -526,56 +526,56 @@ public class class72 {
var9.__s_297(var5.array, 0, var5.index);
var9.writeShort(var8.index);
var9.__s_297(var8.array, 0, var8.index);
- byte[] var11 = var9.array;
- int var13 = var11.length;
- StringBuilder var14 = new StringBuilder();
+ byte[] var10 = var9.array;
+ int var11 = var10.length;
+ StringBuilder var12 = new StringBuilder();
- int var17;
- for(int var15 = 0; var15 < var13 + 0; var15 += 3) {
- int var16 = var11[var15] & 255;
- var14.append(class307.__kc_m[var16 >>> 2]);
- if(var15 < var13 - 1) {
- var17 = var11[var15 + 1] & 255;
- var14.append(class307.__kc_m[(var16 & 3) << 4 | var17 >>> 4]);
- if(var15 < var13 - 2) {
- int var18 = var11[var15 + 2] & 255;
- var14.append(class307.__kc_m[(var17 & 15) << 2 | var18 >>> 6]).append(class307.__kc_m[var18 & 63]);
+ int var13;
+ for(int var14 = 0; var14 < var11 + 0; var14 += 3) {
+ int var15 = var10[var14] & 255;
+ var12.append(class307.__kc_m[var15 >>> 2]);
+ if(var14 < var11 - 1) {
+ var13 = var10[var14 + 1] & 255;
+ var12.append(class307.__kc_m[(var15 & 3) << 4 | var13 >>> 4]);
+ if(var14 < var11 - 2) {
+ int var16 = var10[var14 + 2] & 255;
+ var12.append(class307.__kc_m[(var13 & 15) << 2 | var16 >>> 6]).append(class307.__kc_m[var16 & 63]);
} else {
- var14.append(class307.__kc_m[(var17 & 15) << 2]).append("=");
+ var12.append(class307.__kc_m[(var13 & 15) << 2]).append("=");
}
} else {
- var14.append(class307.__kc_m[(var16 & 3) << 4]).append("==");
+ var12.append(class307.__kc_m[(var15 & 3) << 4]).append("==");
}
}
- String var12 = var14.toString();
- var12 = var12;
+ String var21 = var12.toString();
+ var21 = var21;
try {
- URL var19 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws");
- URLConnection var24 = var19.openConnection();
- var24.setDoInput(true);
- var24.setDoOutput(true);
- var24.setConnectTimeout(5000);
- OutputStreamWriter var20 = new OutputStreamWriter(var24.getOutputStream());
- var20.write("data2=" + class306.method5781(var12) + "&dest=" + class306.method5781("passwordchoice.ws"));
- var20.flush();
- InputStream var21 = var24.getInputStream();
+ URL var22 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws");
+ URLConnection var23 = var22.openConnection();
+ var23.setDoInput(true);
+ var23.setDoOutput(true);
+ var23.setConnectTimeout(5000);
+ OutputStreamWriter var17 = new OutputStreamWriter(var23.getOutputStream());
+ var17.write("data2=" + class306.method5781(var21) + "&dest=" + class306.method5781("passwordchoice.ws"));
+ var17.flush();
+ InputStream var18 = var23.getInputStream();
var9 = new Buffer(new byte[1000]);
do {
- var17 = var21.read(var9.array, var9.index, 1000 - var9.index);
- if(var17 == -1) {
- var20.close();
- var21.close();
- String var22 = new String(var9.array);
- if(var22.startsWith("OFFLINE")) {
+ var13 = var18.read(var9.array, var9.index, 1000 - var9.index);
+ if(var13 == -1) {
+ var17.close();
+ var18.close();
+ String var19 = new String(var9.array);
+ if(var19.startsWith("OFFLINE")) {
return 4;
- } else if(var22.startsWith("WRONG")) {
+ } else if(var19.startsWith("WRONG")) {
return 7;
- } else if(var22.startsWith("RELOAD")) {
+ } else if(var19.startsWith("RELOAD")) {
return 3;
- } else if(var22.startsWith("Not permitted for social network accounts.")) {
+ } else if(var19.startsWith("Not permitted for social network accounts.")) {
return 6;
} else {
var9.xteaDecryptAll(var6);
@@ -584,9 +584,9 @@ public class class72 {
--var9.index;
}
- var22 = new String(var9.array, 0, var9.index);
- if(class83.method2026(var22)) {
- WorldMapCacheName.method635(var22, true, false);
+ var19 = new String(var9.array, 0, var9.index);
+ if(class83.method2026(var19)) {
+ WorldMapCacheName.method635(var19, true, false);
return 2;
} else {
return 5;
@@ -594,12 +594,12 @@ public class class72 {
}
}
- var9.index += var17;
+ var9.index += var13;
} while(var9.index < 1000);
return 5;
- } catch (Throwable var23) {
- var23.printStackTrace();
+ } catch (Throwable var20) {
+ var20.printStackTrace();
return 5;
}
}
diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java
index 61022cc1b2..cc827eb907 100644
--- a/runescape-client/src/main/java/class80.java
+++ b/runescape-client/src/main/java/class80.java
@@ -12,11 +12,6 @@ public class class80 {
@Export("__ce_u")
static final BigInteger __ce_u;
- static {
- __ce_o = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049");
- __ce_u = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683");
- }
-
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "(I)V",
@@ -43,5 +38,11 @@ public class class80 {
UserComparator9.method3343(true);
Login.__cu_f = false;
}
+
+ }
+
+ static {
+ __ce_o = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049");
+ __ce_u = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683");
}
}
diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java
index 0672aea3fe..4f7da9683a 100644
--- a/runescape-client/src/main/java/class83.java
+++ b/runescape-client/src/main/java/class83.java
@@ -21,11 +21,6 @@ public class class83 {
@Export("__cm_e")
public static int __cm_e;
- static {
- __cm_m = new BigInteger("10001", 16);
- __cm_f = new BigInteger("a181e4c9b7c4ae27afa67c87f25364d4edaaca3c4469db685caeb364d37584dadb6c61e33782065de4e6895674c56f0facf0672cab09e95c02c2862a7501ba4f2ac713a3153c137f4c69f0a3c2fc674fa5f43dfa956f2ab98d300c9af3c98fba50a132170a7623fbb29b6fc48710e2f7e1abaf23b3eb3f825cb6fef68e63b934d4c4bf0f3a6a7fdde7716a67944a11df711adc5994597ca1e0603fac548300b8a060b37ebec3a711ce9e112bfa70dd01eadbee6b787daffe299ad501b6ef9937deefe969882c7c20bee7b3a956c9e921a1a7539ac501d86576b1ceea6a07b9f0c7e31fce121008821aa6b752cac49f20c42c2c4e84caf93165af6d2b32211257", 16);
- }
-
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(III)I",
@@ -62,4 +57,9 @@ public class class83 {
public static IndexedSprite method2028(AbstractIndexCache var0, int var1) {
return !class179.method3643(var0, var1)?null:ServerPacket.method3663();
}
+
+ static {
+ __cm_m = new BigInteger("10001", 16);
+ __cm_f = new BigInteger("db7adc8af6f44b1359c5d1701d6bddc3eb47ce3ff2c690521ec8a9ea27525bf69263cea25648540cb572db8c703eeab85e740d1b44342555ab5733e9884f979fb42929d0a21b79d4a180fe83e48e1abaf08ec41e9dc2c0d8b087dc1a9637df68a64b82dddfdfbc6ae31a3c077434c892c7e8425a0184eed3971fa77b0ec895399d7b683042ee981990d9dd2ce3c436be9b2ec93587fb25d1f17cbb771e0f0bf88b27c47af0fd5417f4d1977e3f5483f787a71f59820d1b29a9af9460c6ad8a713ee2a1bf4021e51ce9776aa4eddae3616a808174493b572218c957c15b06df5aef889dbfd5de3a1326ea2d47dbf68b5bd06201b36d6ca5dedb69a8be84c254bb", 16);
+ }
}
diff --git a/runescape-client/src/main/java/class98.java b/runescape-client/src/main/java/class98.java
index 043142871d..92cfca91ef 100644
--- a/runescape-client/src/main/java/class98.java
+++ b/runescape-client/src/main/java/class98.java
@@ -23,22 +23,22 @@ public class class98 {
boolean var1 = MusicSample.method2338() != 0;
int var2;
int var3;
- int var5;
+ int var4;
if(var1) {
var2 = 0;
for(var3 = MusicSample.method2352(5) + 1; var2 < this.field1303; ++var3) {
- int var4 = MusicSample.method2352(WorldMapCacheName.method634(this.field1303 - var2));
+ int var5 = MusicSample.method2352(WorldMapCacheName.method634(this.field1303 - var2));
- for(var5 = 0; var5 < var4; ++var5) {
+ for(var4 = 0; var4 < var5; ++var4) {
this.field1304[var2++] = var3;
}
}
} else {
- boolean var14 = MusicSample.method2338() != 0;
+ boolean var15 = MusicSample.method2338() != 0;
for(var3 = 0; var3 < this.field1303; ++var3) {
- if(var14 && MusicSample.method2338() == 0) {
+ if(var15 && MusicSample.method2338() == 0) {
this.field1304[var3] = 0;
} else {
this.field1304[var3] = MusicSample.method2352(5) + 1;
@@ -49,57 +49,57 @@ public class class98 {
this.method2311();
var2 = MusicSample.method2352(4);
if(var2 > 0) {
- float var15 = MusicSample.method2357(MusicSample.method2352(32));
float var16 = MusicSample.method2357(MusicSample.method2352(32));
- var5 = MusicSample.method2352(4) + 1;
- boolean var6 = MusicSample.method2338() != 0;
- int var7;
+ float var6 = MusicSample.method2357(MusicSample.method2352(32));
+ var4 = MusicSample.method2352(4) + 1;
+ boolean var7 = MusicSample.method2338() != 0;
+ int var8;
if(var2 == 1) {
- var7 = method2310(this.field1303, this.field1306);
+ var8 = method2310(this.field1303, this.field1306);
} else {
- var7 = this.field1303 * this.field1306;
+ var8 = this.field1303 * this.field1306;
}
- this.field1305 = new int[var7];
+ this.field1305 = new int[var8];
- int var8;
- for(var8 = 0; var8 < var7; ++var8) {
- this.field1305[var8] = MusicSample.method2352(var5);
+ int var9;
+ for(var9 = 0; var9 < var8; ++var9) {
+ this.field1305[var9] = MusicSample.method2352(var4);
}
this.field1302 = new float[this.field1303][this.field1306];
- float var9;
- int var10;
+ float var10;
int var11;
+ int var12;
if(var2 == 1) {
- for(var8 = 0; var8 < this.field1303; ++var8) {
- var9 = 0.0F;
- var10 = 1;
+ for(var9 = 0; var9 < this.field1303; ++var9) {
+ var10 = 0.0F;
+ var11 = 1;
- for(var11 = 0; var11 < this.field1306; ++var11) {
- int var12 = var8 / var10 % var7;
- float var13 = (float)this.field1305[var12] * var16 + var15 + var9;
- this.field1302[var8][var11] = var13;
- if(var6) {
- var9 = var13;
+ for(var12 = 0; var12 < this.field1306; ++var12) {
+ int var13 = var9 / var11 % var8;
+ float var14 = (float)this.field1305[var13] * var6 + var16 + var10;
+ this.field1302[var9][var12] = var14;
+ if(var7) {
+ var10 = var14;
}
- var10 *= var7;
+ var11 *= var8;
}
}
} else {
- for(var8 = 0; var8 < this.field1303; ++var8) {
- var9 = 0.0F;
- var10 = var8 * this.field1306;
+ for(var9 = 0; var9 < this.field1303; ++var9) {
+ var10 = 0.0F;
+ var11 = var9 * this.field1306;
- for(var11 = 0; var11 < this.field1306; ++var11) {
- float var17 = (float)this.field1305[var10] * var16 + var15 + var9;
- this.field1302[var8][var11] = var17;
- if(var6) {
- var9 = var17;
+ for(var12 = 0; var12 < this.field1306; ++var12) {
+ float var17 = (float)this.field1305[var11] * var6 + var16 + var10;
+ this.field1302[var9][var12] = var17;
+ if(var7) {
+ var10 = var17;
}
- ++var10;
+ ++var11;
}
}
}
@@ -118,6 +118,7 @@ public class class98 {
int var6;
int var7;
int var8;
+ int var9;
int var10;
for(var3 = 0; var3 < this.field1303; ++var3) {
var4 = this.field1304[var3];
@@ -125,33 +126,32 @@ public class class98 {
var5 = 1 << 32 - var4;
var6 = var2[var4];
var1[var3] = var6;
- int var12;
if((var6 & var5) != 0) {
var7 = var2[var4 - 1];
} else {
var7 = var6 | var5;
for(var8 = var4 - 1; var8 >= 1; --var8) {
- var12 = var2[var8];
- if(var12 != var6) {
+ var10 = var2[var8];
+ if(var10 != var6) {
break;
}
- var10 = 1 << 32 - var8;
- if((var12 & var10) != 0) {
+ var9 = 1 << 32 - var8;
+ if((var10 & var9) != 0) {
var2[var8] = var2[var8 - 1];
break;
}
- var2[var8] = var12 | var10;
+ var2[var8] = var10 | var9;
}
}
var2[var4] = var7;
for(var8 = var4 + 1; var8 <= 32; ++var8) {
- var12 = var2[var8];
- if(var12 == var6) {
+ var10 = var2[var8];
+ if(var10 == var6) {
var2[var8] = var7;
}
}
@@ -159,7 +159,7 @@ public class class98 {
}
this.field1307 = new int[8];
- int var11 = 0;
+ var10 = 0;
for(var3 = 0; var3 < this.field1303; ++var3) {
var4 = this.field1304[var3];
@@ -171,7 +171,7 @@ public class class98 {
var8 = Integer.MIN_VALUE >>> var7;
if((var5 & var8) != 0) {
if(this.field1307[var6] == 0) {
- this.field1307[var6] = var11;
+ this.field1307[var6] = var10;
}
var6 = this.field1307[var6];
@@ -180,21 +180,21 @@ public class class98 {
}
if(var6 >= this.field1307.length) {
- int[] var9 = new int[this.field1307.length * 2];
+ int[] var11 = new int[this.field1307.length * 2];
- for(var10 = 0; var10 < this.field1307.length; ++var10) {
- var9[var10] = this.field1307[var10];
+ for(var9 = 0; var9 < this.field1307.length; ++var9) {
+ var11[var9] = this.field1307[var9];
}
- this.field1307 = var9;
+ this.field1307 = var11;
}
var8 >>>= 1;
}
this.field1307[var6] = ~var3;
- if(var6 >= var11) {
- var11 = var6 + 1;
+ if(var6 >= var10) {
+ var10 = var6 + 1;
}
}
}
diff --git a/runescape-client/src/main/java/net/runelite/rs/Reflection.java b/runescape-client/src/main/java/net/runelite/rs/Reflection.java
index 456b58a368..11dae33948 100644
--- a/runescape-client/src/main/java/net/runelite/rs/Reflection.java
+++ b/runescape-client/src/main/java/net/runelite/rs/Reflection.java
@@ -1,27 +1,3 @@
-/*
- * Copyright (c) 2017, Adam
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
package net.runelite.rs;
import java.io.File;
@@ -29,287 +5,197 @@ import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
import java.math.BigInteger;
import java.net.URISyntaxException;
import java.net.URL;
+import java.nio.file.FileVisitOption;
import java.nio.file.Files;
+import java.nio.file.LinkOption;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-public class Reflection
-{
- private static final boolean PRINT_DEBUG_MESSAGES = true;
+public class Reflection {
+ private static final boolean PRINT_DEBUG_MESSAGES = true;
+ private static Map classes;
- private static Map> classes = new HashMap<>();
+ public static Class findClass(String name) throws ClassNotFoundException {
+ Class var1 = (Class)classes.get(name);
+ if(var1 != null) {
+ return var1;
+ } else {
+ System.out.println("Server requested dummy class " + name);
+ return Class.forName(name);
+ }
+ }
- static
- {
- try
- {
- Enumeration systemResources = ClassLoader.getSystemResources("");
+ public static Field findField(Class clazz, String name) throws NoSuchFieldException {
+ System.out.println("Looking for field " + name + " in " + clazz);
+ Field[] var2 = clazz.getDeclaredFields();
+ int var3 = var2.length;
- while (systemResources.hasMoreElements())
- {
- URL url = systemResources.nextElement();
+ for(int var4 = 0; var4 < var3; ++var4) {
+ Field var5 = var2[var4];
+ ObfuscatedName var6 = (ObfuscatedName)var5.getAnnotation(ObfuscatedName.class);
+ if(var6 != null && var6.value().equals(name)) {
+ return var5;
+ }
+ }
- Path path;
- try
- {
- path = new File(url.toURI())
- .toPath();
- }
- catch (URISyntaxException e)
- {
- path = new File(url.getPath())
- .toPath();
- }
+ System.out.println("Server requested dummy field " + name + " in " + clazz);
+ return clazz.getDeclaredField(name);
+ }
- Files.walk(path)
- .filter(Files::isRegularFile)
- .forEach(f ->
- {
- String className = f
- .getName(f.getNameCount() - 1)
- .toString()
- .replace(".class", "");
+ public static String getMethodName(Method method) {
+ ObfuscatedName var1 = (ObfuscatedName)method.getAnnotation(ObfuscatedName.class);
+ return var1 != null?var1.value():method.getName();
+ }
- try
- {
- Class clazz = Class.forName(className);
+ public static Class[] getParameterTypes(Method method) {
+ ObfuscatedSignature var1 = (ObfuscatedSignature)method.getAnnotation(ObfuscatedSignature.class);
+ Class[] var2 = method.getParameterTypes();
+ if(var1 == null) {
+ return var2;
+ } else {
+ String var3 = var1.signature();
+ int var4 = var3.lastIndexOf(41);
+ char var5 = var3.charAt(var4 - 1);
+ Class var6;
+ switch(var5) {
+ case 'B':
+ var6 = Byte.TYPE;
+ break;
+ case 'I':
+ var6 = Integer.TYPE;
+ break;
+ case 'S':
+ var6 = Short.TYPE;
+ break;
+ default:
+ throw new IllegalStateException();
+ }
- ObfuscatedName obfuscatedName = clazz
- .getAnnotation(ObfuscatedName.class);
+ var2 = (Class[])Arrays.copyOf(var2, var2.length + 1);
+ var2[var2.length - 1] = var6;
+ return var2;
+ }
+ }
- if (obfuscatedName != null)
- {
- classes.put(obfuscatedName.value(), clazz);
- }
- }
- catch (ClassNotFoundException ignore)
- {
- }
- });
- }
- }
- catch (IOException e)
- {
- e.printStackTrace();
- }
- }
+ public static int getInt(Field field, Object obj) throws IllegalArgumentException, IllegalAccessException {
+ System.out.println("Getting field " + field);
+ boolean var2 = false;
+ if((field.getModifiers() & 2) == 0) {
+ field.setAccessible(true);
+ var2 = true;
+ }
- public static Class findClass(String name) throws ClassNotFoundException
- {
- Class clazz = classes.get(name);
+ int var3;
+ try {
+ var3 = field.getInt(obj);
+ } catch (Exception var9) {
+ var9.printStackTrace();
+ throw var9;
+ } finally {
+ if(var2) {
+ field.setAccessible(false);
+ }
- if (clazz != null)
- {
- return clazz;
- }
+ }
- if (PRINT_DEBUG_MESSAGES)
- {
- System.out.println("Server requested dummy class " + name);
- }
+ ObfuscatedGetter var4 = (ObfuscatedGetter)field.getAnnotation(ObfuscatedGetter.class);
+ if(var4 != null) {
+ int var5 = var4.intValue();
+ int var6 = modInverse(var5);
+ var3 *= var6;
+ }
- return Class.forName(name);
- }
+ return var3;
+ }
- public static Field findField(Class clazz, String name) throws NoSuchFieldException
- {
- if (PRINT_DEBUG_MESSAGES)
- {
- System.out.println("Looking for field " + name + " in " + clazz);
- }
+ public static void setInt(Field field, Object obj, int value) throws IllegalArgumentException, IllegalAccessException {
+ System.out.println("Setting field " + field + " to " + value);
+ ObfuscatedGetter var3 = (ObfuscatedGetter)field.getAnnotation(ObfuscatedGetter.class);
+ if(var3 != null) {
+ int var4 = var3.intValue();
+ value *= var4;
+ }
- for (Field f : clazz.getDeclaredFields())
- {
- ObfuscatedName annotation = f.getAnnotation(ObfuscatedName.class);
- if (annotation != null && annotation.value().equals(name))
- {
- return f;
- }
- }
+ boolean var8 = false;
+ if((field.getModifiers() & 2) == 0) {
+ field.setAccessible(true);
+ var8 = true;
+ }
- if (PRINT_DEBUG_MESSAGES)
- {
- System.out.println("Server requested dummy field " + name + " in " + clazz);
- }
+ try {
+ field.setInt(obj, value);
+ } finally {
+ if(var8) {
+ field.setAccessible(false);
+ }
- return clazz.getDeclaredField(name);
- }
+ }
- public static String getMethodName(Method method)
- {
- ObfuscatedName annotation = method.getAnnotation(ObfuscatedName.class);
- if (annotation != null)
- {
- return annotation.value();
- }
- else
- {
- return method.getName();
- }
- }
+ }
- public static Class[] getParameterTypes(Method method)
- {
- ObfuscatedSignature sig = method.getAnnotation(ObfuscatedSignature.class);
- Class[] types = method.getParameterTypes();
+ public static BigInteger modInverse(BigInteger val, int bits) {
+ BigInteger var2 = BigInteger.ONE.shiftLeft(bits);
+ return val.modInverse(var2);
+ }
- if (sig == null)
- {
- return types;
- }
+ public static int modInverse(int val) {
+ return modInverse(BigInteger.valueOf((long)val), 32).intValue();
+ }
- String s = sig.signature();
- int i = s.lastIndexOf(')');
- char c = s.charAt(i - 1);
+ public static Object invoke(Method method, Object object, Object[] args) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+ System.out.println("Invoking " + method);
- Class last;
+ try {
+ return method.invoke(object, args);
+ } catch (Throwable var4) {
+ var4.printStackTrace();
+ throw var4;
+ }
+ }
- switch (c)
- {
- case 'B':
- last = byte.class;
- break;
- case 'I':
- last = int.class;
- break;
- case 'S':
- last = short.class;
- break;
- default:
- throw new IllegalStateException();
- }
+ static {
+ classes = new HashMap();
- types = Arrays.copyOf(types, types.length + 1);
- types[types.length - 1] = last;
- return types;
- }
+ Path var2;
+ try {
+ for(Enumeration var0 = ClassLoader.getSystemResources(""); var0.hasMoreElements(); Files.walk(var2, new FileVisitOption[0]).filter((x$0) -> {
+ return Files.isRegularFile(x$0, new LinkOption[0]);
+ }).forEach((f) -> {
+ String var1 = f.getName(f.getNameCount() - 1).toString().replace(".class", "");
- public static int getInt(Field field, Object obj) throws IllegalArgumentException, IllegalAccessException
- {
- if (PRINT_DEBUG_MESSAGES)
- {
- System.out.println("Getting field " + field);
- }
+ try {
+ Class var3 = Class.forName(var1);
+ ObfuscatedName var4 = (ObfuscatedName)var3.getAnnotation(ObfuscatedName.class);
+ if(var3 != null) {
+ classes.put(var4.value(), var3);
+ }
+ } catch (ClassNotFoundException var4) {
+ ;
+ }
- boolean unset = false;
- if ((field.getModifiers() & Modifier.PRIVATE) == 0)
- {
- // we're outside of the package so set it accessable
- // to behave like we are in the package
- field.setAccessible(true);
- unset = true;
- }
+ })) {
+ URL var1 = (URL)var0.nextElement();
- int i;
- try
- {
- i = field.getInt(obj);
- }
- catch (Exception ex)
- {
- if (PRINT_DEBUG_MESSAGES)
- {
- ex.printStackTrace();
- }
- throw ex;
- }
- finally
- {
- if (unset)
- {
- field.setAccessible(false);
- }
- }
+ try {
+ var2 = (new File(var1.toURI())).toPath();
+ } catch (URISyntaxException var4) {
+ var2 = (new File(var1.getPath())).toPath();
+ }
+ }
+ } catch (IOException var5) {
+ var5.printStackTrace();
+ }
- ObfuscatedGetter og = field.getAnnotation(ObfuscatedGetter.class);
- if (og != null)
- {
- int getter = og.intValue();
- int setter = modInverse(getter);
-
- // encrypt
- i *= setter;
- }
- return i;
- }
-
- public static void setInt(Field field, Object obj, int value) throws IllegalArgumentException, IllegalAccessException
- {
- if (PRINT_DEBUG_MESSAGES)
- {
- System.out.println("Setting field " + field + " to " + value);
- }
-
- ObfuscatedGetter og = field.getAnnotation(ObfuscatedGetter.class);
- if (og != null)
- {
- int getter = og.intValue();
-
- // decrypt
- value *= getter;
- }
-
- boolean unset = false;
- if ((field.getModifiers() & Modifier.PRIVATE) == 0)
- {
- // we're outside of the package so set it accessable
- // to behave like we are in the package
- field.setAccessible(true);
- unset = true;
- }
-
- try
- {
- field.setInt(obj, value);
- }
- finally
- {
- if (unset)
- {
- field.setAccessible(false);
- }
- }
- }
-
- public static BigInteger modInverse(BigInteger val, int bits)
- {
- BigInteger shift = BigInteger.ONE.shiftLeft(bits);
- return val.modInverse(shift);
- }
-
- public static int modInverse(int val)
- {
- return modInverse(BigInteger.valueOf(val), 32).intValue();
- }
-
- public static Object invoke(Method method, Object object, Object[] args) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException
- {
- if (PRINT_DEBUG_MESSAGES)
- {
- System.out.println("Invoking " + method);
- }
-
- try
- {
- return method.invoke(object, args);
- }
- catch (Throwable ex)
- {
- if (PRINT_DEBUG_MESSAGES)
- {
- ex.printStackTrace();
- }
- throw ex;
- }
- }
-}
\ No newline at end of file
+ }
+}