2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-11 09:00:23 -07:00
Code Issues Projects Releases Packages Wiki Activity

More renaming

Browse source
This commit is contained in:
Woah 2021-03-31 22:58:50 -04:00
parent 243a25b5e0
commit 4ca254c946
59 changed files with 1646 additions and 1642 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Client/src/main/java/org/runite/client/AudioHandler.java
View file

@ -159,4 +159,15 @@ public final class AudioHandler {
throw ClientErrorException.clientError(var6, "ck.C(" + (var1 != null ? "{...}" : "null") + ',' + (var2 != null ? "{...}" : "null") + ',' + (var3 != null ? "{...}" : "null") + ',' + (var4 != null ? "{...}" : "null") + ')');
}
}
public static void musicEffectHandler(int var1) {
try {
if (musicVolume != 0 && var1 != -1) {
Class70.method1285(CacheIndex.music2Index, var1, musicVolume);
musicEffectPlaying = true;
}
} catch (RuntimeException var4) {
throw ClientErrorException.clientError(var4, "wj.D(" + ',' + var1 + ',' + (byte) -1 + ')');
}
}
}

4
Client/src/main/java/org/runite/client/AudioThread.java
View file

@ -18,7 +18,7 @@ public final class AudioThread implements Runnable {
static boolean method888(int var0, ObjectDefinition var1, int var3, int var5, int var6) {
try {
Class2 var7 = InterfaceWidget.c(var1.anInt1516);
MapSceneDefinition var7 = InterfaceWidget.c(var1.anInt1516);
if (var7.sprite == -1) {
return false;
} else {
@ -80,7 +80,7 @@ public final class AudioThread implements Runnable {
if (HDToolKit.highDetail) {
var1[var2] = new HDSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[var2], Unsorted.anIntArray2591[var2], Class140_Sub7.anIntArray2931[var2], Unsorted.anIntArray3076[var2], var5);
} else {
var1[var2] = new Class3_Sub28_Sub16_Sub2(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[var2], Unsorted.anIntArray2591[var2], Class140_Sub7.anIntArray2931[var2], Unsorted.anIntArray3076[var2], var5);
var1[var2] = new SoftwareSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[var2], Unsorted.anIntArray2591[var2], Class140_Sub7.anIntArray2931[var2], Unsorted.anIntArray3076[var2], var5);
}
}

49
Client/src/main/java/org/runite/client/CS2Methods.java
View file

@ -48,4 +48,53 @@ public class CS2Methods {
throw ClientErrorException.clientError(var3, "bc.A(" + var0 + ',' + -28236 + ')');
}
}
static void method2280(int var1) {
try {
InterfaceWidget var2 = InterfaceWidget.getWidget(11, var1);
var2.a();
} catch (RuntimeException var3) {
throw ClientErrorException.clientError(var3, "wl.B(" + 2714 + ',' + var1 + ')');
}
}
/* * * * INTERFACE SPECIFIC SEPARATE CORRECTLY * * * */
static void method225(RSInterface iface) {
RSInterface var2 = method2273(iface);
int windowWidth;
int windowHeight;
if (var2 == null) {
windowHeight = Class140_Sub7.canvasHeight;
windowWidth = Class23.canvasWidth;
} else {
windowHeight = var2.height;
windowWidth = var2.width;
}
Unsorted.calculateInterfaceSize(iface, windowWidth, windowHeight, false);
Unsorted.calculateInterfacePosition(iface, windowWidth, windowHeight);
}
//INTERFACE SPECIFIC RENAME
static RSInterface method2273(RSInterface iface) {
if (iface.parentId != -1) {
return Unsorted.getRSInterface(iface.parentId);
}
int var3 = iface.componentHash >>> 16;
Class80<Class3_Sub31> var4 = new Class80<>(TextureOperation23.aHashTable_3208);
for (Class3_Sub31 var2 = var4.method1393(); null != var2; var2 = var4.method1392()) {
if (var2.anInt2602 == var3) {
return Unsorted.getRSInterface((int) var2.linkableKey);
}
}
return null;
}
/* * * * END INTERFACE * * * */
}

20
Client/src/main/java/org/runite/client/CS2Script.java
View file

@ -612,9 +612,9 @@ public final class CS2Script extends Linkable {
class11_2.verticalPos = (byte) l66;
class11_2.horizontalPos = (byte) k44;
Class20.method909(class11_2);
TextureOperation24.method225(class11_2);
CS2Methods.method225(class11_2);
if (class11_2.anInt191 == -1)
Class168.method2280(class11_2.componentHash);
CS2Methods.method2280(class11_2.componentHash);
continue;
}
if (opcode == 1001) {
@ -638,7 +638,7 @@ public final class CS2Script extends Linkable {
l44 = 4;
class11_2.horizontalResize = (byte) l44;
Class20.method909(class11_2);
TextureOperation24.method225(class11_2);
CS2Methods.method225(class11_2);
if (class11_2.type == 0)
Unsorted.method2104(class11_2, false, 32);
continue;
@ -658,7 +658,7 @@ public final class CS2Script extends Linkable {
class11_2.anInt216 = ItemDefinition.intsStack[iStackCounter];
class11_2.anInt160 = ItemDefinition.intsStack[iStackCounter - -1];
Class20.method909(class11_2);
TextureOperation24.method225(class11_2);
CS2Methods.method225(class11_2);
if (class11_2.type == 0)
Unsorted.method2104(class11_2, false, -127);
continue;
@ -947,7 +947,7 @@ public final class CS2Script extends Linkable {
if (opcode != 3202)
break;
iStackCounter -= 2;
Class167.musicEffectHandler(ItemDefinition.intsStack[iStackCounter]);
AudioHandler.musicEffectHandler(ItemDefinition.intsStack[iStackCounter]);
continue;
}
if (opcode < 3400) {
@ -3041,7 +3041,7 @@ public final class CS2Script extends Linkable {
continue;
}
if (opcode == 6203) {
Class65.method1239(Class168.aClass11_2091.width, 81, 0, Class168.aClass11_2091.height, 0, false);
Class65.method1239(Unsorted.aClass11_2091.width, 81, 0, Unsorted.aClass11_2091.height, 0, false);
ItemDefinition.intsStack[iStackCounter++] = Class96.anInt1358;
ItemDefinition.intsStack[iStackCounter++] = Unsorted.anInt31;
continue;
@ -3189,8 +3189,8 @@ public final class CS2Script extends Linkable {
if (4205 == opcode) {
int l39 = ItemDefinition.intsStack[--iStackCounter];
ItemDefinition class48 = ItemDefinition.getItemDefinition(l39);
if (-1 == class48.anInt791 && class48.anInt789 >= 0)
ItemDefinition.intsStack[iStackCounter++] = class48.anInt789;
if (-1 == class48.anInt791 && class48.noteID >= 0)
ItemDefinition.intsStack[iStackCounter++] = class48.noteID;
else
ItemDefinition.intsStack[iStackCounter++] = l39;
continue;
@ -3198,8 +3198,8 @@ public final class CS2Script extends Linkable {
if (opcode == 4206) {
int i40 = ItemDefinition.intsStack[--iStackCounter];
ItemDefinition class48_1 = ItemDefinition.getItemDefinition(i40);
if (0 <= class48_1.anInt791 && class48_1.anInt789 >= 0)
ItemDefinition.intsStack[iStackCounter++] = class48_1.anInt789;
if (0 <= class48_1.anInt791 && class48_1.noteID >= 0)
ItemDefinition.intsStack[iStackCounter++] = class48_1.noteID;
else
ItemDefinition.intsStack[iStackCounter++] = i40;
continue;

48
Client/src/main/java/org/runite/client/Class1.java
View file

@ -63,7 +63,7 @@ final class Class1 {
var15 = var9[var13][var14] & 0xFF;
var16 = 255 & var10[var13][var14];
if (var16 != 0) {
Class168 var17 = Class168.method350(-1 + var16);
FloorOverlayDefinition var17 = FloorOverlayDefinition.getFile(-1 + var16);
if (var17.anInt2103 == -1) {
continue;
}
@ -93,11 +93,11 @@ final class Class1 {
var29 = 255 & var10[var13 + 1][-1 + var14];
var28 = var10[var13 - 1][-1 + var14] & 0xFF;
var30 = var10[1 + var13][var14 - -1] & 0xFF;
Class168 var31;
FloorOverlayDefinition var31;
int var34;
byte var32;
if (var27 != 0 || var27 != var16) {
var31 = Class168.method350(-1 + var27);
var31 = FloorOverlayDefinition.getFile(-1 + var27);
if (var31.aBoolean2092 && var31.anInt2103 != -1) {
var32 = var5[var13 + -1][var14 - -1];
var33 = var8[-1 + var13][var14 + 1];
@ -119,7 +119,7 @@ final class Class1 {
}
if (var28 != 0 || var28 != var16) {
var31 = Class168.method350(-1 + var28);
var31 = FloorOverlayDefinition.getFile(-1 + var28);
if (var31.aBoolean2092 && var31.anInt2103 != -1) {
var32 = var5[-1 + var13][var14 + -1];
var33 = var8[-1 + var13][-1 + var14];
@ -141,7 +141,7 @@ final class Class1 {
}
if (var29 != 0 || var29 != var16) {
var31 = Class168.method350(var29 - 1);
var31 = FloorOverlayDefinition.getFile(var29 - 1);
if (var31.aBoolean2092 && var31.anInt2103 != -1) {
var32 = var5[1 + var13][var14 - 1];
var33 = var8[var13 - -1][var14 + -1];
@ -163,7 +163,7 @@ final class Class1 {
}
if (var30 != 0 || var30 != var16) {
var31 = Class168.method350(var30 + -1);
var31 = FloorOverlayDefinition.getFile(var30 + -1);
if (var31.aBoolean2092 && var31.anInt2103 != -1) {
var32 = var5[var13 - -1][1 + var14];
var33 = var8[var13 + 1][1 + var14];
@ -185,7 +185,7 @@ final class Class1 {
}
if (var23 != 0 && var23 != var16) {
var31 = Class168.method350(-1 + var23);
var31 = FloorOverlayDefinition.getFile(-1 + var23);
if (var31.aBoolean2092 && var31.anInt2103 != -1) {
var60 = anIntArray2642[4 * var8[var13][var14 - -1] + (var5[var13][var14 - -1] - -2 & 3)];
@ -203,7 +203,7 @@ final class Class1 {
}
if (0 != var24 && var24 != var16) {
var31 = Class168.method350(var24 + -1);
var31 = FloorOverlayDefinition.getFile(var24 + -1);
if (var31.aBoolean2092 && var31.anInt2103 != -1) {
var65 = anIntArray2642[(3 & 3 + var5[var13 + -1][var14]) + var8[var13 + -1][var14] * 4];
@ -221,7 +221,7 @@ final class Class1 {
}
if (var25 != 0 && var16 != var25) {
var31 = Class168.method350(-1 + var25);
var31 = FloorOverlayDefinition.getFile(-1 + var25);
if (var31.aBoolean2092 && var31.anInt2103 != -1) {
var21 = anIntArray2642[(3 & var5[var13][var14 + -1]) + var8[var13][var14 + -1] * 4];
@ -239,7 +239,7 @@ final class Class1 {
}
if (0 != var26 && var16 != var26) {
var31 = Class168.method350(var26 - 1);
var31 = FloorOverlayDefinition.getFile(var26 - 1);
if (var31.aBoolean2092 && var31.anInt2103 != -1) {
var22 = anIntArray2642[(3 & var5[var13 + 1][var14] + 1) + 4 * var8[1 + var13][var14]];
@ -262,7 +262,7 @@ final class Class1 {
var75 = TextureOperation8.aBooleanArrayArray3468[var25 != var74 ? 0 : var21];
boolean[] var80 = TextureOperation8.aBooleanArrayArray3468[var23 == var74 ? var60 : 0];
var81 = TextureOperation8.aBooleanArrayArray3468[var26 == var74 ? var22 : 0];
Class168 var37 = Class168.method350(-1 + var74);
FloorOverlayDefinition var37 = FloorOverlayDefinition.getFile(-1 + var74);
Class3_Sub11 var38 = method2052(var12, var37);
var38.anInt2342 += 5;
var38.anInt2342 += -2 + var80.length;
@ -293,7 +293,7 @@ final class Class1 {
}
if (0 != var58) {
Class168 var62 = Class168.method350(-1 + var58);
FloorOverlayDefinition var62 = FloorOverlayDefinition.getFile(-1 + var58);
if (var62.anInt2103 == -1) {
continue;
}
@ -323,13 +323,13 @@ final class Class1 {
var29 = 255 & var10[var13 - 1][var14 - 1];
var30 = 255 & var10[1 + var13][var14 + -1];
var73 = var10[1 + var13][var14 + 1] & 0xFF;
Class168 var76;
FloorOverlayDefinition var76;
byte var77;
int var83;
if (0 == var28 || var28 == var58) {
var28 = 0;
} else {
var76 = Class168.method350(-1 + var28);
var76 = FloorOverlayDefinition.getFile(-1 + var28);
if (var76.aBoolean2092 && var76.anInt2103 != -1) {
var33 = var5[var13 + -1][1 + var14];
var77 = var8[-1 + var13][1 + var14];
@ -357,7 +357,7 @@ final class Class1 {
if (0 == var29 || var29 == var58) {
var29 = 0;
} else {
var76 = Class168.method350(-1 + var29);
var76 = FloorOverlayDefinition.getFile(-1 + var29);
if (var76.aBoolean2092 && -1 != var76.anInt2103) {
var33 = var5[var13 + -1][-1 + var14];
var77 = var8[-1 + var13][var14 + -1];
@ -385,7 +385,7 @@ final class Class1 {
if (var30 == 0 || var58 == var30) {
var30 = 0;
} else {
var76 = Class168.method350(-1 + var30);
var76 = FloorOverlayDefinition.getFile(-1 + var30);
if (var76.aBoolean2092 && -1 != var76.anInt2103) {
var33 = var5[1 + var13][var14 - 1];
var77 = var8[1 + var13][var14 + -1];
@ -413,7 +413,7 @@ final class Class1 {
if (var73 == 0 || var73 == var58) {
var73 = 0;
} else {
var76 = Class168.method350(-1 + var73);
var76 = FloorOverlayDefinition.getFile(-1 + var73);
if (var76.aBoolean2092 && var76.anInt2103 != -1) {
var77 = var8[1 + var13][1 + var14];
var33 = var5[1 + var13][var14 + 1];
@ -440,7 +440,7 @@ final class Class1 {
int var78;
if (var24 != 0 && var58 != var24) {
var76 = Class168.method350(var24 - 1);
var76 = FloorOverlayDefinition.getFile(var24 - 1);
if (var76.aBoolean2092 && -1 != var76.anInt2103) {
var65 = anIntArray2642[var8[var13][var14 - -1] * 4 + (2 + var5[var13][var14 - -1] & 3)];
@ -458,7 +458,7 @@ final class Class1 {
}
if (var25 != 0 && var58 != var25) {
var76 = Class168.method350(var25 + -1);
var76 = FloorOverlayDefinition.getFile(var25 + -1);
if (var76.aBoolean2092 && var76.anInt2103 != -1) {
var21 = anIntArray2642[(3 & var5[var13 - 1][var14] - -3) + 4 * var8[var13 + -1][var14]];
@ -476,7 +476,7 @@ final class Class1 {
}
if (var26 != 0 && var58 != var26) {
var76 = Class168.method350(var26 - 1);
var76 = FloorOverlayDefinition.getFile(var26 - 1);
if (var76.aBoolean2092 && -1 != var76.anInt2103) {
var22 = anIntArray2642[(var5[var13][var14 + -1] & 3) + 4 * var8[var13][-1 + var14]];
@ -494,7 +494,7 @@ final class Class1 {
}
if (var27 != 0 && var27 != var58) {
var76 = Class168.method350(var27 + -1);
var76 = FloorOverlayDefinition.getFile(var27 + -1);
if (var76.aBoolean2092 && var76.anInt2103 != -1) {
var23 = anIntArray2642[4 * var8[1 + var13][var14] - -(3 & var5[var13 + 1][var14] - -1)];
@ -517,7 +517,7 @@ final class Class1 {
var75 = TextureOperation8.aBooleanArrayArray3468[var25 == var78 ? var21 : 0];
var81 = TextureOperation8.aBooleanArrayArray3468[var26 == var78 ? var22 : 0];
boolean[] var84 = TextureOperation8.aBooleanArrayArray3468[var78 != var27 ? 0 : var23];
Class168 var82 = Class168.method350(-1 + var78);
FloorOverlayDefinition var82 = FloorOverlayDefinition.getFile(-1 + var78);
Class3_Sub11 var39 = method2052(var12, var82);
int var40 = TextureOperation34.method190(var82.anInt2095, var82.anInt2103, (byte) -76, var6[var13][var14]) << 8 | 255;
byte var44 = 6;
@ -604,7 +604,7 @@ final class Class1 {
if (WorldMap.anInt2737 >= 100) {
if (null == Class36.aAbstractSprite_637 || var2 != Class36.aAbstractSprite_637.width || Class36.aAbstractSprite_637.height != var1) {
Class3_Sub28_Sub16_Sub2 var5 = new Class3_Sub28_Sub16_Sub2(var2, var1);
SoftwareSprite var5 = new SoftwareSprite(var2, var1);
Class74.setBuffer(var5.anIntArray4081, var2, var1);
Unsorted.method523(var2, 0, Class23.anInt455, 0, 0, Class108.anInt1460, var1, 0);
if (HDToolKit.highDetail) {
@ -654,7 +654,7 @@ final class Class1 {
}
}
static Class3_Sub11 method2052(HashTable var0, Class168 var2) {
static Class3_Sub11 method2052(HashTable var0, FloorOverlayDefinition var2) {
try {
long var3 = ((long) var2.anInt2095 - -1 << 16) + var2.anInt2090 + (((long) var2.anInt2100 << 56) - -((long) var2.anInt2094 << 32));
Class3_Sub11 var5 = (Class3_Sub11) var0.get(var3);

2
Client/src/main/java/org/runite/client/Class102.java
View file

@ -257,7 +257,7 @@ public final class Class102 implements Interface2 {
}
anIntArray2125 = null;
Sprites.aClass3_Sub28_Sub16_Sub2Array2140 = null;
Sprites.aSoftwareSpriteArray2140 = null;
AudioHandler.soundEffects = null;
} catch (RuntimeException var2) {
throw ClientErrorException.clientError(var2, "nk.W(" + var0 + ')');

2
Client/src/main/java/org/runite/client/Class114.java
View file

@ -55,7 +55,7 @@ final class Class114 {
AbstractSprite var10 = (AbstractSprite) Class67.aReferenceCache_1013.get(var8);
if (var10 == null) {
Class51.aBoolean837 = false;
var10 = Unsorted.method1570(var4, (byte) 13, false, var1, var2, var0, var3, false);
var10 = Unsorted.constructItemSprite(var4, false, var1, var2, var0, var3, false);
if (var10 != null && !Class51.aBoolean837) {
Class67.aReferenceCache_1013.put(var10, var8);
}

4
Client/src/main/java/org/runite/client/Class117.java
View file

@ -95,7 +95,7 @@ public final class Class117 {
}
}
static Class3_Sub28_Sub16_Sub2 method1722(int var0) {
static SoftwareSprite method1722(int var0) {
try {
int var1 = Class140_Sub7.anIntArray2931[0] * Unsorted.anIntArray3076[0];
byte[] var2 = Class163_Sub1.aByteArrayArray2987[0];
@ -105,7 +105,7 @@ public final class Class117 {
var3[var4] = TextureOperation38.spritePalette[Unsorted.bitwiseAnd(var2[var4], 255)];
}
Class3_Sub28_Sub16_Sub2 var6 = new Class3_Sub28_Sub16_Sub2(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[0], Unsorted.anIntArray2591[0], Class140_Sub7.anIntArray2931[0], Unsorted.anIntArray3076[0], var3);
SoftwareSprite var6 = new SoftwareSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[0], Unsorted.anIntArray2591[0], Class140_Sub7.anIntArray2931[0], Unsorted.anIntArray3076[0], var3);
Class39.method1035((byte) 122);
return var0 >= -51 ? null : var6;
} catch (RuntimeException var5) {

22
Client/src/main/java/org/runite/client/Class129.java
View file

@ -43,7 +43,7 @@ abstract class Class129 {
int var11 = Toolkit.JAVA_TOOLKIT.getBuffer()[var5++ + var0];
int var10 = Class159.anIntArray1681[var4++];
if (var10 == 0) {
Class84.aClass3_Sub28_Sub16_Sub2_1381.anIntArray4081[var6++] = var11;
Class84.aSoftwareSprite_1381.anIntArray4081[var6++] = var11;
} else {
int var12 = 18 + var10;
if (var12 > 255) {
@ -56,21 +56,21 @@ abstract class Class129 {
}
var10 = Class52.anIntArray861[var10];
Class84.aClass3_Sub28_Sub16_Sub2_1381.anIntArray4081[var6++] = Unsorted.bitwiseAnd(var13 * Unsorted.bitwiseAnd(var11, 16711935) + Unsorted.bitwiseAnd(16711935, var10) * var12, -16711936) - -Unsorted.bitwiseAnd(Unsorted.bitwiseAnd(var10, 65280) * var12 - -(Unsorted.bitwiseAnd(65280, var11) * var13), 16711680) >> 8;
Class84.aSoftwareSprite_1381.anIntArray4081[var6++] = Unsorted.bitwiseAnd(var13 * Unsorted.bitwiseAnd(var11, 16711935) + Unsorted.bitwiseAnd(16711935, var10) * var12, -16711936) - -Unsorted.bitwiseAnd(Unsorted.bitwiseAnd(var10, 65280) * var12 - -(Unsorted.bitwiseAnd(65280, var11) * var13), 16711680) >> 8;
}
}
for (var9 = 0; var9 < var8; ++var9) {
Class84.aClass3_Sub28_Sub16_Sub2_1381.anIntArray4081[var6++] = Toolkit.JAVA_TOOLKIT.getBuffer()[var0 + var5++];
Class84.aSoftwareSprite_1381.anIntArray4081[var6++] = Toolkit.JAVA_TOOLKIT.getBuffer()[var0 + var5++];
}
var5 += Toolkit.JAVA_TOOLKIT.width + -128;
}
if (HDToolKit.highDetail) {
Class22.method926(Class84.aClass3_Sub28_Sub16_Sub2_1381.anIntArray4081, var0, var2, Class84.aClass3_Sub28_Sub16_Sub2_1381.width, Class84.aClass3_Sub28_Sub16_Sub2_1381.height);
Class22.method926(Class84.aSoftwareSprite_1381.anIntArray4081, var0, var2, Class84.aSoftwareSprite_1381.width, Class84.aSoftwareSprite_1381.height);
} else {
Class84.aClass3_Sub28_Sub16_Sub2_1381.method635(var0, var2);
Class84.aSoftwareSprite_1381.method635(var0, var2);
}
} catch (RuntimeException var14) {
@ -121,7 +121,7 @@ abstract class Class129 {
int var24 = 255 & var1[var23][var19];
var25 = 255 & var8[var23][var19];
boolean var26 = false;
Class168 var27;
FloorOverlayDefinition var27;
int[] var29;
int[] var28;
if (0 == var24) {
@ -129,7 +129,7 @@ abstract class Class129 {
continue;
}
var27 = Class168.method350(var25 + -1);
var27 = FloorOverlayDefinition.getFile(var25 + -1);
if (var27.anInt2103 == -1) {
continue;
}
@ -141,7 +141,7 @@ abstract class Class129 {
continue;
}
} else if (var25 != 0) {
var27 = Class168.method350(var25 - 1);
var27 = FloorOverlayDefinition.getFile(var25 - 1);
byte var42;
if (var27.anInt2103 == -1) {
var42 = var7[var23][var19];
@ -259,13 +259,13 @@ abstract class Class129 {
var25 = 255 & var1[var23][var19];
byte var38 = var2[var23][var19];
boolean var39 = false;
Class168 var46;
FloorOverlayDefinition var46;
if (var25 == 0) {
if (0 == var43) {
continue;
}
var46 = Class168.method350(var43 - 1);
var46 = FloorOverlayDefinition.getFile(var43 - 1);
if (-1 == var46.anInt2103) {
continue;
}
@ -275,7 +275,7 @@ abstract class Class129 {
continue;
}
} else if (var43 != 0) {
var46 = Class168.method350(-1 + var43);
var46 = FloorOverlayDefinition.getFile(-1 + var43);
if (-1 == var46.anInt2103) {
TextureOperation18.method284(var0, var9, var23, var6, var19, Class25.anIntArrayArray499[var7[var23][var19]], var14, (byte) 116, var13, var11, var2[var23][var19]);
continue;

4
Client/src/main/java/org/runite/client/Class132.java
View file

@ -89,7 +89,7 @@ final class Class132 {
}
if (Unsorted.anInt3660 == 1) {
if (TextureOperation8.anInt3460 == NPCDefinition.anInt1297 && Class38_Sub1.anInt2612 == Class168.anInt2099) {
if (TextureOperation8.anInt3460 == NPCDefinition.anInt1297 && Class38_Sub1.anInt2612 == Unsorted.anInt2099) {
Class21.anInt3537 = Unsorted.menuOptionCount * 15 - -(!Unsorted.aBoolean1951 ? 22 : 26);
Unsorted.anInt3660 = 0;
Class21.anInt3395 = var4;
@ -105,7 +105,7 @@ final class Class132 {
Class21.anInt3537 = (Unsorted.aBoolean1951 ? 26 : 22) + Unsorted.menuOptionCount * 15;
Class38_Sub1.aBoolean2615 = true;
} else {
Class168.anInt2099 = Class38_Sub1.anInt2614;
Unsorted.anInt2099 = Class38_Sub1.anInt2614;
TextureOperation8.anInt3460 = Class163_Sub1.anInt2993;
Unsorted.anInt3660 = 1;
}

4
Client/src/main/java/org/runite/client/Class136.java
View file

@ -58,7 +58,7 @@ final class Class136 {
var30.anInt2532 = var14.MapIcon;
aLinkedList_1424.method1215(var30);
} else {
GameObject.aClass3_Sub28_Sub16_Sub2Array1839[var14.MapIcon].drawAt(var18 + -7, -7 + var24);
GameObject.aSoftwareSpriteArray1839[var14.MapIcon].drawAt(var18 + -7, -7 + var24);
}
}
}
@ -74,7 +74,7 @@ final class Class136 {
Class74.method1330(var32.anInt2531, var32.anInt2539, 13, var13);
Class74.method1330(var32.anInt2531, var32.anInt2539, 11, var13);
Class74.method1330(var32.anInt2531, var32.anInt2539, 9, var13);
GameObject.aClass3_Sub28_Sub16_Sub2Array1839[var32.anInt2532].drawAt(-7 + var32.anInt2531, -7 + var32.anInt2539);
GameObject.aSoftwareSpriteArray1839[var32.anInt2532].drawAt(-7 + var32.anInt2531, -7 + var32.anInt2539);
}
aLinkedList_1424.method1211(-76);

8
Client/src/main/java/org/runite/client/Class157.java
View file

@ -57,7 +57,7 @@ final class Class157 {
return var3 != null && var3.aClass70_2234 != null ? var3.aClass70_2234.aLong1048 : 0L;
}
static Class3_Sub28_Sub16_Sub2[] method2176(int var0, CacheIndex var1) {
static SoftwareSprite[] method2176(int var0, CacheIndex var1) {
try {
//System.out.println("Class 157 " + var2);
if (Class75_Sub4.method1351(var1, 0, var0)) {
@ -70,9 +70,9 @@ final class Class157 {
}
}
static Class3_Sub28_Sub16_Sub2[] method851() {
static SoftwareSprite[] method851() {
try {
Class3_Sub28_Sub16_Sub2[] var1 = new Class3_Sub28_Sub16_Sub2[Class95.anInt1338];
SoftwareSprite[] var1 = new SoftwareSprite[Class95.anInt1338];
for (int var2 = 0; Class95.anInt1338 > var2; ++var2) {
int var3 = Unsorted.anIntArray3076[var2] * Class140_Sub7.anIntArray2931[var2];
@ -83,7 +83,7 @@ final class Class157 {
var5[var6] = TextureOperation38.spritePalette[Unsorted.bitwiseAnd(255, var4[var6])];
}
var1[var2] = new Class3_Sub28_Sub16_Sub2(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[var2], Unsorted.anIntArray2591[var2], Class140_Sub7.anIntArray2931[var2], Unsorted.anIntArray3076[var2], var5);
var1[var2] = new SoftwareSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[var2], Unsorted.anIntArray2591[var2], Class140_Sub7.anIntArray2931[var2], Unsorted.anIntArray3076[var2], var5);
}
Class39.method1035((byte) 113);

11
Client/src/main/java/org/runite/client/Class167.java
View file

@ -44,17 +44,6 @@ public final class Class167 {
}
}
public static void musicEffectHandler(int var1) {
try {
if (AudioHandler.musicVolume != 0 && var1 != -1) {
Class70.method1285(CacheIndex.music2Index, var1, AudioHandler.musicVolume);
AudioHandler.musicEffectPlaying = true;
}
} catch (RuntimeException var4) {
throw ClientErrorException.clientError(var4, "wj.D(" + ',' + var1 + ',' + (byte) -1 + ')');
}
}
static void method2267(int var0, int var1, boolean var2, DataBuffer var3, int var4, int var5, byte var6, int var7, int var8) {
try {
int var9;

998
Client/src/main/java/org/runite/client/Class168.java
View file

@ -1,998 +0,0 @@
package org.runite.client;
import org.rs09.client.rendering.Toolkit;
final class Class168 {
static RSInterface aClass11_2091 = null;
static int anInt2099 = 0;
int anInt2090 = 128;
boolean aBoolean2092 = false;
boolean aBoolean2093 = true;
int anInt2094 = 1190717;
int anInt2095 = -1;
int anInt2098 = -1;
int anInt2100 = 8;
int anInt2101 = 16;
boolean aBoolean2102 = true;
int anInt2103 = 0;
static void method2270(Class140_Sub4 var0) {
try {
if (Class44.anInt719 == var0.anInt2790 || var0.anInt2771 == -1 || var0.anInt2828 != 0 || SequenceDefinition.getAnimationDefinition(var0.anInt2771).duration[var0.anInt2832] < 1 + var0.anInt2760) {
int var2 = var0.anInt2790 + -var0.anInt2800;
int var3 = Class44.anInt719 + -var0.anInt2800;
int var4 = var0.anInt2784 * 128 + 64 * var0.getSize();
int var5 = var0.anInt2835 * 128 - -(var0.getSize() * 64);
int var6 = 128 * var0.anInt2823 + var0.getSize() * 64;
int var7 = 128 * var0.anInt2798 + var0.getSize() * 64;
var0.xAxis = (var3 * var6 + var4 * (var2 - var3)) / var2;
var0.zAxis = (var7 * var3 + var5 * (var2 - var3)) / var2;
}
var0.anInt2824 = 0;
if (var0.anInt2840 == 0) {
var0.anInt2806 = 1024;
}
if (1 == var0.anInt2840) {
var0.anInt2806 = 1536;
}
if (var0.anInt2840 == 2) {
var0.anInt2806 = 0;
}
if (var0.anInt2840 == 3) {
var0.anInt2806 = 512;
}
var0.anInt2785 = var0.anInt2806;
} catch (RuntimeException var8) {
throw ClientErrorException.clientError(var8, "wl.K(" + (var0 != null ? "{...}" : "null") + ',' + (byte) -56 + ')');
}
}
static void method2271(int var0, int var1, int var3) {
try {
InterfaceWidget var4 = InterfaceWidget.getWidget(11, var1);
var4.flagUpdate();
var4.anInt3597 = var3;
var4.anInt3598 = var0;
} catch (RuntimeException var5) {
throw ClientErrorException.clientError(var5, "wl.F(" + var0 + ',' + var1 + ',' + 1 + ',' + var3 + ')');
}
}
static void method2272(int[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, boolean var9) {
try {
int var11 = var2;
if (var2 < Toolkit.JAVA_TOOLKIT.clipRight) {
if (Toolkit.JAVA_TOOLKIT.clipLeft > var2) {
var11 = Toolkit.JAVA_TOOLKIT.clipLeft;
}
int var12 = var7 + var2;
if (Toolkit.JAVA_TOOLKIT.clipLeft < var12) {
if (Toolkit.JAVA_TOOLKIT.clipRight < var12) {
var12 = Toolkit.JAVA_TOOLKIT.clipRight;
}
int var13 = var8;
if (var8 < Toolkit.JAVA_TOOLKIT.clipBottom) {
int var14 = var8 + var6;
if (Toolkit.JAVA_TOOLKIT.clipTop > var8) {
var13 = Toolkit.JAVA_TOOLKIT.clipTop;
}
if (var14 > Toolkit.JAVA_TOOLKIT.clipTop) {
int var15 = var11 + Toolkit.JAVA_TOOLKIT.width * var13;
if (var5 == 9) {
var3 = 3 & var3 - -1;
var5 = 1;
}
int var16 = -var12 + var11 + Toolkit.JAVA_TOOLKIT.width;
var13 -= var8;
int var20 = var6 + -var13;
if (Toolkit.JAVA_TOOLKIT.clipBottom < var14) {
var14 = Toolkit.JAVA_TOOLKIT.clipBottom;
}
if (var5 == 10) {
var3 = var3 - -3 & 3;
var5 = 1;
}
var11 -= var2;
int var18 = -var11 + var7;
if (11 == var5) {
var3 = 3 & var3 + 3;
var5 = 8;
}
var12 -= var2;
int var17 = var7 + -var12;
var14 -= var8;
int var19 = var6 - var14;
int var21;
int var22;
if (var5 != 1) {
if (2 == var5) {
if (var3 == 0) {
for (var21 = var20 + -1; var19 <= var21; --var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var22 <= var21 >> 1) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (1 == var3) {
for (var21 = var13; var14 > var21; ++var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (0 <= var15 && var0.length > var15) {
if (var22 >= var21 << 1) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
} else {
++var15;
}
}
var15 += var16;
}
} else if (var3 == 2) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var18 + -1; var17 <= var22; --var22) {
if (var21 >> 1 >= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (3 == var3) {
for (var21 = var20 + -1; var19 <= var21; --var21) {
for (var22 = -1 + var18; var17 <= var22; --var22) {
if (var21 << 1 > var22) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
}
} else if (var5 != 3) {
if (var5 != 4) {
if (var5 != 5) {
if (var5 == 6) {
if (var3 == 0) {
for (var21 = var13; var14 > var21; ++var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var22 > var7 / 2) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
return;
}
if (var3 == 1) {
for (var21 = var13; var14 > var21; ++var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var21 > var6 / 2) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
return;
}
if (2 == var3) {
for (var21 = var13; var14 > var21; ++var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (var22 >= var7 / 2) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
return;
}
if (var3 == 3) {
for (var21 = var13; var14 > var21; ++var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var6 / 2 > var21) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
return;
}
}
if (7 == var5) {
if (0 == var3) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (var22 <= var21 + -(var6 / 2)) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
return;
}
if (var3 == 1) {
for (var21 = var20 + -1; var21 >= var19; --var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var22 > -(var6 / 2) + var21) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
return;
}
if (var3 == 2) {
for (var21 = var20 + -1; var21 >= var19; --var21) {
for (var22 = -1 + var18; var22 >= var17; --var22) {
if (var22 > var21 + -(var6 / 2)) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
return;
}
if (3 == var3) {
for (var21 = var13; var14 > var21; ++var21) {
for (var22 = -1 + var18; var17 <= var22; --var22) {
if (var21 + -(var6 / 2) >= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
return;
}
}
if (var5 == 8) {
if (0 == var3) {
for (var21 = var13; var14 > var21; ++var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (-(var6 / 2) + var21 <= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
return;
}
if (var3 == 1) {
for (var21 = -1 + var20; var21 >= var19; --var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (-(var6 / 2) + var21 > var22) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
return;
}
if (var3 == 2) {
for (var21 = var20 - 1; var19 <= var21; --var21) {
for (var22 = -1 + var18; var22 >= var17; --var22) {
if (var21 - var6 / 2 > var22) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
return;
}
if (var3 == 3) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = -1 + var18; var17 <= var22; --var22) {
if (var21 + -(var6 / 2) > var22) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
return;
}
}
} else if (0 == var3) {
for (var21 = var20 + -1; var21 >= var19; --var21) {
for (var22 = -1 + var18; var22 >= var17; --var22) {
if (var21 >> 1 <= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (1 == var3) {
for (var21 = -1 + var20; var21 >= var19; --var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (var22 > var21 << 1) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
} else if (var3 == 2) {
for (var21 = var13; var14 > var21; ++var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (var21 >> 1 > var22) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
} else if (var3 == 3) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var18 + -1; var17 <= var22; --var22) {
if (var21 << 1 >= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
}
} else if (var3 == 0) {
for (var21 = var20 + -1; var21 >= var19; --var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var22 < var21 >> 1) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
} else if (1 == var3) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (var22 <= var21 << 1) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (2 == var3) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var18 + -1; var22 >= var17; --var22) {
if (var21 >> 1 <= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (var3 == 3) {
for (var21 = -1 + var20; var21 >= var19; --var21) {
for (var22 = -1 + var18; var22 >= var17; --var22) {
if (var22 <= var21 << 1) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
}
} else if (var3 == 0) {
for (var21 = var20 - 1; var21 >= var19; --var21) {
for (var22 = -1 + var18; var17 <= var22; --var22) {
if (var22 <= var21 >> 1) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (var3 == 1) {
for (var21 = -1 + var20; var19 <= var21; --var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var22 >= var21 << 1) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (2 == var3) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var21 >> 1 >= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (3 == var3) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var18 - 1; var17 <= var22; --var22) {
if (var22 < var21 << 1) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
}
} else if (var3 == 0) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (var21 >= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (1 == var3) {
for (var21 = var20 + -1; var21 >= var19; --var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (var21 >= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (2 == var3) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var22 >= var21) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (var3 == 3) {
for (var21 = var20 + -1; var19 <= var21; --var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var22 < var21) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
}
}
}
}
}
} catch (RuntimeException var23) {
throw ClientErrorException.clientError(var23, "wl.C(" + "null" + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ',' + var7 + ',' + var8 + ',' + var9 + ',' + (byte) 21 + ')');
}
}
static RSInterface method2273(RSInterface iface) {
if (iface.parentId != -1) {
return Unsorted.getRSInterface(iface.parentId);
}
int var3 = iface.componentHash >>> 16;
Class80<Class3_Sub31> var4 = new Class80<>(TextureOperation23.aHashTable_3208);
for (Class3_Sub31 var2 = var4.method1393(); null != var2; var2 = var4.method1392()) {
if (var2.anInt2602 == var3) {
return Unsorted.getRSInterface((int) var2.linkableKey);
}
}
return null;
}
static void method2275(int var0, int var2, int var3, int var4, int var5, int var6) {
try {
int var8 = -var5 + var3;
MouseListeningClass.method2091(var3);
int var7 = 0;
if (var8 < 0) {
var8 = 0;
}
int var9 = var3;
int var10 = -var3;
int var12 = -var8;
int var11 = var8;
int var13 = -1;
int var17;
int var16;
int var19;
int var18;
if (var2 >= Class159.anInt2020 && Class57.anInt902 >= var2) {
int[] var15 = Class38.anIntArrayArray663[var2];
var16 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, -var3 + var6, Class101.anInt1425);
var17 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var3 + var6, Class101.anInt1425);
var18 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var6 + -var8, Class101.anInt1425);
var19 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var6 - -var8, Class101.anInt1425);
TextureOperation18.method282(var15, var16, 102, var18, var4);
TextureOperation18.method282(var15, var18, -44, var19, var0);
TextureOperation18.method282(var15, var19, -61, var17, var4);
}
int var14 = -1;
while (var9 > var7) {
var13 += 2;
var14 += 2;
var12 += var14;
var10 += var13;
if (var12 >= 0 && var11 >= 1) {
--var11;
GameObject.anIntArray1838[var11] = var7;
var12 -= var11 << 1;
}
++var7;
int var21;
int var20;
int[] var22;
int var24;
if (0 <= var10) {
--var9;
var10 -= var9 << 1;
var24 = var2 + -var9;
var16 = var2 + var9;
if (var16 >= Class159.anInt2020 && var24 <= Class57.anInt902) {
if (var8 <= var9) {
var17 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var7 + var6, Class101.anInt1425);
var18 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, -var7 + var6, Class101.anInt1425);
if (var16 <= Class57.anInt902) {
TextureOperation18.method282(Class38.anIntArrayArray663[var16], var18, -53, var17, var4);
}
if (var24 >= Class159.anInt2020) {
TextureOperation18.method282(Class38.anIntArrayArray663[var24], var18, 96, var17, var4);
}
} else {
var17 = GameObject.anIntArray1838[var9];
var18 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var7 + var6, Class101.anInt1425);
var19 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, -var7 + var6, Class101.anInt1425);
var20 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var6 - -var17, Class101.anInt1425);
var21 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, -var17 + var6, Class101.anInt1425);
if (Class57.anInt902 >= var16) {
var22 = Class38.anIntArrayArray663[var16];
TextureOperation18.method282(var22, var19, 116, var21, var4);
TextureOperation18.method282(var22, var21, 125, var20, var0);
TextureOperation18.method282(var22, var20, 87, var18, var4);
}
if (Class159.anInt2020 <= var24) {
var22 = Class38.anIntArrayArray663[var24];
TextureOperation18.method282(var22, var19, 110, var21, var4);
TextureOperation18.method282(var22, var21, -114, var20, var0);
TextureOperation18.method282(var22, var20, -88, var18, var4);
}
}
}
}
var24 = -var7 + var2;
var16 = var2 - -var7;
if (var16 >= Class159.anInt2020 && var24 <= Class57.anInt902) {
var17 = var6 + var9;
var18 = var6 + -var9;
if (var17 >= Class101.anInt1425 && var18 <= Class3_Sub28_Sub18.anInt3765) {
var17 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var17, Class101.anInt1425);
var18 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var18, Class101.anInt1425);
if (var7 < var8) {
var19 = var11 >= var7 ? var11 : GameObject.anIntArray1838[var7];
var20 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var19 + var6, Class101.anInt1425);
var21 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var6 - var19, Class101.anInt1425);
if (Class57.anInt902 >= var16) {
var22 = Class38.anIntArrayArray663[var16];
TextureOperation18.method282(var22, var18, 126, var21, var4);
TextureOperation18.method282(var22, var21, 103, var20, var0);
TextureOperation18.method282(var22, var20, -61, var17, var4);
}
if (var24 >= Class159.anInt2020) {
var22 = Class38.anIntArrayArray663[var24];
TextureOperation18.method282(var22, var18, 102, var21, var4);
TextureOperation18.method282(var22, var21, -94, var20, var0);
TextureOperation18.method282(var22, var20, 99, var17, var4);
}
} else {
if (var16 <= Class57.anInt902) {
TextureOperation18.method282(Class38.anIntArrayArray663[var16], var18, 94, var17, var4);
}
if (var24 >= Class159.anInt2020) {
TextureOperation18.method282(Class38.anIntArrayArray663[var24], var18, 126, var17, var4);
}
}
}
}
}
} catch (RuntimeException var23) {
throw ClientErrorException.clientError(var23, "wl.I(" + var0 + ',' + (byte) 109 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ')');
}
}
static void method2277(int var0, int var1, int var2, int var3, byte var4) {
try {
Class3_Sub25 var5 = (Class3_Sub25) Class3_Sub2.aHashTable_2220.get(var3);
if (var5 == null) {
var5 = new Class3_Sub25();
Class3_Sub2.aHashTable_2220.put(var3, var5);
}
if (var4 > 16) {
if (var1 >= var5.anIntArray2547.length) {
int[] var6 = new int[var1 - -1];
int[] var7 = new int[1 + var1];
int var8;
for (var8 = 0; var8 < var5.anIntArray2547.length; ++var8) {
var6[var8] = var5.anIntArray2547[var8];
var7[var8] = var5.anIntArray2551[var8];
}
for (var8 = var5.anIntArray2547.length; var1 > var8; ++var8) {
var6[var8] = -1;
var7[var8] = 0;
}
var5.anIntArray2547 = var6;
var5.anIntArray2551 = var7;
}
var5.anIntArray2547[var1] = var0;
var5.anIntArray2551[var1] = var2;
}
} catch (RuntimeException var9) {
throw ClientErrorException.clientError(var9, "wl.A(" + var0 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ')');
}
}
static void method2278(int var0) {
try {
boolean var1 = false;
while (!var1) {
var1 = true;
for (int var2 = 0; -1 + Unsorted.menuOptionCount > var2; ++var2) {
if (TextureOperation27.aShortArray3095[var2] < 1000 && TextureOperation27.aShortArray3095[1 + var2] > 1000) {
RSString var3 = Class163_Sub2_Sub1.aClass94Array4016[var2];
var1 = false;
Class163_Sub2_Sub1.aClass94Array4016[var2] = Class163_Sub2_Sub1.aClass94Array4016[1 + var2];
Class163_Sub2_Sub1.aClass94Array4016[1 + var2] = var3;
RSString var4 = Class140_Sub7.aClass94Array2935[var2];
Class140_Sub7.aClass94Array2935[var2] = Class140_Sub7.aClass94Array2935[var2 + 1];
Class140_Sub7.aClass94Array2935[var2 - -1] = var4;
int var5 = Class117.anIntArray1613[var2];
Class117.anIntArray1613[var2] = Class117.anIntArray1613[1 + var2];
Class117.anIntArray1613[var2 + 1] = var5;
var5 = Class27.anIntArray512[var2];
Class27.anIntArray512[var2] = Class27.anIntArray512[var2 + 1];
Class27.anIntArray512[1 + var2] = var5;
var5 = Class114.anIntArray1578[var2];
Class114.anIntArray1578[var2] = Class114.anIntArray1578[1 + var2];
Class114.anIntArray1578[var2 - -1] = var5;
short var6 = TextureOperation27.aShortArray3095[var2];
TextureOperation27.aShortArray3095[var2] = TextureOperation27.aShortArray3095[1 + var2];
TextureOperation27.aShortArray3095[var2 + 1] = var6;
long var7 = Unsorted.aLongArray3271[var2];
Unsorted.aLongArray3271[var2] = Unsorted.aLongArray3271[var2 + 1];
Unsorted.aLongArray3271[var2 - -1] = var7;
}
}
}
} catch (RuntimeException var9) {
throw ClientErrorException.clientError(var9, "wl.D(" + var0 + ')');
}
}
static void method2280(int var1) {
try {
InterfaceWidget var2 = InterfaceWidget.getWidget(11, var1);
var2.a();
} catch (RuntimeException var3) {
throw ClientErrorException.clientError(var3, "wl.B(" + 2714 + ',' + var1 + ')');
}
}
static Class168 method350(int var1) {
try {
Class168 var2 = (Class168)Class163_Sub2_Sub1.aReferenceCache_4015.get(var1);
if(null == var2) {
byte[] var4 = Class3_Sub28_Sub5.aClass153_3580.getFile(4, var1);
var2 = new Class168();
if(var4 != null) {
var2.method2274(new DataBuffer(var4), var1);
}
Class163_Sub2_Sub1.aReferenceCache_4015.put(var2, var1);
}
return var2;
} catch (RuntimeException var5) {
throw ClientErrorException.clientError(var5, "um.C(" + ',' + var1 + ')');
}
}
final void method2274(DataBuffer var2, int var3) {
try {
while (true) {
int var4 = var2.readUnsignedByte();
if (var4 == 0) {
return;
}
this.method2279(var4, var2, var3);
}
} catch (RuntimeException var5) {
throw ClientErrorException.clientError(var5, "wl.H(" + 24559 + ',' + (var2 != null ? "{...}" : "null") + ',' + var3 + ')');
}
}
private void method2279(int var2, DataBuffer var3, int var4) {
try {
if (var2 == 1) {
this.anInt2103 = RSInterface.method869(var3.readMedium());
} else if (var2 == 2) {
this.anInt2095 = var3.readUnsignedByte();
} else if (3 == var2) {
this.anInt2095 = var3.readUnsignedShort();
if (this.anInt2095 == 65535) {
this.anInt2095 = -1;
}
} else if (5 == var2) {
this.aBoolean2102 = false;
} else if (var2 == 7) {
this.anInt2098 = RSInterface.method869(var3.readMedium());
} else if (var2 == 8) {
TextureOperation26.anInt3081 = var4;
} else if (var2 == 9) {
this.anInt2090 = var3.readUnsignedShort();
} else if (var2 == 10) {
this.aBoolean2093 = false;
} else if (var2 == 11) {
this.anInt2100 = var3.readUnsignedByte();
} else if (12 == var2) {
this.aBoolean2092 = true;
} else if (13 == var2) {
this.anInt2094 = var3.readMedium();
} else if (var2 == 14) {
this.anInt2101 = var3.readUnsignedByte();
}
} catch (RuntimeException var6) {
throw ClientErrorException.clientError(var6, "wl.E(" + 0 + ',' + var2 + ',' + (var3 != null ? "{...}" : "null") + ',' + var4 + ')');
}
}
}

2
Client/src/main/java/org/runite/client/Class27.java
View file

@ -9,7 +9,7 @@ final class Class27 {
static int[] anIntArray512 = new int[500];
static int anInt515 = -1;
static int anInt517 = 0;
static Class3_Sub28_Sub16_Sub2 aClass3_Sub28_Sub16_Sub2_518;
static SoftwareSprite aSoftwareSprite_518;
static Class157 resampler;
static RSInterface aClass11_526 = null;

54
Client/src/main/java/org/runite/client/Class36.java
View file

@ -137,60 +137,6 @@ final class Class36 {
}
}
static void method1014(int var1, int var2) {
try {
for (int var4 = 0; var4 < Client.anInt869; ++var4) {
Class168 var5 = Class168.method350(var4);
if (null != var5) {
int var6 = var5.anInt2095;
if (0 <= var6 && !Class51.anInterface2_838.method17(var6, 126)) {
var6 = -1;
}
int var7;
int var8;
int var9;
int var10;
if (var5.anInt2098 < 0) {
if (var6 >= 0) {
var7 = Class51.anIntArray834[LinkableRSString.method729((byte) -74, Class51.anInterface2_838.method15(var6, 65535), 96)];
} else if (-1 == var5.anInt2103) {
var7 = -1;
} else {
var8 = var5.anInt2103;
var9 = var1 + (var8 & 127);
if (var9 < 0) {
var9 = 0;
} else if (var9 > 127) {
var9 = 127;
}
var10 = var9 + (896 & var8) + ('\ufc00' & var8 + var2);
var7 = Class51.anIntArray834[LinkableRSString.method729((byte) -127, var10, 96)];
}
} else {
var8 = var5.anInt2098;
var9 = (127 & var8) + var1;
if (var9 < 0) {
var9 = 0;
} else if (var9 > 127) {
var9 = 127;
}
var10 = (896 & var8) + ('\ufc00' & var2 + var8) + var9;
var7 = Class51.anIntArray834[LinkableRSString.method729((byte) -63, var10, 96)];
}
Class83.anIntArray1161[1 + var4] = var7;
}
}
} catch (RuntimeException var11) {
throw ClientErrorException.clientError(var11, "fi.B(" + -120 + ',' + var1 + ',' + var2 + ')');
}
}
final int method1015(int var1, byte[] var3, byte[] var4, int var5, int var6) {
try {
var1 += var5;

2
Client/src/main/java/org/runite/client/Class38_Sub1.java
View file

@ -28,7 +28,7 @@ public final class Class38_Sub1 extends Class38 {
if(HDToolKit.highDetail) {
((HDSprite)var1).drawMinimapIcons(var0.width / 2 + var6 + var12 - var1.anInt3697 / 2, var0.height / 2 + var4 - (var13 + var1.anInt3706 / 2), (HDSprite)var0.method866(false));
} else {
((Class3_Sub28_Sub16_Sub2)var1).drawMinimapIcons(var0.width / 2 + var6 - -var12 + -(var1.anInt3697 / 2), -(var1.anInt3706 / 2) + var0.height / 2 + var4 + -var13, var0.anIntArray207, var0.anIntArray291);
((SoftwareSprite)var1).drawMinimapIcons(var0.width / 2 + var6 - -var12 + -(var1.anInt3697 / 2), -(var1.anInt3706 / 2) + var0.height / 2 + var4 + -var13, var0.anIntArray207, var0.anIntArray291);
}
}

624
Client/src/main/java/org/runite/client/Class3_Sub11.java
View file

@ -11,341 +11,341 @@ import java.nio.ByteOrder;
final class Class3_Sub11 extends Linkable {
int anInt2342 = 0;
int anInt2343 = 0;
int anInt2344 = 0;
private ByteBuffer aByteBuffer2345;
private float[] aFloatArray2346;
private final boolean aBoolean2347;
private int[] anIntArray2348;
private int[] anIntArray2349;
private int[] anIntArray2350;
int anInt2351;
private int[] anIntArray2352;
private HashTable aHashTable_2353;
private float[] aFloatArray2354;
int anInt2355;
private int anInt2356 = 0;
private int[][] anIntArrayArray2357;
private int[] anIntArray2358;
private int anInt2359 = 0;
private int[][] anIntArrayArray2360;
private static ByteBuffer aByteBuffer2361;
private static DataBuffer aClass3_Sub30_2362;
private Class156 aClass156_2363;
boolean aBoolean2364;
private float[] aFloatArray2365;
private int anInt2366 = 0;
private int[] anIntArray2367;
private static ByteBuffer aByteBuffer2368;
private float[] aFloatArray2369;
private boolean[] aBooleanArray2370;
private int[] anIntArray2371;
private static DataBuffer aClass3_Sub30_2372;
private final float aFloat2373;
int anInt2342 = 0;
int anInt2343 = 0;
int anInt2344 = 0;
private ByteBuffer aByteBuffer2345;
private float[] aFloatArray2346;
private final boolean aBoolean2347;
private int[] anIntArray2348;
private int[] anIntArray2349;
private int[] anIntArray2350;
int anInt2351;
private int[] anIntArray2352;
private HashTable aHashTable_2353;
private float[] aFloatArray2354;
int anInt2355;
private int anInt2356 = 0;
private int[][] anIntArrayArray2357;
private int[] anIntArray2358;
private int anInt2359 = 0;
private int[][] anIntArrayArray2360;
private static ByteBuffer aByteBuffer2361;
private static DataBuffer aClass3_Sub30_2362;
private Class156 aClass156_2363;
boolean aBoolean2364;
private float[] aFloatArray2365;
private int anInt2366 = 0;
private int[] anIntArray2367;
private static ByteBuffer aByteBuffer2368;
private float[] aFloatArray2369;
private boolean[] aBooleanArray2370;
private int[] anIntArray2371;
private static DataBuffer aClass3_Sub30_2372;
private final float aFloat2373;
static void method144() {
aClass3_Sub30_2372 = null;
aClass3_Sub30_2362 = null;
aByteBuffer2368 = null;
aByteBuffer2361 = null;
}
static void method144() {
aClass3_Sub30_2372 = null;
aClass3_Sub30_2362 = null;
aByteBuffer2368 = null;
aByteBuffer2361 = null;
}
final void method145() {
this.anIntArray2371 = new int[this.anInt2342];
this.anIntArray2358 = new int[this.anInt2342];
this.anIntArray2352 = new int[this.anInt2342];
if(this.aBoolean2347) {
this.aFloatArray2346 = new float[this.anInt2342];
}
final void method145() {
this.anIntArray2371 = new int[this.anInt2342];
this.anIntArray2358 = new int[this.anInt2342];
this.anIntArray2352 = new int[this.anInt2342];
if (this.aBoolean2347) {
this.aFloatArray2346 = new float[this.anInt2342];
}
this.anIntArray2348 = new int[this.anInt2342];
this.aFloatArray2369 = new float[this.anInt2342];
this.aFloatArray2365 = new float[this.anInt2342];
this.aFloatArray2354 = new float[this.anInt2342];
this.anIntArray2350 = new int[this.anInt2344];
this.anIntArray2349 = new int[this.anInt2344];
this.anIntArray2367 = new int[this.anInt2344];
this.anIntArrayArray2357 = new int[this.anInt2344][];
this.aHashTable_2353 = new HashTable(Class95.method1585((byte)123, this.anInt2342));
if(this.aBoolean2364) {
this.anIntArrayArray2360 = new int[this.anInt2344][];
this.aBooleanArray2370 = new boolean[this.anInt2344];
}
this.anIntArray2348 = new int[this.anInt2342];
this.aFloatArray2369 = new float[this.anInt2342];
this.aFloatArray2365 = new float[this.anInt2342];
this.aFloatArray2354 = new float[this.anInt2342];
this.anIntArray2350 = new int[this.anInt2344];
this.anIntArray2349 = new int[this.anInt2344];
this.anIntArray2367 = new int[this.anInt2344];
this.anIntArrayArray2357 = new int[this.anInt2344][];
this.aHashTable_2353 = new HashTable(Class95.method1585((byte) 123, this.anInt2342));
if (this.aBoolean2364) {
this.anIntArrayArray2360 = new int[this.anInt2344][];
this.aBooleanArray2370 = new boolean[this.anInt2344];
}
}
}
final int method146(int var1, int var2, int var3, float var4, float var5, float var6, int var7, float var8) {
long var9 = 0L;
if((var1 & 127) == 0 || (var3 & 127) == 0) {
var9 = (long)(var1 + (var3 << 16)) + ((long)var7 << 32);
LinkableInt var11 = (LinkableInt)this.aHashTable_2353.get(var9);
if(var11 != null) {
if(var2 < this.anIntArray2358[var11.value]) {
this.anIntArray2358[var11.value] = var2;
final int method146(int var1, int var2, int var3, float var4, float var5, float var6, int var7, float var8) {
long var9 = 0L;
if ((var1 & 127) == 0 || (var3 & 127) == 0) {
var9 = (long) (var1 + (var3 << 16)) + ((long) var7 << 32);
LinkableInt var11 = (LinkableInt) this.aHashTable_2353.get(var9);
if (var11 != null) {
if (var2 < this.anIntArray2358[var11.value]) {
this.anIntArray2358[var11.value] = var2;
}
return var11.value;
}
}
return var11.value;
}
}
this.anIntArray2371[this.anInt2343] = var1;
this.anIntArray2358[this.anInt2343] = var2;
this.anIntArray2352[this.anInt2343] = var3;
if (this.aBoolean2347) {
this.aFloatArray2346[this.anInt2343] = var8;
}
this.anIntArray2371[this.anInt2343] = var1;
this.anIntArray2358[this.anInt2343] = var2;
this.anIntArray2352[this.anInt2343] = var3;
if(this.aBoolean2347) {
this.aFloatArray2346[this.anInt2343] = var8;
}
this.aFloatArray2369[this.anInt2343] = var4;
this.aFloatArray2365[this.anInt2343] = var5;
this.aFloatArray2354[this.anInt2343] = var6;
this.anIntArray2348[this.anInt2343] = var7;
if (var9 != 0L) {
this.aHashTable_2353.put(var9, new LinkableInt(this.anInt2343));
}
this.aFloatArray2369[this.anInt2343] = var4;
this.aFloatArray2365[this.anInt2343] = var5;
this.aFloatArray2354[this.anInt2343] = var6;
this.anIntArray2348[this.anInt2343] = var7;
if(var9 != 0L) {
this.aHashTable_2353.put(var9, new LinkableInt(this.anInt2343));
}
return this.anInt2343++;
}
return this.anInt2343++;
}
final void method148() {
DataBuffer var1 = new DataBuffer((this.aBoolean2347 ? 40 : 36) * this.anInt2343);
final void method148() {
DataBuffer var1 = new DataBuffer((this.aBoolean2347?40:36) * this.anInt2343);
for(int var2 = 0; var2 < this.anInt2343; ++var2) {
if(HDToolKit.aBoolean1790) {
var1.writeFloat((float)this.anIntArray2371[var2]);
var1.writeFloat((float)this.anIntArray2358[var2]);
var1.writeFloat((float)this.anIntArray2352[var2]);
var1.writeInt(this.anIntArray2348[var2]);
var1.writeFloat(this.aFloatArray2369[var2]);
var1.writeFloat(this.aFloatArray2365[var2]);
var1.writeFloat(this.aFloatArray2354[var2]);
var1.writeFloat((float)this.anIntArray2371[var2] / this.aFloat2373);
var1.writeFloat((float)this.anIntArray2352[var2] / this.aFloat2373);
if(this.aBoolean2347) {
var1.writeFloat(this.aFloatArray2346[var2]);
}
} else {
var1.writeFloatLE((float)this.anIntArray2371[var2]);
var1.writeFloatLE((float)this.anIntArray2358[var2]);
var1.writeFloatLE((float)this.anIntArray2352[var2]);
var1.writeInt(this.anIntArray2348[var2]);
var1.writeFloatLE(this.aFloatArray2369[var2]);
var1.writeFloatLE(this.aFloatArray2365[var2]);
var1.writeFloatLE(this.aFloatArray2354[var2]);
var1.writeFloatLE((float)this.anIntArray2371[var2] / this.aFloat2373);
var1.writeFloatLE((float)this.anIntArray2352[var2] / this.aFloat2373);
if(this.aBoolean2347) {
var1.writeFloatLE(this.aFloatArray2346[var2]);
}
}
}
if(HDToolKit.supportVertexBufferObject) {
ByteBuffer var3 = ByteBuffer.wrap(var1.buffer, 0, var1.index);
this.aClass156_2363 = new Class156();
this.aClass156_2363.method2172(var3);
} else {
this.aByteBuffer2345 = ByteBuffer.allocateDirect(var1.index).order(ByteOrder.nativeOrder());
this.aByteBuffer2345.put(var1.buffer, 0, var1.index);
this.aByteBuffer2345.flip();
}
this.anIntArray2371 = null;
this.anIntArray2358 = null;
this.anIntArray2352 = null;
this.anIntArray2348 = null;
this.aFloatArray2369 = null;
this.aFloatArray2365 = null;
this.aFloatArray2354 = null;
this.aHashTable_2353 = null;
this.aFloatArray2346 = null;
}
final void method149(Class3_Sub2[][][] var1, float var2, boolean var3) {
if(aClass3_Sub30_2372 != null && aClass3_Sub30_2372.buffer.length >= this.anInt2359 * 4) {
aClass3_Sub30_2372.index = 0;
} else {
aClass3_Sub30_2372 = new DataBuffer(this.anInt2359 * 4);
}
if(aClass3_Sub30_2362 != null && aClass3_Sub30_2362.buffer.length >= this.anInt2356 * 4) {
aClass3_Sub30_2362.index = 0;
} else {
aClass3_Sub30_2362 = new DataBuffer(this.anInt2356 * 4);
}
int var4;
Class3_Sub2 var5;
DataBuffer var6;
int[] var7;
int[] var8;
int var9;
int var12;
if(HDToolKit.aBoolean1790) {
for(var4 = 0; var4 < this.anInt2366; ++var4) {
var5 = var1[this.anIntArray2367[var4]][this.anIntArray2350[var4]][this.anIntArray2349[var4]];
if(var5 != null && var5.aBoolean2222) {
var7 = this.anIntArrayArray2357[var4];
if(this.aBoolean2364) {
var8 = this.anIntArrayArray2360[var4];
if(var8 != null) {
for(var9 = 0; var9 < var8.length; ++var9) {
aClass3_Sub30_2362.writeInt(var8[var9]);
}
}
var6 = this.aBooleanArray2370[var4]?aClass3_Sub30_2362:aClass3_Sub30_2372;
} else {
var6 = aClass3_Sub30_2372;
}
for(var12 = 1; var12 < var7.length - 1; ++var12) {
var6.writeInt(var7[0]);
var6.writeInt(var7[var12]);
var6.writeInt(var7[var12 + 1]);
}
}
}
} else {
for(var4 = 0; var4 < this.anInt2366; ++var4) {
var5 = var1[this.anIntArray2367[var4]][this.anIntArray2350[var4]][this.anIntArray2349[var4]];
if(var5 != null && var5.aBoolean2222) {
var7 = this.anIntArrayArray2357[var4];
if(this.aBoolean2364) {
var8 = this.anIntArrayArray2360[var4];
if(var8 != null) {
for(var9 = 0; var9 < var8.length; ++var9) {
aClass3_Sub30_2362.writeIntLE(var8[var9]);
}
}
var6 = this.aBooleanArray2370[var4]?aClass3_Sub30_2362:aClass3_Sub30_2372;
} else {
var6 = aClass3_Sub30_2372;
}
for(var12 = 1; var12 < var7.length - 1; ++var12) {
var6.writeIntLE(var7[0]);
var6.writeIntLE(var7[var12]);
var6.writeIntLE(var7[var12 + 1]);
}
}
}
}
if(aClass3_Sub30_2372.index != 0 || aClass3_Sub30_2362.index != 0) {
GL var10 = HDToolKit.gl;
if(this.anInt2351 == -1 || var3) {
HDToolKit.bindTexture2D(-1);
Unsorted.method551(0, 0);
} else {
Class51.anInterface2_838.method8(this.anInt2351, true);
}
int var11 = this.aBoolean2347?40:36;
if(this.aClass156_2363 == null) {
if(HDToolKit.supportVertexBufferObject) {
var10.glBindBufferARB('\u8892', 0);
}
this.aByteBuffer2345.position(0);
var10.glVertexPointer(3, 5126, var11, this.aByteBuffer2345);
this.aByteBuffer2345.position(12);
var10.glColorPointer(4, 5121, var11, this.aByteBuffer2345);
if(Class106.aBoolean1441) {
this.aByteBuffer2345.position(16);
var10.glNormalPointer(5126, var11, this.aByteBuffer2345);
}
this.aByteBuffer2345.position(28);
var10.glTexCoordPointer(2, 5126, var11, this.aByteBuffer2345);
if(this.aBoolean2347) {
var10.glClientActiveTexture(WaterShader.method2252());
this.aByteBuffer2345.position(36);
var10.glTexCoordPointer(1, 5126, var11, this.aByteBuffer2345);
var10.glClientActiveTexture('\u84c0');
}
} else {
this.aClass156_2363.method2169();
var10.glVertexPointer(3, 5126, var11, 0L);
var10.glColorPointer(4, 5121, var11, 12L);
if(Class106.aBoolean1441) {
var10.glNormalPointer(5126, var11, 16L);
}
var10.glTexCoordPointer(2, 5126, var11, 28L);
if(this.aBoolean2347) {
var10.glClientActiveTexture(WaterShader.method2252());
var10.glTexCoordPointer(1, 5126, var11, 36L);
var10.glClientActiveTexture('\u84c0');
}
}
if(HDToolKit.supportVertexBufferObject) {
var10.glBindBufferARB('\u8893', 0);
}
if(aClass3_Sub30_2372.index != 0) {
if(aByteBuffer2368 != null && aByteBuffer2368.capacity() >= aClass3_Sub30_2372.index) {
aByteBuffer2368.clear();
for (int var2 = 0; var2 < this.anInt2343; ++var2) {
if (HDToolKit.aBoolean1790) {
var1.writeFloat((float) this.anIntArray2371[var2]);
var1.writeFloat((float) this.anIntArray2358[var2]);
var1.writeFloat((float) this.anIntArray2352[var2]);
var1.writeInt(this.anIntArray2348[var2]);
var1.writeFloat(this.aFloatArray2369[var2]);
var1.writeFloat(this.aFloatArray2365[var2]);
var1.writeFloat(this.aFloatArray2354[var2]);
var1.writeFloat((float) this.anIntArray2371[var2] / this.aFloat2373);
var1.writeFloat((float) this.anIntArray2352[var2] / this.aFloat2373);
if (this.aBoolean2347) {
var1.writeFloat(this.aFloatArray2346[var2]);
}
} else {
aByteBuffer2368 = ByteBuffer.allocateDirect(aClass3_Sub30_2372.index).order(ByteOrder.nativeOrder());
var1.writeFloatLE((float) this.anIntArray2371[var2]);
var1.writeFloatLE((float) this.anIntArray2358[var2]);
var1.writeFloatLE((float) this.anIntArray2352[var2]);
var1.writeInt(this.anIntArray2348[var2]);
var1.writeFloatLE(this.aFloatArray2369[var2]);
var1.writeFloatLE(this.aFloatArray2365[var2]);
var1.writeFloatLE(this.aFloatArray2354[var2]);
var1.writeFloatLE((float) this.anIntArray2371[var2] / this.aFloat2373);
var1.writeFloatLE((float) this.anIntArray2352[var2] / this.aFloat2373);
if (this.aBoolean2347) {
var1.writeFloatLE(this.aFloatArray2346[var2]);
}
}
}
aByteBuffer2368.put(aClass3_Sub30_2372.buffer, 0, aClass3_Sub30_2372.index);
aByteBuffer2368.flip();
HDToolKit.method1832(var2);
var10.glDrawElements(4, aClass3_Sub30_2372.index / 4, 5125, aByteBuffer2368);
}
if (HDToolKit.supportVertexBufferObject) {
ByteBuffer var3 = ByteBuffer.wrap(var1.buffer, 0, var1.index);
this.aClass156_2363 = new Class156();
this.aClass156_2363.method2172(var3);
} else {
this.aByteBuffer2345 = ByteBuffer.allocateDirect(var1.index).order(ByteOrder.nativeOrder());
this.aByteBuffer2345.put(var1.buffer, 0, var1.index);
this.aByteBuffer2345.flip();
}
if(aClass3_Sub30_2362.index != 0) {
if(aByteBuffer2361 != null && aByteBuffer2361.capacity() >= aClass3_Sub30_2362.index) {
aByteBuffer2361.clear();
this.anIntArray2371 = null;
this.anIntArray2358 = null;
this.anIntArray2352 = null;
this.anIntArray2348 = null;
this.aFloatArray2369 = null;
this.aFloatArray2365 = null;
this.aFloatArray2354 = null;
this.aHashTable_2353 = null;
this.aFloatArray2346 = null;
}
final void method149(Class3_Sub2[][][] var1, float var2, boolean var3) {
if (aClass3_Sub30_2372 != null && aClass3_Sub30_2372.buffer.length >= this.anInt2359 * 4) {
aClass3_Sub30_2372.index = 0;
} else {
aClass3_Sub30_2372 = new DataBuffer(this.anInt2359 * 4);
}
if (aClass3_Sub30_2362 != null && aClass3_Sub30_2362.buffer.length >= this.anInt2356 * 4) {
aClass3_Sub30_2362.index = 0;
} else {
aClass3_Sub30_2362 = new DataBuffer(this.anInt2356 * 4);
}
int var4;
Class3_Sub2 var5;
DataBuffer var6;
int[] var7;
int[] var8;
int var9;
int var12;
if (HDToolKit.aBoolean1790) {
for (var4 = 0; var4 < this.anInt2366; ++var4) {
var5 = var1[this.anIntArray2367[var4]][this.anIntArray2350[var4]][this.anIntArray2349[var4]];
if (var5 != null && var5.aBoolean2222) {
var7 = this.anIntArrayArray2357[var4];
if (this.aBoolean2364) {
var8 = this.anIntArrayArray2360[var4];
if (var8 != null) {
for (var9 = 0; var9 < var8.length; ++var9) {
aClass3_Sub30_2362.writeInt(var8[var9]);
}
}
var6 = this.aBooleanArray2370[var4] ? aClass3_Sub30_2362 : aClass3_Sub30_2372;
} else {
var6 = aClass3_Sub30_2372;
}
for (var12 = 1; var12 < var7.length - 1; ++var12) {
var6.writeInt(var7[0]);
var6.writeInt(var7[var12]);
var6.writeInt(var7[var12 + 1]);
}
}
}
} else {
for (var4 = 0; var4 < this.anInt2366; ++var4) {
var5 = var1[this.anIntArray2367[var4]][this.anIntArray2350[var4]][this.anIntArray2349[var4]];
if (var5 != null && var5.aBoolean2222) {
var7 = this.anIntArrayArray2357[var4];
if (this.aBoolean2364) {
var8 = this.anIntArrayArray2360[var4];
if (var8 != null) {
for (var9 = 0; var9 < var8.length; ++var9) {
aClass3_Sub30_2362.writeIntLE(var8[var9]);
}
}
var6 = this.aBooleanArray2370[var4] ? aClass3_Sub30_2362 : aClass3_Sub30_2372;
} else {
var6 = aClass3_Sub30_2372;
}
for (var12 = 1; var12 < var7.length - 1; ++var12) {
var6.writeIntLE(var7[0]);
var6.writeIntLE(var7[var12]);
var6.writeIntLE(var7[var12 + 1]);
}
}
}
}
if (aClass3_Sub30_2372.index != 0 || aClass3_Sub30_2362.index != 0) {
GL var10 = HDToolKit.gl;
if (this.anInt2351 == -1 || var3) {
HDToolKit.bindTexture2D(-1);
Unsorted.method551(0, 0);
} else {
aByteBuffer2361 = ByteBuffer.allocateDirect(aClass3_Sub30_2362.index).order(ByteOrder.nativeOrder());
Class51.anInterface2_838.method8(this.anInt2351, true);
}
aByteBuffer2361.put(aClass3_Sub30_2362.buffer, 0, aClass3_Sub30_2362.index);
aByteBuffer2361.flip();
HDToolKit.method1832(var2 - 100.0F);
HDToolKit.depthBufferWritingDisabled();
var10.glDrawElements(4, aClass3_Sub30_2362.index / 4, 5125, aByteBuffer2361);
HDToolKit.method1830();
}
int var11 = this.aBoolean2347 ? 40 : 36;
if (this.aClass156_2363 == null) {
if (HDToolKit.supportVertexBufferObject) {
var10.glBindBufferARB('\u8892', 0);
}
}
}
this.aByteBuffer2345.position(0);
var10.glVertexPointer(3, 5126, var11, this.aByteBuffer2345);
this.aByteBuffer2345.position(12);
var10.glColorPointer(4, 5121, var11, this.aByteBuffer2345);
if (Class106.aBoolean1441) {
this.aByteBuffer2345.position(16);
var10.glNormalPointer(5126, var11, this.aByteBuffer2345);
}
final void method150(int var1, int var2, int var3, int[] var4, int[] var5, boolean var6) {
if(this.aBoolean2364) {
this.anIntArrayArray2360[this.anInt2366] = var5;
this.aBooleanArray2370[this.anInt2366] = var6;
if(var5 != null) {
this.anInt2356 += var5.length;
}
this.aByteBuffer2345.position(28);
var10.glTexCoordPointer(2, 5126, var11, this.aByteBuffer2345);
if (this.aBoolean2347) {
var10.glClientActiveTexture(WaterShader.method2252());
this.aByteBuffer2345.position(36);
var10.glTexCoordPointer(1, 5126, var11, this.aByteBuffer2345);
var10.glClientActiveTexture('\u84c0');
}
} else {
this.aClass156_2363.method2169();
var10.glVertexPointer(3, 5126, var11, 0L);
var10.glColorPointer(4, 5121, var11, 12L);
if (Class106.aBoolean1441) {
var10.glNormalPointer(5126, var11, 16L);
}
if(var6) {
this.anInt2356 += 3 * (var4.length - 2);
} else {
var10.glTexCoordPointer(2, 5126, var11, 28L);
if (this.aBoolean2347) {
var10.glClientActiveTexture(WaterShader.method2252());
var10.glTexCoordPointer(1, 5126, var11, 36L);
var10.glClientActiveTexture('\u84c0');
}
}
if (HDToolKit.supportVertexBufferObject) {
var10.glBindBufferARB('\u8893', 0);
}
if (aClass3_Sub30_2372.index != 0) {
if (aByteBuffer2368 != null && aByteBuffer2368.capacity() >= aClass3_Sub30_2372.index) {
aByteBuffer2368.clear();
} else {
aByteBuffer2368 = ByteBuffer.allocateDirect(aClass3_Sub30_2372.index).order(ByteOrder.nativeOrder());
}
aByteBuffer2368.put(aClass3_Sub30_2372.buffer, 0, aClass3_Sub30_2372.index);
aByteBuffer2368.flip();
HDToolKit.method1832(var2);
var10.glDrawElements(4, aClass3_Sub30_2372.index / 4, 5125, aByteBuffer2368);
}
if (aClass3_Sub30_2362.index != 0) {
if (aByteBuffer2361 != null && aByteBuffer2361.capacity() >= aClass3_Sub30_2362.index) {
aByteBuffer2361.clear();
} else {
aByteBuffer2361 = ByteBuffer.allocateDirect(aClass3_Sub30_2362.index).order(ByteOrder.nativeOrder());
}
aByteBuffer2361.put(aClass3_Sub30_2362.buffer, 0, aClass3_Sub30_2362.index);
aByteBuffer2361.flip();
HDToolKit.method1832(var2 - 100.0F);
HDToolKit.depthBufferWritingDisabled();
var10.glDrawElements(4, aClass3_Sub30_2362.index / 4, 5125, aByteBuffer2361);
HDToolKit.method1830();
}
}
}
final void method150(int var1, int var2, int var3, int[] var4, int[] var5, boolean var6) {
if (this.aBoolean2364) {
this.anIntArrayArray2360[this.anInt2366] = var5;
this.aBooleanArray2370[this.anInt2366] = var6;
if (var5 != null) {
this.anInt2356 += var5.length;
}
if (var6) {
this.anInt2356 += 3 * (var4.length - 2);
} else {
this.anInt2359 += 3 * (var4.length - 2);
}
} else {
this.anInt2359 += 3 * (var4.length - 2);
}
} else {
this.anInt2359 += 3 * (var4.length - 2);
}
}
this.anIntArray2367[this.anInt2366] = var1;
this.anIntArray2350[this.anInt2366] = var2;
this.anIntArray2349[this.anInt2366] = var3;
this.anIntArrayArray2357[this.anInt2366] = var4;
this.anInt2366++;
}
this.anIntArray2367[this.anInt2366] = var1;
this.anIntArray2350[this.anInt2366] = var2;
this.anIntArray2349[this.anInt2366] = var3;
this.anIntArrayArray2357[this.anInt2366] = var4;
this.anInt2366++;
}
Class3_Sub11(int var1, float var2, boolean var3, boolean var4, int var5) {
this.anInt2351 = var1;
this.aFloat2373 = var2;
this.aBoolean2364 = var3;
this.aBoolean2347 = var4;
this.anInt2355 = var5;
}
Class3_Sub11(int var1, float var2, boolean var3, boolean var4, int var5) {
this.anInt2351 = var1;
this.aFloat2373 = var2;
this.aBoolean2364 = var3;
this.aBoolean2347 = var4;
this.anInt2355 = var5;
}
}

90
Client/src/main/java/org/runite/client/Class3_Sub15.java
View file

@ -157,48 +157,48 @@ public final class Class3_Sub15 extends Linkable {
int var3 = 0;
this.aByteArray2425 = new byte[128];
DataBuffer var2;
for (var2 = new DataBuffer(var1); var2.buffer[var3 + var2.index] != 0; ++var3) {
DataBuffer buffer;
for (buffer = new DataBuffer(var1); buffer.buffer[var3 + buffer.index] != 0; ++var3) {
}
byte[] var4 = new byte[var3];
int var5;
for (var5 = 0; var3 > var5; ++var5) {
var4[var5] = var2.readSignedByte();
var4[var5] = buffer.readSignedByte();
}
++var2.index;
++buffer.index;
++var3;
var5 = var2.index;
var2.index += var3;
var5 = buffer.index;
buffer.index += var3;
int var6;
for (var6 = 0; 0 != var2.buffer[var2.index + var6]; ++var6) {
for (var6 = 0; 0 != buffer.buffer[buffer.index + var6]; ++var6) {
}
byte[] var7 = new byte[var6];
int var8;
for (var8 = 0; var6 > var8; ++var8) {
var7[var8] = var2.readSignedByte();
var7[var8] = buffer.readSignedByte();
}
++var2.index;
++buffer.index;
++var6;
int var9 = 0;
var8 = var2.index;
var8 = buffer.index;
for (var2.index += var6; var2.buffer[var9 + var2.index] != 0; ++var9) {
for (buffer.index += var6; buffer.buffer[var9 + buffer.index] != 0; ++var9) {
}
byte[] var10 = new byte[var9];
for (int var11 = 0; var9 > var11; ++var11) {
var10[var11] = var2.readSignedByte();
var10[var11] = buffer.readSignedByte();
}
++var2.index;
++buffer.index;
++var9;
byte[] var37 = new byte[var9];
int var12;
@ -211,7 +211,7 @@ public final class Class3_Sub15 extends Linkable {
int var13 = 1;
for (var14 = 2; var14 < var9; ++var14) {
int var15 = var2.readUnsignedByte();
int var15 = buffer.readUnsignedByte();
if (0 == var15) {
var13 = var12++;
} else {
@ -231,48 +231,48 @@ public final class Class3_Sub15 extends Linkable {
Class166 var41;
for (var14 = 0; var14 < var38.length; ++var14) {
var41 = var38[var14] = new Class166();
int var16 = var2.readUnsignedByte();
int var16 = buffer.readUnsignedByte();
if (0 < var16) {
var41.aByteArray2064 = new byte[2 * var16];
}
var16 = var2.readUnsignedByte();
var16 = buffer.readUnsignedByte();
if (var16 > 0) {
var41.aByteArray2076 = new byte[var16 * 2 + 2];
var41.aByteArray2076[1] = 64;
}
}
var14 = var2.readUnsignedByte();
var14 = buffer.readUnsignedByte();
byte[] var40 = var14 > 0 ? new byte[var14 * 2] : null;
var14 = var2.readUnsignedByte();
var14 = buffer.readUnsignedByte();
byte[] var39 = var14 > 0 ? new byte[var14 * 2] : null;
int var17;
for (var17 = 0; var2.buffer[var17 + var2.index] != 0; ++var17) {
for (var17 = 0; buffer.buffer[var17 + buffer.index] != 0; ++var17) {
}
byte[] var18 = new byte[var17];
int var19;
for (var19 = 0; var19 < var17; ++var19) {
var18[var19] = var2.readSignedByte();
var18[var19] = buffer.readSignedByte();
}
++var2.index;
++buffer.index;
++var17;
var19 = 0;
int var20;
for (var20 = 0; var20 < 128; ++var20) {
var19 += var2.readUnsignedByte();
var19 += buffer.readUnsignedByte();
this.aShortArray2434[var20] = (short) var19;
}
var19 = 0;
for (var20 = 0; var20 < 128; ++var20) {
var19 += var2.readUnsignedByte();
var19 += buffer.readUnsignedByte();
this.aShortArray2434[var20] = (short) (this.aShortArray2434[var20] + (var19 << 8));
}
@ -289,7 +289,7 @@ public final class Class3_Sub15 extends Linkable {
var20 = -1;
}
var22 = var2.method741();
var22 = buffer.method741();
}
this.aShortArray2434[var23] = (short) (this.aShortArray2434[var23] + Unsorted.bitwiseAnd(32768, -1 + var22 << 14));
@ -305,7 +305,7 @@ public final class Class3_Sub15 extends Linkable {
for (var24 = 0; var24 < 128; ++var24) {
if (this.anIntArray2423[var24] != 0) {
if (var20 == 0) {
var23 = var2.buffer[var5++] + -1;
var23 = buffer.buffer[var5++] + -1;
if (var4.length > var21) {
var20 = var4[var21++];
} else {
@ -325,7 +325,7 @@ public final class Class3_Sub15 extends Linkable {
for (int var25 = 0; var25 < 128; ++var25) {
if (this.anIntArray2423[var25] != 0) {
if (0 == var20) {
var24 = var2.buffer[var8++] - -16 << 2;
var24 = buffer.buffer[var8++] - -16 << 2;
if (var7.length > var21) {
var20 = var7[var21++];
} else {
@ -373,7 +373,7 @@ public final class Class3_Sub15 extends Linkable {
}
if (this.anIntArray2423[var27] > 0) {
var26 = var2.readUnsignedByte() + 1;
var26 = buffer.readUnsignedByte() + 1;
}
}
@ -381,7 +381,7 @@ public final class Class3_Sub15 extends Linkable {
this.aByteArray2430[var27] = (byte) var26;
}
this.anInt2424 = var2.readUnsignedByte() + 1;
this.anInt2424 = buffer.readUnsignedByte() + 1;
int var29;
Class166 var28;
@ -389,26 +389,26 @@ public final class Class3_Sub15 extends Linkable {
var28 = var38[var27];
if (var28.aByteArray2064 != null) {
for (var29 = 1; var29 < var28.aByteArray2064.length; var29 += 2) {
var28.aByteArray2064[var29] = var2.readSignedByte();
var28.aByteArray2064[var29] = buffer.readSignedByte();
}
}
if (var28.aByteArray2076 != null) {
for (var29 = 3; var29 < var28.aByteArray2076.length + -2; var29 += 2) {
var28.aByteArray2076[var29] = var2.readSignedByte();
var28.aByteArray2076[var29] = buffer.readSignedByte();
}
}
}
if (null != var40) {
for (var27 = 1; var40.length > var27; var27 += 2) {
var40[var27] = var2.readSignedByte();
var40[var27] = buffer.readSignedByte();
}
}
if (null != var39) {
for (var27 = 1; var27 < var39.length; var27 += 2) {
var39[var27] = var2.readSignedByte();
var39[var27] = buffer.readSignedByte();
}
}
@ -418,7 +418,7 @@ public final class Class3_Sub15 extends Linkable {
var19 = 0;
for (var29 = 2; var28.aByteArray2076.length > var29; var29 += 2) {
var19 -= -1 + -var2.readUnsignedByte();
var19 -= -1 + -buffer.readUnsignedByte();
var28.aByteArray2076[var29] = (byte) var19;
}
}
@ -430,7 +430,7 @@ public final class Class3_Sub15 extends Linkable {
var19 = 0;
for (var29 = 2; var28.aByteArray2064.length > var29; var29 += 2) {
var19 = var19 - -1 - -var2.readUnsignedByte();
var19 = var19 - -1 - -buffer.readUnsignedByte();
var28.aByteArray2064[var29] = (byte) var19;
}
}
@ -443,11 +443,11 @@ public final class Class3_Sub15 extends Linkable {
int var44;
byte var48;
if (null != var40) {
var19 = var2.readUnsignedByte();
var19 = buffer.readUnsignedByte();
var40[0] = (byte) var19;
for (var27 = 2; var40.length > var27; var27 += 2) {
var19 = 1 + (var19 - -var2.readUnsignedByte());
var19 = 1 + (var19 - -buffer.readUnsignedByte());
var40[var27] = (byte) var19;
}
@ -479,11 +479,11 @@ public final class Class3_Sub15 extends Linkable {
}
if (null != var39) {
var19 = var2.readUnsignedByte();
var19 = buffer.readUnsignedByte();
var39[0] = (byte) var19;
for (var27 = 2; var27 < var39.length; var27 += 2) {
var19 = 1 + (var19 - -var2.readUnsignedByte());
var19 = 1 + (var19 - -buffer.readUnsignedByte());
var39[var27] = (byte) var19;
}
@ -543,39 +543,39 @@ public final class Class3_Sub15 extends Linkable {
}
for (var27 = 0; var12 > var27; ++var27) {
var38[var27].anInt2078 = var2.readUnsignedByte();
var38[var27].anInt2078 = buffer.readUnsignedByte();
}
for (var27 = 0; var27 < var12; ++var27) {
var28 = var38[var27];
if (null != var28.aByteArray2064) {
var28.anInt2067 = var2.readUnsignedByte();
var28.anInt2067 = buffer.readUnsignedByte();
}
if (null != var28.aByteArray2076) {
var28.anInt2071 = var2.readUnsignedByte();
var28.anInt2071 = buffer.readUnsignedByte();
}
if (var28.anInt2078 > 0) {
var28.anInt2063 = var2.readUnsignedByte();
var28.anInt2063 = buffer.readUnsignedByte();
}
}
for (var27 = 0; var12 > var27; ++var27) {
var38[var27].anInt2077 = var2.readUnsignedByte();
var38[var27].anInt2077 = buffer.readUnsignedByte();
}
for (var27 = 0; var12 > var27; ++var27) {
var28 = var38[var27];
if (var28.anInt2077 > 0) {
var28.anInt2066 = var2.readUnsignedByte();
var28.anInt2066 = buffer.readUnsignedByte();
}
}
for (var27 = 0; var27 < var12; ++var27) {
var28 = var38[var27];
if (var28.anInt2066 > 0) {
var28.anInt2069 = var2.readUnsignedByte();
var28.anInt2069 = buffer.readUnsignedByte();
}
}

18
Client/src/main/java/org/runite/client/Class3_Sub19.java
View file

@ -29,14 +29,14 @@ public final class Class3_Sub19 extends Linkable {
int var6;
int var7;
int var8;
if (null == Class27.aClass3_Sub28_Sub16_Sub2_518) {
if (null == Class27.aSoftwareSprite_518) {
if (HDToolKit.highDetail || null == Class49.aAbstractSprite_812) {
Class27.aClass3_Sub28_Sub16_Sub2_518 = new Class3_Sub28_Sub16_Sub2(512, 512);
Class27.aSoftwareSprite_518 = new SoftwareSprite(512, 512);
} else {
Class27.aClass3_Sub28_Sub16_Sub2_518 = (Class3_Sub28_Sub16_Sub2) Class49.aAbstractSprite_812;
Class27.aSoftwareSprite_518 = (SoftwareSprite) Class49.aAbstractSprite_812;
}
int[] var4 = Class27.aClass3_Sub28_Sub16_Sub2_518.anIntArray4081;
int[] var4 = Class27.aSoftwareSprite_518.anIntArray4081;
var5 = var4.length;
for (var6 = 0; var5 > var6; ++var6) {
@ -116,7 +116,7 @@ public final class Class3_Sub19 extends Linkable {
}
}
Class27.aClass3_Sub28_Sub16_Sub2_518.method658();
Class27.aSoftwareSprite_518.method658();
int var18 = (238 + (int) (20.0D * Math.random()) - 10 << 8) + (-10 + (int) (Math.random() * 20.0D) + 238 << 16) + (228 - -((int) (20.0D * Math.random())));
var5 = (int) (Math.random() * 20.0D) + 238 + -10 << 16;
@ -145,7 +145,7 @@ public final class Class3_Sub19 extends Linkable {
}
if (HDToolKit.highDetail) {
int[] var19 = Class27.aClass3_Sub28_Sub16_Sub2_518.anIntArray4081;
int[] var19 = Class27.aSoftwareSprite_518.anIntArray4081;
var7 = var19.length;
for (var8 = 0; var7 > var8; ++var8) {
@ -154,9 +154,9 @@ public final class Class3_Sub19 extends Linkable {
}
}
Class49.aAbstractSprite_812 = new HDSprite(Class27.aClass3_Sub28_Sub16_Sub2_518);
Class49.aAbstractSprite_812 = new HDSprite(Class27.aSoftwareSprite_518);
} else {
Class49.aAbstractSprite_812 = Class27.aClass3_Sub28_Sub16_Sub2_518;
Class49.aAbstractSprite_812 = Class27.aSoftwareSprite_518;
}
if (HDToolKit.highDetail) {
@ -165,7 +165,7 @@ public final class Class3_Sub19 extends Linkable {
Unsorted.aClass158_3009.method2182();
}
Class27.aClass3_Sub28_Sub16_Sub2_518 = null;
Class27.aSoftwareSprite_518 = null;
return true;
} catch (RuntimeException var17) {
throw ClientErrorException.clientError(var17, "kl.B(" + 0 + ',' + var1 + ')');

2
Client/src/main/java/org/runite/client/Class3_Sub28_Sub16_Sub1_Sub1.java
View file

@ -51,7 +51,7 @@ public final class Class3_Sub28_Sub16_Sub1_Sub1 extends HDSprite {
super(var1, var2, var3, var4, var5, var6, var7);
}
public Class3_Sub28_Sub16_Sub1_Sub1(Class3_Sub28_Sub16_Sub2 var1) {
public Class3_Sub28_Sub16_Sub1_Sub1(SoftwareSprite var1) {
super(var1);
}
}

2
Client/src/main/java/org/runite/client/Class3_Sub28_Sub16_Sub2_Sub1.java
View file

@ -2,7 +2,7 @@ package org.runite.client;
import org.rs09.client.rendering.Toolkit;
public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 {
public final class Class3_Sub28_Sub16_Sub2_Sub1 extends SoftwareSprite {
final void method660(int var1, int var2, double var7) {
try {

6
Client/src/main/java/org/runite/client/Class3_Sub28_Sub9.java
View file

@ -17,7 +17,7 @@ final class Class3_Sub28_Sub9 extends Node {
static int anInt3624;
static Class3_Sub28_Sub16_Sub2 method578() {
static SoftwareSprite method578() {
try {
int var1 = Unsorted.anIntArray3076[0] * Class140_Sub7.anIntArray2931[0];
byte[] var2 = Class163_Sub1.aByteArrayArray2987[0];
@ -39,11 +39,11 @@ final class Class3_Sub28_Sub9 extends Node {
var8[var9] = TextureOperation38.spritePalette[Unsorted.bitwiseAnd(var2[var9], 255)];
}
var3 = new Class3_Sub28_Sub16_Sub2(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[0], Unsorted.anIntArray2591[0], Class140_Sub7.anIntArray2931[0], Unsorted.anIntArray3076[0], var8);
var3 = new SoftwareSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[0], Unsorted.anIntArray2591[0], Class140_Sub7.anIntArray2931[0], Unsorted.anIntArray3076[0], var8);
}
Class39.method1035((byte)127);
return (Class3_Sub28_Sub16_Sub2)var3;
return (SoftwareSprite)var3;
} catch (RuntimeException var7) {
throw ClientErrorException.clientError(var7, "hn.P(" + 115 + ')');
}

18
Client/src/main/java/org/runite/client/Class40.java
View file

@ -39,7 +39,7 @@ public final class Class40 {
}
}
static Class3_Sub28_Sub16_Sub2 method1043(int var0, CacheIndex var1, int archiveId) {
static SoftwareSprite method1043(int var0, CacheIndex var1, int archiveId) {
try {
// System.out.println("Class 40 " + archiveId);
return Class75_Sub4.method1351(var1, var0, archiveId) ? Class117.method1722(-53) : null;
@ -500,7 +500,7 @@ public final class Class40 {
if (var37 < 104) {
var13 = 255 & TextureOperation36.aByteArrayArrayArray3430[var8][var37][var11];
if (var13 > 0) {
MapUnderlayColorDefinition var39 = MapUnderlayColorDefinition.method629(-1 + var13);
FloorUnderlayDefinition var39 = FloorUnderlayDefinition.method629(-1 + var13);
Class129.anIntArray1695[var11] += var39.anInt1408;
Unsorted.anIntArray1138[var11] += var39.anInt1406;
Class3_Sub31.anIntArray2606[var11] += var39.anInt1417;
@ -513,7 +513,7 @@ public final class Class40 {
if (0 <= var13) {
var14 = 255 & TextureOperation36.aByteArrayArrayArray3430[var8][var13][var11];
if (var14 > 0) {
MapUnderlayColorDefinition var42 = MapUnderlayColorDefinition.method629(-1 + var14);
FloorUnderlayDefinition var42 = FloorUnderlayDefinition.method629(-1 + var14);
Class129.anIntArray1695[var11] -= var42.anInt1408;
Unsorted.anIntArray1138[var11] -= var42.anInt1406;
Class3_Sub31.anIntArray2606[var11] -= var42.anInt1417;
@ -577,7 +577,7 @@ public final class Class40 {
var47 = false;
}
if (var13 > 0 && !Class168.method350(var13 + -1).aBoolean2102) {
if (var13 > 0 && !FloorOverlayDefinition.getFile(var13 + -1).aBoolean2102) {
var47 = false;
}
@ -610,7 +610,7 @@ public final class Class40 {
var22 = var35[var10 - -1][var11 - -1];
if (var13 == 0) {
method1629(var8, var10, var11, 0, 0, -1, var14, var15, var16, var44, Unsorted.method1100(var20, var18), Unsorted.method1100(var21, var18), Unsorted.method1100(var22, var18), Unsorted.method1100(var23, var18), 0, 0, 0, 0, var19, 0);
if (HDToolKit.highDetail && var8 > 0 && var18 != -1 && MapUnderlayColorDefinition.method629(-1 + var37).aBoolean1411) {
if (HDToolKit.highDetail && var8 > 0 && var18 != -1 && FloorUnderlayDefinition.method629(-1 + var37).aBoolean1411) {
Class141.method2037(0, 0, true, false, var10, var11, var14 - Class44.anIntArrayArrayArray723[0][var10][var11], -Class44.anIntArrayArrayArray723[0][1 + var10][var11] + var15, var16 - Class44.anIntArrayArrayArray723[0][1 + var10][1 + var11], var44 - Class44.anIntArrayArrayArray723[0][var10][1 + var11]);
}
@ -620,7 +620,7 @@ public final class Class40 {
if ((var24 != var10 || var11 != var52) && var24 >= 0 && var24 < 104 && 0 <= var52 && var52 < 104) {
int var54 = Class158_Sub1.aByteArrayArrayArray1828[var8][var24][var52] & 0xFF;
if (var54 != 0) {
Class168 var53 = Class168.method350(-1 + var54);
FloorOverlayDefinition var53 = FloorOverlayDefinition.getFile(-1 + var54);
if (var53.anInt2095 != -1 && 4 == Class51.anInterface2_838.method18(var53.anInt2095, 255)) {
TextureOperation16.anIntArrayArray3115[var10][var11] = var53.anInt2094 + (var53.anInt2101 << 24);
continue label754;
@ -633,7 +633,7 @@ public final class Class40 {
} else {
var24 = 1 + Unsorted.aByteArrayArrayArray1328[var8][var10][var11];
byte var25 = PacketParser.aByteArrayArrayArray81[var8][var10][var11];
Class168 var26 = Class168.method350(var13 + -1);
FloorOverlayDefinition var26 = FloorOverlayDefinition.getFile(var13 + -1);
int var27;
int var29;
int var28;
@ -647,7 +647,7 @@ public final class Class40 {
if ((var27 != var10 || var11 != var28) && var27 >= 0 && var27 < 104 && var28 >= 0 && var28 < 104) {
var29 = Class158_Sub1.aByteArrayArrayArray1828[var8][var27][var28] & 0xFF;
if (var29 != 0) {
Class168 var30 = Class168.method350(-1 + var29);
FloorOverlayDefinition var30 = FloorOverlayDefinition.getFile(-1 + var29);
if (var30.anInt2095 != -1 && Class51.anInterface2_838.method18(var30.anInt2095, 255) == 4) {
TextureOperation16.anIntArrayArray3115[var10][var11] = var30.anInt2094 + (var30.anInt2101 << 24);
break label722;
@ -706,7 +706,7 @@ public final class Class40 {
method1629(var8, var10, var11, var24, var25, var27, var14, var15, var16, var44, Unsorted.method1100(var20, var18), Unsorted.method1100(var21, var18), Unsorted.method1100(var22, var18), Unsorted.method1100(var23, var18), LinkableRSString.method729((byte) -72, var28, var20), LinkableRSString.method729((byte) -107, var28, var21), LinkableRSString.method729((byte) -82, var28, var22), LinkableRSString.method729((byte) -93, var28, var23), var19, var29);
if (HDToolKit.highDetail && var8 > 0) {
Class141.method2037(var24, var25, var28 == -2 || !var26.aBoolean2093, -1 == var18 || !MapUnderlayColorDefinition.method629(-1 + var37).aBoolean1411, var10, var11, -Class44.anIntArrayArrayArray723[0][var10][var11] + var14, var15 - Class44.anIntArrayArrayArray723[0][1 + var10][var11], -Class44.anIntArrayArrayArray723[0][1 + var10][var11 + 1] + var16, -Class44.anIntArrayArrayArray723[0][var10][1 + var11] + var44);
Class141.method2037(var24, var25, var28 == -2 || !var26.aBoolean2093, -1 == var18 || !FloorUnderlayDefinition.method629(-1 + var37).aBoolean1411, var10, var11, -Class44.anIntArrayArrayArray723[0][var10][var11] + var14, var15 - Class44.anIntArrayArrayArray723[0][1 + var10][var11], -Class44.anIntArrayArrayArray723[0][1 + var10][var11 + 1] + var16, -Class44.anIntArrayArrayArray723[0][var10][1 + var11] + var44);
}
}
}

2
Client/src/main/java/org/runite/client/Class43.java
View file

@ -103,7 +103,7 @@ public final class Class43 {
if (HDToolKit.highDetail) {
var6 = new HDSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[0], Unsorted.anIntArray2591[0], Class140_Sub7.anIntArray2931[0], Unsorted.anIntArray3076[0], var3);
} else {
var6 = new Class3_Sub28_Sub16_Sub2(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[0], Unsorted.anIntArray2591[0], Class140_Sub7.anIntArray2931[0], Unsorted.anIntArray3076[0], var3);
var6 = new SoftwareSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[0], Unsorted.anIntArray2591[0], Class140_Sub7.anIntArray2931[0], Unsorted.anIntArray3076[0], var3);
}
Class39.method1035((byte) 111);

44
Client/src/main/java/org/runite/client/Class49.java
View file

@ -182,7 +182,7 @@ public final class Class49 {
if (!Class38_Sub1.aBoolean2615) {
if (Unsorted.anInt3660 != 0) {
NPCDefinition.anInt1297 = TextureOperation8.anInt3460;
Class38_Sub1.anInt2612 = Class168.anInt2099;
Class38_Sub1.anInt2612 = Unsorted.anInt2099;
} else if (Unsorted.anInt3644 == 0) {
NPCDefinition.anInt1297 = Class126.anInt1676;
Class38_Sub1.anInt2612 = Unsorted.anInt1709;
@ -233,7 +233,7 @@ public final class Class49 {
Class74.resetClipping();
}
Class168.method2278(var0 + 122);
method2278(var0 + 122);
if (Class38_Sub1.aBoolean2615) {
if (Unsorted.aBoolean1951) {
WorldListEntry.buildWorldListInterface();
@ -341,4 +341,44 @@ public final class Class49 {
static void method831(String var1) {
System.out.println("Error: " + InterfaceWidget.a("%0a", "\n", var1));
}
static void method2278(int var0) {
try {
boolean var1 = false;
while (!var1) {
var1 = true;
for (int var2 = 0; -1 + Unsorted.menuOptionCount > var2; ++var2) {
if (TextureOperation27.aShortArray3095[var2] < 1000 && TextureOperation27.aShortArray3095[1 + var2] > 1000) {
RSString var3 = Class163_Sub2_Sub1.aClass94Array4016[var2];
var1 = false;
Class163_Sub2_Sub1.aClass94Array4016[var2] = Class163_Sub2_Sub1.aClass94Array4016[1 + var2];
Class163_Sub2_Sub1.aClass94Array4016[1 + var2] = var3;
RSString var4 = Class140_Sub7.aClass94Array2935[var2];
Class140_Sub7.aClass94Array2935[var2] = Class140_Sub7.aClass94Array2935[var2 + 1];
Class140_Sub7.aClass94Array2935[var2 - -1] = var4;
int var5 = Class117.anIntArray1613[var2];
Class117.anIntArray1613[var2] = Class117.anIntArray1613[1 + var2];
Class117.anIntArray1613[var2 + 1] = var5;
var5 = Class27.anIntArray512[var2];
Class27.anIntArray512[var2] = Class27.anIntArray512[var2 + 1];
Class27.anIntArray512[1 + var2] = var5;
var5 = Class114.anIntArray1578[var2];
Class114.anIntArray1578[var2] = Class114.anIntArray1578[1 + var2];
Class114.anIntArray1578[var2 - -1] = var5;
short var6 = TextureOperation27.aShortArray3095[var2];
TextureOperation27.aShortArray3095[var2] = TextureOperation27.aShortArray3095[1 + var2];
TextureOperation27.aShortArray3095[var2 + 1] = var6;
long var7 = Unsorted.aLongArray3271[var2];
Unsorted.aLongArray3271[var2] = Unsorted.aLongArray3271[var2 + 1];
Unsorted.aLongArray3271[var2 - -1] = var7;
}
}
}
} catch (RuntimeException var9) {
throw ClientErrorException.clientError(var9, "wl.D(" + var0 + ')');
}
}
}

2
Client/src/main/java/org/runite/client/Class53.java
View file

@ -38,7 +38,7 @@ public final class Class53 {
if (HDToolKit.highDetail) {
((HDSprite) TextureOperation8.aAbstractSpriteArray3458[var0]).method648(240, 240, (var5.width / 2 + var2 + var16) * 16, 16 * (-var17 + var5.height / 2 + var1), (int) (10430.378D * var14));
} else {
((Class3_Sub28_Sub16_Sub2) TextureOperation8.aAbstractSpriteArray3458[var0]).method660(-10 + var16 + var5.width / 2 + var2, -10 + var5.height / 2 + var1 + -var17, var14);
((SoftwareSprite) TextureOperation8.aAbstractSpriteArray3458[var0]).method660(-10 + var16 + var5.width / 2 + var2, -10 + var5.height / 2 + var1 + -var17, var14);
}
}

2
Client/src/main/java/org/runite/client/Class65.java
View file

@ -157,7 +157,7 @@ public final class Class65 {
aAbstractSpriteArray1825 = null;
Sprites.nameIconsSpriteArray = null;
Class157.aClass3_Sub28_Sub17_Sub1_2000 = null;
Sprites.aClass3_Sub28_Sub16_Sub2Array2140 = null;
Sprites.aSoftwareSpriteArray2140 = null;
Class140_Sub4.aAbstractSpriteArray2839 = null;
Class129_Sub1.aAbstractSpriteArray2690 = null;
NPC.aAbstractSpriteArray3977 = null;

2
Client/src/main/java/org/runite/client/Class75_Sub3.java
View file

@ -135,7 +135,7 @@ final class Class75_Sub3 extends Class75 {
if(HDToolKit.highDetail) {
var1[var2] = new HDSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[var2], Unsorted.anIntArray2591[var2], Class140_Sub7.anIntArray2931[var2], Unsorted.anIntArray3076[var2], var9);
} else {
var1[var2] = new Class3_Sub28_Sub16_Sub2(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[var2], Unsorted.anIntArray2591[var2], Class140_Sub7.anIntArray2931[var2], Unsorted.anIntArray3076[var2], var9);
var1[var2] = new SoftwareSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[var2], Unsorted.anIntArray2591[var2], Class140_Sub7.anIntArray2931[var2], Unsorted.anIntArray3076[var2], var9);
}
}
}

6
Client/src/main/java/org/runite/client/Class75_Sub4.java
View file

@ -92,11 +92,11 @@ public final class Class75_Sub4 extends Class75 {
}
}
static void method1353(Class3_Sub28_Sub16_Sub2[] var0, CacheIndex var2) {
static void method1353(SoftwareSprite[] var0, CacheIndex var2) {
try {
WorldMap.aClass153_3210 = var2;
GameObject.aClass3_Sub28_Sub16_Sub2Array1839 = var0;
Class3_Sub24_Sub4.aBooleanArray3503 = new boolean[GameObject.aClass3_Sub28_Sub16_Sub2Array1839.length];
GameObject.aSoftwareSpriteArray1839 = var0;
Class3_Sub24_Sub4.aBooleanArray3503 = new boolean[GameObject.aSoftwareSpriteArray1839.length];
Class134.aLinkedList_1758.method1211(-68);
int var3 = WorldMap.aClass153_3210.getArchiveForName(TextCore.aClass94_2304);
int[] var4 = WorldMap.aClass153_3210.getFileIds(var3);

632
Client/src/main/java/org/runite/client/Class83.java
View file

@ -120,7 +120,7 @@ public final class Class83 {
var35 = var42[var28] != null ? var42[var28][var31] : 0;
var36 = var35 & 252;
if (var36 != 0 && var16 > 1 && var27 > 1) {
Class168.method2272(Toolkit.JAVA_TOOLKIT.getBuffer(), var33, var14, var35 & 3, var32, var36 >> 2, var27, var16, var25, true);
method2272(Toolkit.JAVA_TOOLKIT.getBuffer(), var33, var14, var35 & 3, var32, var36 >> 2, var27, var16, var25, true);
} else {
Toolkit.JAVA_TOOLKIT.method934(var14, var25, var16, var27, var33);//Remember! If it's a SPECIFIC JAVA_TOOLKIT CALL THERE IS A REASON
}
@ -137,7 +137,7 @@ public final class Class83 {
Toolkit.JAVA_TOOLKIT.method934(var14, var25, var16, var27, var34);//Remember! If it's a SPECIFIC JAVA_TOOLKIT CALL THERE IS A REASON
}
Class168.method2272(Toolkit.JAVA_TOOLKIT.getBuffer(), var34, var14, var35 & 3, 0, var36 >> 2, var27, var16, var25, var33 == 0);
method2272(Toolkit.JAVA_TOOLKIT.getBuffer(), var34, var14, var35 & 3, 0, var36 >> 2, var27, var16, var25, var33 == 0);
}
}
@ -276,7 +276,7 @@ public final class Class83 {
var26 = 16383 & var25;
if (var26 != 0) {
var28 = ('\ud228' & var25) >> 14;
Class2 var47 = InterfaceWidget.c(-1 + var26);
MapSceneDefinition var47 = InterfaceWidget.c(-1 + var26);
LDIndexedSprite var48 = var47.getSprite(var28);
if (var48 != null) {
var31 = var22 * var48.height / 4;
@ -332,6 +332,632 @@ public final class Class83 {
}
}
static void method2272(int[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, boolean var9) {
try {
int var11 = var2;
if (var2 < Toolkit.JAVA_TOOLKIT.clipRight) {
if (Toolkit.JAVA_TOOLKIT.clipLeft > var2) {
var11 = Toolkit.JAVA_TOOLKIT.clipLeft;
}
int var12 = var7 + var2;
if (Toolkit.JAVA_TOOLKIT.clipLeft < var12) {
if (Toolkit.JAVA_TOOLKIT.clipRight < var12) {
var12 = Toolkit.JAVA_TOOLKIT.clipRight;
}
int var13 = var8;
if (var8 < Toolkit.JAVA_TOOLKIT.clipBottom) {
int var14 = var8 + var6;
if (Toolkit.JAVA_TOOLKIT.clipTop > var8) {
var13 = Toolkit.JAVA_TOOLKIT.clipTop;
}
if (var14 > Toolkit.JAVA_TOOLKIT.clipTop) {
int var15 = var11 + Toolkit.JAVA_TOOLKIT.width * var13;
if (var5 == 9) {
var3 = 3 & var3 - -1;
var5 = 1;
}
int var16 = -var12 + var11 + Toolkit.JAVA_TOOLKIT.width;
var13 -= var8;
int var20 = var6 + -var13;
if (Toolkit.JAVA_TOOLKIT.clipBottom < var14) {
var14 = Toolkit.JAVA_TOOLKIT.clipBottom;
}
if (var5 == 10) {
var3 = var3 - -3 & 3;
var5 = 1;
}
var11 -= var2;
int var18 = -var11 + var7;
if (11 == var5) {
var3 = 3 & var3 + 3;
var5 = 8;
}
var12 -= var2;
int var17 = var7 + -var12;
var14 -= var8;
int var19 = var6 - var14;
int var21;
int var22;
if (var5 != 1) {
if (2 == var5) {
if (var3 == 0) {
for (var21 = var20 + -1; var19 <= var21; --var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var22 <= var21 >> 1) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (1 == var3) {
for (var21 = var13; var14 > var21; ++var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (0 <= var15 && var0.length > var15) {
if (var22 >= var21 << 1) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
} else {
++var15;
}
}
var15 += var16;
}
} else if (var3 == 2) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var18 + -1; var17 <= var22; --var22) {
if (var21 >> 1 >= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (3 == var3) {
for (var21 = var20 + -1; var19 <= var21; --var21) {
for (var22 = -1 + var18; var17 <= var22; --var22) {
if (var21 << 1 > var22) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
}
} else if (var5 != 3) {
if (var5 != 4) {
if (var5 != 5) {
if (var5 == 6) {
if (var3 == 0) {
for (var21 = var13; var14 > var21; ++var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var22 > var7 / 2) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
return;
}
if (var3 == 1) {
for (var21 = var13; var14 > var21; ++var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var21 > var6 / 2) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
return;
}
if (2 == var3) {
for (var21 = var13; var14 > var21; ++var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (var22 >= var7 / 2) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
return;
}
if (var3 == 3) {
for (var21 = var13; var14 > var21; ++var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var6 / 2 > var21) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
return;
}
}
if (7 == var5) {
if (0 == var3) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (var22 <= var21 + -(var6 / 2)) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
return;
}
if (var3 == 1) {
for (var21 = var20 + -1; var21 >= var19; --var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var22 > -(var6 / 2) + var21) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
return;
}
if (var3 == 2) {
for (var21 = var20 + -1; var21 >= var19; --var21) {
for (var22 = -1 + var18; var22 >= var17; --var22) {
if (var22 > var21 + -(var6 / 2)) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
return;
}
if (3 == var3) {
for (var21 = var13; var14 > var21; ++var21) {
for (var22 = -1 + var18; var17 <= var22; --var22) {
if (var21 + -(var6 / 2) >= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
return;
}
}
if (var5 == 8) {
if (0 == var3) {
for (var21 = var13; var14 > var21; ++var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (-(var6 / 2) + var21 <= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
return;
}
if (var3 == 1) {
for (var21 = -1 + var20; var21 >= var19; --var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (-(var6 / 2) + var21 > var22) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
return;
}
if (var3 == 2) {
for (var21 = var20 - 1; var19 <= var21; --var21) {
for (var22 = -1 + var18; var22 >= var17; --var22) {
if (var21 - var6 / 2 > var22) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
return;
}
if (var3 == 3) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = -1 + var18; var17 <= var22; --var22) {
if (var21 + -(var6 / 2) > var22) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
return;
}
}
} else if (0 == var3) {
for (var21 = var20 + -1; var21 >= var19; --var21) {
for (var22 = -1 + var18; var22 >= var17; --var22) {
if (var21 >> 1 <= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (1 == var3) {
for (var21 = -1 + var20; var21 >= var19; --var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (var22 > var21 << 1) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
} else if (var3 == 2) {
for (var21 = var13; var14 > var21; ++var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (var21 >> 1 > var22) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
} else if (var3 == 3) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var18 + -1; var17 <= var22; --var22) {
if (var21 << 1 >= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
}
} else if (var3 == 0) {
for (var21 = var20 + -1; var21 >= var19; --var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var22 < var21 >> 1) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
} else if (1 == var3) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (var22 <= var21 << 1) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (2 == var3) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var18 + -1; var22 >= var17; --var22) {
if (var21 >> 1 <= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (var3 == 3) {
for (var21 = -1 + var20; var21 >= var19; --var21) {
for (var22 = -1 + var18; var22 >= var17; --var22) {
if (var22 <= var21 << 1) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
}
} else if (var3 == 0) {
for (var21 = var20 - 1; var21 >= var19; --var21) {
for (var22 = -1 + var18; var17 <= var22; --var22) {
if (var22 <= var21 >> 1) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (var3 == 1) {
for (var21 = -1 + var20; var19 <= var21; --var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var22 >= var21 << 1) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (2 == var3) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var21 >> 1 >= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (3 == var3) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var18 - 1; var17 <= var22; --var22) {
if (var22 < var21 << 1) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
}
} else if (var3 == 0) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (var21 >= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (1 == var3) {
for (var21 = var20 + -1; var21 >= var19; --var21) {
for (var22 = var11; var22 < var12; ++var22) {
if (var21 >= var22) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (2 == var3) {
for (var21 = var13; var21 < var14; ++var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var22 >= var21) {
var0[var15] = var1;
} else if (var9) {
var0[var15] = var4;
}
++var15;
}
var15 += var16;
}
} else if (var3 == 3) {
for (var21 = var20 + -1; var19 <= var21; --var21) {
for (var22 = var11; var12 > var22; ++var22) {
if (var22 < var21) {
if (var9) {
var0[var15] = var4;
}
} else {
var0[var15] = var1;
}
++var15;
}
var15 += var16;
}
}
}
}
}
}
} catch (RuntimeException var23) {
throw ClientErrorException.clientError(var23, "wl.C(" + "null" + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ',' + var7 + ',' + var8 + ',' + var9 + ',' + (byte) 21 + ')');
}
}
private PcmSound method1412(int[] var1, int var3, int var4) {
try {
int var5 = var4 ^ (var3 >>> 12 | var3 << 4 & '\ufff3');

4
Client/src/main/java/org/runite/client/Class84.java
View file

@ -6,7 +6,7 @@ public final class Class84 {
static LinkedList aLinkedList_1162 = new LinkedList();
public static int[] anIntArray1163 = new int[1000];
static int leftMargin = 0;
static Class3_Sub28_Sub16_Sub2 aClass3_Sub28_Sub16_Sub2_1381;
static SoftwareSprite aSoftwareSprite_1381;
static int[] anIntArray1729 = new int[]{12543016, 15504954, 15914854, 16773818};
static void method1417() {
@ -58,7 +58,7 @@ public final class Class84 {
TextureOperation30.method215((byte) -89, null);
BufferedDataStream.anIntArray3805 = new int[32768];
Class159.anIntArray1681 = new int[32768];
aClass3_Sub28_Sub16_Sub2_1381 = new Class3_Sub28_Sub16_Sub2(128, 254);
aSoftwareSprite_1381 = new SoftwareSprite(128, 254);
} catch (RuntimeException var13) {
throw ClientErrorException.clientError(var13, "lf.E(" + -110 + ',' + (var1 != null ? "{...}" : "null") + ')');
}

15
Client/src/main/java/org/runite/client/Client.java
View file

@ -59,15 +59,6 @@ public final class Client extends GameShell {
static Client clientInstance;
static boolean sweepReferenceCache = false;
static void method631(CacheIndex var1) {
try {
Class3_Sub28_Sub5.aClass153_3580 = var1;
anInt869 = Class3_Sub28_Sub5.aClass153_3580.getFileAmount(4);
} catch (RuntimeException var3) {
throw ClientErrorException.clientError(var3, "qc.D(" + false + ',' + (var1 != null ? "{...}" : "null") + ')');
}
}
static void method1175(int var0) {
try {
TextureOperation13.anInt3362 = -1;
@ -351,7 +342,7 @@ public final class Client extends GameShell {
int var29;
if (inter.anInt189 != 0) {
if (inter.anInt189 == 1337) {
Class168.aClass11_2091 = inter;
Unsorted.aClass11_2091 = inter;
Class20.method909(inter);
continue;
}
@ -1605,7 +1596,7 @@ public final class Client extends GameShell {
var2 += CacheIndex.particlesConfigIndex.method2136((byte) -124);
if (var2 >= 1100) {
Class132.method1799((byte) 96, CacheIndex.configurationsIndex);
method631(CacheIndex.configurationsIndex);
FloorOverlayDefinition.method631(CacheIndex.configurationsIndex);
Class3_Sub28_Sub8.method575(CacheIndex.configurationsIndex, -1);
method375(CacheIndex.modelsIndex, CacheIndex.configurationsIndex);
Class108.method1661(CacheIndex.objectConfigIndex, CacheIndex.modelsIndex);
@ -1662,7 +1653,7 @@ public final class Client extends GameShell {
if (CacheIndex.interfaceScriptsIndex.method2113()) {
if (CacheIndex.fontsIndex.method2113()) {
if (CacheIndex.worldmapIndex.method2127(TextCore.aClass94_1342)) {
Class75_Sub4.method1353(Sprites.aClass3_Sub28_Sub16_Sub2Array2140, CacheIndex.worldmapIndex);
Class75_Sub4.method1353(Sprites.aSoftwareSpriteArray2140, CacheIndex.worldmapIndex);
LoadingStageNumber = 95;
loadingBarTextToDisplay = TextCore.LoadedInterfaces;
anInt1354 = 135;

150
Client/src/main/java/org/runite/client/FloorOverlayDefinition.java Normal file
View file

@ -0,0 +1,150 @@
package org.runite.client;
final class FloorOverlayDefinition {
int anInt2090 = 128;
boolean aBoolean2092 = false;
boolean aBoolean2093 = true;
int anInt2094 = 1190717;
int anInt2095 = -1;
int anInt2098 = -1;
int anInt2100 = 8;
int anInt2101 = 16;
boolean aBoolean2102 = true;
int anInt2103 = 0;
static FloorOverlayDefinition getFile(int var1) {
try {
FloorOverlayDefinition var2 = (FloorOverlayDefinition) Class163_Sub2_Sub1.aReferenceCache_4015.get(var1);
if (null == var2) {
System.out.println("Retrieving file " + var1);
byte[] var4 = Class3_Sub28_Sub5.aClass153_3580.getFile(4, var1);
var2 = new FloorOverlayDefinition();
if (var4 != null) {
var2.parseDefinition(new DataBuffer(var4), var1);
}
Class163_Sub2_Sub1.aReferenceCache_4015.put(var2, var1);
}
return var2;
} catch (RuntimeException var5) {
throw ClientErrorException.clientError(var5, "um.C(" + ',' + var1 + ')');
}
}
static void method1014(int var1, int var2) {
try {
for (int var4 = 0; var4 < Client.anInt869; ++var4) {
FloorOverlayDefinition var5 = getFile(var4);
if (null != var5) {
int var6 = var5.anInt2095;
if (0 <= var6 && !Class51.anInterface2_838.method17(var6, 126)) {
var6 = -1;
}
int var7;
int var8;
int var9;
int var10;
if (var5.anInt2098 < 0) {
if (var6 >= 0) {
var7 = Class51.anIntArray834[LinkableRSString.method729((byte) -74, Class51.anInterface2_838.method15(var6, 65535), 96)];
} else if (-1 == var5.anInt2103) {
var7 = -1;
} else {
var8 = var5.anInt2103;
var9 = var1 + (var8 & 127);
if (var9 < 0) {
var9 = 0;
} else if (var9 > 127) {
var9 = 127;
}
var10 = var9 + (896 & var8) + ('\ufc00' & var8 + var2);
var7 = Class51.anIntArray834[LinkableRSString.method729((byte) -127, var10, 96)];
}
} else {
var8 = var5.anInt2098;
var9 = (127 & var8) + var1;
if (var9 < 0) {
var9 = 0;
} else if (var9 > 127) {
var9 = 127;
}
var10 = (896 & var8) + ('\ufc00' & var2 + var8) + var9;
var7 = Class51.anIntArray834[LinkableRSString.method729((byte) -63, var10, 96)];
}
Class83.anIntArray1161[1 + var4] = var7;
}
}
} catch (RuntimeException var11) {
throw ClientErrorException.clientError(var11, "fi.B(" + -120 + ',' + var1 + ',' + var2 + ')');
}
}
static void method631(CacheIndex var1) {
try {
Class3_Sub28_Sub5.aClass153_3580 = var1;
Client.anInt869 = Class3_Sub28_Sub5.aClass153_3580.getFileAmount(4);
} catch (RuntimeException var3) {
throw ClientErrorException.clientError(var3, "qc.D(" + false + ',' + (var1 != null ? "{...}" : "null") + ')');
}
}
final void parseDefinition(DataBuffer var2, int var3) {
try {
while (true) {
int var4 = var2.readUnsignedByte();
if (var4 == 0) {
return;
}
this.decode(var4, var2, var3);
}
} catch (RuntimeException var5) {
throw ClientErrorException.clientError(var5, "wl.H(" + 24559 + ',' + (var2 != null ? "{...}" : "null") + ',' + var3 + ')');
}
}
private void decode(int opcode, DataBuffer buffer, int var4) {
try {
if (opcode == 1) {
this.anInt2103 = RSInterface.method869(buffer.readMedium());
} else if (opcode == 2) {
this.anInt2095 = buffer.readUnsignedByte();
} else if (3 == opcode) {
this.anInt2095 = buffer.readUnsignedShort();
if (this.anInt2095 == 65535) {
this.anInt2095 = -1;
}
} else if (5 == opcode) {
this.aBoolean2102 = false;
} else if (opcode == 7) {
this.anInt2098 = RSInterface.method869(buffer.readMedium());
} else if (opcode == 8) {
TextureOperation26.anInt3081 = var4;
} else if (opcode == 9) {
this.anInt2090 = buffer.readUnsignedShort();
} else if (opcode == 10) {
this.aBoolean2093 = false;
} else if (opcode == 11) {
this.anInt2100 = buffer.readUnsignedByte();
} else if (12 == opcode) {
this.aBoolean2092 = true;
} else if (13 == opcode) {
this.anInt2094 = buffer.readMedium();
} else if (opcode == 14) {
this.anInt2101 = buffer.readUnsignedByte();
}
} catch (RuntimeException var6) {
throw ClientErrorException.clientError(var6, "wl.E(" + 0 + ',' + opcode + ',' + (buffer != null ? "{...}" : "null") + ',' + var4 + ')');
}
}
}

8
Client/src/main/java/org/runite/client/MapUnderlayColorDefinition.java → Client/src/main/java/org/runite/client/FloorUnderlayDefinition.java
View file

@ -2,7 +2,7 @@ package org.runite.client;
import org.rs09.client.config.GameConfig;
final class MapUnderlayColorDefinition {
final class FloorUnderlayDefinition {
int anInt1406;
int anInt1408;
@ -12,12 +12,12 @@ final class MapUnderlayColorDefinition {
int anInt1417;
int anInt1418;
static MapUnderlayColorDefinition method629(int var1) {
static FloorUnderlayDefinition method629(int var1) {
try {
MapUnderlayColorDefinition var2 = (MapUnderlayColorDefinition)Class44.aReferenceCache_725.get(var1);
FloorUnderlayDefinition var2 = (FloorUnderlayDefinition)Class44.aReferenceCache_725.get(var1);
if(var2 == null) {
byte[] var3 = Class3_Sub23.aClass153_2536.getFile(1, var1);
var2 = new MapUnderlayColorDefinition();
var2 = new FloorUnderlayDefinition();
if(null != var3) {
var2.parseUnderlayDefinition(var1, new DataBuffer(var3));
}

2
Client/src/main/java/org/runite/client/GameObject.java
View file

@ -6,7 +6,7 @@ abstract class GameObject {
static RSInterface[][] aClass11ArrayArray1834;
static boolean aBoolean1837 = false;
static int[] anIntArray1838;
static Class3_Sub28_Sub16_Sub2[] aClass3_Sub28_Sub16_Sub2Array1839;
static SoftwareSprite[] aSoftwareSpriteArray1839;
static void method1859(double var0) {

2
Client/src/main/java/org/runite/client/HDSprite.java
View file

@ -29,7 +29,7 @@ public class HDSprite extends AbstractSprite {
this.method651();
}
public HDSprite(Class3_Sub28_Sub16_Sub2 var1) {
public HDSprite(SoftwareSprite var1) {
this.anInt3697 = var1.anInt3697;
this.anInt3706 = var1.anInt3706;
this.anInt3701 = var1.anInt3701;

6
Client/src/main/java/org/runite/client/InterfaceWidget.java
View file

@ -153,13 +153,13 @@ final class InterfaceWidget extends Node {
}
}
static Class2 c(int var0) {
static MapSceneDefinition c(int var0) {
try {
Class2 var2 = (Class2) TextureOperation25.aReferenceCache_3412.get(var0);
MapSceneDefinition var2 = (MapSceneDefinition) TextureOperation25.aReferenceCache_3412.get(var0);
if(var2 == null) {
byte[] var3 = Class107.aClass153_878.getFile(34, var0);
var2 = new Class2();
var2 = new MapSceneDefinition();
if(var3 != null) {
var2.decode(new DataBuffer(var3));
}

8
Client/src/main/java/org/runite/client/ItemDefinition.java
View file

@ -63,7 +63,7 @@ final class ItemDefinition {
int anInt786;
int itemId;
int anInt788;
int anInt789;
public int noteID;
private int anInt790;
int anInt791;
int anInt792;
@ -186,7 +186,7 @@ final class ItemDefinition {
var2.method1112();
if(var2.anInt791 != -1) {
var2.method1118(getItemDefinition(var2.anInt789), getItemDefinition(var2.anInt791));
var2.method1118(getItemDefinition(var2.noteID), getItemDefinition(var2.anInt791));
}
if(var2.anInt762 != -1) {
@ -560,7 +560,7 @@ final class ItemDefinition {
} else if (opcode == 96) {
this.anInt800 = buffer.readUnsignedByte();
} else if (opcode == 97) {
this.anInt789 = buffer.readUnsignedShort();
this.noteID = buffer.readUnsignedShort();
} else if (opcode == 98) {
this.anInt791 = buffer.readUnsignedShort();
} else if (opcode >= 100 && opcode < 110) {
@ -840,7 +840,7 @@ final class ItemDefinition {
this.anInt799 = 0;
this.anInt800 = 0;
this.stackingType = 0;
this.anInt789 = -1;
this.noteID = -1;
this.anInt794 = -1;
this.anInt788 = -1;
this.anInt797 = 128;

13
Client/src/main/java/org/runite/client/JavaAudioChannel.java
View file

@ -27,24 +27,23 @@ final class JavaAudioChannel extends AudioChannel {
Info[] var2 = AudioSystem.getMixerInfo();
if(null != var2) {
for(int var4 = 0; var2.length > var4; ++var4) {
Info var5 = var2[var4];
if(null != var5) {
for (Info var5 : var2) {
if (null != var5) {
String var6 = var5.getName();
if(null != var6 && var6.toLowerCase().contains("soundmax")) {
if (null != var6 && var6.toLowerCase().contains("soundmax")) {
this.aBoolean2973 = true;
}
}
}
}
this.anAudioFormat2974 = new AudioFormat((float)Class21.sampleRate, 16, !AudioChannel.stereo ?1:2, true, false);
this.aByteArray2975 = new byte[256 << (AudioChannel.stereo ?2:1)];
this.anAudioFormat2974 = new AudioFormat((float)Class21.sampleRate, 16, !AudioChannel.stereo ? 1 : 2, true, false);
this.aByteArray2975 = new byte[256 << (AudioChannel.stereo ? 2 : 1 )];
}
final void open(int var1) throws LineUnavailableException {
try {
javax.sound.sampled.DataLine.Info var2 = new javax.sound.sampled.DataLine.Info(SourceDataLine.class, this.anAudioFormat2974, var1 << (!AudioChannel.stereo ?1:2));
javax.sound.sampled.DataLine.Info var2 = new javax.sound.sampled.DataLine.Info(SourceDataLine.class, this.anAudioFormat2974, var1 << (!AudioChannel.stereo ? 1 : 2 ));
this.aSourceDataLine2972 = (SourceDataLine)AudioSystem.getLine(var2);
this.aSourceDataLine2972.open();
this.aSourceDataLine2972.start();

6
Client/src/main/java/org/runite/client/Class2.java → Client/src/main/java/org/runite/client/MapSceneDefinition.java
View file

@ -1,7 +1,7 @@
package org.runite.client;
// TODO MapSceneDefinition or something
public final class Class2 {
public final class MapSceneDefinition {
public int color;
public int sprite;
@ -23,7 +23,7 @@ public final class Class2 {
* by 90 degrees clockwise.
*/
public final LDIndexedSprite getSprite(int rotations) {
LDIndexedSprite sprite = (LDIndexedSprite) TextureOperation2.aReferenceCache_3369.get(rotations << 16 | this.sprite);
LDIndexedSprite sprite = (LDIndexedSprite) TextureOperation2.aReferenceCache_3369.get((long) rotations << 16 | this.sprite);
if (sprite != null) {
return sprite;
}
@ -39,7 +39,7 @@ public final class Class2 {
sprite.rotateClockwise();
}
TextureOperation2.aReferenceCache_3369.put(sprite, rotations << 16 | this.sprite);
TextureOperation2.aReferenceCache_3369.put(sprite, (long) rotations << 16 | this.sprite);
}
return sprite;

44
Client/src/main/java/org/runite/client/PacketParser.java
View file

@ -1230,7 +1230,7 @@ public final class PacketParser {
modelId = BufferedDataStream.incomingBuffer.readSignedShort();
counter = BufferedDataStream.incomingBuffer.readSignedShort128();
Class146.updateInterfacePacketCounter(nodeModelId);
Class168.method2271(modelId, var19, counter);
RSInterface.method2271(modelId, var19, counter);
Unsorted.incomingOpcode = -1;
return true;
@ -1418,7 +1418,7 @@ public final class PacketParser {
var25 = Unsorted.getRSInterface(nodeModelId);
}
for (; Unsorted.incomingPacketLength > BufferedDataStream.incomingBuffer.index; Class168.method2277(var6 + -1, counter, var30, var19, (byte) 46)) {
for (; Unsorted.incomingPacketLength > BufferedDataStream.incomingBuffer.index; method2277(var6 + -1, counter, var30, var19, (byte) 46)) {
counter = BufferedDataStream.incomingBuffer.getSmart();
var6 = BufferedDataStream.incomingBuffer.readUnsignedShort();
var30 = 0;
@ -1674,7 +1674,7 @@ public final class PacketParser {
var25.itemIds[var6] = var30;
}
Class168.method2277(-1 + chatIcon, var6, var30, var19, (byte) 41);
method2277(-1 + chatIcon, var6, var30, var19, (byte) 41);
}
if (var25 != null) {
@ -1710,7 +1710,7 @@ public final class PacketParser {
var19 = -1;
}
Class167.musicEffectHandler(var19);
AudioHandler.musicEffectHandler(var19);
Unsorted.incomingOpcode = -1;
return true;
} else {
@ -1852,4 +1852,40 @@ public final class PacketParser {
throw ClientErrorException.clientError(var2, "af.D(" + (byte) -86 + ')');
}
}
static void method2277(int var0, int var1, int var2, int var3, byte var4) {
try {
Class3_Sub25 var5 = (Class3_Sub25) Class3_Sub2.aHashTable_2220.get(var3);
if (var5 == null) {
var5 = new Class3_Sub25();
Class3_Sub2.aHashTable_2220.put(var3, var5);
}
if (var4 > 16) {
if (var1 >= var5.anIntArray2547.length) {
int[] var6 = new int[var1 - -1];
int[] var7 = new int[1 + var1];
int var8;
for (var8 = 0; var8 < var5.anIntArray2547.length; ++var8) {
var6[var8] = var5.anIntArray2547[var8];
var7[var8] = var5.anIntArray2551[var8];
}
for (var8 = var5.anIntArray2547.length; var1 > var8; ++var8) {
var6[var8] = -1;
var7[var8] = 0;
}
var5.anIntArray2547 = var6;
var5.anIntArray2551 = var7;
}
var5.anIntArray2547[var1] = var0;
var5.anIntArray2551[var1] = var2;
}
} catch (RuntimeException var9) {
throw ClientErrorException.clientError(var9, "wl.A(" + var0 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ')');
}
}
}

14
Client/src/main/java/org/runite/client/RSInterface.java
View file

@ -166,6 +166,18 @@ public final class RSInterface {
int[] itemIds;
int anInt318;
static void method2271(int var0, int var1, int var3) {
try {
InterfaceWidget var4 = InterfaceWidget.getWidget(11, var1);
var4.flagUpdate();
var4.anInt3597 = var3;
var4.anInt3598 = var0;
} catch (RuntimeException var5) {
throw ClientErrorException.clientError(var5, "wl.F(" + var0 + ',' + var1 + ',' + 1 + ',' + var3 + ')');
}
}
final void method854(int var1, int var2) {
try {
@ -743,7 +755,7 @@ public final class RSInterface {
long var4 = ((this.aBoolean178 ? 1L : 0L) << 38) + ((!this.aBoolean157 ? 0L : 1L) << 35) + (long) archiveId + ((long) this.anInt288 << 36) + ((this.aBoolean199 ? 1L : 0L) << 39) + ((long) this.anInt287 << 40);
AbstractSprite var6 = (AbstractSprite) Class114.aReferenceCache_1569.get(var4);
if (var6 == null) {
Class3_Sub28_Sub16_Sub2 var7;
SoftwareSprite var7;
if (this.aBoolean157) {
var7 = Unsorted.method562(Class12.aClass153_323, archiveId);
} else {

6
Client/src/main/java/org/runite/client/Class3_Sub28_Sub16_Sub2.java → Client/src/main/java/org/runite/client/SoftwareSprite.java
View file

@ -2,7 +2,7 @@ package org.runite.client;
import org.rs09.client.rendering.Toolkit;
public class Class3_Sub28_Sub16_Sub2 extends AbstractSprite {
public class SoftwareSprite extends AbstractSprite {
int[] anIntArray4081;
@ -823,7 +823,7 @@ public class Class3_Sub28_Sub16_Sub2 extends AbstractSprite {
}
}
Class3_Sub28_Sub16_Sub2(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7) {
SoftwareSprite(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7) {
this.anInt3697 = var1;
this.anInt3706 = var2;
this.anInt3701 = var3;
@ -1129,7 +1129,7 @@ public class Class3_Sub28_Sub16_Sub2 extends AbstractSprite {
}
}
Class3_Sub28_Sub16_Sub2(int var1, int var2) {
SoftwareSprite(int var1, int var2) {
this.anIntArray4081 = new int[var1 * var2];
this.width = this.anInt3697 = var1;
this.height = this.anInt3706 = var2;

20
Client/src/main/java/org/runite/client/Sprites.java
View file

@ -25,7 +25,7 @@ final class Sprites {
static int scrollbarSpriteArchive;
static int nameIconsSpriteArchive;
static int floorShadowSpriteArchive;
static Class3_Sub28_Sub16_Sub2[] aClass3_Sub28_Sub16_Sub2Array2140;
static SoftwareSprite[] aSoftwareSpriteArray2140;
private static LDIndexedSprite[] method885(int var1, CacheIndex var2) {
@ -39,7 +39,7 @@ final class Sprites {
static void method887(CacheIndex index8) {
try {
aClass3_Sub28_Sub16_Sub2Array2140 = Class157.method2176(mapFunctionSpriteArchive, index8);
aSoftwareSpriteArray2140 = Class157.method2176(mapFunctionSpriteArchive, index8);
Class75_Sub3.aAbstractSpriteArray2656 = Class140_Sub6.getSprites(hitmarkSpriteArchive, index8);
Unsorted.aAbstractSpriteArray996 = Class140_Sub6.getSprites(hitbarDefaultSpriteArchive, index8);
TextureOperation2.aAbstractSpriteArray3373 = Class140_Sub6.getSprites(headiconsPkSpriteArchive, index8);
@ -62,7 +62,7 @@ final class Sprites {
}
}
Class3_Sub28_Sub16_Sub2 var10 = Class40.method1043(0, index8, compassSpriteArchive);
SoftwareSprite var10 = Class40.method1043(0, index8, compassSpriteArchive);
Objects.requireNonNull(var10).method665();
if (HDToolKit.highDetail) {
Class57.aAbstractSprite_895 = new HDSprite(var10);
@ -70,7 +70,7 @@ final class Sprites {
Class57.aAbstractSprite_895 = var10;
}
Class3_Sub28_Sub16_Sub2[] var3 = Class157.method2176(hintMapEdgeSpriteArchive, index8);
SoftwareSprite[] var3 = Class157.method2176(hintMapEdgeSpriteArchive, index8);
int var4;
for (var4 = 0; Objects.requireNonNull(var3).length > var4; ++var4) {
@ -93,18 +93,18 @@ final class Sprites {
int var7 = -20 + (int) (Math.random() * 41.0D);
int var8;
for (var8 = 0; var8 < aClass3_Sub28_Sub16_Sub2Array2140.length; ++var8) {
aClass3_Sub28_Sub16_Sub2Array2140[var8].method669(var4 + var7, var7 + var5, var7 + var6);
for (var8 = 0; var8 < aSoftwareSpriteArray2140.length; ++var8) {
aSoftwareSpriteArray2140[var8].method669(var4 + var7, var7 + var5, var7 + var6);
}
if (HDToolKit.highDetail) {
Class140_Sub4.aAbstractSpriteArray2839 = new AbstractSprite[aClass3_Sub28_Sub16_Sub2Array2140.length];
Class140_Sub4.aAbstractSpriteArray2839 = new AbstractSprite[aSoftwareSpriteArray2140.length];
for (var8 = 0; var8 < aClass3_Sub28_Sub16_Sub2Array2140.length; ++var8) {
Class140_Sub4.aAbstractSpriteArray2839[var8] = new HDSprite(aClass3_Sub28_Sub16_Sub2Array2140[var8]);
for (var8 = 0; var8 < aSoftwareSpriteArray2140.length; ++var8) {
Class140_Sub4.aAbstractSpriteArray2839[var8] = new HDSprite(aSoftwareSpriteArray2140[var8]);
}
} else {
Class140_Sub4.aAbstractSpriteArray2839 = aClass3_Sub28_Sub16_Sub2Array2140;
Class140_Sub4.aAbstractSpriteArray2839 = aSoftwareSpriteArray2140;
}
} catch (RuntimeException var9) {

2
Client/src/main/java/org/runite/client/TextureOperation20.java
View file

@ -32,7 +32,7 @@ final class TextureOperation20 extends TextureOperation {
if(cursor != Class65.anInt991) {
if(cursor != -1) {
CursorDefinition cursorDef = TextureOperation3.method311(cursor);
Class3_Sub28_Sub16_Sub2 image = cursorDef.getImage();
SoftwareSprite image = cursorDef.getImage();
if(image == null) {
cursor = -1;
} else {

17
Client/src/main/java/org/runite/client/TextureOperation24.java
View file

@ -61,23 +61,6 @@ final class TextureOperation24 extends TextureOperation {
}
}
static void method225(RSInterface iface) {
RSInterface var2 = Class168.method2273(iface);
int windowWidth;
int windowHeight;
if (var2 == null) {
windowHeight = Class140_Sub7.canvasHeight;
windowWidth = Class23.canvasWidth;
} else {
windowHeight = var2.height;
windowWidth = var2.width;
}
Unsorted.calculateInterfaceSize(iface, windowWidth, windowHeight, false);
Unsorted.calculateInterfacePosition(iface, windowWidth, windowHeight);
}
static void method226(int var0) {
try {
if (var0 != -1) {

2
Client/src/main/java/org/runite/client/TextureOperation39.java
View file

@ -65,7 +65,7 @@ class TextureOperation39 extends TextureOperation {
if(this.anInt3278 < 0) {
return false;
} else {
Class3_Sub28_Sub16_Sub2 var3 = Texture.anInt1668 < 0 ? Unsorted.method1537(WaterfallShader.aClass153_2172, this.anInt3278):Class40.method1043(this.anInt3278, WaterfallShader.aClass153_2172, Texture.anInt1668);
SoftwareSprite var3 = Texture.anInt1668 < 0 ? Unsorted.method1537(WaterfallShader.aClass153_2172, this.anInt3278):Class40.method1043(this.anInt3278, WaterfallShader.aClass153_2172, Texture.anInt1668);
Objects.requireNonNull(var3).method665();
this.anInt3283 = var3.height;
this.anInt3280 = var3.width;

2
Client/src/main/java/org/runite/client/TextureOperation7.java
View file

@ -288,7 +288,7 @@ final class TextureOperation7 extends TextureOperation {
}
if(0 != var18) {
MapUnderlayColorDefinition var19 = MapUnderlayColorDefinition.method629(-1 + (255 & var18));
FloorUnderlayDefinition var19 = FloorUnderlayDefinition.method629(-1 + (255 & var18));
var15[var16][var17] = (1 + var19.anInt1412 << 16) - -var19.anInt1414;
}
}

4
Client/src/main/java/org/runite/client/TextureOperation9.java
View file

@ -73,7 +73,7 @@ public final class TextureOperation9 extends TextureOperation {
try {
//int var1 = 15 / ((-11 - var0) / 63);
if(Unsorted.anInt3660 == 2) {
if(TextureOperation8.anInt3460 == NPCDefinition.anInt1297 && Class38_Sub1.anInt2612 == Class168.anInt2099) {
if(TextureOperation8.anInt3460 == NPCDefinition.anInt1297 && Class38_Sub1.anInt2612 == Unsorted.anInt2099) {
Unsorted.anInt3660 = 0;
if(ClientCommands.shiftClickEnabled && ObjectDefinition.aBooleanArray1490[81] && Unsorted.menuOptionCount > 2) {
BufferedDataStream.method806(Unsorted.menuOptionCount + -2);
@ -89,7 +89,7 @@ public final class TextureOperation9 extends TextureOperation {
BufferedDataStream.method806(Unsorted.menuOptionCount - 1);
}
} else {
Class168.anInt2099 = Class38_Sub1.anInt2614;
Unsorted.anInt2099 = Class38_Sub1.anInt2614;
Unsorted.anInt3660 = 2;
TextureOperation8.anInt3460 = Class163_Sub1.anInt2993;
}

216
Client/src/main/java/org/runite/client/Unsorted.java
View file

@ -12,6 +12,8 @@ import org.rs09.client.util.ArrayUtils;
import org.runite.client.drawcalls.*;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Objects;
@ -168,6 +170,8 @@ public class Unsorted {
static long[] aLongArray3271 = new long[500];
static boolean aBoolean3275 = true;
static int anInt154 = 0;
static RSInterface aClass11_2091 = null;
static int anInt2099 = 0;
static void method2086() {
try {
@ -381,7 +385,7 @@ public class Unsorted {
}
}
static Class3_Sub28_Sub16_Sub2 method1537(CacheIndex var0, int var1) {
static SoftwareSprite method1537(CacheIndex var0, int var1) {
try {
if (Class140_Sub7.method2029((byte) -118, var0, var1)) {
@ -403,14 +407,14 @@ public class Unsorted {
}
}
static AbstractSprite method1570(int var0, byte var1, boolean var2, int var3, boolean var4, int var5, int var6, boolean var7) {
static AbstractSprite constructItemSprite(int var0, boolean useHDSprite, int itemID, boolean var4, int outlineType, int itemCount, boolean shrinkInSprite) {
try {
ItemDefinition item = ItemDefinition.getItemDefinition(var3);
if (var6 > 1 && item.anIntArray804 != null) {
ItemDefinition item = ItemDefinition.getItemDefinition(itemID);
if (itemCount > 1 && item.anIntArray804 != null) {
int var9 = -1;
for (int var10 = 0; var10 < 10; ++var10) {
if (item.anIntArray766[var10] <= var6 && item.anIntArray766[var10] != 0) {
if (item.anIntArray766[var10] <= itemCount && item.anIntArray766[var10] != 0) {
var9 = item.anIntArray804[var10];
}
}
@ -424,16 +428,16 @@ public class Unsorted {
if (null == var21) {
return null;
} else {
Class3_Sub28_Sub16_Sub2 var22 = null;
SoftwareSprite var22 = null;
if (item.anInt791 == -1) {
if (item.anInt762 != -1) {
var22 = (Class3_Sub28_Sub16_Sub2) method1570(var0, (byte) -107, true, item.anInt795, false, var5, var6, false);
var22 = (SoftwareSprite) constructItemSprite(var0, true, item.anInt795, false, outlineType, itemCount, false);
if (null == var22) {
return null;
}
}
} else {
var22 = (Class3_Sub28_Sub16_Sub2) method1570(0, (byte) 116, true, item.anInt789, false, 1, 10, true);
var22 = (SoftwareSprite) constructItemSprite(0, true, item.noteID, false, 1, 10, true);
if (null == var22) {
return null;
}
@ -444,24 +448,24 @@ public class Unsorted {
int var13 = Toolkit.JAVA_TOOLKIT.height;
int[] var14 = new int[4];
Class74.method1325(var14);
Class3_Sub28_Sub16_Sub2 var15 = new Class3_Sub28_Sub16_Sub2(36, 32);
SoftwareSprite var15 = new SoftwareSprite(36, 32);
Class74.setBuffer(var15.anIntArray4081, 36, 32);
Class51.method1134();
Class51.method1145(16, 16);
int var16 = item.anInt810;
Class51.aBoolean843 = false;
if (var7) {
if (shrinkInSprite) {
var16 = (int) ((double) var16 * 1.5D);
} else if (var5 == 2) {
} else if (outlineType == 2) {
var16 = (int) (1.04D * (double) var16);
}
int var18 = Class51.anIntArray851[item.anInt786] * var16 >> 16;
int var17 = Class51.anIntArray840[item.anInt786] * var16 >> 16;
var21.method1893(item.anInt799, item.anInt768, item.anInt786, item.anInt792, var17 - (var21.method1871() / 2 + -item.anInt754), item.anInt754 + var18);
if (var5 >= 1) {
if (outlineType >= 1) {
var15.method657(1);
if (var5 >= 2) {
if (outlineType >= 2) {
var15.method657(16777215);
}
@ -480,18 +484,18 @@ public class Unsorted {
var15 = var22;
}
if (var4 && (item.stackingType == 1 || var6 != 1) && var6 != -1) {
TextureOperation10.aClass3_Sub28_Sub17_Sub1_3440.method681(Class3_Sub7.itemStackColor(1000, var6), 0, 9, 16776960, 1);
if (var4 && (item.stackingType == 1 || itemCount != 1) && itemCount != -1) {
TextureOperation10.aClass3_Sub28_Sub17_Sub1_3440.method681(Class3_Sub7.itemStackColor(1000, itemCount), 0, 9, 16776960, 1);
}
Class74.setBuffer(var11, var12, var13);
Class74.setClipping(var14);
Class51.method1134();
Class51.aBoolean843 = true;
return HDToolKit.highDetail && !var2 ? new HDSprite(var15) : var15;
return HDToolKit.highDetail && !useHDSprite ? new HDSprite(var15) : var15;
}
} catch (RuntimeException var20) {
throw ClientErrorException.clientError(var20, "na.WA(" + var0 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ',' + var7 + ')');
throw ClientErrorException.clientError(var20, "na.WA(" + var0 + ',' + useHDSprite + ',' + itemID + ',' + var4 + ',' + outlineType + ',' + itemCount + ',' + shrinkInSprite + ')');
}
}
@ -709,7 +713,7 @@ public class Unsorted {
Class119.aClass33_1626 = null;
Class36.aAbstractSprite_637 = null;
Texture.anInt1150 = -1;
WorldMap.aClass3_Sub28_Sub16_Sub2_3221 = null;
WorldMap.aSoftwareSprite_3221 = null;
} catch (RuntimeException var3) {
throw ClientErrorException.clientError(var3, "jb.E(" + var0 + ',' + var1 + ')');
}
@ -851,7 +855,7 @@ public class Unsorted {
try {
if (var2.anInt2800 <= Class44.anInt719) {
if (var2.anInt2790 >= Class44.anInt719) {
Class168.method2270(var2);
method2270(var2);
} else {
method1180((byte) -22, var2);
}
@ -930,7 +934,7 @@ public class Unsorted {
if (Class101.anInt1425 <= var5 - var4 && Class3_Sub28_Sub18.anInt3765 >= var5 - -var4 && Class159.anInt2020 <= -var4 + var1 && Class57.anInt902 >= var4 + var1) {
TextureOperation6.method175(var6, var0, var1, var3, var4, var5);
} else {
Class168.method2275(var3, var1, var4, var6, var0, var5);
method2275(var3, var1, var4, var6, var0, var5);
}
} catch (RuntimeException var8) {
@ -2816,7 +2820,7 @@ public class Unsorted {
}
if (iface.anInt189 == 1337) {
Class168.aClass11_2091 = iface;
aClass11_2091 = iface;
}
if (notifyScripts && null != iface.anObjectArray235 && (iface.width != oldWidth || iface.height != oldHeight)) {
@ -3742,7 +3746,7 @@ public class Unsorted {
int var47;
if (var11.anInt189 != 0) {
if (var11.anInt189 == 1337 || var11.anInt189 == 1403 && HDToolKit.highDetail) {
Class168.aClass11_2091 = var11;
aClass11_2091 = var11;
anInt2567 = var14;
Class53.anInt865 = var13;
method338(var11.height, var11.anInt189 == 1403, var13, var11.width, var14);
@ -4742,7 +4746,7 @@ public class Unsorted {
}
}
public static Class3_Sub28_Sub16_Sub2 method562(CacheIndex var0, int var2) {
public static SoftwareSprite method562(CacheIndex var0, int var2) {
try {
// System.out.println("Class 3_Sub28_Sub16_Sub2 " + var2);
return Class75_Sub4.method1351(var0, 0, var2) ? Class3_Sub28_Sub9.method578() : null;
@ -5258,4 +5262,170 @@ public class Unsorted {
throw ClientErrorException.clientError(var4, "cb.A(" + 0 + ',' + var1 + ',' + var2 + ')');
}
}
static void method2275(int var0, int var2, int var3, int var4, int var5, int var6) {
try {
int var8 = -var5 + var3;
MouseListeningClass.method2091(var3);
int var7 = 0;
if (var8 < 0) {
var8 = 0;
}
int var9 = var3;
int var10 = -var3;
int var12 = -var8;
int var11 = var8;
int var13 = -1;
int var17;
int var16;
int var19;
int var18;
if (var2 >= Class159.anInt2020 && Class57.anInt902 >= var2) {
int[] var15 = Class38.anIntArrayArray663[var2];
var16 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, -var3 + var6, Class101.anInt1425);
var17 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var3 + var6, Class101.anInt1425);
var18 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var6 + -var8, Class101.anInt1425);
var19 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var6 - -var8, Class101.anInt1425);
TextureOperation18.method282(var15, var16, 102, var18, var4);
TextureOperation18.method282(var15, var18, -44, var19, var0);
TextureOperation18.method282(var15, var19, -61, var17, var4);
}
int var14 = -1;
while (var9 > var7) {
var13 += 2;
var14 += 2;
var12 += var14;
var10 += var13;
if (var12 >= 0 && var11 >= 1) {
--var11;
GameObject.anIntArray1838[var11] = var7;
var12 -= var11 << 1;
}
++var7;
int var21;
int var20;
int[] var22;
int var24;
if (0 <= var10) {
--var9;
var10 -= var9 << 1;
var24 = var2 + -var9;
var16 = var2 + var9;
if (var16 >= Class159.anInt2020 && var24 <= Class57.anInt902) {
if (var8 <= var9) {
var17 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var7 + var6, Class101.anInt1425);
var18 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, -var7 + var6, Class101.anInt1425);
if (var16 <= Class57.anInt902) {
TextureOperation18.method282(Class38.anIntArrayArray663[var16], var18, -53, var17, var4);
}
if (var24 >= Class159.anInt2020) {
TextureOperation18.method282(Class38.anIntArrayArray663[var24], var18, 96, var17, var4);
}
} else {
var17 = GameObject.anIntArray1838[var9];
var18 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var7 + var6, Class101.anInt1425);
var19 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, -var7 + var6, Class101.anInt1425);
var20 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var6 - -var17, Class101.anInt1425);
var21 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, -var17 + var6, Class101.anInt1425);
if (Class57.anInt902 >= var16) {
var22 = Class38.anIntArrayArray663[var16];
TextureOperation18.method282(var22, var19, 116, var21, var4);
TextureOperation18.method282(var22, var21, 125, var20, var0);
TextureOperation18.method282(var22, var20, 87, var18, var4);
}
if (Class159.anInt2020 <= var24) {
var22 = Class38.anIntArrayArray663[var24];
TextureOperation18.method282(var22, var19, 110, var21, var4);
TextureOperation18.method282(var22, var21, -114, var20, var0);
TextureOperation18.method282(var22, var20, -88, var18, var4);
}
}
}
}
var24 = -var7 + var2;
var16 = var2 - -var7;
if (var16 >= Class159.anInt2020 && var24 <= Class57.anInt902) {
var17 = var6 + var9;
var18 = var6 + -var9;
if (var17 >= Class101.anInt1425 && var18 <= Class3_Sub28_Sub18.anInt3765) {
var17 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var17, Class101.anInt1425);
var18 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var18, Class101.anInt1425);
if (var7 < var8) {
var19 = var11 >= var7 ? var11 : GameObject.anIntArray1838[var7];
var20 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var19 + var6, Class101.anInt1425);
var21 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var6 - var19, Class101.anInt1425);
if (Class57.anInt902 >= var16) {
var22 = Class38.anIntArrayArray663[var16];
TextureOperation18.method282(var22, var18, 126, var21, var4);
TextureOperation18.method282(var22, var21, 103, var20, var0);
TextureOperation18.method282(var22, var20, -61, var17, var4);
}
if (var24 >= Class159.anInt2020) {
var22 = Class38.anIntArrayArray663[var24];
TextureOperation18.method282(var22, var18, 102, var21, var4);
TextureOperation18.method282(var22, var21, -94, var20, var0);
TextureOperation18.method282(var22, var20, 99, var17, var4);
}
} else {
if (var16 <= Class57.anInt902) {
TextureOperation18.method282(Class38.anIntArrayArray663[var16], var18, 94, var17, var4);
}
if (var24 >= Class159.anInt2020) {
TextureOperation18.method282(Class38.anIntArrayArray663[var24], var18, 126, var17, var4);
}
}
}
}
}
} catch (RuntimeException var23) {
throw ClientErrorException.clientError(var23, "wl.I(" + var0 + ',' + (byte) 109 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ')');
}
}
static void method2270(Class140_Sub4 var0) {
try {
if (Class44.anInt719 == var0.anInt2790 || var0.anInt2771 == -1 || var0.anInt2828 != 0 || SequenceDefinition.getAnimationDefinition(var0.anInt2771).duration[var0.anInt2832] < 1 + var0.anInt2760) {
int var2 = var0.anInt2790 + -var0.anInt2800;
int var3 = Class44.anInt719 + -var0.anInt2800;
int var4 = var0.anInt2784 * 128 + 64 * var0.getSize();
int var5 = var0.anInt2835 * 128 - -(var0.getSize() * 64);
int var6 = 128 * var0.anInt2823 + var0.getSize() * 64;
int var7 = 128 * var0.anInt2798 + var0.getSize() * 64;
var0.xAxis = (var3 * var6 + var4 * (var2 - var3)) / var2;
var0.zAxis = (var7 * var3 + var5 * (var2 - var3)) / var2;
}
var0.anInt2824 = 0;
if (var0.anInt2840 == 0) {
var0.anInt2806 = 1024;
}
if (1 == var0.anInt2840) {
var0.anInt2806 = 1536;
}
if (var0.anInt2840 == 2) {
var0.anInt2806 = 0;
}
if (var0.anInt2840 == 3) {
var0.anInt2806 = 512;
}
var0.anInt2785 = var0.anInt2806;
} catch (RuntimeException var8) {
throw ClientErrorException.clientError(var8, "wl.K(" + (var0 != null ? "{...}" : "null") + ',' + (byte) -56 + ')');
}
}
}

20
Client/src/main/java/org/runite/client/WorldListEntry.java
View file

@ -86,15 +86,15 @@ public final class WorldListEntry extends Class44 {
aAbstractSprite_1457 = Unsorted.method562(CacheIndex.spritesIndex, anInt1400);
if (HDToolKit.highDetail) {
if (aAbstractSprite_3099 instanceof Class3_Sub28_Sub16_Sub2_Sub1) {
aAbstractSprite_3099 = new Class3_Sub28_Sub16_Sub1_Sub1((Class3_Sub28_Sub16_Sub2) aAbstractSprite_3099);
aAbstractSprite_3099 = new Class3_Sub28_Sub16_Sub1_Sub1((SoftwareSprite) aAbstractSprite_3099);
} else {
aAbstractSprite_3099 = new HDSprite((Class3_Sub28_Sub16_Sub2) aAbstractSprite_3099);
aAbstractSprite_3099 = new HDSprite((SoftwareSprite) aAbstractSprite_3099);
}
if (aAbstractSprite_1457 instanceof Class3_Sub28_Sub16_Sub2_Sub1) {
aAbstractSprite_1457 = new Class3_Sub28_Sub16_Sub1_Sub1((Class3_Sub28_Sub16_Sub2) aAbstractSprite_1457);
aAbstractSprite_1457 = new Class3_Sub28_Sub16_Sub1_Sub1((SoftwareSprite) aAbstractSprite_1457);
} else {
aAbstractSprite_1457 = new HDSprite((Class3_Sub28_Sub16_Sub2) aAbstractSprite_1457);
aAbstractSprite_1457 = new HDSprite((SoftwareSprite) aAbstractSprite_1457);
}
}
} else {
@ -135,21 +135,21 @@ public final class WorldListEntry extends Class44 {
Class3_Sub26.aAbstractSprite_2560 = Unsorted.method562(CacheIndex.spritesIndex, anInt2937);
if (HDToolKit.highDetail) {
if (aAbstractSprite_1339 instanceof Class3_Sub28_Sub16_Sub2_Sub1) {
aAbstractSprite_1339 = new Class3_Sub28_Sub16_Sub1_Sub1((Class3_Sub28_Sub16_Sub2) aAbstractSprite_1339);
aAbstractSprite_1339 = new Class3_Sub28_Sub16_Sub1_Sub1((SoftwareSprite) aAbstractSprite_1339);
} else {
aAbstractSprite_1339 = new HDSprite((Class3_Sub28_Sub16_Sub2) aAbstractSprite_1339);
aAbstractSprite_1339 = new HDSprite((SoftwareSprite) aAbstractSprite_1339);
}
if (Class50.aAbstractSprite_824 instanceof Class3_Sub28_Sub16_Sub2_Sub1) {
Class50.aAbstractSprite_824 = new Class3_Sub28_Sub16_Sub1_Sub1((Class3_Sub28_Sub16_Sub2) Class50.aAbstractSprite_824);
Class50.aAbstractSprite_824 = new Class3_Sub28_Sub16_Sub1_Sub1((SoftwareSprite) Class50.aAbstractSprite_824);
} else {
Class50.aAbstractSprite_824 = new HDSprite((Class3_Sub28_Sub16_Sub2) Class50.aAbstractSprite_824);
Class50.aAbstractSprite_824 = new HDSprite((SoftwareSprite) Class50.aAbstractSprite_824);
}
if (Class3_Sub26.aAbstractSprite_2560 instanceof Class3_Sub28_Sub16_Sub2_Sub1) {
Class3_Sub26.aAbstractSprite_2560 = new Class3_Sub28_Sub16_Sub1_Sub1((Class3_Sub28_Sub16_Sub2) Class3_Sub26.aAbstractSprite_2560);
Class3_Sub26.aAbstractSprite_2560 = new Class3_Sub28_Sub16_Sub1_Sub1((SoftwareSprite) Class3_Sub26.aAbstractSprite_2560);
} else {
Class3_Sub26.aAbstractSprite_2560 = new HDSprite((Class3_Sub28_Sub16_Sub2) Class3_Sub26.aAbstractSprite_2560);
Class3_Sub26.aAbstractSprite_2560 = new HDSprite((SoftwareSprite) Class3_Sub26.aAbstractSprite_2560);
}
}
}

14
Client/src/main/java/org/runite/client/WorldMap.java
View file

@ -8,7 +8,7 @@ final class WorldMap extends Node {
static int anInt2737 = 0;
static CacheIndex aClass153_3210;
static Class3_Sub28_Sub16_Sub2 aClass3_Sub28_Sub16_Sub2_3221;
static SoftwareSprite aSoftwareSprite_3221;
Class140_Sub7 aClass140_Sub7_3676;
@ -91,7 +91,7 @@ final class WorldMap extends Node {
int var6 = Class158_Sub1.anInt1463 >> 1;
CS2Script.aByteArrayArrayArray2452 = new byte[var3][var4][];
Class29.anIntArrayArrayArray558 = new int[var3][var4][];
Class36.method1014(var6, var5);
FloorOverlayDefinition.method1014(var6, var5);
anInt2737 = 20;
@ -211,16 +211,16 @@ final class WorldMap extends Node {
Class49.anInt817 = (int) ((float) (var4 * 2) / Class44.aFloat727);
if (HDToolKit.highDetail) {
if (aClass3_Sub28_Sub16_Sub2_3221 == null || var4 != aClass3_Sub28_Sub16_Sub2_3221.width || var3 != aClass3_Sub28_Sub16_Sub2_3221.height) {
aClass3_Sub28_Sub16_Sub2_3221 = null;
aClass3_Sub28_Sub16_Sub2_3221 = new Class3_Sub28_Sub16_Sub2(var4, var3);
if (aSoftwareSprite_3221 == null || var4 != aSoftwareSprite_3221.width || var3 != aSoftwareSprite_3221.height) {
aSoftwareSprite_3221 = null;
aSoftwareSprite_3221 = new SoftwareSprite(var4, var3);
}
Class74.setBuffer(aClass3_Sub28_Sub16_Sub2_3221.anIntArray4081, var4, var3);
Class74.setBuffer(aSoftwareSprite_3221.anIntArray4081, var4, var3);
Unsorted.method523(var4, 0, var7, var6, 0, var8, var3, var15);
Class23.method938(var4, 0, var7, var8, var3, 0, var15, var6);
Class3_Sub5.method111((byte) -54, 0, 0, var15, var4, var8, var6, var7, var3);
Class22.method926(aClass3_Sub28_Sub16_Sub2_3221.anIntArray4081, var0, var2, var4, var3);
Class22.method926(aSoftwareSprite_3221.anIntArray4081, var0, var2, var4, var3);
Toolkit.JAVA_TOOLKIT.resetBuffer();
} else {
Unsorted.method523(var4 + var0, var2, var7, var6, var0, var8, var2 - -var3, var15);

4
Client/src/main/java/org/runite/client/WorldMapUnderlayDecoder.java
View file

@ -58,7 +58,7 @@ public final class WorldMapUnderlayDecoder {
if (var27 > var14) {
var15 = 255 & var4[var14][var34];
if (var15 > 0) {
MapUnderlayColorDefinition var16 = MapUnderlayColorDefinition.method629(var15 - 1);
FloorUnderlayDefinition var16 = FloorUnderlayDefinition.method629(var15 - 1);
var28[var34] += var16.anInt1408;
var29[var34] += var16.anInt1406;
var30[var34] += var16.anInt1417;
@ -71,7 +71,7 @@ public final class WorldMapUnderlayDecoder {
if (var15 >= 0) {
var35 = var4[var15][var34] & 0xFF;
if (0 < var35) {
MapUnderlayColorDefinition var17 = MapUnderlayColorDefinition.method629(-1 + var35);
FloorUnderlayDefinition var17 = FloorUnderlayDefinition.method629(-1 + var35);
var28[var34] -= var17.anInt1408;
var29[var34] -= var17.anInt1406;
var30[var34] -= var17.anInt1417;

2
Client/src/main/java/org/runite/client/drawcalls/Compass.java
View file

@ -21,7 +21,7 @@ public final class Compass {
} else if (HDToolKit.highDetail) {
((HDSprite) Class57.aAbstractSprite_895).drawMinimapRegion(var0, var1, var2.width, var2.height, Class57.aAbstractSprite_895.width / 2, Class57.aAbstractSprite_895.height / 2, GraphicDefinition.CAMERA_DIRECTION, 256, (HDSprite) var2.method866(false));
} else {
((Class3_Sub28_Sub16_Sub2) Class57.aAbstractSprite_895).method667(var0, var1, var2.width, var2.height, Class57.aAbstractSprite_895.width / 2, Class57.aAbstractSprite_895.height / 2, GraphicDefinition.CAMERA_DIRECTION, var2.anIntArray207, var2.anIntArray291);
((SoftwareSprite) Class57.aAbstractSprite_895).method667(var0, var1, var2.width, var2.height, Class57.aAbstractSprite_895.width / 2, Class57.aAbstractSprite_895.height / 2, GraphicDefinition.CAMERA_DIRECTION, var2.anIntArray207, var2.anIntArray291);
}
Class163_Sub1_Sub1.aBooleanArray4008[var3] = true;

2
Client/src/main/java/org/runite/client/drawcalls/Minimap.java
View file

@ -23,7 +23,7 @@ public final class Minimap {
if (HDToolKit.highDetail) {
((HDSprite) Class49.aAbstractSprite_812).drawMinimapRegion(var3, var2, var4.width, var4.height, var6, var7, var19, Class164_Sub2.anInt3020 + 256, (HDSprite) var4.method866(false));
} else {
((Class3_Sub28_Sub16_Sub2) Class49.aAbstractSprite_812).drawMinimapRegion(var3, var2, var4.width, var4.height, var6, var7, var19, 256 - -Class164_Sub2.anInt3020, var4.anIntArray207, var4.anIntArray291);
((SoftwareSprite) Class49.aAbstractSprite_812).drawMinimapRegion(var3, var2, var4.width, var4.height, var6, var7, var19, 256 - -Class164_Sub2.anInt3020, var4.anIntArray207, var4.anIntArray291);
}
int var9;

4
Client/src/main/kotlin/org/rs09/XPGainDraw.kt
View file

@ -162,9 +162,9 @@ object XPGainDraw {
rawSprite = Unsorted.method562(CacheIndex.spritesIndex, archiveIndex)
if(HDToolKit.highDetail){
if(rawSprite is Class3_Sub28_Sub16_Sub2_Sub1){
rawSprite = Class3_Sub28_Sub16_Sub1_Sub1(rawSprite as Class3_Sub28_Sub16_Sub2)
rawSprite = Class3_Sub28_Sub16_Sub1_Sub1(rawSprite as SoftwareSprite)
} else {
rawSprite = HDSprite(rawSprite as Class3_Sub28_Sub16_Sub2)
rawSprite = HDSprite(rawSprite as SoftwareSprite)
}
}
}

2
Client/src/main/kotlin/org/rs09/client/console/DeveloperConsole.kt
View file

@ -277,7 +277,7 @@ object DeveloperConsole {
"playsfx" -> {
if (argSize == 2) {
args = clientCommand[1].toIntOrNull() ?: -1
Class167.musicEffectHandler(args as Int)
AudioHandler.musicEffectHandler(args as Int)
} else {
println("Error. Plays a music effect. Use: playeffectfx #")
}

4
Client/src/main/kotlin/org/rs09/client/filestore/resources/configs/cursors/CursorDefinition.kt
View file

@ -7,8 +7,8 @@ class CursorDefinition {
var hotspotY = 0
var imageId = 0
fun getImage(): Class3_Sub28_Sub16_Sub2 {
var image = Class163_Sub1.aReferenceCache_2984.get(imageId.toLong()) as? Class3_Sub28_Sub16_Sub2
fun getImage(): SoftwareSprite {
var image = Class163_Sub1.aReferenceCache_2984.get(imageId.toLong()) as? SoftwareSprite
if (image != null) return image
image = Unsorted.method562(SequenceDefinition.aClass153_1852, imageId)