diff --git a/Client/src/main/java/org/runite/client/AbstractIndexedSprite.java b/Client/src/main/java/org/runite/client/AbstractIndexedSprite.java index 25946578e..99ba73040 100644 --- a/Client/src/main/java/org/runite/client/AbstractIndexedSprite.java +++ b/Client/src/main/java/org/runite/client/AbstractIndexedSprite.java @@ -3,7 +3,6 @@ package org.runite.client; abstract class AbstractIndexedSprite { int width; - static int anInt1462; int anInt1464; int anInt1467; int height; diff --git a/Client/src/main/java/org/runite/client/AnimationHeader.java b/Client/src/main/java/org/runite/client/AnimationHeader.java index 9c08b2888..3712c2791 100644 --- a/Client/src/main/java/org/runite/client/AnimationHeader.java +++ b/Client/src/main/java/org/runite/client/AnimationHeader.java @@ -74,9 +74,9 @@ final class AnimationHeader { // // aByteArray1389[var6] = (byte)(var11 >>> 3 & 3); // if(var10 == 2) { -// aShortArray1394[var6] = (short)(((aShortArray1394[var6] & 255) << 3) + (aShortArray1394[var6] >> 8 & 7)); -// aShortArray1391[var6] = (short)(((aShortArray1391[var6] & 255) << 3) + (aShortArray1391[var6] >> 8 & 7)); -// aShortArray1390[var6] = (short)(((aShortArray1390[var6] & 255) << 3) + (aShortArray1390[var6] >> 8 & 7)); +// aShortArray1394[var6] = (short)(((aShortArray1394[var6] & 0xFF) << 3) + (aShortArray1394[var6] >> 8 & 7)); +// aShortArray1391[var6] = (short)(((aShortArray1391[var6] & 0xFF) << 3) + (aShortArray1391[var6] >> 8 & 7)); +// aShortArray1390[var6] = (short)(((aShortArray1390[var6] & 0xFF) << 3) + (aShortArray1390[var6] >> 8 & 7)); // } // var7 = i; // if(var10 != 1 && var10 != 2 && var10 != 3) { @@ -163,9 +163,9 @@ final class AnimationHeader { aByteArray1389[var6] = (byte)(var11 >>> 3 & 3); if(var10 == 2) { - aShortArray1394[var6] = (short)(((aShortArray1394[var6] & 255) << 3) + (aShortArray1394[var6] >> 8 & 7)); - aShortArray1391[var6] = (short)(((aShortArray1391[var6] & 255) << 3) + (aShortArray1391[var6] >> 8 & 7)); - aShortArray1390[var6] = (short)(((aShortArray1390[var6] & 255) << 3) + (aShortArray1390[var6] >> 8 & 7)); + aShortArray1394[var6] = (short)(((aShortArray1394[var6] & 0xFF) << 3) + (aShortArray1394[var6] >> 8 & 7)); + aShortArray1391[var6] = (short)(((aShortArray1391[var6] & 0xFF) << 3) + (aShortArray1391[var6] >> 8 & 7)); + aShortArray1390[var6] = (short)(((aShortArray1390[var6] & 0xFF) << 3) + (aShortArray1390[var6] >> 8 & 7)); } aShortArray1392[var6] = -1; diff --git a/Client/src/main/java/org/runite/client/AtmosphereParser.java b/Client/src/main/java/org/runite/client/AtmosphereParser.java index 4ee41c835..7d6ed2ad6 100644 --- a/Client/src/main/java/org/runite/client/AtmosphereParser.java +++ b/Client/src/main/java/org/runite/client/AtmosphereParser.java @@ -55,7 +55,7 @@ public final class AtmosphereParser { if (var2 == null) { byte[] var3 = CacheIndex.fontsIndex.getFile(var1, 0); var2 = new Class3_Sub28_Sub17_Sub1(var3); - var2.method697(Class3_Sub13_Sub22.nameIconsSpriteArray, null); + var2.method697(TextureOperation0.nameIconsSpriteArray, null); Unsorted.aReferenceCache_1135.put(var2, var1); } return var2; diff --git a/Client/src/main/java/org/runite/client/Bzip2Decompressor.java b/Client/src/main/java/org/runite/client/Bzip2Decompressor.java index ecfde6ea5..fdb618077 100644 --- a/Client/src/main/java/org/runite/client/Bzip2Decompressor.java +++ b/Client/src/main/java/org/runite/client/Bzip2Decompressor.java @@ -7,7 +7,7 @@ public final class Bzip2Decompressor { private static int method1633(int var0, Bzip2Context var1) { while(var1.anInt128 < var0) { - var1.anInt140 = var1.anInt140 << 8 | var1.aByteArray127[var1.anInt116] & 255; + var1.anInt140 = var1.anInt140 << 8 | var1.aByteArray127[var1.anInt116] & 0xFF; var1.anInt128 += 8; ++var1.anInt116; ++var1.anInt147; @@ -65,7 +65,7 @@ public final class Bzip2Decompressor { var2 = (byte)var5; var7 = var6[var7]; - var1 = (byte)(var7 & 255); + var1 = (byte)(var7 & 0xFF); var7 >>= 8; ++var4; if(var1 != var5) { @@ -94,25 +94,25 @@ public final class Bzip2Decompressor { var3 = 2; var7 = var6[var7]; - var1 = (byte)(var7 & 255); + var1 = (byte)(var7 & 0xFF); var7 >>= 8; ++var4; if(var4 != var12) { if(var1 == var5) { var3 = 3; var7 = var6[var7]; - var1 = (byte)(var7 & 255); + var1 = (byte)(var7 & 0xFF); var7 >>= 8; ++var4; if(var4 != var12) { if(var1 == var5) { var7 = var6[var7]; - var1 = (byte)(var7 & 255); + var1 = (byte)(var7 & 0xFF); var7 >>= 8; ++var4; - var3 = (var1 & 255) + 4; + var3 = (var1 & 0xFF) + 4; var7 = var6[var7]; - var5 = (byte)(var7 & 255); + var5 = (byte)(var7 & 0xFF); var7 >>= 8; ++var4; } else { @@ -226,11 +226,11 @@ public final class Bzip2Decompressor { var0.anInt135 = 0; var1 = method1637(var0); - var0.anInt135 = var0.anInt135 << 8 | var1 & 255; + var0.anInt135 = var0.anInt135 << 8 | var1 & 0xFF; var1 = method1637(var0); - var0.anInt135 = var0.anInt135 << 8 | var1 & 255; + var0.anInt135 = var0.anInt135 << 8 | var1 & 0xFF; var1 = method1637(var0); - var0.anInt135 = var0.anInt135 << 8 | var1 & 255; + var0.anInt135 = var0.anInt135 << 8 | var1 & 0xFF; int var35; for(var35 = 0; var35 < 16; ++var35) { @@ -413,10 +413,10 @@ public final class Bzip2Decompressor { } while(var44 == 0 || var44 == 1); ++var46; - var1 = var0.aByteArray114[var0.aByteArray109[var0.anIntArray123[0]] & 255]; + var1 = var0.aByteArray114[var0.aByteArray109[var0.anIntArray123[0]] & 0xFF]; - for(var0.anIntArray134[var1 & 255] += var46; var46 > 0; --var46) { - Class129.anIntArray1690[var47] = var1 & 255; + for(var0.anIntArray134[var1 & 0xFF] += var46; var46 > 0; --var46) { + Class129.anIntArray1690[var47] = var1 & 0xFF; ++var47; } } else { @@ -472,8 +472,8 @@ public final class Bzip2Decompressor { } } - ++var0.anIntArray134[var0.aByteArray114[var1 & 255] & 255]; - Class129.anIntArray1690[var47] = var0.aByteArray114[var1 & 255] & 255; + ++var0.anIntArray134[var0.aByteArray114[var1 & 0xFF] & 0xFF]; + Class129.anIntArray1690[var47] = var0.aByteArray114[var1 & 0xFF] & 0xFF; ++var47; if(var45 == 0) { ++var41; @@ -510,15 +510,15 @@ public final class Bzip2Decompressor { } for(var35 = 0; var35 < var47; ++var35) { - var1 = (byte)(Class129.anIntArray1690[var35] & 255); - Class129.anIntArray1690[var0.anIntArray122[var1 & 255]] |= var35 << 8; - ++var0.anIntArray122[var1 & 255]; + var1 = (byte)(Class129.anIntArray1690[var35] & 0xFF); + Class129.anIntArray1690[var0.anIntArray122[var1 & 0xFF]] |= var35 << 8; + ++var0.anIntArray122[var1 & 0xFF]; } var0.anInt133 = Class129.anIntArray1690[var0.anInt135] >> 8; var0.anInt131 = 0; var0.anInt133 = Class129.anIntArray1690[var0.anInt133]; - var0.anInt129 = (byte)(var0.anInt133 & 255); + var0.anInt129 = (byte)(var0.anInt133 & 0xFF); var0.anInt133 >>= 8; ++var0.anInt131; var0.anInt121 = var47; diff --git a/Client/src/main/java/org/runite/client/CS2Script.java b/Client/src/main/java/org/runite/client/CS2Script.java index a2a8fbfd5..5bf935785 100644 --- a/Client/src/main/java/org/runite/client/CS2Script.java +++ b/Client/src/main/java/org/runite/client/CS2Script.java @@ -44,12 +44,12 @@ public final class CS2Script extends Linkable { static void sendRegistryRequest(int year, int country, int day, int month) { try { // System.out.println("CS2Script year=" + year + ", country=" + country + ", day=" + day + ", month=" + month + ", stage=" + stage + ", " + System.currentTimeMillis()); - Class3_Sub13_Sub1.outgoingBuffer.index = 0; - Class3_Sub13_Sub1.outgoingBuffer.writeByte(147);//Handshake opcode - Class3_Sub13_Sub1.outgoingBuffer.writeByte(day); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(month); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(year); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(country); + TextureOperation12.outgoingBuffer.index = 0; + TextureOperation12.outgoingBuffer.writeByte(147);//Handshake opcode + TextureOperation12.outgoingBuffer.writeByte(day); + TextureOperation12.outgoingBuffer.writeByte(month); + TextureOperation12.outgoingBuffer.writeShort(year); + TextureOperation12.outgoingBuffer.writeShort(country); Class132.anInt1734 = 0; GraphicDefinition.anInt548 = 0; Unsorted.registryStage = 1; @@ -87,11 +87,11 @@ public final class CS2Script extends Linkable { try { int var2 = Class146.anInt1904 * 128 - -64; int var1 = 128 * Unsorted.anInt30 + 64; - int var3 = Class121.method1736(WorldListCountry.localPlane, 1, var1, var2) - Class3_Sub13_Sub34.anInt3414; + int var3 = Class121.method1736(WorldListCountry.localPlane, 1, var1, var2) - TextureOperation25.anInt3414; if (100 <= Unsorted.anInt3631) { NPC.anInt3995 = 64 + Unsorted.anInt30 * 128; Class77.anInt1111 = 64 + Class146.anInt1904 * 128; - Class7.anInt2162 = Class121.method1736(WorldListCountry.localPlane, 1024 + -1023, NPC.anInt3995, Class77.anInt1111) + -Class3_Sub13_Sub34.anInt3414; + Class7.anInt2162 = Class121.method1736(WorldListCountry.localPlane, 1024 + -1023, NPC.anInt3995, Class77.anInt1111) + -TextureOperation25.anInt3414; } else { if (NPC.anInt3995 < var1) { NPC.anInt3995 += Class163_Sub2_Sub1.anInt4021 + Unsorted.anInt3631 * (-NPC.anInt3995 + var1) / 1000; @@ -143,7 +143,7 @@ public final class CS2Script extends Linkable { int var6 = -Class77.anInt1111 + var2; int var4 = -NPC.anInt3995 + var1; int var7 = (int) Math.sqrt(var4 * var4 + var6 * var6); - int var8 = (int) (325.949D * Math.atan2(var5, var7)) & 2047; + int var8 = (int) (325.949D * Math.atan2(var5, var7)) & 0x7FF; if (128 > var8) { var8 = 128; } @@ -152,7 +152,7 @@ public final class CS2Script extends Linkable { var8 = 383; } - int var9 = (int) (-325.949D * Math.atan2(var4, var6)) & 2047; + int var9 = (int) (-325.949D * Math.atan2(var4, var6)) & 0x7FF; if (var8 > Class139.anInt1823) { Class139.anInt1823 += Class75.anInt1105 + Class163_Sub2_Sub1.anInt4014 * (-Class139.anInt1823 + var8) / 1000; if (Class139.anInt1823 > var8) { @@ -167,7 +167,7 @@ public final class CS2Script extends Linkable { } } - int var10 = -Class3_Sub13_Sub25.anInt3315 + var9; + int var10 = -TextureOperation28.anInt3315 + var9; if (var10 > 1024) { var10 -= 2048; } @@ -177,16 +177,16 @@ public final class CS2Script extends Linkable { } if (var10 > 0) { - Class3_Sub13_Sub25.anInt3315 += var10 * Class163_Sub2_Sub1.anInt4014 / 1000 + Class75.anInt1105; - Class3_Sub13_Sub25.anInt3315 &= 2047; + TextureOperation28.anInt3315 += var10 * Class163_Sub2_Sub1.anInt4014 / 1000 + Class75.anInt1105; + TextureOperation28.anInt3315 &= 2047; } if (var10 < 0) { - Class3_Sub13_Sub25.anInt3315 -= Class163_Sub2_Sub1.anInt4014 * -var10 / 1000 + Class75.anInt1105; - Class3_Sub13_Sub25.anInt3315 &= 2047; + TextureOperation28.anInt3315 -= Class163_Sub2_Sub1.anInt4014 * -var10 / 1000 + Class75.anInt1105; + TextureOperation28.anInt3315 &= 2047; } - int var11 = -Class3_Sub13_Sub25.anInt3315 + var9; + int var11 = -TextureOperation28.anInt3315 + var9; if (1024 < var11) { var11 -= 2048; } @@ -196,7 +196,7 @@ public final class CS2Script extends Linkable { } if (var11 < 0 && var10 > 0 || var11 > 0 && var10 < 0) { - Class3_Sub13_Sub25.anInt3315 = var9; + TextureOperation28.anInt3315 = var9; } } catch (RuntimeException var12) { @@ -363,7 +363,7 @@ public final class CS2Script extends Linkable { } if (opcode == 27) { int k3 = instructionOperands[programCounter]; - Class3_Sub13_Sub29.method306(k3, ItemDefinition.intsStack[--iStackCounter]); + TextureOperation3.method306(k3, ItemDefinition.intsStack[--iStackCounter]); continue; } if (opcode == CS2AsmOpcodes.BRANCH_GREATER_OR_EQUAL.getOp()) { @@ -613,7 +613,7 @@ public final class CS2Script extends Linkable { class11_2.verticalPos = (byte) l66; class11_2.horizontalPos = (byte) k44; Class20.method909(class11_2); - Class3_Sub13_Sub12.method225(class11_2); + TextureOperation24.method225(class11_2); if (class11_2.anInt191 == -1) Class168.method2280(class11_2.componentHash); continue; @@ -639,7 +639,7 @@ public final class CS2Script extends Linkable { l44 = 4; class11_2.horizontalResize = (byte) l44; Class20.method909(class11_2); - Class3_Sub13_Sub12.method225(class11_2); + TextureOperation24.method225(class11_2); if (class11_2.type == 0) Unsorted.method2104(class11_2, false, 32); continue; @@ -659,7 +659,7 @@ public final class CS2Script extends Linkable { class11_2.anInt216 = ItemDefinition.intsStack[iStackCounter]; class11_2.anInt160 = ItemDefinition.intsStack[iStackCounter - -1]; Class20.method909(class11_2); - Class3_Sub13_Sub12.method225(class11_2); + TextureOperation24.method225(class11_2); if (class11_2.type == 0) Unsorted.method2104(class11_2, false, -127); continue; @@ -880,7 +880,7 @@ public final class CS2Script extends Linkable { continue; } if (opcode == 3103) { - Class3_Sub13_Sub19.method264((byte) 87); + TextureOperation4.method264((byte) 87); continue; } if (opcode == 3104) { @@ -888,21 +888,21 @@ public final class CS2Script extends Linkable { int i46 = 0; if (class94_4.isInteger()) i46 = class94_4.parseInt(); - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(23); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(i46); + TextureOperation12.outgoingBuffer.putOpcode(23); + TextureOperation12.outgoingBuffer.writeInt(i46); continue; } if (opcode == 3105) { RSString class94_5 = ItemDefinition.stringsStack[--sStackCounter]; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(244); - Class3_Sub13_Sub1.outgoingBuffer.writeLong(class94_5.toLong()); + TextureOperation12.outgoingBuffer.putOpcode(244); + TextureOperation12.outgoingBuffer.writeLong(class94_5.toLong()); continue; } if (opcode == 3106) { RSString class94_6 = ItemDefinition.stringsStack[--sStackCounter]; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(65); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(1 + class94_6.length()); - Class3_Sub13_Sub1.outgoingBuffer.writeString(class94_6); + TextureOperation12.outgoingBuffer.putOpcode(65); + TextureOperation12.outgoingBuffer.writeByte(1 + class94_6.length()); + TextureOperation12.outgoingBuffer.writeString(class94_6); continue; } if (opcode == 3107) { @@ -931,14 +931,14 @@ public final class CS2Script extends Linkable { if (opcode != 3110) break; int l7 = ItemDefinition.intsStack[--iStackCounter]; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(111); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(l7); + TextureOperation12.outgoingBuffer.putOpcode(111); + TextureOperation12.outgoingBuffer.writeShort(l7); continue; } if (opcode < 3300) { if (opcode == 3200) { iStackCounter -= 3; - Class3_Sub13_Sub6.method199(ItemDefinition.intsStack[iStackCounter - -1], ItemDefinition.intsStack[iStackCounter], ItemDefinition.intsStack[iStackCounter + 2]); + TextureOperation26.method199(ItemDefinition.intsStack[iStackCounter - -1], ItemDefinition.intsStack[iStackCounter], ItemDefinition.intsStack[iStackCounter + 2]); continue; } if (opcode == 3201) { @@ -984,7 +984,7 @@ public final class CS2Script extends Linkable { } if (opcode == 3305) { //Skill update listener (mostly spams health value) int i9 = ItemDefinition.intsStack[--iStackCounter]; - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub13_Sub15.anIntArray3185[i9]; + ItemDefinition.intsStack[iStackCounter++] = TextureOperation17.anIntArray3185[i9]; continue; } if (opcode == 3306) { //Another Skill update listener (spams 10? Possible TOTAL hp) @@ -1000,7 +1000,7 @@ public final class CS2Script extends Linkable { if (opcode == 3308) { int l9 = WorldListCountry.localPlane; int k47 = Class131.anInt1716 + (Class102.player.anInt2819 >> 7); - int i68 = (Class102.player.anInt2829 >> 7) - -Class82.anInt1152; + int i68 = (Class102.player.anInt2829 >> 7) - -Texture.anInt1152; ItemDefinition.intsStack[iStackCounter++] = (l9 << 28) - (-(k47 << 14) - i68); continue; } @@ -1082,7 +1082,7 @@ public final class CS2Script extends Linkable { continue; } if (3325 == opcode) { - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub13_Sub29.disableGEBoxes ? 1 : 0; + ItemDefinition.intsStack[iStackCounter++] = TextureOperation3.disableGEBoxes ? 1 : 0; continue; } if (3326 == opcode) { @@ -1098,7 +1098,7 @@ public final class CS2Script extends Linkable { continue; } if (3329 == opcode) { - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub13_Sub14.aBoolean3166 ? 1 : 0; + ItemDefinition.intsStack[iStackCounter++] = TextureOperation31.aBoolean3166 ? 1 : 0; continue; } if (opcode == 3330) { @@ -1247,7 +1247,7 @@ public final class CS2Script extends Linkable { } if (opcode == 3606) { RSString class94_9 = ItemDefinition.stringsStack[--sStackCounter]; - Class3_Sub13_Sub27.method297(class94_9.toLong(), 1); + TextureOperation7.method297(class94_9.toLong(), 1); continue; } if (opcode == 3607) { @@ -1257,7 +1257,7 @@ public final class CS2Script extends Linkable { } if (opcode == 3608) { RSString class94_11 = ItemDefinition.stringsStack[--sStackCounter]; - Class3_Sub13_Sub10.method212(class94_11.toLong()); + TextureOperation30.method212(class94_11.toLong()); continue; } if (opcode == 3609) { @@ -1403,56 +1403,56 @@ public final class CS2Script extends Linkable { if (opcode < 4000) { if (opcode == 3903) { int k16 = ItemDefinition.intsStack[--iStackCounter]; - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub13_Sub33.aClass133Array3393[k16].method1805(); + ItemDefinition.intsStack[iStackCounter++] = TextureOperation29.aClass133Array3393[k16].method1805(); continue; } if (opcode == 3904) { int l16 = ItemDefinition.intsStack[--iStackCounter]; - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub13_Sub33.aClass133Array3393[l16].anInt1752; + ItemDefinition.intsStack[iStackCounter++] = TextureOperation29.aClass133Array3393[l16].anInt1752; continue; } if (opcode == 3905) { int i17 = ItemDefinition.intsStack[--iStackCounter]; - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub13_Sub33.aClass133Array3393[i17].anInt1757; + ItemDefinition.intsStack[iStackCounter++] = TextureOperation29.aClass133Array3393[i17].anInt1757; continue; } if (opcode == 3906) { int j17 = ItemDefinition.intsStack[--iStackCounter]; - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub13_Sub33.aClass133Array3393[j17].anInt1747; + ItemDefinition.intsStack[iStackCounter++] = TextureOperation29.aClass133Array3393[j17].anInt1747; continue; } if (opcode == 3907) { int k17 = ItemDefinition.intsStack[--iStackCounter]; - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub13_Sub33.aClass133Array3393[k17].anInt1746; + ItemDefinition.intsStack[iStackCounter++] = TextureOperation29.aClass133Array3393[k17].anInt1746; continue; } if (3908 == opcode) { int l17 = ItemDefinition.intsStack[--iStackCounter]; - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub13_Sub33.aClass133Array3393[l17].anInt1750; + ItemDefinition.intsStack[iStackCounter++] = TextureOperation29.aClass133Array3393[l17].anInt1750; continue; } if (3910 == opcode) { int i18 = ItemDefinition.intsStack[--iStackCounter]; - int j50 = Class3_Sub13_Sub33.aClass133Array3393[i18].method1804(); + int j50 = TextureOperation29.aClass133Array3393[i18].method1804(); ItemDefinition.intsStack[iStackCounter++] = j50 == 0 ? 1 : 0; continue; } if (3911 == opcode) { int j18 = ItemDefinition.intsStack[--iStackCounter]; - int k50 = Class3_Sub13_Sub33.aClass133Array3393[j18].method1804(); + int k50 = TextureOperation29.aClass133Array3393[j18].method1804(); ItemDefinition.intsStack[iStackCounter++] = k50 != 2 ? 0 : 1; continue; } if (opcode == 3912) { int k18 = ItemDefinition.intsStack[--iStackCounter]; - int l50 = Class3_Sub13_Sub33.aClass133Array3393[k18].method1804(); + int l50 = TextureOperation29.aClass133Array3393[k18].method1804(); ItemDefinition.intsStack[iStackCounter++] = l50 == 5 ? 1 : 0; continue; } if (opcode != 3913) break; int l18 = ItemDefinition.intsStack[--iStackCounter]; - int i51 = Class3_Sub13_Sub33.aClass133Array3393[l18].method1804(); + int i51 = TextureOperation29.aClass133Array3393[l18].method1804(); ItemDefinition.intsStack[iStackCounter++] = 1 == i51 ? 1 : 0; continue; } @@ -1516,7 +1516,7 @@ public final class CS2Script extends Linkable { iStackCounter -= 2; int i21 = ItemDefinition.intsStack[iStackCounter]; int k52 = ItemDefinition.intsStack[1 + iStackCounter]; - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub13_Sub29.bitwiseOr(i21, 1 << k52); + ItemDefinition.intsStack[iStackCounter++] = TextureOperation3.bitwiseOr(i21, 1 << k52); continue; } if (4009 == opcode) { @@ -1573,7 +1573,7 @@ public final class CS2Script extends Linkable { iStackCounter -= 2; int l22 = ItemDefinition.intsStack[iStackCounter]; int j54 = ItemDefinition.intsStack[iStackCounter + 1]; - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub13_Sub29.bitwiseOr(l22, j54); + ItemDefinition.intsStack[iStackCounter++] = TextureOperation3.bitwiseOr(l22, j54); continue; } if (opcode == 4016) { @@ -1626,10 +1626,10 @@ public final class CS2Script extends Linkable { anInt3101 = ItemDefinition.intsStack[iStackCounter]; Class24.anInt467 = ItemDefinition.intsStack[1 + iStackCounter]; Class45.anInt734 = ItemDefinition.intsStack[2 + iStackCounter]; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(157); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(anInt3101); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(Class24.anInt467); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(Class45.anInt734); + TextureOperation12.outgoingBuffer.putOpcode(157); + TextureOperation12.outgoingBuffer.writeByte(anInt3101); + TextureOperation12.outgoingBuffer.writeByte(Class24.anInt467); + TextureOperation12.outgoingBuffer.writeByte(Class45.anInt734); continue; } if (opcode == 5002) { @@ -1637,10 +1637,10 @@ public final class CS2Script extends Linkable { iStackCounter -= 2; int j55 = ItemDefinition.intsStack[iStackCounter]; int j69 = ItemDefinition.intsStack[1 + iStackCounter]; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(99); - Class3_Sub13_Sub1.outgoingBuffer.writeLong(class94_17.toLong()); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(j55 - 1); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(j69); + TextureOperation12.outgoingBuffer.putOpcode(99); + TextureOperation12.outgoingBuffer.writeLong(class94_17.toLong()); + TextureOperation12.outgoingBuffer.writeByte(j55 - 1); + TextureOperation12.outgoingBuffer.writeByte(j69); continue; } if (opcode == 5003) { @@ -1669,7 +1669,7 @@ public final class CS2Script extends Linkable { RSString class94_18 = ItemDefinition.stringsStack[--sStackCounter]; if (class94_18.startsWith(TextCore.aClass94_132) || class94_18.startsWith(RSString.parse(";;"))) ClientCommands.ClientCommands(class94_18); - else if (Player.rights != 0 || (!Class3_Sub15.aBoolean2433 || Class121.aBoolean1641) && !Class3_Sub13_Sub14.aBoolean3166) { + else if (Player.rights != 0 || (!Class3_Sub15.aBoolean2433 || Class121.aBoolean1641) && !TextureOperation31.aBoolean3166) { RSString class94_47 = class94_18.toLowercase(); byte byte3 = 0; if (class94_47.startsWith(TextCore.TextColorYellow)) { @@ -1780,13 +1780,13 @@ public final class CS2Script extends Linkable { class94_18 = class94_18.substring(TextCore.TextSlide.length()); byte4 = 5; } - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(237); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(0); - int k79 = Class3_Sub13_Sub1.outgoingBuffer.index; - Class3_Sub13_Sub1.outgoingBuffer.writeByte(byte3); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(byte4); - Class85.method1423(Class3_Sub13_Sub1.outgoingBuffer, class94_18); - Class3_Sub13_Sub1.outgoingBuffer.method769(-k79 + Class3_Sub13_Sub1.outgoingBuffer.index); + TextureOperation12.outgoingBuffer.putOpcode(237); + TextureOperation12.outgoingBuffer.writeByte(0); + int k79 = TextureOperation12.outgoingBuffer.index; + TextureOperation12.outgoingBuffer.writeByte(byte3); + TextureOperation12.outgoingBuffer.writeByte(byte4); + Class85.method1423(TextureOperation12.outgoingBuffer, class94_18); + TextureOperation12.outgoingBuffer.method769(-k79 + TextureOperation12.outgoingBuffer.index); } continue; } @@ -1794,13 +1794,13 @@ public final class CS2Script extends Linkable { sStackCounter -= 2; RSString class94_48 = ItemDefinition.stringsStack[sStackCounter + 1]; RSString class94_19 = ItemDefinition.stringsStack[sStackCounter]; - if (Player.rights != 0 || (!Class3_Sub15.aBoolean2433 || Class121.aBoolean1641) && !Class3_Sub13_Sub14.aBoolean3166) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(201); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(0); - int k69 = Class3_Sub13_Sub1.outgoingBuffer.index; - Class3_Sub13_Sub1.outgoingBuffer.writeLong(class94_19.toLong()); - Class85.method1423(Class3_Sub13_Sub1.outgoingBuffer, class94_48); - Class3_Sub13_Sub1.outgoingBuffer.method769(Class3_Sub13_Sub1.outgoingBuffer.index - k69); + if (Player.rights != 0 || (!Class3_Sub15.aBoolean2433 || Class121.aBoolean1641) && !TextureOperation31.aBoolean3166) { + TextureOperation12.outgoingBuffer.putOpcode(201); + TextureOperation12.outgoingBuffer.writeByte(0); + int k69 = TextureOperation12.outgoingBuffer.index; + TextureOperation12.outgoingBuffer.writeLong(class94_19.toLong()); + Class85.method1423(TextureOperation12.outgoingBuffer, class94_48); + TextureOperation12.outgoingBuffer.method769(TextureOperation12.outgoingBuffer.index - k69); } continue; } @@ -1846,7 +1846,7 @@ public final class CS2Script extends Linkable { continue; } if (opcode == 5017) { - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub13_Sub9.anInt3114; + ItemDefinition.intsStack[iStackCounter++] = TextureOperation16.anInt3114; continue; } if (5050 == opcode) { @@ -1917,34 +1917,34 @@ public final class CS2Script extends Linkable { continue; } if (5059 == opcode) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(167); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(0); - int j27 = Class3_Sub13_Sub1.outgoingBuffer.index; - Class3_Sub13_Sub1.outgoingBuffer.writeByte(0); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class70.aClass10_1056.anInt149); - Class70.aClass10_1056.aClass3_Sub28_Sub4_151.method545(Class3_Sub13_Sub1.outgoingBuffer, Class70.aClass10_1056.anIntArray153); - Class3_Sub13_Sub1.outgoingBuffer.method769(-j27 + Class3_Sub13_Sub1.outgoingBuffer.index); + TextureOperation12.outgoingBuffer.putOpcode(167); + TextureOperation12.outgoingBuffer.writeByte(0); + int j27 = TextureOperation12.outgoingBuffer.index; + TextureOperation12.outgoingBuffer.writeByte(0); + TextureOperation12.outgoingBuffer.writeShort(Class70.aClass10_1056.anInt149); + Class70.aClass10_1056.aClass3_Sub28_Sub4_151.method545(TextureOperation12.outgoingBuffer, Class70.aClass10_1056.anIntArray153); + TextureOperation12.outgoingBuffer.method769(-j27 + TextureOperation12.outgoingBuffer.index); continue; } if (5060 == opcode) { RSString class94_21 = ItemDefinition.stringsStack[--sStackCounter]; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(178); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(0); - int l56 = Class3_Sub13_Sub1.outgoingBuffer.index; - Class3_Sub13_Sub1.outgoingBuffer.writeLong(class94_21.toLong()); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class70.aClass10_1056.anInt149); - Class70.aClass10_1056.aClass3_Sub28_Sub4_151.method545(Class3_Sub13_Sub1.outgoingBuffer, Class70.aClass10_1056.anIntArray153); - Class3_Sub13_Sub1.outgoingBuffer.method769(Class3_Sub13_Sub1.outgoingBuffer.index + -l56); + TextureOperation12.outgoingBuffer.putOpcode(178); + TextureOperation12.outgoingBuffer.writeByte(0); + int l56 = TextureOperation12.outgoingBuffer.index; + TextureOperation12.outgoingBuffer.writeLong(class94_21.toLong()); + TextureOperation12.outgoingBuffer.writeShort(Class70.aClass10_1056.anInt149); + Class70.aClass10_1056.aClass3_Sub28_Sub4_151.method545(TextureOperation12.outgoingBuffer, Class70.aClass10_1056.anIntArray153); + TextureOperation12.outgoingBuffer.method769(TextureOperation12.outgoingBuffer.index + -l56); continue; } if (opcode == 5061) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(167); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(0); - int k27 = Class3_Sub13_Sub1.outgoingBuffer.index; - Class3_Sub13_Sub1.outgoingBuffer.writeByte(1); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class70.aClass10_1056.anInt149); - Class70.aClass10_1056.aClass3_Sub28_Sub4_151.method545(Class3_Sub13_Sub1.outgoingBuffer, Class70.aClass10_1056.anIntArray153); - Class3_Sub13_Sub1.outgoingBuffer.method769(-k27 + Class3_Sub13_Sub1.outgoingBuffer.index); + TextureOperation12.outgoingBuffer.putOpcode(167); + TextureOperation12.outgoingBuffer.writeByte(0); + int k27 = TextureOperation12.outgoingBuffer.index; + TextureOperation12.outgoingBuffer.writeByte(1); + TextureOperation12.outgoingBuffer.writeShort(Class70.aClass10_1056.anInt149); + Class70.aClass10_1056.aClass3_Sub28_Sub4_151.method545(TextureOperation12.outgoingBuffer, Class70.aClass10_1056.anIntArray153); + TextureOperation12.outgoingBuffer.method769(-k27 + TextureOperation12.outgoingBuffer.index); continue; } if (opcode == 5062) { @@ -2109,7 +2109,7 @@ public final class CS2Script extends Linkable { continue; } if (5209 == opcode) { - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub13_Sub21.anInt3256 + Class3_Sub28_Sub1.anInt3536; + ItemDefinition.intsStack[iStackCounter++] = TextureOperation37.anInt3256 + Class3_Sub28_Sub1.anInt3536; ItemDefinition.intsStack[iStackCounter++] = Unsorted.anInt65 + -Class3_Sub4.anInt2251 + (-1 + Class108.anInt1460); continue; } @@ -2152,7 +2152,7 @@ public final class CS2Script extends Linkable { } if (opcode == 5213) { int i71 = 0; - int k30 = Class3_Sub13_Sub17.method251(); + int k30 = TextureOperation23.method251(); RSString class94_52; if (k30 == -1) { class94_52 = TextCore.aClass94_2331; @@ -2193,7 +2193,7 @@ public final class CS2Script extends Linkable { } if (opcode == 5216) { int j31 = ItemDefinition.intsStack[--iStackCounter]; - Class3_Sub13_Sub36.method344(j31, 4); + TextureOperation36.method344(j31, 4); continue; } if (opcode == 5217) { @@ -2227,11 +2227,11 @@ public final class CS2Script extends Linkable { int i59 = ItemDefinition.intsStack[1 + iStackCounter]; int l31 = ItemDefinition.intsStack[iStackCounter]; GameObject.graphicsSettings(false, 3, l31, i59); - ItemDefinition.intsStack[iStackCounter++] = null != Class3_Sub13_Sub10.aFrame3121 ? 1 : 0; + ItemDefinition.intsStack[iStackCounter++] = null != TextureOperation30.aFrame3121 ? 1 : 0; continue; } if (opcode == 5301) { - if (null != Class3_Sub13_Sub10.aFrame3121) + if (null != TextureOperation30.aFrame3121) GameObject.graphicsSettings(false, Unsorted.anInt2577, -1, -1); continue; } @@ -2296,16 +2296,16 @@ public final class CS2Script extends Linkable { RSString class94_23 = ItemDefinition.stringsStack[sStackCounter]; RSString class94_54 = ItemDefinition.stringsStack[sStackCounter - -1]; int k71 = ItemDefinition.intsStack[--iStackCounter]; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(117); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(Class3_Sub13_Sub33.method326((byte) 39, class94_23) - (-Class3_Sub13_Sub33.method326((byte) 102, class94_54) + -1)); - Class3_Sub13_Sub1.outgoingBuffer.writeString(class94_23); - Class3_Sub13_Sub1.outgoingBuffer.writeString(class94_54); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(k71); + TextureOperation12.outgoingBuffer.putOpcode(117); + TextureOperation12.outgoingBuffer.writeByte(TextureOperation29.method326((byte) 39, class94_23) - (-TextureOperation29.method326((byte) 102, class94_54) + -1)); + TextureOperation12.outgoingBuffer.writeString(class94_23); + TextureOperation12.outgoingBuffer.writeString(class94_54); + TextureOperation12.outgoingBuffer.writeByte(k71); continue; } if (opcode == 5401) { iStackCounter -= 2; - Class3_Sub13_Sub38.aShortArray3455[ItemDefinition.intsStack[iStackCounter]] = (short) Class56.method1186(ItemDefinition.intsStack[iStackCounter + 1]); + TextureOperation38.aShortArray3455[ItemDefinition.intsStack[iStackCounter]] = (short) Class56.method1186(ItemDefinition.intsStack[iStackCounter + 1]); CS2Methods.method28(); Unsorted.method746((byte) -29); Class167.method2265(); @@ -2346,7 +2346,7 @@ public final class CS2Script extends Linkable { continue; } if (opcode == 5411) { - if (Class3_Sub13_Sub10.aFrame3121 != null) + if (TextureOperation30.aFrame3121 != null) GameObject.graphicsSettings(false, Unsorted.anInt2577, -1, -1); if (null == GameShell.frame) System.exit(0); @@ -2362,7 +2362,7 @@ public final class CS2Script extends Linkable { if (Class136.aClass64_1778.anObject974 != null) { byte[] abyte0 = null; abyte0 = ((String) Class136.aClass64_1778.anObject974).getBytes(StandardCharsets.ISO_8859_1); - class94_24 = Class3_Sub13_Sub3.bufferToString(abyte0, abyte0.length, 0); + class94_24 = TextureOperation33.bufferToString(abyte0, abyte0.length, 0); } } ItemDefinition.stringsStack[sStackCounter++] = class94_24; @@ -2373,7 +2373,7 @@ public final class CS2Script extends Linkable { continue; } if (opcode == 5421) { - if (null != Class3_Sub13_Sub10.aFrame3121) + if (null != TextureOperation30.aFrame3121) GameObject.graphicsSettings(false, Unsorted.anInt2577, -1, -1); boolean flag5 = 1 == ItemDefinition.intsStack[--iStackCounter]; RSString class94_25 = ItemDefinition.stringsStack[--sStackCounter]; @@ -2384,7 +2384,7 @@ public final class CS2Script extends Linkable { Class99.method1596(class94_64, (byte) 127, flag5); } else { Unsorted.aBoolean2154 = flag5; - Class3_Sub13_Sub24.aClass94_3295 = class94_64; + TextureOperation5.aClass94_3295 = class94_64; Class15.aClass64_351 = Class38.signlink.method1452(new String(class94_64.method1568(), StandardCharsets.ISO_8859_1), true); } continue; @@ -2396,12 +2396,12 @@ public final class CS2Script extends Linkable { RSString class94_26 = ItemDefinition.stringsStack[sStackCounter]; if (class94_26.length() > 0) { if (null == Class3_Sub30_Sub1.aClass94Array3802) - Class3_Sub30_Sub1.aClass94Array3802 = new RSString[Class3_Sub13_Sub18.anIntArray3218[Class158.paramGameTypeID]]; + Class3_Sub30_Sub1.aClass94Array3802 = new RSString[TextureOperation19.anIntArray3218[Class158.paramGameTypeID]]; Class3_Sub30_Sub1.aClass94Array3802[i72] = class94_26; } if (class94_55.length() > 0) { if (Unsorted.aClass94Array45 == null) - Unsorted.aClass94Array45 = new RSString[Class3_Sub13_Sub18.anIntArray3218[Class158.paramGameTypeID]]; + Unsorted.aClass94Array45 = new RSString[TextureOperation19.anIntArray3218[Class158.paramGameTypeID]]; Unsorted.aClass94Array45[i72] = class94_55; } continue; @@ -2431,7 +2431,7 @@ public final class CS2Script extends Linkable { continue; } if (opcode == 5425) { - TextureOperation.method165(); + InvalidateData.method165(); Unsorted.aBoolean1951 = false; continue; } @@ -2453,7 +2453,7 @@ public final class CS2Script extends Linkable { int l77 = ItemDefinition.intsStack[iStackCounter - -3]; int j72 = ItemDefinition.intsStack[iStackCounter - -2]; int i60 = ItemDefinition.intsStack[iStackCounter + 1]; - Class3_Sub20.method390(false, j72, i60, l77, (byte) -128, -Class82.anInt1152 + (0x3fff & l33), ((0xffffe30 & l33) >> 14) - Class131.anInt1716); + Class3_Sub20.method390(false, j72, i60, l77, (byte) -128, -Texture.anInt1152 + (0x3fff & l33), ((0xffffe30 & l33) >> 14) - Class131.anInt1716); continue; } if (opcode == 5501) { @@ -2462,7 +2462,7 @@ public final class CS2Script extends Linkable { int i34 = ItemDefinition.intsStack[iStackCounter]; int i78 = ItemDefinition.intsStack[iStackCounter - -3]; int k72 = ItemDefinition.intsStack[iStackCounter + 2]; - Class164_Sub1.method2238(j60, (0x3fff & i34) - Class82.anInt1152, k72, -Class131.anInt1716 + ((0xffff221 & i34) >> 14), i78); + Class164_Sub1.method2238(j60, (0x3fff & i34) - Texture.anInt1152, k72, -Class131.anInt1716 + ((0xffff221 & i34) >> 14), i78); continue; } if (opcode == 5502) { @@ -2498,7 +2498,7 @@ public final class CS2Script extends Linkable { Unsorted.anInt2309 = ItemDefinition.intsStack[iStackCounter]; GraphicDefinition.CAMERA_DIRECTION = ItemDefinition.intsStack[iStackCounter + 1]; if (Class133.anInt1753 == 2) { - Class3_Sub13_Sub25.anInt3315 = GraphicDefinition.CAMERA_DIRECTION; + TextureOperation28.anInt3315 = GraphicDefinition.CAMERA_DIRECTION; Class139.anInt1823 = Unsorted.anInt2309; } Unsorted.method1098((byte) -74); @@ -2533,7 +2533,7 @@ public final class CS2Script extends Linkable { Class51.method1137(0.6F); } if (HDToolKit.highDetail) { - Class3_Sub13_Sub14.method236(); + TextureOperation31.method236(); if (!Class106.aBoolean1441) Class84.method1417(); } @@ -2585,7 +2585,7 @@ public final class CS2Script extends Linkable { continue; } if (opcode == 6009) { - Class3_Sub13_Sub22.aBoolean3275 = ItemDefinition.intsStack[--iStackCounter] == 1; + TextureOperation0.aBoolean3275 = ItemDefinition.intsStack[--iStackCounter] == 1; Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; @@ -2637,7 +2637,7 @@ public final class CS2Script extends Linkable { if (opcode == 6015) { Class38.aBoolean661 = ItemDefinition.intsStack[--iStackCounter] == 1; if (HDToolKit.highDetail) - Class3_Sub13_Sub14.method236(); + TextureOperation31.method236(); Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; @@ -2652,7 +2652,7 @@ public final class CS2Script extends Linkable { continue; } if (opcode == 6017) { - Class3_Sub13_Sub15.aBoolean3184 = ItemDefinition.intsStack[--iStackCounter] == 1; + TextureOperation17.aBoolean3184 = ItemDefinition.intsStack[--iStackCounter] == 1; GameShell.method34(); Class119.method1730(Class38.signlink); aBoolean2705 = false; @@ -2768,7 +2768,7 @@ public final class CS2Script extends Linkable { continue; } if (6109 == opcode) { - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub13_Sub22.aBoolean3275 ? 1 : 0; + ItemDefinition.intsStack[iStackCounter++] = TextureOperation0.aBoolean3275 ? 1 : 0; continue; } if (opcode == 6110) { @@ -2796,7 +2796,7 @@ public final class CS2Script extends Linkable { continue; } if (6117 == opcode) { - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub13_Sub15.aBoolean3184 ? 1 : 0; + ItemDefinition.intsStack[iStackCounter++] = TextureOperation17.aBoolean3184 ? 1 : 0; continue; } if (opcode == 6118) { @@ -3032,12 +3032,12 @@ public final class CS2Script extends Linkable { ItemDefinition.aShort505 = (short) ItemDefinition.intsStack[2 + iStackCounter]; if (ItemDefinition.aShort505 <= 0) ItemDefinition.aShort505 = 1; - Class3_Sub13_Sub23_Sub1.aShort4038 = (short) ItemDefinition.intsStack[iStackCounter - -3]; - if (Class3_Sub13_Sub23_Sub1.aShort4038 > 0) { - if (ItemDefinition.aShort505 > Class3_Sub13_Sub23_Sub1.aShort4038) - Class3_Sub13_Sub23_Sub1.aShort4038 = ItemDefinition.aShort505; + TextureOperation18.aShort4038 = (short) ItemDefinition.intsStack[iStackCounter - -3]; + if (TextureOperation18.aShort4038 > 0) { + if (ItemDefinition.aShort505 > TextureOperation18.aShort4038) + TextureOperation18.aShort4038 = ItemDefinition.aShort505; } else { - Class3_Sub13_Sub23_Sub1.aShort4038 = 32767; + TextureOperation18.aShort4038 = 32767; } continue; } @@ -3106,7 +3106,7 @@ public final class CS2Script extends Linkable { continue; } if (opcode == 5608) { - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub13_Sub34.anInt3413; + ItemDefinition.intsStack[iStackCounter++] = TextureOperation25.anInt3413; continue; } if (5609 == opcode) { @@ -3115,9 +3115,9 @@ public final class CS2Script extends Linkable { } if (opcode == 5610) { for (int l37 = 0; l37 < 5; l37++) - ItemDefinition.stringsStack[sStackCounter++] = Class3_Sub13_Sub33.aClass94Array3391.length <= l37 ? TextCore.aClass94_2331 : Class3_Sub13_Sub33.aClass94Array3391[l37].longToRSString(); + ItemDefinition.stringsStack[sStackCounter++] = TextureOperation29.aClass94Array3391.length <= l37 ? TextCore.aClass94_2331 : TextureOperation29.aClass94Array3391[l37].longToRSString(); - Class3_Sub13_Sub33.aClass94Array3391 = null; + TextureOperation29.aClass94Array3391 = null; continue; } if (opcode != 5611) @@ -3415,7 +3415,7 @@ public final class CS2Script extends Linkable { } if (opcode == 4122) { int j42 = ItemDefinition.intsStack[--iStackCounter]; - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub13_Sub34.method332(2, j42); + ItemDefinition.intsStack[iStackCounter++] = TextureOperation25.method332(2, j42); continue; } if (opcode == 4123) { @@ -3467,7 +3467,7 @@ public final class CS2Script extends Linkable { } if (opcode == 2702) { int l42 = ItemDefinition.intsStack[--iStackCounter]; - Class3_Sub31 class3_sub31 = Class3_Sub13_Sub17.aHashTable_3208.get(l42); + Class3_Sub31 class3_sub31 = TextureOperation23.aHashTable_3208.get(l42); if (class3_sub31 == null) ItemDefinition.intsStack[iStackCounter++] = 0; else @@ -3499,7 +3499,7 @@ public final class CS2Script extends Linkable { iStackCounter -= 2; int i43 = ItemDefinition.intsStack[iStackCounter]; int j65 = ItemDefinition.intsStack[iStackCounter + 1]; - Class3_Sub31 class3_sub31_1 = Class3_Sub13_Sub17.aHashTable_3208.get(i43); + Class3_Sub31 class3_sub31_1 = TextureOperation23.aHashTable_3208.get(i43); if (class3_sub31_1 == null || class3_sub31_1.anInt2602 != j65) ItemDefinition.intsStack[iStackCounter++] = 0; else @@ -3688,7 +3688,7 @@ public final class CS2Script extends Linkable { int k65 = ItemDefinition.intsStack[iStackCounter]; if (-1 == class11_15.anInt191) { MouseListeningClass.method2092(class11_15.componentHash); - Class3_Sub13_Sub19.method265(class11_15.componentHash); + TextureOperation4.method265(class11_15.componentHash); Class107.method1649(class11_15.componentHash, -101); } if (-1 == k65) { @@ -3821,7 +3821,7 @@ public final class CS2Script extends Linkable { class11_16.anInt164 = ItemDefinition.intsStack[5 + iStackCounter]; Class20.method909(class11_16); if (class11_16.anInt191 == -1) { - Class3_Sub13_Sub19.method265(class11_16.componentHash); + TextureOperation4.method265(class11_16.componentHash); Class107.method1649(class11_16.componentHash, -106); } continue; @@ -3918,7 +3918,7 @@ public final class CS2Script extends Linkable { class11_16.anInt164 = ItemDefinition.intsStack[--iStackCounter]; Class20.method909(class11_16); if (class11_16.anInt191 == -1) - Class3_Sub13_Sub19.method265(class11_16.componentHash); + TextureOperation4.method265(class11_16.componentHash); continue; } if (opcode == 403) { @@ -3993,7 +3993,7 @@ public final class CS2Script extends Linkable { int var5 = 0; for (int var6 = 0; var6 < var4.anIntArray2547.length; ++var6) { - if (var4.anIntArray2547[var6] >= 0 && Class3_Sub13_Sub23.itemDefinitionSize > var4.anIntArray2547[var6]) { + if (var4.anIntArray2547[var6] >= 0 && TextureOperation39.itemDefinitionSize > var4.anIntArray2547[var6]) { ItemDefinition var7 = ItemDefinition.getItemDefinition(var4.anIntArray2547[var6]); if (null != var7.aHashTable_798) { LinkableInt var8 = (LinkableInt) var7.aHashTable_798.get(var3); diff --git a/Client/src/main/java/org/runite/client/Class1.java b/Client/src/main/java/org/runite/client/Class1.java index 547c31cb1..d0a0de987 100644 --- a/Client/src/main/java/org/runite/client/Class1.java +++ b/Client/src/main/java/org/runite/client/Class1.java @@ -25,7 +25,7 @@ final class Class1 { static void method69(Class36 var0) { try { - Class3_Sub13_Sub9.aClass36_3112 = var0; + TextureOperation16.aClass36_3112 = var0; } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "a.B(" + (var0 != null ? "{...}" : "null") + ')'); } @@ -60,10 +60,10 @@ final class Class1 { boolean[] var81; for (var13 = 1; var13 <= 102; ++var13) { for (var14 = 1; var14 <= 102; ++var14) { - var15 = var9[var13][var14] & 255; + var15 = var9[var13][var14] & 0xFF; var16 = 255 & var10[var13][var14]; if (var16 != 0) { - Class168 var17 = Class3_Sub13_Sub37.method350((byte) -81, -1 + var16); + Class168 var17 = TextureOperation10.method350((byte) -81, -1 + var16); if (var17.anInt2103 == -1) { continue; } @@ -78,32 +78,32 @@ final class Class1 { } } - if ((var9[var13][var14] & 255) != 0 || var16 != 0 && var8[var13][var14] == 0) { + if ((var9[var13][var14] & 0xFF) != 0 || var16 != 0 && var8[var13][var14] == 0) { var58 = 0; int var60 = 0; var21 = 0; var65 = 0; var23 = 255 & var10[var13][1 + var14]; - var25 = var10[var13][var14 - 1] & 255; - var24 = var10[-1 + var13][var14] & 255; + var25 = var10[var13][var14 - 1] & 0xFF; + var24 = var10[-1 + var13][var14] & 0xFF; int[] var63 = new int[8]; var22 = 0; var27 = 255 & var10[var13 + -1][1 + var14]; - var26 = var10[var13 + 1][var14] & 255; + var26 = var10[var13 + 1][var14] & 0xFF; var29 = 255 & var10[var13 + 1][-1 + var14]; - var28 = var10[var13 - 1][-1 + var14] & 255; - var30 = var10[1 + var13][var14 - -1] & 255; + var28 = var10[var13 - 1][-1 + var14] & 0xFF; + var30 = var10[1 + var13][var14 - -1] & 0xFF; Class168 var31; int var34; byte var32; if (var27 != 0 || var27 != var16) { - var31 = Class3_Sub13_Sub37.method350((byte) 106, -1 + var27); + var31 = TextureOperation10.method350((byte) 106, -1 + var27); if (var31.aBoolean2092 && var31.anInt2103 != -1) { var32 = var5[var13 + -1][var14 - -1]; var33 = var8[-1 + var13][var14 + 1]; var34 = anIntArray2642[4 * var33 - -(2 + var32 & 3)]; var35 = anIntArray2642[(3 + var32 & 3) + 4 * var33]; - if (!Class3_Sub13_Sub39.aBooleanArrayArray3468[var35][1] && !Class3_Sub13_Sub39.aBooleanArrayArray3468[var34][0]) { + if (!TextureOperation8.aBooleanArrayArray3468[var35][1] && !TextureOperation8.aBooleanArrayArray3468[var34][0]) { for (var36 = 0; 8 > var36; ++var36) { if (var58 == var36) { var63[var58++] = var27; @@ -119,13 +119,13 @@ final class Class1 { } if (var28 != 0 || var28 != var16) { - var31 = Class3_Sub13_Sub37.method350((byte) 114, -1 + var28); + var31 = TextureOperation10.method350((byte) 114, -1 + var28); if (var31.aBoolean2092 && var31.anInt2103 != -1) { var32 = var5[-1 + var13][var14 + -1]; var33 = var8[-1 + var13][-1 + var14]; var34 = anIntArray2642[var33 * 4 - -(var32 & 3)]; var35 = anIntArray2642[(var32 - -3 & 3) + var33 * 4]; - if (!Class3_Sub13_Sub39.aBooleanArrayArray3468[var34][1] && !Class3_Sub13_Sub39.aBooleanArrayArray3468[var35][0]) { + if (!TextureOperation8.aBooleanArrayArray3468[var34][1] && !TextureOperation8.aBooleanArrayArray3468[var35][0]) { for (var36 = 0; var36 < 8; ++var36) { if (var36 == var58) { var63[var58++] = var28; @@ -141,13 +141,13 @@ final class Class1 { } if (var29 != 0 || var29 != var16) { - var31 = Class3_Sub13_Sub37.method350((byte) 107, var29 - 1); + var31 = TextureOperation10.method350((byte) 107, var29 - 1); if (var31.aBoolean2092 && var31.anInt2103 != -1) { var32 = var5[1 + var13][var14 - 1]; var33 = var8[var13 - -1][var14 + -1]; var35 = anIntArray2642[4 * var33 + (3 & 1 + var32)]; var34 = anIntArray2642[var33 * 4 - -(var32 & 3)]; - if (!Class3_Sub13_Sub39.aBooleanArrayArray3468[var35][1] && !Class3_Sub13_Sub39.aBooleanArrayArray3468[var34][0]) { + if (!TextureOperation8.aBooleanArrayArray3468[var35][1] && !TextureOperation8.aBooleanArrayArray3468[var34][0]) { for (var36 = 0; var36 < 8; ++var36) { if (var36 == var58) { var63[var58++] = var29; @@ -163,13 +163,13 @@ final class Class1 { } if (var30 != 0 || var30 != var16) { - var31 = Class3_Sub13_Sub37.method350((byte) 105, var30 + -1); + var31 = TextureOperation10.method350((byte) 105, var30 + -1); if (var31.aBoolean2092 && var31.anInt2103 != -1) { var32 = var5[var13 - -1][1 + var14]; var33 = var8[var13 + 1][1 + var14]; var35 = anIntArray2642[4 * var33 + (var32 - -1 & 3)]; var34 = anIntArray2642[var33 * 4 + (var32 - -2 & 3)]; - if (!Class3_Sub13_Sub39.aBooleanArrayArray3468[var34][1] && !Class3_Sub13_Sub39.aBooleanArrayArray3468[var35][0]) { + if (!TextureOperation8.aBooleanArrayArray3468[var34][1] && !TextureOperation8.aBooleanArrayArray3468[var35][0]) { for (var36 = 0; var36 < 8; ++var36) { if (var58 == var36) { var63[var58++] = var30; @@ -185,7 +185,7 @@ final class Class1 { } if (var23 != 0 && var23 != var16) { - var31 = Class3_Sub13_Sub37.method350((byte) -29, -1 + var23); + var31 = TextureOperation10.method350((byte) -29, -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 = Class3_Sub13_Sub37.method350((byte) -32, var24 + -1); + var31 = TextureOperation10.method350((byte) -32, 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 = Class3_Sub13_Sub37.method350((byte) 112, -1 + var25); + var31 = TextureOperation10.method350((byte) 112, -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 = Class3_Sub13_Sub37.method350((byte) -41, var26 - 1); + var31 = TextureOperation10.method350((byte) -41, var26 - 1); if (var31.aBoolean2092 && var31.anInt2103 != -1) { var22 = anIntArray2642[(3 & var5[var13 + 1][var14] + 1) + 4 * var8[1 + var13][var14]]; @@ -258,11 +258,11 @@ final class Class1 { for (var73 = 0; var58 > var73; ++var73) { var74 = var63[var73]; - var79 = Class3_Sub13_Sub39.aBooleanArrayArray3468[var74 != var24 ? 0 : var65]; - var75 = Class3_Sub13_Sub39.aBooleanArrayArray3468[var25 != var74 ? 0 : var21]; - boolean[] var80 = Class3_Sub13_Sub39.aBooleanArrayArray3468[var23 == var74 ? var60 : 0]; - var81 = Class3_Sub13_Sub39.aBooleanArrayArray3468[var26 == var74 ? var22 : 0]; - Class168 var37 = Class3_Sub13_Sub37.method350((byte) 113, -1 + var74); + var79 = TextureOperation8.aBooleanArrayArray3468[var74 != var24 ? 0 : var65]; + var75 = TextureOperation8.aBooleanArrayArray3468[var25 != var74 ? 0 : var21]; + boolean[] var80 = TextureOperation8.aBooleanArrayArray3468[var23 == var74 ? var60 : 0]; + var81 = TextureOperation8.aBooleanArrayArray3468[var26 == var74 ? var22 : 0]; + Class168 var37 = TextureOperation10.method350((byte) 113, -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 = Class3_Sub13_Sub37.method350((byte) -25, -1 + var58); + Class168 var62 = TextureOperation10.method350((byte) -25, -1 + var58); if (var62.anInt2103 == -1) { continue; } @@ -301,41 +301,41 @@ final class Class1 { Class3_Sub11 var66 = method2052(var12, var62); byte var67 = var8[var13][var14]; byte var68 = var5[var13][var14]; - var22 = Class3_Sub13_Sub4.method190(var62.anInt2095, var62.anInt2103, (byte) -111, var6[var13][var14]); - var23 = Class3_Sub13_Sub4.method190(var62.anInt2095, var62.anInt2103, (byte) 65, var6[var13 + 1][var14]); - var24 = Class3_Sub13_Sub4.method190(var62.anInt2095, var62.anInt2103, (byte) 68, var6[1 + var13][var14 + 1]); - var25 = Class3_Sub13_Sub4.method190(var62.anInt2095, var62.anInt2103, (byte) -84, var6[var13][var14 - -1]); + var22 = TextureOperation34.method190(var62.anInt2095, var62.anInt2103, (byte) -111, var6[var13][var14]); + var23 = TextureOperation34.method190(var62.anInt2095, var62.anInt2103, (byte) 65, var6[var13 + 1][var14]); + var24 = TextureOperation34.method190(var62.anInt2095, var62.anInt2103, (byte) 68, var6[1 + var13][var14 + 1]); + var25 = TextureOperation34.method190(var62.anInt2095, var62.anInt2103, (byte) -84, var6[var13][var14 - -1]); Class29.method971(var22, var2, var1, var13, var0, var23, var68, var15, var24, var16 != 0 && var62.aBoolean2092, var67, var14, var4, var25, var66); } - if ((var9[var13][var14] & 255) != 0 || var58 != 0 && 0 == var8[var13][var14]) { + if ((var9[var13][var14] & 0xFF) != 0 || var58 != 0 && 0 == var8[var13][var14]) { int[] var64 = new int[8]; var65 = 0; int var61 = 0; var21 = 0; var22 = 0; - var24 = var10[var13][var14 - -1] & 255; + var24 = var10[var13][var14 - -1] & 0xFF; var23 = 0; - var25 = var10[-1 + var13][var14] & 255; - var27 = var10[1 + var13][var14] & 255; - var26 = var10[var13][-1 + var14] & 255; + var25 = var10[-1 + var13][var14] & 0xFF; + var27 = var10[1 + var13][var14] & 0xFF; + var26 = var10[var13][-1 + var14] & 0xFF; var28 = 255 & var10[-1 + var13][var14 + 1]; var29 = 255 & var10[var13 - 1][var14 - 1]; var30 = 255 & var10[1 + var13][var14 + -1]; - var73 = var10[1 + var13][var14 + 1] & 255; + var73 = var10[1 + var13][var14 + 1] & 0xFF; Class168 var76; byte var77; int var83; if (0 == var28 || var28 == var58) { var28 = 0; } else { - var76 = Class3_Sub13_Sub37.method350((byte) -88, -1 + var28); + var76 = TextureOperation10.method350((byte) -88, -1 + var28); if (var76.aBoolean2092 && var76.anInt2103 != -1) { var33 = var5[var13 + -1][1 + var14]; var77 = var8[-1 + var13][1 + var14]; var35 = anIntArray2642[4 * var77 - -(2 + var33 & 3)]; var36 = anIntArray2642[var77 * 4 - -(3 + var33 & 3)]; - if (Class3_Sub13_Sub39.aBooleanArrayArray3468[var36][1] && Class3_Sub13_Sub39.aBooleanArrayArray3468[var35][0]) { + if (TextureOperation8.aBooleanArrayArray3468[var36][1] && TextureOperation8.aBooleanArrayArray3468[var35][0]) { var28 = 0; } else { for (var83 = 0; var83 < 8; ++var83) { @@ -357,13 +357,13 @@ final class Class1 { if (0 == var29 || var29 == var58) { var29 = 0; } else { - var76 = Class3_Sub13_Sub37.method350((byte) -87, -1 + var29); + var76 = TextureOperation10.method350((byte) -87, -1 + var29); if (var76.aBoolean2092 && -1 != var76.anInt2103) { var33 = var5[var13 + -1][-1 + var14]; var77 = var8[-1 + var13][var14 + -1]; var35 = anIntArray2642[(3 & var33) + var77 * 4]; var36 = anIntArray2642[(var33 - -3 & 3) + 4 * var77]; - if (Class3_Sub13_Sub39.aBooleanArrayArray3468[var35][1] && Class3_Sub13_Sub39.aBooleanArrayArray3468[var36][0]) { + if (TextureOperation8.aBooleanArrayArray3468[var35][1] && TextureOperation8.aBooleanArrayArray3468[var36][0]) { var29 = 0; } else { for (var83 = 0; 8 > var83; ++var83) { @@ -385,13 +385,13 @@ final class Class1 { if (var30 == 0 || var58 == var30) { var30 = 0; } else { - var76 = Class3_Sub13_Sub37.method350((byte) -123, -1 + var30); + var76 = TextureOperation10.method350((byte) -123, -1 + var30); if (var76.aBoolean2092 && -1 != var76.anInt2103) { var33 = var5[1 + var13][var14 - 1]; var77 = var8[1 + var13][var14 + -1]; var36 = anIntArray2642[(1 + var33 & 3) + 4 * var77]; var35 = anIntArray2642[var77 * 4 + (var33 & 3)]; - if (Class3_Sub13_Sub39.aBooleanArrayArray3468[var36][1] && Class3_Sub13_Sub39.aBooleanArrayArray3468[var35][0]) { + if (TextureOperation8.aBooleanArrayArray3468[var36][1] && TextureOperation8.aBooleanArrayArray3468[var35][0]) { var30 = 0; } else { for (var83 = 0; 8 > var83; ++var83) { @@ -413,13 +413,13 @@ final class Class1 { if (var73 == 0 || var73 == var58) { var73 = 0; } else { - var76 = Class3_Sub13_Sub37.method350((byte) 119, -1 + var73); + var76 = TextureOperation10.method350((byte) 119, -1 + var73); if (var76.aBoolean2092 && var76.anInt2103 != -1) { var77 = var8[1 + var13][1 + var14]; var33 = var5[1 + var13][var14 + 1]; var35 = anIntArray2642[(3 & var33 - -2) + 4 * var77]; var36 = anIntArray2642[(var33 + 1 & 3) + 4 * var77]; - if (Class3_Sub13_Sub39.aBooleanArrayArray3468[var35][1] && Class3_Sub13_Sub39.aBooleanArrayArray3468[var36][0]) { + if (TextureOperation8.aBooleanArrayArray3468[var35][1] && TextureOperation8.aBooleanArrayArray3468[var36][0]) { var73 = 0; } else { for (var83 = 0; var83 < 8; ++var83) { @@ -440,7 +440,7 @@ final class Class1 { int var78; if (var24 != 0 && var58 != var24) { - var76 = Class3_Sub13_Sub37.method350((byte) 113, var24 - 1); + var76 = TextureOperation10.method350((byte) 113, 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 = Class3_Sub13_Sub37.method350((byte) -103, var25 + -1); + var76 = TextureOperation10.method350((byte) -103, 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 = Class3_Sub13_Sub37.method350((byte) 126, var26 - 1); + var76 = TextureOperation10.method350((byte) 126, 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 = Class3_Sub13_Sub37.method350((byte) 116, var27 + -1); + var76 = TextureOperation10.method350((byte) 116, var27 + -1); if (var76.aBoolean2092 && var76.anInt2103 != -1) { var23 = anIntArray2642[4 * var8[1 + var13][var14] - -(3 & var5[var13 + 1][var14] - -1)]; @@ -513,17 +513,17 @@ final class Class1 { for (var74 = 0; var61 > var74; ++var74) { var78 = var64[var74]; - var79 = Class3_Sub13_Sub39.aBooleanArrayArray3468[var78 == var24 ? var65 : 0]; - var75 = Class3_Sub13_Sub39.aBooleanArrayArray3468[var25 == var78 ? var21 : 0]; - var81 = Class3_Sub13_Sub39.aBooleanArrayArray3468[var26 == var78 ? var22 : 0]; - boolean[] var84 = Class3_Sub13_Sub39.aBooleanArrayArray3468[var78 != var27 ? 0 : var23]; - Class168 var82 = Class3_Sub13_Sub37.method350((byte) 121, -1 + var78); + var79 = TextureOperation8.aBooleanArrayArray3468[var78 == var24 ? var65 : 0]; + var75 = TextureOperation8.aBooleanArrayArray3468[var25 == var78 ? var21 : 0]; + var81 = TextureOperation8.aBooleanArrayArray3468[var26 == var78 ? var22 : 0]; + boolean[] var84 = TextureOperation8.aBooleanArrayArray3468[var78 != var27 ? 0 : var23]; + Class168 var82 = TextureOperation10.method350((byte) 121, -1 + var78); Class3_Sub11 var39 = method2052(var12, var82); - int var40 = Class3_Sub13_Sub4.method190(var82.anInt2095, var82.anInt2103, (byte) -76, var6[var13][var14]) << 8 | 255; + int var40 = TextureOperation34.method190(var82.anInt2095, var82.anInt2103, (byte) -76, var6[var13][var14]) << 8 | 255; byte var44 = 6; - int var41 = 255 | Class3_Sub13_Sub4.method190(var82.anInt2095, var82.anInt2103, (byte) -85, var6[1 + var13][var14]) << 8; - int var42 = Class3_Sub13_Sub4.method190(var82.anInt2095, var82.anInt2103, (byte) 123, var6[var13 - -1][var14 - -1]) << 8 | 255; - int var43 = 255 | Class3_Sub13_Sub4.method190(var82.anInt2095, var82.anInt2103, (byte) 106, var6[var13][var14 - -1]) << 8; + int var41 = 255 | TextureOperation34.method190(var82.anInt2095, var82.anInt2103, (byte) -85, var6[1 + var13][var14]) << 8; + int var42 = TextureOperation34.method190(var82.anInt2095, var82.anInt2103, (byte) 123, var6[var13 - -1][var14 - -1]) << 8 | 255; + int var43 = 255 | TextureOperation34.method190(var82.anInt2095, var82.anInt2103, (byte) 106, var6[var13][var14 - -1]) << 8; boolean var48 = var29 != var78 && var81[0] && var75[1]; boolean var47 = var73 != var78 && var79[0] && var84[1]; boolean var46 = var28 != var78 && var75[0] && var79[1]; @@ -616,7 +616,7 @@ final class Class1 { if (HDToolKit.highDetail) { Toolkit.JAVA_TOOLKIT.resetBuffer(); } else { - Class164_Sub1.aClass158_3009.method2182(); + Unsorted.aClass158_3009.method2182(); } } diff --git a/Client/src/main/java/org/runite/client/Class10.java b/Client/src/main/java/org/runite/client/Class10.java index f6e9fdb21..ea8760e80 100644 --- a/Client/src/main/java/org/runite/client/Class10.java +++ b/Client/src/main/java/org/runite/client/Class10.java @@ -18,7 +18,7 @@ final class Class10 { int[] var5 = new int[var3]; for (int var6 = 0; var3 > var6; ++var6) { - var5[var6] = Class3_Sub13_Sub38.spritePalette[Unsorted.bitwiseAnd(255, var4[var6])]; + 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); diff --git a/Client/src/main/java/org/runite/client/Class102.java b/Client/src/main/java/org/runite/client/Class102.java index 48cbe44e1..ce38cc1b8 100644 --- a/Client/src/main/java/org/runite/client/Class102.java +++ b/Client/src/main/java/org/runite/client/Class102.java @@ -2,12 +2,12 @@ package org.runite.client; import org.rs09.client.data.NodeCache; -final class Class102 implements Interface2 { +public final class Class102 implements Interface2 { static int[] anIntArray2125; static Class135[] aClass135Array2131 = new Class135[50]; static int anInt2136; - static Player player; + public static Player player; private final boolean[] aBooleanArray2122; private final CacheIndex aClass153_2123; private final boolean[] aBooleanArray2124; @@ -307,11 +307,11 @@ final class Class102 implements Interface2 { if (Class159.anInt2020 > var4) { var4 = Class159.anInt2020; } else { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var4++], var1, -66, var3, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var4++], var1, -66, var3, var0); } if (var2 <= Class57.anInt902) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var2--], var1, -54, var3, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var2--], var1, -54, var3, var0); } else { var2 = Class57.anInt902; } @@ -368,7 +368,7 @@ final class Class102 implements Interface2 { public final void method8(int var1, boolean var2) { try { - Class3_Sub28_Sub4.method551(255 & this.aByteArray2143[var1], this.aByteArray2144[var1] & 255); + Class3_Sub28_Sub4.method551(255 & this.aByteArray2143[var1], this.aByteArray2144[var1] & 0xFF); if (var2) { boolean var3 = false; Class3_Sub28_Sub20 var4 = this.method1613(var1); @@ -431,7 +431,7 @@ final class Class102 implements Interface2 { public final int method10(int var1, int var2) { try { - return this.aByteArray2126[var2] & 255; + return this.aByteArray2126[var2] & 0xFF; } catch (RuntimeException var4) { throw ClientErrorException.clientError(var4, "nk.C(" + var1 + ',' + var2 + ')'); } @@ -453,7 +453,7 @@ final class Class102 implements Interface2 { try { Class3_Sub28_Sub18 var4 = (Class3_Sub28_Sub18) this.aClass47_2138.get(var2); if (null == var4) { - var4 = new Class3_Sub28_Sub18(this.aShortArray2137[var2] & '\uffff'); + var4 = new Class3_Sub28_Sub18(this.aShortArray2137[var2] & 65535); this.aClass47_2138.put(var2, var4); } return var4; @@ -518,11 +518,11 @@ final class Class102 implements Interface2 { public final int method15(int var1, int var2) { try { - if (var2 != '\uffff') { + if (var2 != 65535) { this.method11(-82, -17); } - return '\uffff' & this.aShortArray2137[var1]; + return 65535 & this.aShortArray2137[var1]; } catch (RuntimeException var4) { throw ClientErrorException.clientError(var4, "nk.E(" + var1 + ',' + var2 + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class106.java b/Client/src/main/java/org/runite/client/Class106.java index d4584a1a4..f42bcd9d0 100644 --- a/Client/src/main/java/org/runite/client/Class106.java +++ b/Client/src/main/java/org/runite/client/Class106.java @@ -22,8 +22,8 @@ final class Class106 { } if (var2 < PacketParser.aClass3_Sub19Array3694.length && null != PacketParser.aClass3_Sub19Array3694[var2]) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(162); - Class3_Sub13_Sub1.outgoingBuffer.writeLong(PacketParser.aClass3_Sub19Array3694[var2].linkableKey); + TextureOperation12.outgoingBuffer.putOpcode(162); + TextureOperation12.outgoingBuffer.writeLong(PacketParser.aClass3_Sub19Array3694[var2].linkableKey); } } } diff --git a/Client/src/main/java/org/runite/client/Class108.java b/Client/src/main/java/org/runite/client/Class108.java index 0e92ab86b..f3ef013ca 100644 --- a/Client/src/main/java/org/runite/client/Class108.java +++ b/Client/src/main/java/org/runite/client/Class108.java @@ -24,7 +24,7 @@ final class Class108 { static RSString method1653(int var0) { try { - return RSString.stringCombiner(new RSString[]{RSString.stringAnimator(255 & var0 >> 24), TextCore.aClass94_4023, RSString.stringAnimator((var0 & 16712751) >> 16), TextCore.aClass94_4023, RSString.stringAnimator(255 & var0 >> 8), TextCore.aClass94_4023, RSString.stringAnimator(var0 & 255)}); + return RSString.stringCombiner(new RSString[]{RSString.stringAnimator(255 & var0 >> 24), TextCore.aClass94_4023, RSString.stringAnimator((var0 & 16712751) >> 16), TextCore.aClass94_4023, RSString.stringAnimator(255 & var0 >> 8), TextCore.aClass94_4023, RSString.stringAnimator(var0 & 0xFF)}); } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "oi.F(" + var0 + ',' + 0 + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class110.java b/Client/src/main/java/org/runite/client/Class110.java index aff03672d..001f75b20 100644 --- a/Client/src/main/java/org/runite/client/Class110.java +++ b/Client/src/main/java/org/runite/client/Class110.java @@ -163,7 +163,7 @@ final class Class110 { Class7.method835(var2, var7, var9, var19, 1, 1, (GameObject) object, var24); if (var1 && type <= 17 && type != 13 && var2 > 0) { - Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9] = Class3_Sub13_Sub29.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9], 4); + Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9] = TextureOperation3.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9], 4); } if (def.ClipType != 0 && null != var4) { @@ -191,7 +191,7 @@ final class Class110 { } if (def.aBoolean1542) { - Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9] = Class3_Sub13_Sub29.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9], 1); + Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9] = TextureOperation3.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9], 1); } } else if (1 == var10) { if (def.aBoolean1525) { @@ -200,7 +200,7 @@ final class Class110 { } if (def.aBoolean1542) { - Class38_Sub1.anIntArrayArrayArray2609[var2][var7][1 + var9] = Class3_Sub13_Sub29.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][1 + var9], 2); + Class38_Sub1.anIntArrayArrayArray2609[var2][var7][1 + var9] = TextureOperation3.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][1 + var9], 2); } } else if (var10 == 2) { if (def.aBoolean1525) { @@ -209,7 +209,7 @@ final class Class110 { } if (def.aBoolean1542) { - Class38_Sub1.anIntArrayArrayArray2609[var2][var7 - -1][var9] = Class3_Sub13_Sub29.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7 - -1][var9], 1); + Class38_Sub1.anIntArrayArrayArray2609[var2][var7 - -1][var9] = TextureOperation3.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7 - -1][var9], 1); } } else if (var10 == 3) { if (def.aBoolean1525) { @@ -218,7 +218,7 @@ final class Class110 { } if (def.aBoolean1542) { - Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9] = Class3_Sub13_Sub29.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9], 2); + Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9] = TextureOperation3.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9], 2); } } } @@ -287,17 +287,17 @@ final class Class110 { Class154.method2146(var2, var7, var9, var19, (GameObject) var42, (GameObject) var38, Class159.anIntArray2017[var10], Class159.anIntArray2017[var43], var24); if (def.aBoolean1542 && var1) { if (var10 == 0) { - Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9] = Class3_Sub13_Sub29.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9], 1); - Class38_Sub1.anIntArrayArrayArray2609[var2][var7][1 + var9] = Class3_Sub13_Sub29.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][1 + var9], 2); + Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9] = TextureOperation3.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9], 1); + Class38_Sub1.anIntArrayArrayArray2609[var2][var7][1 + var9] = TextureOperation3.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][1 + var9], 2); } else if (var10 == 1) { - Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9 - -1] = Class3_Sub13_Sub29.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9 - -1], 2); - Class38_Sub1.anIntArrayArrayArray2609[var2][var7 - -1][var9] = Class3_Sub13_Sub29.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7 - -1][var9], 1); + Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9 - -1] = TextureOperation3.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9 - -1], 2); + Class38_Sub1.anIntArrayArrayArray2609[var2][var7 - -1][var9] = TextureOperation3.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7 - -1][var9], 1); } else if (var10 == 2) { - Class38_Sub1.anIntArrayArrayArray2609[var2][1 + var7][var9] = Class3_Sub13_Sub29.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][1 + var7][var9], 1); - Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9] = Class3_Sub13_Sub29.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9], 2); + Class38_Sub1.anIntArrayArrayArray2609[var2][1 + var7][var9] = TextureOperation3.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][1 + var7][var9], 1); + Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9] = TextureOperation3.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9], 2); } else if (var10 == 3) { - Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9] = Class3_Sub13_Sub29.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9], 2); - Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9] = Class3_Sub13_Sub29.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9], 1); + Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9] = TextureOperation3.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9], 2); + Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9] = TextureOperation3.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var2][var7][var9], 1); } } @@ -472,7 +472,7 @@ final class Class110 { } else { object = new Class140_Sub3(objectId, 22, var10, var0, var7, var9, def.animationId, def.aBoolean1492, null); } - Class3_Sub13_Sub23.method276(var2, var7, var9, var19, (GameObject) object, var24, def.aBoolean1502); + TextureOperation39.method276(var2, var7, var9, var19, (GameObject) object, var24, def.aBoolean1502); if (def.ClipType == 1 && null != var4) { var4.method1503(var7, var9); } diff --git a/Client/src/main/java/org/runite/client/Class114.java b/Client/src/main/java/org/runite/client/Class114.java index de60252eb..ab3dac1c9 100644 --- a/Client/src/main/java/org/runite/client/Class114.java +++ b/Client/src/main/java/org/runite/client/Class114.java @@ -36,11 +36,11 @@ final class Class114 { int var3 = Class92.screenColorRgb(); float var7 = 0.58823526F; MouseListeningClass.aFloatArray1919[3] = 1.0F; - float var4 = (float) (var3 >> 16 & 255) / 255.0F; + float var4 = (float) (var3 >> 16 & 0xFF) / 255.0F; float var5 = (float) (('\uff1e' & var3) >> 8) / 255.0F; MouseListeningClass.aFloatArray1919[1] = var2 * (float) Unsorted.bitwiseAnd(var0 >> 8, 255) / 255.0F * var5 * var7; MouseListeningClass.aFloatArray1919[var1] = var2 * var7 * var4 * ((float) (Unsorted.bitwiseAnd(16754958, var0) >> 16) / 255.0F); - float var6 = (float) (var3 & 255) / 255.0F; + float var6 = (float) (var3 & 0xFF) / 255.0F; MouseListeningClass.aFloatArray1919[2] = (float) Unsorted.bitwiseAnd(255, var0) / 255.0F * var6 * var7 * var2; return MouseListeningClass.aFloatArray1919; } catch (RuntimeException var8) { diff --git a/Client/src/main/java/org/runite/client/Class115.java b/Client/src/main/java/org/runite/client/Class115.java index ab24c353c..89bf6c916 100644 --- a/Client/src/main/java/org/runite/client/Class115.java +++ b/Client/src/main/java/org/runite/client/Class115.java @@ -19,7 +19,7 @@ final class Class115 { if (Class3_Sub1.localIndex == var3) { var2 = Class102.player; } else { - var2 = Class3_Sub13_Sub22.players[var3]; + var2 = TextureOperation0.players[var3]; } } else { var3 = var1.anInt2273 - 1; diff --git a/Client/src/main/java/org/runite/client/Class116.java b/Client/src/main/java/org/runite/client/Class116.java index e0907a143..9c9db1c6f 100644 --- a/Client/src/main/java/org/runite/client/Class116.java +++ b/Client/src/main/java/org/runite/client/Class116.java @@ -7,7 +7,7 @@ import java.util.Random; final class Class116 { private static final int[] anIntArray1591; - private static final int[] anIntArray1594 = new int['\u8000']; + private static final int[] anIntArray1594 = new int[32768]; private static final int[] anIntArray1598; private static final int[] anIntArray1599; private static final int[] anIntArray1600; @@ -21,13 +21,13 @@ final class Class116 { Random var0 = new Random(0L); int var1; - for (var1 = 0; var1 < '\u8000'; ++var1) { + for (var1 = 0; var1 < 32768; ++var1) { anIntArray1594[var1] = (var0.nextInt() & 2) - 1; } - anIntArray1591 = new int['\u8000']; + anIntArray1591 = new int[32768]; - for (var1 = 0; var1 < '\u8000'; ++var1) { + for (var1 = 0; var1 < 32768; ++var1) { anIntArray1591[var1] = (int) (Math.sin((double) var1 / 5215.1903D) * 16384.0D); } @@ -115,7 +115,7 @@ final class Class116 { if (this.aClass34_1595 != null) { var14 = this.aClass34_1595.method1007(var1); var15 = this.aClass34_1584.method1007(var1); - var13 = var13 * ((this.method1716(var10, var15, this.aClass34_1595.anInt601) >> 1) + '\u8000') >> 15; + var13 = var13 * ((this.method1716(var10, var15, this.aClass34_1595.anInt601) >> 1) + 32768) >> 15; var10 += (var14 * var8 >> 16) + var9; } diff --git a/Client/src/main/java/org/runite/client/Class117.java b/Client/src/main/java/org/runite/client/Class117.java index 1cb5fc8af..ac9f61ca0 100644 --- a/Client/src/main/java/org/runite/client/Class117.java +++ b/Client/src/main/java/org/runite/client/Class117.java @@ -38,7 +38,7 @@ public final class Class117 { if (var0 == 5) { Class108.method1656(CacheIndex.spritesIndex, (byte) -111); } else { - Class3_Sub13_Sub17.method247((byte) -121); + TextureOperation23.method247((byte) -121); } boolean var3 = 5 == Class143.gameStage || Class143.gameStage == 10 || Class143.gameStage == 28; @@ -89,7 +89,7 @@ public final class Class117 { Class158_Sub1.aByteArrayArrayArray1828 = new byte[var2][104][104]; Class3_Sub31.anIntArray2606 = new int[104]; PacketParser.aByteArrayArrayArray81 = new byte[var2][104][104]; - Class3_Sub13_Sub36.aByteArrayArrayArray3430 = new byte[var2][104][104]; + TextureOperation36.aByteArrayArrayArray3430 = new byte[var2][104][104]; } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "pl.B(" + var0 + ',' + var1 + ')'); } @@ -102,7 +102,7 @@ public final class Class117 { int[] var3 = new int[var1]; for (int var4 = 0; var1 > var4; ++var4) { - var3[var4] = Class3_Sub13_Sub38.spritePalette[Unsorted.bitwiseAnd(var2[var4], 255)]; + 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); diff --git a/Client/src/main/java/org/runite/client/Class119.java b/Client/src/main/java/org/runite/client/Class119.java index 1643ad6ab..57b82e479 100644 --- a/Client/src/main/java/org/runite/client/Class119.java +++ b/Client/src/main/java/org/runite/client/Class119.java @@ -12,14 +12,14 @@ final class Class119 { static void method1729() { try { Object var1; - if (null == Class3_Sub13_Sub10.aFrame3121) { + if (null == TextureOperation30.aFrame3121) { if (GameShell.frame == null) { var1 = Class38.signlink.gameApplet; } else { var1 = GameShell.frame; } } else { - var1 = Class3_Sub13_Sub10.aFrame3121; + var1 = TextureOperation30.aFrame3121; } Unsorted.anInt2334 = ((Container) var1).getSize().width; diff --git a/Client/src/main/java/org/runite/client/Class121.java b/Client/src/main/java/org/runite/client/Class121.java index e10bb4686..ef2ecec86 100644 --- a/Client/src/main/java/org/runite/client/Class121.java +++ b/Client/src/main/java/org/runite/client/Class121.java @@ -76,9 +76,9 @@ final class Class121 { var26 += (-var26 + var7[1 + var6][var14 - -1]) * var22; var20 += (-var20 + var7[var6 - -1][var14]) * var22; var20 += (-var20 + var26) * var23; - int var27 = Class3_Sub13_Sub10.method210(var15, var2, var3); - int var28 = Class3_Sub13_Sub10.method210(var15, var0, var8); - var21 = Class3_Sub13_Sub10.method210(var17, var27, var28); + int var27 = TextureOperation30.method210(var15, var2, var3); + int var28 = TextureOperation30.method210(var15, var0, var8); + var21 = TextureOperation30.method210(var17, var27, var28); } if (var9 > -111) { @@ -98,7 +98,7 @@ final class Class121 { try { try { if (Class43.worldListStage == 0) { - if (Class3_Sub13_Sub34.aLong3411 > TimeUtils.time() + -5000L) { + if (TextureOperation25.aLong3411 > TimeUtils.time() + -5000L) { return 0; } @@ -108,14 +108,14 @@ final class Class121 { } if (30000L + RSInterface.aLong261 < TimeUtils.time()) { - return Class3_Sub13_Sub3.method179((byte) 92, 1000); + return TextureOperation33.method179((byte) 92, 1000); } int wlUpdateStamp; int var2; if (1 == Class43.worldListStage) { if (Class3_Sub9.aClass64_2318.anInt978 == 2) { - return Class3_Sub13_Sub3.method179((byte) 92, 1001); + return TextureOperation33.method179((byte) 92, 1001); } if (1 != Class3_Sub9.aClass64_2318.anInt978) { @@ -123,16 +123,16 @@ final class Class121 { } Class3_Sub15.activeConnection = new Connection((Socket) Class3_Sub9.aClass64_2318.anObject974, Class38.signlink); - Class3_Sub13_Sub1.outgoingBuffer.index = 0; + TextureOperation12.outgoingBuffer.index = 0; Class3_Sub9.aClass64_2318 = null; wlUpdateStamp = 0; if (Class30.loadedWorldList) { wlUpdateStamp = WorldListEntry.updateStamp; } - Class3_Sub13_Sub1.outgoingBuffer.writeByte(255); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(wlUpdateStamp); - Class3_Sub15.activeConnection.sendBytes(Class3_Sub13_Sub1.outgoingBuffer.buffer, Class3_Sub13_Sub1.outgoingBuffer.index); + TextureOperation12.outgoingBuffer.writeByte(255); + TextureOperation12.outgoingBuffer.writeInt(wlUpdateStamp); + Class3_Sub15.activeConnection.sendBytes(TextureOperation12.outgoingBuffer.buffer, TextureOperation12.outgoingBuffer.index); if (null != WorldListEntry.aClass155_2627) { WorldListEntry.aClass155_2627.method2159(67); } @@ -152,7 +152,7 @@ final class Class121 { } if (var2 != 0) { - return Class3_Sub13_Sub3.method179((byte) 92, var2); + return TextureOperation33.method179((byte) 92, var2); } Class43.worldListStage = 2; @@ -168,7 +168,7 @@ final class Class121 { Unsorted.wlPacketSize += Class3_Sub15.activeConnection.readByte(); Class43.worldListStage = 3; Class3_Sub20.wlPacketIndex = 0; - Class3_Sub13_Sub33.aByteArray3396 = new byte[Unsorted.wlPacketSize]; + TextureOperation29.aByteArray3396 = new byte[Unsorted.wlPacketSize]; } if (Class43.worldListStage == 3) { @@ -181,10 +181,10 @@ final class Class121 { wlUpdateStamp = Unsorted.wlPacketSize + -Class3_Sub20.wlPacketIndex; } - Class3_Sub15.activeConnection.readBytes(Class3_Sub13_Sub33.aByteArray3396, Class3_Sub20.wlPacketIndex, wlUpdateStamp); + Class3_Sub15.activeConnection.readBytes(TextureOperation29.aByteArray3396, Class3_Sub20.wlPacketIndex, wlUpdateStamp); Class3_Sub20.wlPacketIndex += wlUpdateStamp; if (Class3_Sub20.wlPacketIndex >= Unsorted.wlPacketSize) { - if (Class3_Sub13_Sub23.handleWorldListUpdate(Class3_Sub13_Sub33.aByteArray3396)) { + if (TextureOperation39.handleWorldListUpdate(TextureOperation29.aByteArray3396)) { Unsorted.aClass44_Sub1Array3201 = new WorldListEntry[WorldListEntry.activeWorldListSize]; var2 = 0; @@ -200,18 +200,18 @@ final class Class121 { Class3_Sub15.activeConnection = null; Unsorted.anInt1088 = 0; Class43.worldListStage = 0; - Class3_Sub13_Sub33.aByteArray3396 = null; - Class3_Sub13_Sub34.aLong3411 = TimeUtils.time(); + TextureOperation29.aByteArray3396 = null; + TextureOperation25.aLong3411 = TimeUtils.time(); return 0; } - return Class3_Sub13_Sub3.method179((byte) 92, 1002); + return TextureOperation33.method179((byte) 92, 1002); } return -1; } } catch (IOException var5) { - return Class3_Sub13_Sub3.method179((byte) 92, 1003); + return TextureOperation33.method179((byte) 92, 1003); } return -1; diff --git a/Client/src/main/java/org/runite/client/Class125.java b/Client/src/main/java/org/runite/client/Class125.java index 75dbb18fe..13ac98ebf 100644 --- a/Client/src/main/java/org/runite/client/Class125.java +++ b/Client/src/main/java/org/runite/client/Class125.java @@ -73,7 +73,7 @@ final class Class125 implements ShaderInterface { var1.glActiveTexture('\u84c1'); var1.glMatrixMode(5890); var1.glTranslatef((float) Unsorted.anInt144, (float) Unsorted.anInt3695, (float) LinkableRSString.anInt2587); - var1.glRotatef(-((float) Class3_Sub13_Sub8.anInt3103 * 360.0F) / 2048.0F, 0.0F, 1.0F, 0.0F); + var1.glRotatef(-((float) TextureOperation9.anInt3103 * 360.0F) / 2048.0F, 0.0F, 1.0F, 0.0F); var1.glRotatef(-((float) Class140_Sub7.anInt2938 * 360.0F) / 2048.0F, 1.0F, 0.0F, 0.0F); var1.glRotatef(-180.0F, 1.0F, 0.0F, 0.0F); var1.glMatrixMode(5888); @@ -83,7 +83,7 @@ final class Class125 implements ShaderInterface { var1.glActiveTexture('\u84c0'); if (this.anInt2182 != HDToolKit.anInt1791) { - int var2 = (HDToolKit.anInt1791 & 255) * 256; + int var2 = (HDToolKit.anInt1791 & 0xFF) * 256; for (int var3 = 0; var3 < 64; ++var3) { this.aFloatBuffer2183.position(var2); diff --git a/Client/src/main/java/org/runite/client/Class126.java b/Client/src/main/java/org/runite/client/Class126.java index 893017413..01eb662d6 100644 --- a/Client/src/main/java/org/runite/client/Class126.java +++ b/Client/src/main/java/org/runite/client/Class126.java @@ -4,10 +4,9 @@ import org.rs09.client.data.Queue; public final class Class126 { - public static Font plainFont; static int anInt1665; static Queue aClass13_1666 = new Queue(); - static int anInt1676 = 0; + public static int anInt1676 = 0; int anInt1663; int anInt1664; int anInt1667; diff --git a/Client/src/main/java/org/runite/client/Class128.java b/Client/src/main/java/org/runite/client/Class128.java index 961789741..0b78a3447 100644 --- a/Client/src/main/java/org/runite/client/Class128.java +++ b/Client/src/main/java/org/runite/client/Class128.java @@ -33,7 +33,7 @@ final class Class128 { System.err.println("Local plane " + WorldListCountry.localPlane + " is out of bounds - rendering log=" + Arrays.toString(Class163_Sub3.PLAYER_RENDER_LOG) + "!"); WorldListCountry.localPlane %= 4; } - Class61 var3 = Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var2][var0]; + Class61 var3 = TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var2][var0]; if (var3 == null) { ObjectDefinition.method1688(WorldListCountry.localPlane, var2, var0); } else { @@ -75,7 +75,7 @@ final class Class128 { } long var13 = 1610612736 + (var0 << 7) + var2; - Class3_Sub13_Sub10.method213(WorldListCountry.localPlane, var2, var0, Class121.method1736(WorldListCountry.localPlane, 1, 64 + 128 * var2, 64 + var0 * 128), var5.aClass140_Sub7_3676, var13, var12, var14); + TextureOperation30.method213(WorldListCountry.localPlane, var2, var0, Class121.method1736(WorldListCountry.localPlane, 1, 64 + 128 * var2, 64 + var0 * 128), var5.aClass140_Sub7_3676, var13, var12, var14); } } } catch (RuntimeException var11) { @@ -136,14 +136,14 @@ final class Class128 { static void method1764() { for (int var3 = 0; var3 < Class3_Sub17.anInt2456; ++var3) { for (int var4 = 0; var4 < Unsorted.anInt1234; ++var4) { - for (int var5 = 0; var5 < Class3_Sub13_Sub15.anInt3179; ++var5) { + for (int var5 = 0; var5 < TextureOperation17.anInt3179; ++var5) { Class3_Sub2 var6 = Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var3][var4][var5]; if (var6 != null) { Class70 var7 = var6.aClass70_2234; if (var7 != null && var7.aClass140_1049.method1865()) { - Class3_Sub13_Sub10.method214(var7.aClass140_1049, var3, var4, var5, 1, 1); + TextureOperation30.method214(var7.aClass140_1049, var3, var4, var5, 1, 1); if (var7.aClass140_1052 != null && var7.aClass140_1052.method1865()) { - Class3_Sub13_Sub10.method214(var7.aClass140_1052, var3, var4, var5, 1, 1); + TextureOperation30.method214(var7.aClass140_1052, var3, var4, var5, 1, 1); var7.aClass140_1049.method1866(var7.aClass140_1052, 0, 0, 0, false); var7.aClass140_1052 = var7.aClass140_1052.method1861(); } @@ -154,7 +154,7 @@ final class Class128 { for (int var8 = 0; var8 < var6.anInt2223; ++var8) { Class25 var9 = var6.aClass25Array2221[var8]; if (var9 != null && var9.aClass140_479.method1865()) { - Class3_Sub13_Sub10.method214(var9.aClass140_479, var3, var4, var5, var9.anInt495 - var9.anInt483 + 1, var9.anInt481 - var9.anInt478 + 1); + TextureOperation30.method214(var9.aClass140_479, var3, var4, var5, var9.anInt495 - var9.anInt483 + 1, var9.anInt481 - var9.anInt478 + 1); var9.aClass140_479 = var9.aClass140_479.method1861(); } } diff --git a/Client/src/main/java/org/runite/client/Class129.java b/Client/src/main/java/org/runite/client/Class129.java index da47ad7d2..e48912be7 100644 --- a/Client/src/main/java/org/runite/client/Class129.java +++ b/Client/src/main/java/org/runite/client/Class129.java @@ -57,7 +57,7 @@ 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, '\uff00') * var12 - -(Unsorted.bitwiseAnd('\uff00', var11) * var13), 16711680) >> 8; + 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; } } @@ -130,7 +130,7 @@ abstract class Class129 { continue; } - var27 = Class3_Sub13_Sub37.method350((byte) -103, var25 + -1); + var27 = TextureOperation10.method350((byte) -103, var25 + -1); if (var27.anInt2103 == -1) { continue; } @@ -142,7 +142,7 @@ abstract class Class129 { continue; } } else if (var25 != 0) { - var27 = Class3_Sub13_Sub37.method350((byte) 123, var25 - 1); + var27 = TextureOperation10.method350((byte) 123, var25 - 1); byte var42; if (var27.anInt2103 == -1) { var42 = var7[var23][var19]; @@ -182,7 +182,7 @@ abstract class Class129 { if (!var32 && -1 + var19 >= var17) { var33 = var13.aShortArray706[var15 + -1]; var34 = var16 + (var33 >> 8); - var35 = var34 - -(var33 & 255); + var35 = var34 - -(var33 & 0xFF); var32 = var23 > var34 && var35 > var23; } @@ -266,19 +266,19 @@ abstract class Class129 { continue; } - var46 = Class3_Sub13_Sub37.method350((byte) -49, var43 - 1); + var46 = TextureOperation10.method350((byte) -49, var43 - 1); if (-1 == var46.anInt2103) { continue; } if (var7[var23][var19] != 0) { - Class3_Sub13_Sub23_Sub1.method284(var0, var9, var23, var6, var19, Class134.anIntArrayArray1763[var7[var23][var19]], var14, (byte) -88, var13, var11, var2[var23][var19]); + TextureOperation18.method284(var0, var9, var23, var6, var19, Class134.anIntArrayArray1763[var7[var23][var19]], var14, (byte) -88, var13, var11, var2[var23][var19]); continue; } } else if (var43 != 0) { - var46 = Class3_Sub13_Sub37.method350((byte) 113, -1 + var43); + var46 = TextureOperation10.method350((byte) 113, -1 + var43); if (-1 == var46.anInt2103) { - Class3_Sub13_Sub23_Sub1.method284(var0, var9, var23, var6, var19, Class25.anIntArrayArray499[var7[var23][var19]], var14, (byte) 116, var13, var11, var2[var23][var19]); + TextureOperation18.method284(var0, var9, var23, var6, var19, Class25.anIntArrayArray499[var7[var23][var19]], var14, (byte) 116, var13, var11, var2[var23][var19]); continue; } @@ -303,7 +303,7 @@ abstract class Class129 { if (!var32 && var18 >= var19 - -1) { var50 = var13.aShortArray706[1 + var15]; var35 = (var50 >> 8) + var16; - var36 = (var50 & 255) + var35; + var36 = (var50 & 0xFF) + var35; var32 = var23 > var35 && var23 < var36; } @@ -352,17 +352,17 @@ abstract class Class129 { } if (null != var45) { - Class3_Sub13_Sub23_Sub1.method284(var0, var9, var23, var6, var19, var45, var14, (byte) 98, var13, var11, var38); + TextureOperation18.method284(var0, var9, var23, var6, var19, var45, var14, (byte) 98, var13, var11, var38); } continue; } } if (var39) { - Class3_Sub13_Sub23_Sub1.method284(var0, var9, var23, var6, var19, Class25.anIntArrayArray499[var7[var23][var19]], var14, (byte) 96, var13, var11, var2[var23][var19]); - Class3_Sub13_Sub23_Sub1.method284(var0, var9, var23, var6, var19, Class134.anIntArrayArray1763[var7[var23][var19]], var14, (byte) -117, var13, var11, var2[var23][var19]); + TextureOperation18.method284(var0, var9, var23, var6, var19, Class25.anIntArrayArray499[var7[var23][var19]], var14, (byte) 96, var13, var11, var2[var23][var19]); + TextureOperation18.method284(var0, var9, var23, var6, var19, Class134.anIntArrayArray1763[var7[var23][var19]], var14, (byte) -117, var13, var11, var2[var23][var19]); } else { - Class3_Sub13_Sub23_Sub1.method284(var0, var9, var23, var6, var19, Class134.anIntArrayArray1763[0], var14, (byte) 61, var13, var11, var38); + TextureOperation18.method284(var0, var9, var23, var6, var19, Class134.anIntArrayArray1763[0], var14, (byte) 61, var13, var11, var38); } } diff --git a/Client/src/main/java/org/runite/client/Class131.java b/Client/src/main/java/org/runite/client/Class131.java index 3921888ce..2b8abd47f 100644 --- a/Client/src/main/java/org/runite/client/Class131.java +++ b/Client/src/main/java/org/runite/client/Class131.java @@ -2,18 +2,18 @@ package org.runite.client; import org.rs09.client.config.GameConfig; -final class Class131 { +public final class Class131 { - static int anInt1716; + public static int anInt1716; static RSString password = TextCore.emptyJagexString; static RSString username = TextCore.emptyJagexString; static int anInt1719 = -1; static CacheIndex aClass153_1723; - short[] aShortArray1718; - int anInt1720; - RSString[] aClass94Array1721; - int[] anIntArray1725; - short[] aShortArray1727; + public short[] aShortArray1718; + public int anInt1720; + public RSString[] aClass94Array1721; + public int[] anIntArray1725; + public short[] aShortArray1727; byte[] aByteArray1730; Class131(int var1) { @@ -36,16 +36,16 @@ final class Class131 { int index = GraphicDefinition.incomingBuffer.getBits(11); if (index != 2047) { boolean var2 = false; - if (null == Class3_Sub13_Sub22.players[index]) { - Class3_Sub13_Sub22.players[index] = new Player(); + if (null == TextureOperation0.players[index]) { + TextureOperation0.players[index] = new Player(); var2 = true; if (null != Class65.aClass3_Sub30Array986[index]) { - Class3_Sub13_Sub22.players[index].parseAppearance(-54, Class65.aClass3_Sub30Array986[index]); + TextureOperation0.players[index].parseAppearance(-54, Class65.aClass3_Sub30Array986[index]); } } Class56.localPlayerIndexes[Class159.localPlayerCount++] = index; - Player var3 = Class3_Sub13_Sub22.players[index]; + Player var3 = TextureOperation0.players[index]; var3.anInt2838 = Class44.anInt719; int var4 = GraphicDefinition.incomingBuffer.getBits(1); if (var4 == 1) { @@ -126,11 +126,11 @@ final class Class131 { var4.writeInt((int) (Math.random() * 9.9999999E7D)); var4.writeString(password); var4.writeInt((int) (Math.random() * 9.9999999E7D)); - var4.rsaEncrypt(Class3_Sub13_Sub37.EXPONENT, Class3_Sub13_Sub14.MODULUS); - Class3_Sub13_Sub1.outgoingBuffer.index = 0; - Class3_Sub13_Sub1.outgoingBuffer.writeByte(210); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(var4.index); - Class3_Sub13_Sub1.outgoingBuffer.putBytes(var4.buffer, var4.index); + var4.rsaEncrypt(TextureOperation10.EXPONENT, TextureOperation31.MODULUS); + TextureOperation12.outgoingBuffer.index = 0; + TextureOperation12.outgoingBuffer.writeByte(210); + TextureOperation12.outgoingBuffer.writeByte(var4.index); + TextureOperation12.outgoingBuffer.putBytes(var4.buffer, var4.index); } else { Class24.method951(); } @@ -148,7 +148,7 @@ final class Class131 { } } - final boolean method1789(int var1, int var2) { + public final boolean method1789(int var1, int var2) { try { if (var2 != 530) { this.method1794(-111, 26); @@ -160,7 +160,7 @@ final class Class131 { } } - final int method1791(int var1, int var2) { + public final int method1791(int var1, int var2) { try { return var2 != 8 ? 35 : this.aByteArray1730[var1] & 3; } catch (RuntimeException var4) { diff --git a/Client/src/main/java/org/runite/client/Class132.java b/Client/src/main/java/org/runite/client/Class132.java index 40219ddc4..8a08717b0 100644 --- a/Client/src/main/java/org/runite/client/Class132.java +++ b/Client/src/main/java/org/runite/client/Class132.java @@ -51,7 +51,7 @@ final class Class132 { static void method1799(byte var0, CacheIndex var1) { try { - Class3_Sub13_Sub7.aClass153_3098 = var1; + TextureOperation27.aClass153_3098 = var1; } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "sf.C(" + var0 + ',' + (var1 != null ? "{...}" : "null") + ')'); } @@ -59,11 +59,11 @@ final class Class132 { static void method1801() { try { - int var1 = Class168.bold.method682(RSString.parse(GameConfig.RCM_TITLE)); + int var1 = FontType.bold.method682(RSString.parse(GameConfig.RCM_TITLE)); int var2; int var3; for (var2 = 0; Unsorted.menuOptionCount > var2; ++var2) { - var3 = Class168.bold.method682(Unsorted.method802(var2)); + var3 = FontType.bold.method682(Unsorted.method802(var2)); if (var3 > var1) { var1 = var3; } @@ -89,24 +89,24 @@ final class Class132 { } if (Unsorted.anInt3660 == 1) { - if (Class3_Sub13_Sub39.anInt3460 == NPCDefinition.anInt1297 && Class38_Sub1.anInt2612 == Class168.anInt2099) { - Class3_Sub28_Sub1.anInt3537 = Unsorted.menuOptionCount * 15 - -(!Unsorted.aBoolean1951 ? 22 : 26); + if (TextureOperation8.anInt3460 == NPCDefinition.anInt1297 && Class38_Sub1.anInt2612 == Class168.anInt2099) { + Class21.anInt3537 = Unsorted.menuOptionCount * 15 - -(!Unsorted.aBoolean1951 ? 22 : 26); Unsorted.anInt3660 = 0; - Class3_Sub13_Sub33.anInt3395 = var4; - AbstractIndexedSprite.anInt1462 = var3; + Class21.anInt3395 = var4; + Class21.anInt1462 = var3; Class38_Sub1.aBoolean2615 = true; - Class3_Sub28_Sub3.anInt3552 = var1; + Class21.anInt3552 = var1; } } else if (Class163_Sub1.anInt2993 == NPCDefinition.anInt1297 && Class38_Sub1.anInt2614 == Class38_Sub1.anInt2612) { - AbstractIndexedSprite.anInt1462 = var3; + Class21.anInt1462 = var3; Unsorted.anInt3660 = 0; - Class3_Sub28_Sub3.anInt3552 = var1; - Class3_Sub13_Sub33.anInt3395 = var4; - Class3_Sub28_Sub1.anInt3537 = (Unsorted.aBoolean1951 ? 26 : 22) + Unsorted.menuOptionCount * 15; + Class21.anInt3552 = var1; + Class21.anInt3395 = var4; + Class21.anInt3537 = (Unsorted.aBoolean1951 ? 26 : 22) + Unsorted.menuOptionCount * 15; Class38_Sub1.aBoolean2615 = true; } else { Class168.anInt2099 = Class38_Sub1.anInt2614; - Class3_Sub13_Sub39.anInt3460 = Class163_Sub1.anInt2993; + TextureOperation8.anInt3460 = Class163_Sub1.anInt2993; Unsorted.anInt3660 = 1; } diff --git a/Client/src/main/java/org/runite/client/Class133.java b/Client/src/main/java/org/runite/client/Class133.java index 63d1a89de..bf026d204 100644 --- a/Client/src/main/java/org/runite/client/Class133.java +++ b/Client/src/main/java/org/runite/client/Class133.java @@ -33,7 +33,7 @@ final class Class133 { static void method1803() { try { - Class82.aReferenceCache_1146.clearSoftReferences(); + Texture.aReferenceCache_1146.clearSoftReferences(); Class159.aReferenceCache_2016.clearSoftReferences(); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "sg.D(" + (byte) 22 + ')'); diff --git a/Client/src/main/java/org/runite/client/Class137.java b/Client/src/main/java/org/runite/client/Class137.java index 6c7a70707..95ff9bdea 100644 --- a/Client/src/main/java/org/runite/client/Class137.java +++ b/Client/src/main/java/org/runite/client/Class137.java @@ -23,7 +23,7 @@ final class Class137 { Class158_Sub1.aBoolean2981 = false; int var8; - if (Class3_Sub13_Sub5.anInt3069 != 0) { + if (TextureOperation21.anInt3069 != 0) { if (var4 >= var5 && var4 < var5 + 16 && var0 >= var6 && var6 - -16 > var0) { var2.anInt208 -= 4; Class20.method909(var2); diff --git a/Client/src/main/java/org/runite/client/Class140_Sub1_Sub1.java b/Client/src/main/java/org/runite/client/Class140_Sub1_Sub1.java index e76c64b2c..a999a4ffd 100644 --- a/Client/src/main/java/org/runite/client/Class140_Sub1_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class140_Sub1_Sub1.java @@ -118,7 +118,7 @@ final class Class140_Sub1_Sub1 extends Model { var27 = Class51.anIntArray851[var1]; } - if(var9 > 0L && Class3_Sub13_Sub36.aBoolean3094 && var19 > 0) { + if(var9 > 0L && TextureOperation36.aBoolean3094 && var19 > 0) { int var28; int var30; if(var20 > 0) { @@ -200,7 +200,7 @@ final class Class140_Sub1_Sub1 extends Model { if(Unsorted.anInt3642 >= var28 && Unsorted.anInt3642 <= var30 && RenderAnimationDefinition.anInt384 >= var29 && RenderAnimationDefinition.anInt384 <= var31) { if(this.aBoolean2699) { - Class3_Sub13_Sub38.aLongArray3448[Unsorted.anInt59++] = var9; + TextureOperation38.aLongArray3448[Unsorted.anInt59++] = var9; } else { if(anIntArray3861.length < this.anInt3833) { anIntArray3861 = new int[this.anInt3833]; @@ -223,7 +223,7 @@ final class Class140_Sub1_Sub1 extends Model { short var52 = this.aShortArray3830[var39]; short var51 = this.aShortArray3831[var39]; if(this.method1927(Unsorted.anInt3642, RenderAnimationDefinition.anInt384, anIntArray3857[var53], anIntArray3857[var52], anIntArray3857[var51], anIntArray3861[var53], anIntArray3861[var52], anIntArray3861[var51])) { - Class3_Sub13_Sub38.aLongArray3448[Unsorted.anInt59++] = var9; + TextureOperation38.aLongArray3448[Unsorted.anInt59++] = var9; break label118; } @@ -595,7 +595,7 @@ final class Class140_Sub1_Sub1 extends Model { private static int method1905(int var0, short var1, int var2, byte var3) { int var4 = Class51.anIntArray834[Class140_Sub1_Sub2.method1940(var0, var2)]; if(var1 != -1) { - int var5 = Class51.anInterface2_838.method19(93, var1 & '\uffff'); + int var5 = Class51.anInterface2_838.method19(93, var1 & 65535); int var6; int var8; if(var5 != 0) { @@ -611,33 +611,33 @@ final class Class140_Sub1_Sub1 extends Model { var4 = var6; } else { var8 = 256 - var5; - var4 = ((var6 & 16711935) * var5 + (var4 & 16711935) * var8 & -16711936) + ((var6 & '\uff00') * var5 + (var4 & '\uff00') * var8 & 16711680) >> 8; + var4 = ((var6 & 16711935) * var5 + (var4 & 16711935) * var8 & -16711936) + ((var6 & 65280) * var5 + (var4 & 65280) * var8 & 16711680) >> 8; } } - var6 = Class51.anInterface2_838.method10(90, var1 & '\uffff'); + var6 = Class51.anInterface2_838.method10(90, var1 & 65535); if(var6 != 0) { var6 += 256; int var7 = ((var4 & 16711680) >> 16) * var6; - if(var7 > '\uffff') { - var7 = '\uffff'; + if(var7 > 65535) { + var7 = 65535; } - var8 = ((var4 & '\uff00') >> 8) * var6; - if(var8 > '\uffff') { - var8 = '\uffff'; + var8 = ((var4 & 65280) >> 8) * var6; + if(var8 > 65535) { + var8 = 65535; } - int var9 = (var4 & 255) * var6; - if(var9 > '\uffff') { - var9 = '\uffff'; + int var9 = (var4 & 0xFF) * var6; + if(var9 > 65535) { + var9 = 65535; } - var4 = (var7 << 8 & 16711680) + (var8 & '\uff00') + (var9 >> 8); + var4 = (var7 << 8 & 16711680) + (var8 & 65280) + (var9 >> 8); } } - return (var4 << 8) + (255 - (var3 & 255)); + return (var4 << 8) + (255 - (var3 & 0xFF)); } private static float[] method1906(int var0, int var1, int var2, int var3, float var4, float var5, float var6) { @@ -1162,7 +1162,7 @@ final class Class140_Sub1_Sub1 extends Model { for(var13 = 0; var13 < var12.length; ++var13) { var14 = var12[var13]; if(this.aShortArray3813 == null || (var7 & this.aShortArray3813[var14]) != 0) { - var15 = (this.aByteArray3816[var14] & 255) + var3 * 8; + var15 = (this.aByteArray3816[var14] & 0xFF) + var3 * 8; if(var15 < 0) { var15 = 0; } else if(var15 > 255) { @@ -1190,7 +1190,7 @@ final class Class140_Sub1_Sub1 extends Model { for(var13 = 0; var13 < var12.length; ++var13) { var14 = var12[var13]; if(this.aShortArray3813 == null || (var7 & this.aShortArray3813[var14]) != 0) { - var15 = this.aShortArray3808[var14] & '\uffff'; + var15 = this.aShortArray3808[var14] & 65535; var16 = var15 >> 10 & 63; var17 = var15 >> 7 & 7; var18 = var15 & 127; @@ -1243,7 +1243,7 @@ final class Class140_Sub1_Sub1 extends Model { var2 = 0; for(var3 = 0; var3 < this.anInt3823; ++var3) { - var4 = this.anIntArray3844[var3] & 255; + var4 = this.anIntArray3844[var3] & 0xFF; ++var1[var4]; if(var4 > var2) { var2 = var4; @@ -1258,7 +1258,7 @@ final class Class140_Sub1_Sub1 extends Model { } for(var3 = 0; var3 < this.anInt3823; this.anIntArrayArray3825[var4][var1[var4]++] = var3++) { - var4 = this.anIntArray3844[var3] & 255; + var4 = this.anIntArray3844[var3] & 0xFF; } this.anIntArray3844 = null; @@ -1269,7 +1269,7 @@ final class Class140_Sub1_Sub1 extends Model { var2 = 0; for(var3 = 0; var3 < this.anInt3852; ++var3) { - var4 = this.aByteArray3820[var3] & 255; + var4 = this.aByteArray3820[var3] & 0xFF; ++var1[var4]; if(var4 > var2) { var2 = var4; @@ -1284,7 +1284,7 @@ final class Class140_Sub1_Sub1 extends Model { } for(var3 = 0; var3 < this.anInt3852; this.anIntArrayArray3829[var4][var1[var4]++] = var3++) { - var4 = this.aByteArray3820[var3] & 255; + var4 = this.aByteArray3820[var3] & 0xFF; } this.aByteArray3820 = null; @@ -1497,15 +1497,15 @@ final class Class140_Sub1_Sub1 extends Model { var3 = 0; int var4 = 0; if(var1 != -1) { - var3 = Class51.anInterface2_838.method19(-125, var1 & '\uffff'); - var4 = Class51.anInterface2_838.method10(-98, var1 & '\uffff'); + var3 = Class51.anInterface2_838.method19(-125, var1 & 65535); + var4 = Class51.anInterface2_838.method10(-98, var1 & 65535); } int var5 = 0; int var6 = 0; if(var2 != -1) { - var5 = Class51.anInterface2_838.method19(57, var2 & '\uffff'); - var6 = Class51.anInterface2_838.method10(-114, var2 & '\uffff'); + var5 = Class51.anInterface2_838.method19(57, var2 & 65535); + var6 = Class51.anInterface2_838.method10(-114, var2 & 65535); } if(var3 != var5 || var4 != var6) { @@ -1657,8 +1657,8 @@ final class Class140_Sub1_Sub1 extends Model { } } } else if(var1 == 3) { - var13 = (var2 & 255) * 4; - var14 = (var2 >> 8 & 255) * 4; + var13 = (var2 & 0xFF) * 4; + var14 = (var2 >> 8 & 0xFF) * 4; this.method1895(var4, var6, var7, var8, var13, var14); } else if(var1 == 4) { var13 = var3.aClass6_3835.aShort92 - var3.aClass6_3835.aShort91; @@ -2655,7 +2655,7 @@ final class Class140_Sub1_Sub1 extends Model { for(var11 = 0; var11 < var10.length; ++var11) { var12 = var10[var11]; - var13 = (this.aByteArray3816[var12] & 255) + var3 * 8; + var13 = (this.aByteArray3816[var12] & 0xFF) + var3 * 8; if(var13 < 0) { var13 = 0; } else if(var13 > 255) { @@ -2681,7 +2681,7 @@ final class Class140_Sub1_Sub1 extends Model { for(var11 = 0; var11 < var10.length; ++var11) { var12 = var10[var11]; - var13 = this.aShortArray3808[var12] & '\uffff'; + var13 = this.aShortArray3808[var12] & 65535; var14 = var13 >> 10 & 63; var15 = var13 >> 7 & 7; var16 = var13 & 127; @@ -2800,7 +2800,7 @@ final class Class140_Sub1_Sub1 extends Model { } else if (var1 == 5) { for (var5 = 0; var5 < this.anInt3852; ++var5) { - var6 = (this.aByteArray3816[var5] & 255) + var2 * 8; + var6 = (this.aByteArray3816[var5] & 0xFF) + var2 * 8; if (var6 < 0) { var6 = 0; } else if (var6 > 255) { @@ -2813,7 +2813,7 @@ final class Class140_Sub1_Sub1 extends Model { this.aClass121_3814.aBoolean1640 = false; } else if (var1 == 7) { for (var5 = 0; var5 < this.anInt3852; ++var5) { - var6 = this.aShortArray3808[var5] & '\uffff'; + var6 = this.aShortArray3808[var5] & 65535; var7 = var6 >> 10 & 63; var8 = var6 >> 7 & 7; int var9 = var6 & 127; @@ -2981,7 +2981,7 @@ final class Class140_Sub1_Sub1 extends Model { HDToolKit.bindTexture2D(-1); Class3_Sub28_Sub4.method551(0, 0); } else { - Class51.anInterface2_838.method8(var7 & '\uffff', true); + Class51.anInterface2_838.method8(var7 & 65535, true); } if(this.aClass121_3846.aClass156_1643 == null) { @@ -3189,7 +3189,7 @@ final class Class140_Sub1_Sub1 extends Model { this.anIntArray3838 = new int[var1.anInt2887 + 1]; for(int var6 = 0; var6 < var1.anInt2849; ++var6) { - if((var1.aByteArray2859 == null || var1.aByteArray2859[var6] != 2) && (var1.aShortArray2858 == null || var1.aShortArray2858[var6] == -1 || !Class51.anInterface2_838.method12(var1.aShortArray2858[var6] & '\uffff', -65))) { + if((var1.aByteArray2859 == null || var1.aByteArray2859[var6] != 2) && (var1.aShortArray2858 == null || var1.aShortArray2858[var6] == -1 || !Class51.anInterface2_838.method12(var1.aShortArray2858[var6] & 65535, -65))) { var5[this.anInt3852++] = var6; ++this.anIntArray3838[var1.anIntArray2865[var6]]; ++this.anIntArray3838[var1.anIntArray2878[var6]]; @@ -3213,12 +3213,12 @@ final class Class140_Sub1_Sub1 extends Model { if(var1.aShortArray2858 != null) { var13 = var1.aShortArray2858[var8]; if(var13 != -1) { - var11 = Class51.anInterface2_838.method18(var13 & '\uffff', 255); - var12 = Class51.anInterface2_838.method9(var13 & '\uffff', false); + var11 = Class51.anInterface2_838.method18(var13 & 65535, 255); + var12 = Class51.anInterface2_838.method9(var13 & 65535, false); } } - boolean var14 = var1.aByteArray2843 != null && var1.aByteArray2843[var8] != 0 || var13 != -1 && !Class51.anInterface2_838.method7((byte)88, var13 & '\uffff'); + boolean var14 = var1.aByteArray2843 != null && var1.aByteArray2843[var8] != 0 || var13 != -1 && !Class51.anInterface2_838.method7((byte)88, var13 & 65535); if((var4 || var14) && var1.aByteArray2889 != null) { var9 += var1.aByteArray2889[var8] << 17; } @@ -3227,10 +3227,10 @@ final class Class140_Sub1_Sub1 extends Model { var9 += 65536; } - var9 += (var11 & 255) << 8; - var9 += var12 & 255; - var62 = var10 + ((var13 & '\uffff') << 16); - var62 += var7 & '\uffff'; + var9 += (var11 & 0xFF) << 8; + var9 += var12 & 0xFF; + var62 = var10 + ((var13 & 65535) << 16); + var62 += var7 & 65535; var60[var7] = ((long)var9 << 32) + (long)var62; } @@ -3315,7 +3315,7 @@ final class Class140_Sub1_Sub1 extends Model { for(var20 = 0; var20 < this.anInt3852; ++var20) { int var21 = var5[var20]; if(var1.aByteArray2866[var21] != -1) { - int var22 = var1.aByteArray2866[var21] & 255; + int var22 = var1.aByteArray2866[var21] & 0xFF; for(int var23 = 0; var23 < 3; ++var23) { int var24; @@ -3381,18 +3381,18 @@ final class Class140_Sub1_Sub1 extends Model { var75 = (float)(-var80) / 1024.0F; } - var82 = 64.0F / (float)(var1.aShortArray2882[var20] & '\uffff'); + var82 = 64.0F / (float)(var1.aShortArray2882[var20] & 65535); } else if(var76 == 2) { - var75 = 64.0F / (float)(var1.aShortArray2888[var20] & '\uffff'); - var82 = 64.0F / (float)(var1.aShortArray2882[var20] & '\uffff'); - var79 = 64.0F / (float)(var1.aShortArray2851[var20] & '\uffff'); + var75 = 64.0F / (float)(var1.aShortArray2888[var20] & 65535); + var82 = 64.0F / (float)(var1.aShortArray2882[var20] & 65535); + var79 = 64.0F / (float)(var1.aShortArray2851[var20] & 65535); } else { var75 = (float)var1.aShortArray2888[var20] / 1024.0F; var82 = (float)var1.aShortArray2882[var20] / 1024.0F; var79 = (float)var1.aShortArray2851[var20] / 1024.0F; } - var65[var20] = method1906(var1.aShortArray2884[var20], var1.aShortArray2846[var20], var1.aShortArray2891[var20], var1.aByteArray2845[var20] & 255, var75, var82, var79); + var65[var20] = method1906(var1.aShortArray2884[var20], var1.aShortArray2846[var20], var1.aShortArray2891[var20], var1.aByteArray2845[var20] & 0xFF, var75, var82, var79); } } } @@ -3401,7 +3401,7 @@ final class Class140_Sub1_Sub1 extends Model { int var67; for(var68 = 0; var68 < this.anInt3852; ++var68) { int var70 = var5[var68]; - var67 = var1.aShortArray2870[var70] & '\uffff'; + var67 = var1.aShortArray2870[var70] & 65535; if(var1.aShortArray2858 == null) { var71 = -1; } else { @@ -3419,7 +3419,7 @@ final class Class140_Sub1_Sub1 extends Model { if(var1.aByteArray2843 == null) { var74 = 0; } else { - var74 = var1.aByteArray2843[var70] & 255; + var74 = var1.aByteArray2843[var70] & 0xFF; } float var73 = 0.0F; @@ -3511,7 +3511,7 @@ final class Class140_Sub1_Sub1 extends Model { byte var90 = var1.aByteArray2867[var72]; var37 = (float)var1.aByteArray2877[var72] / 256.0F; if(var28 == 1) { - var38 = (float)(var1.aShortArray2851[var72] & '\uffff') / 1024.0F; + var38 = (float)(var1.aShortArray2851[var72] & 65535) / 1024.0F; method1904(var1.anIntArray2885[var29], var1.anIntArray2881[var29], var1.anIntArray2892[var29], var88, var87, var94, var93, var38, var90, var37); var73 = aFloat3863; var78 = aFloat3866; @@ -3567,9 +3567,9 @@ final class Class140_Sub1_Sub1 extends Model { int var99 = var96 * var98 - var103 * var101; int var100 = var101 * var102 - var98 * var97; int var104 = var97 * var103 - var102 * var96; - var49 = 64.0F / (float)(var1.aShortArray2888[var72] & '\uffff'); - var50 = 64.0F / (float)(var1.aShortArray2882[var72] & '\uffff'); - var51 = 64.0F / (float)(var1.aShortArray2851[var72] & '\uffff'); + var49 = 64.0F / (float)(var1.aShortArray2888[var72] & 65535); + var50 = 64.0F / (float)(var1.aShortArray2882[var72] & 65535); + var51 = 64.0F / (float)(var1.aShortArray2851[var72] & 65535); var52 = ((float)var99 * var93[0] + (float)var100 * var93[1] + (float)var104 * var93[2]) / var49; var53 = ((float)var99 * var93[3] + (float)var100 * var93[4] + (float)var104 * var93[5]) / var50; var54 = ((float)var99 * var93[6] + (float)var100 * var93[7] + (float)var104 * var93[8]) / var51; diff --git a/Client/src/main/java/org/runite/client/Class140_Sub1_Sub2.java b/Client/src/main/java/org/runite/client/Class140_Sub1_Sub2.java index 34c22255b..057f08837 100644 --- a/Client/src/main/java/org/runite/client/Class140_Sub1_Sub2.java +++ b/Client/src/main/java/org/runite/client/Class140_Sub1_Sub2.java @@ -97,7 +97,7 @@ final class Class140_Sub1_Sub2 extends Model { if(this.aByteArray3903 == null) { Class51.anInt850 = 0; } else { - Class51.anInt850 = this.aByteArray3903[var1] & 255; + Class51.anInt850 = this.aByteArray3903[var1] & 0xFF; } if(this.aShortArray3908 != null && this.aShortArray3908[var1] != -1) { @@ -109,7 +109,7 @@ final class Class140_Sub1_Sub2 extends Model { var6 = var3; var7 = var4; } else { - int var8 = this.aByteArray3899[var1] & 255; + int var8 = this.aByteArray3899[var1] & 0xFF; var5 = this.anIntArray3882[var8]; var6 = this.anIntArray3890[var8]; var7 = this.anIntArray3881[var8]; @@ -121,9 +121,9 @@ final class Class140_Sub1_Sub2 extends Model { Class51.method1138(anIntArray3932[var2], anIntArray3932[var3], anIntArray3932[var4], anIntArray3943[var2], anIntArray3943[var3], anIntArray3943[var4], this.anIntArray3898[var1], this.anIntArray3874[var1], this.anIntArray3896[var1], anIntArray3948[var5], anIntArray3948[var6], anIntArray3948[var7], anIntArray3928[var5], anIntArray3928[var6], anIntArray3928[var7], anIntArray3921[var5], anIntArray3921[var6], anIntArray3921[var7], this.aShortArray3908[var1]); } } else if(this.anIntArray3896[var1] == -1) { - Class51.method1144(anIntArray3932[var2], anIntArray3932[var3], anIntArray3932[var4], anIntArray3943[var2], anIntArray3943[var3], anIntArray3943[var4], Class51.anIntArray834[this.anIntArray3898[var1] & '\uffff']); + Class51.method1144(anIntArray3932[var2], anIntArray3932[var3], anIntArray3932[var4], anIntArray3943[var2], anIntArray3943[var3], anIntArray3943[var4], Class51.anIntArray834[this.anIntArray3898[var1] & 65535]); } else { - Class51.method1154(anIntArray3932[var2], anIntArray3932[var3], anIntArray3932[var4], anIntArray3943[var2], anIntArray3943[var3], anIntArray3943[var4], this.anIntArray3898[var1] & '\uffff', this.anIntArray3874[var1] & '\uffff', this.anIntArray3896[var1] & '\uffff'); + Class51.method1154(anIntArray3932[var2], anIntArray3932[var3], anIntArray3932[var4], anIntArray3943[var2], anIntArray3943[var3], anIntArray3943[var4], this.anIntArray3898[var1] & 65535, this.anIntArray3874[var1] & 65535, this.anIntArray3896[var1] & 65535); } } @@ -152,7 +152,7 @@ final class Class140_Sub1_Sub2 extends Model { for(int var4 = 0; var4 < this.anInt3889; ++var4) { short var3 = this.aShortArray3908 != null?this.aShortArray3908[var4]:-1; if(var3 == -1) { - int var1 = this.aShortArray3869[var4] & '\uffff'; + int var1 = this.aShortArray3869[var4] & 65535; int var2; if(this.anIntArray3896[var4] == -1) { var2 = this.anIntArray3898[var4] & -131072; @@ -362,7 +362,7 @@ final class Class140_Sub1_Sub2 extends Model { int var34; int var32; int var33; - if(var9 > 0L && Class3_Sub13_Sub36.aBoolean3094 && var14 > 0) { + if(var9 > 0L && TextureOperation36.aBoolean3094 && var14 > 0) { if(var17 > 0) { var31 = var19 / var13; var33 = var18 / var14; @@ -430,7 +430,7 @@ final class Class140_Sub1_Sub2 extends Model { if(Unsorted.anInt3642 >= var31 && Unsorted.anInt3642 <= var33 && RenderAnimationDefinition.anInt384 >= var32 && RenderAnimationDefinition.anInt384 <= var34) { if(this.aBoolean2699) { - Class3_Sub13_Sub38.aLongArray3448[Unsorted.anInt59++] = var9; + TextureOperation38.aLongArray3448[Unsorted.anInt59++] = var9; } else { var30 = true; } @@ -599,8 +599,8 @@ final class Class140_Sub1_Sub2 extends Model { } } } else if(var1 == 3) { - var14 = (var2 & 255) * 4; - var15 = (var2 >> 8 & 255) * 4; + var14 = (var2 & 0xFF) * 4; + var15 = (var2 >> 8 & 0xFF) * 4; var13.method1895(var3, var5, var6, var7, var14, var15); } else if(var1 == 4) { var14 = this.aShort3892 - this.aShort3894; @@ -721,7 +721,7 @@ final class Class140_Sub1_Sub2 extends Model { if(this.aByteArray3903 == null) { Class51.anInt850 = 0; } else { - Class51.anInt850 = this.aByteArray3903[var1] & 255; + Class51.anInt850 = this.aByteArray3903[var1] & 0xFF; } int var11; @@ -731,69 +731,69 @@ final class Class140_Sub1_Sub2 extends Model { if(var8 >= 50) { anIntArray3919[var4] = anIntArray3943[var5]; anIntArray3925[var4] = anIntArray3932[var5]; - anIntArray3936[var4++] = this.anIntArray3898[var1] & '\uffff'; + anIntArray3936[var4++] = this.anIntArray3898[var1] & 65535; } else { var11 = anIntArray3948[var5]; var12 = anIntArray3928[var5]; - var13 = this.anIntArray3898[var1] & '\uffff'; + var13 = this.anIntArray3898[var1] & 65535; if(var10 >= 50) { var14 = (50 - var8) * Class51.anIntArray841[var10 - var8]; anIntArray3919[var4] = var2 + (var11 + ((anIntArray3948[var7] - var11) * var14 >> 16) << 9) / 50; anIntArray3925[var4] = var3 + (var12 + ((anIntArray3928[var7] - var12) * var14 >> 16) << 9) / 50; - anIntArray3936[var4++] = var13 + (((this.anIntArray3896[var1] & '\uffff') - var13) * var14 >> 16); + anIntArray3936[var4++] = var13 + (((this.anIntArray3896[var1] & 65535) - var13) * var14 >> 16); } if(var9 >= 50) { var14 = (50 - var8) * Class51.anIntArray841[var9 - var8]; anIntArray3919[var4] = var2 + (var11 + ((anIntArray3948[var6] - var11) * var14 >> 16) << 9) / 50; anIntArray3925[var4] = var3 + (var12 + ((anIntArray3928[var6] - var12) * var14 >> 16) << 9) / 50; - anIntArray3936[var4++] = var13 + (((this.anIntArray3874[var1] & '\uffff') - var13) * var14 >> 16); + anIntArray3936[var4++] = var13 + (((this.anIntArray3874[var1] & 65535) - var13) * var14 >> 16); } } if(var9 >= 50) { anIntArray3919[var4] = anIntArray3943[var6]; anIntArray3925[var4] = anIntArray3932[var6]; - anIntArray3936[var4++] = this.anIntArray3874[var1] & '\uffff'; + anIntArray3936[var4++] = this.anIntArray3874[var1] & 65535; } else { var11 = anIntArray3948[var6]; var12 = anIntArray3928[var6]; - var13 = this.anIntArray3874[var1] & '\uffff'; + var13 = this.anIntArray3874[var1] & 65535; if(var8 >= 50) { var14 = (50 - var9) * Class51.anIntArray841[var8 - var9]; anIntArray3919[var4] = var2 + (var11 + ((anIntArray3948[var5] - var11) * var14 >> 16) << 9) / 50; anIntArray3925[var4] = var3 + (var12 + ((anIntArray3928[var5] - var12) * var14 >> 16) << 9) / 50; - anIntArray3936[var4++] = var13 + (((this.anIntArray3898[var1] & '\uffff') - var13) * var14 >> 16); + anIntArray3936[var4++] = var13 + (((this.anIntArray3898[var1] & 65535) - var13) * var14 >> 16); } if(var10 >= 50) { var14 = (50 - var9) * Class51.anIntArray841[var10 - var9]; anIntArray3919[var4] = var2 + (var11 + ((anIntArray3948[var7] - var11) * var14 >> 16) << 9) / 50; anIntArray3925[var4] = var3 + (var12 + ((anIntArray3928[var7] - var12) * var14 >> 16) << 9) / 50; - anIntArray3936[var4++] = var13 + (((this.anIntArray3896[var1] & '\uffff') - var13) * var14 >> 16); + anIntArray3936[var4++] = var13 + (((this.anIntArray3896[var1] & 65535) - var13) * var14 >> 16); } } if(var10 >= 50) { anIntArray3919[var4] = anIntArray3943[var7]; anIntArray3925[var4] = anIntArray3932[var7]; - anIntArray3936[var4++] = this.anIntArray3896[var1] & '\uffff'; + anIntArray3936[var4++] = this.anIntArray3896[var1] & 65535; } else { var11 = anIntArray3948[var7]; var12 = anIntArray3928[var7]; - var13 = this.anIntArray3896[var1] & '\uffff'; + var13 = this.anIntArray3896[var1] & 65535; if(var9 >= 50) { var14 = (50 - var10) * Class51.anIntArray841[var9 - var10]; anIntArray3919[var4] = var2 + (var11 + ((anIntArray3948[var6] - var11) * var14 >> 16) << 9) / 50; anIntArray3925[var4] = var3 + (var12 + ((anIntArray3928[var6] - var12) * var14 >> 16) << 9) / 50; - anIntArray3936[var4++] = var13 + (((this.anIntArray3874[var1] & '\uffff') - var13) * var14 >> 16); + anIntArray3936[var4++] = var13 + (((this.anIntArray3874[var1] & 65535) - var13) * var14 >> 16); } if(var8 >= 50) { var14 = (50 - var10) * Class51.anIntArray841[var8 - var10]; anIntArray3919[var4] = var2 + (var11 + ((anIntArray3948[var5] - var11) * var14 >> 16) << 9) / 50; anIntArray3925[var4] = var3 + (var12 + ((anIntArray3928[var5] - var12) * var14 >> 16) << 9) / 50; - anIntArray3936[var4++] = var13 + (((this.anIntArray3898[var1] & '\uffff') - var13) * var14 >> 16); + anIntArray3936[var4++] = var13 + (((this.anIntArray3898[var1] & 65535) - var13) * var14 >> 16); } } @@ -819,7 +819,7 @@ final class Class140_Sub1_Sub2 extends Model { var18 = var6; var19 = var7; } else { - var20 = this.aByteArray3899[var1] & 255; + var20 = this.aByteArray3899[var1] & 0xFF; var17 = this.anIntArray3882[var20]; var18 = this.anIntArray3890[var20]; var19 = this.anIntArray3881[var20]; @@ -831,7 +831,7 @@ final class Class140_Sub1_Sub2 extends Model { Class51.method1138(var14, var15, var16, var11, var12, var13, anIntArray3936[0], anIntArray3936[1], anIntArray3936[2], anIntArray3948[var17], anIntArray3948[var18], anIntArray3948[var19], anIntArray3928[var17], anIntArray3928[var18], anIntArray3928[var19], anIntArray3921[var17], anIntArray3921[var18], anIntArray3921[var19], this.aShortArray3908[var1]); } } else if(this.anIntArray3896[var1] == -1) { - Class51.method1144(var14, var15, var16, var11, var12, var13, Class51.anIntArray834[this.anIntArray3898[var1] & '\uffff']); + Class51.method1144(var14, var15, var16, var11, var12, var13, Class51.anIntArray834[this.anIntArray3898[var1] & 65535]); } else { Class51.method1154(var14, var15, var16, var11, var12, var13, anIntArray3936[0], anIntArray3936[1], anIntArray3936[2]); } @@ -848,7 +848,7 @@ final class Class140_Sub1_Sub2 extends Model { var18 = var6; var19 = var7; } else { - var20 = this.aByteArray3899[var1] & 255; + var20 = this.aByteArray3899[var1] & 0xFF; var17 = this.anIntArray3882[var20]; var18 = this.anIntArray3890[var20]; var19 = this.anIntArray3881[var20]; @@ -863,7 +863,7 @@ final class Class140_Sub1_Sub2 extends Model { Class51.method1138(var14, var16, anIntArray3925[3], var11, var13, anIntArray3919[3], anIntArray3936[0], anIntArray3936[2], anIntArray3936[3], anIntArray3948[var17], anIntArray3948[var18], anIntArray3948[var19], anIntArray3928[var17], anIntArray3928[var18], anIntArray3928[var19], anIntArray3921[var17], anIntArray3921[var18], anIntArray3921[var19], var21); } } else if(this.anIntArray3896[var1] == -1) { - var17 = Class51.anIntArray834[this.anIntArray3898[var1] & '\uffff']; + var17 = Class51.anIntArray834[this.anIntArray3898[var1] & 65535]; Class51.method1144(var14, var15, var16, var11, var12, var13, var17); Class51.method1144(var14, var16, anIntArray3925[3], var11, var13, anIntArray3919[3], var17); } else { @@ -1079,7 +1079,7 @@ final class Class140_Sub1_Sub2 extends Model { for(var11 = 0; var11 < var10.length; ++var11) { var12 = var10[var11]; - var13 = (this.aByteArray3903[var12] & 255) + var3 * 8; + var13 = (this.aByteArray3903[var12] & 0xFF) + var3 * 8; if(var13 < 0) { var13 = 0; } else if(var13 > 255) { @@ -1101,7 +1101,7 @@ final class Class140_Sub1_Sub2 extends Model { for(var11 = 0; var11 < var10.length; ++var11) { var12 = var10[var11]; - var13 = this.aShortArray3869[var12] & '\uffff'; + var13 = this.aShortArray3869[var12] & 65535; var14 = var13 >> 10 & 63; var15 = var13 >> 7 & 7; int var16 = var13 & 127; @@ -1231,7 +1231,7 @@ final class Class140_Sub1_Sub2 extends Model { } } else { if(var2 && this.method1944(Unsorted.anInt3642 + Class51.anInt846, RenderAnimationDefinition.anInt384 + Class51.anInt835, anIntArray3932[var11], anIntArray3932[var12], anIntArray3932[var13], var14, var15, var16)) { - Class3_Sub13_Sub38.aLongArray3448[Unsorted.anInt59++] = var3; + TextureOperation38.aLongArray3448[Unsorted.anInt59++] = var3; var2 = false; } @@ -1986,7 +1986,7 @@ final class Class140_Sub1_Sub2 extends Model { for(var13 = 0; var13 < var12.length; ++var13) { var14 = var12[var13]; if(this.aShortArray3871 == null || (var7 & this.aShortArray3871[var14]) != 0) { - var15 = (this.aByteArray3903[var14] & 255) + var3 * 8; + var15 = (this.aByteArray3903[var14] & 0xFF) + var3 * 8; if(var15 < 0) { var15 = 0; } else if(var15 > 255) { @@ -2010,7 +2010,7 @@ final class Class140_Sub1_Sub2 extends Model { for(var13 = 0; var13 < var12.length; ++var13) { var14 = var12[var13]; if(this.aShortArray3871 == null || (var7 & this.aShortArray3871[var14]) != 0) { - var15 = this.aShortArray3869[var14] & '\uffff'; + var15 = this.aShortArray3869[var14] & 65535; var16 = var15 >> 10 & 63; var17 = var15 >> 7 & 7; var18 = var15 & 127; @@ -2128,7 +2128,7 @@ final class Class140_Sub1_Sub2 extends Model { } else if (var1 == 5) { for (var5 = 0; var5 < this.anInt3889; ++var5) { - var6 = (this.aByteArray3903[var5] & 255) + var2 * 8; + var6 = (this.aByteArray3903[var5] & 0xFF) + var2 * 8; if (var6 < 0) { var6 = 0; } else if (var6 > 255) { @@ -2140,7 +2140,7 @@ final class Class140_Sub1_Sub2 extends Model { } else if (var1 == 7) { for (var5 = 0; var5 < this.anInt3889; ++var5) { - var6 = this.aShortArray3869[var5] & '\uffff'; + var6 = this.aShortArray3869[var5] & 65535; var7 = var6 >> 10 & 63; var8 = var6 >> 7 & 7; int var9 = var6 & 127; @@ -2240,7 +2240,7 @@ final class Class140_Sub1_Sub2 extends Model { int var17; for(var17 = 0; var17 < this.anInt3889; ++var17) { if(var1.aByteArray2866[var17] != -1) { - ++var16[var1.aByteArray2866[var17] & 255]; + ++var16[var1.aByteArray2866[var17] & 0xFF]; } } @@ -2260,9 +2260,9 @@ final class Class140_Sub1_Sub2 extends Model { int var11; for(var11 = 0; var11 < var1.anInt2862; ++var11) { if(var16[var11] > 0 && var1.aByteArray2857[var11] == 0) { - this.anIntArray3882[var17] = var1.aShortArray2884[var11] & '\uffff'; - this.anIntArray3890[var17] = var1.aShortArray2846[var11] & '\uffff'; - this.anIntArray3881[var17] = var1.aShortArray2891[var11] & '\uffff'; + this.anIntArray3882[var17] = var1.aShortArray2884[var11] & 65535; + this.anIntArray3890[var17] = var1.aShortArray2846[var11] & 65535; + this.anIntArray3881[var17] = var1.aShortArray2891[var11] & 65535; var16[var11] = var17++; } else { var16[var11] = -1; @@ -2275,7 +2275,7 @@ final class Class140_Sub1_Sub2 extends Model { if(var1.aByteArray2866[var11] == -1) { this.aByteArray3899[var11] = -1; } else { - this.aByteArray3899[var11] = (byte)var16[var1.aByteArray2866[var11] & 255]; + this.aByteArray3899[var11] = (byte)var16[var1.aByteArray2866[var11] & 0xFF]; if(this.aByteArray3899[var11] == -1 && this.aShortArray3908 != null) { this.aShortArray3908[var11] = -1; } @@ -2318,7 +2318,7 @@ final class Class140_Sub1_Sub2 extends Model { Class120 var20; if(var12 == -1) { if(var18 == 0) { - int var15 = var1.aShortArray2870[var9] & '\uffff'; + int var15 = var1.aShortArray2870[var9] & 65535; if(var1.aClass50Array2883 == null || var1.aClass50Array2883[this.anIntArray3901[var9]] == null) { var13 = var1.aClass50Array2872[this.anIntArray3901[var9]]; } else { @@ -2346,7 +2346,7 @@ final class Class140_Sub1_Sub2 extends Model { } else if(var18 == 1) { var20 = var1.aClass120Array2886[var9]; var14 = var2 + (var4 * var20.anInt1634 + var5 * var20.anInt1635 + var6 * var20.anInt1632) / (var8 + var8 / 2) << 17; - this.anIntArray3898[var9] = var14 | method1940(var1.aShortArray2870[var9] & '\uffff', var14 >> 17); + this.anIntArray3898[var9] = var14 | method1940(var1.aShortArray2870[var9] & 65535, var14 >> 17); this.anIntArray3896[var9] = -1; } else if(var18 == 3) { this.anIntArray3898[var9] = 128; diff --git a/Client/src/main/java/org/runite/client/Class140_Sub2.java b/Client/src/main/java/org/runite/client/Class140_Sub2.java index 9ee5adc1b..29f055425 100644 --- a/Client/src/main/java/org/runite/client/Class140_Sub2.java +++ b/Client/src/main/java/org/runite/client/Class140_Sub2.java @@ -91,7 +91,7 @@ final class Class140_Sub2 extends GameObject { var4 = var9 * var4 >> 8; } - var8 = -var7 + 2048 & 2047; + var8 = -var7 + 2048 & 0x7FF; var9 = 2047 & -var5 + 2048; int var10 = 0; int var12 = var4; @@ -113,7 +113,7 @@ final class Class140_Sub2 extends GameObject { } Class139.anInt1823 = var7; - Class3_Sub13_Sub25.anInt3315 = var5; + TextureOperation28.anInt3315 = var5; Class77.anInt1111 = var6 + -var12; NPC.anInt3995 = var0 + -var10; Class7.anInt2162 = -var11 + var3; diff --git a/Client/src/main/java/org/runite/client/Class140_Sub3.java b/Client/src/main/java/org/runite/client/Class140_Sub3.java index 80a71f8ac..9165c723c 100644 --- a/Client/src/main/java/org/runite/client/Class140_Sub3.java +++ b/Client/src/main/java/org/runite/client/Class140_Sub3.java @@ -101,9 +101,9 @@ final class Class140_Sub3 extends GameObject { if(var2 != null) { var10 = var2.frames[var10]; int frame = var10 >> 16; - // System.out.println(var2.animId + " Roar " + (var10 >> 16) + ", " + (var10 & '\uffff') + ", " + Arrays.toString(var2.frames)); + // System.out.println(var2.animId + " Roar " + (var10 >> 16) + ", " + (var10 & 65535) + ", " + Arrays.toString(var2.frames)); var40 = Class3_Sub9.method133(frame); //NPC render animating - var10 &= '\uffff'; + var10 &= 65535; } var21 = var32; @@ -447,7 +447,7 @@ final class Class140_Sub3 extends GameObject { for(; localPlayerAmount > var2; ++var2) { int var3 = Class56.localPlayerIndexes[var2]; - Player var4 = Class3_Sub13_Sub22.players[var3]; + Player var4 = TextureOperation0.players[var3]; int update = GraphicDefinition.incomingBuffer.getBits(1); if(update == 0) { Class56.localPlayerIndexes[Class159.localPlayerCount++] = var3; diff --git a/Client/src/main/java/org/runite/client/Class140_Sub4.java b/Client/src/main/java/org/runite/client/Class140_Sub4.java index 42ccedbdd..90e2d165e 100644 --- a/Client/src/main/java/org/runite/client/Class140_Sub4.java +++ b/Client/src/main/java/org/runite/client/Class140_Sub4.java @@ -2,7 +2,7 @@ package org.runite.client; import org.rs09.client.data.ReferenceCache; -abstract class Class140_Sub4 extends GameObject { +public abstract class Class140_Sub4 extends GameObject { int textEffect = 0; private int anInt2754 = 0; @@ -67,7 +67,7 @@ abstract class Class140_Sub4 extends GameObject { int anInt2816 = 0; int anInt2817; int anInt2818; - int anInt2819; + public int anInt2819; int anInt2820 = -32768; int anInt2821 = 0; private int size = 1; @@ -77,7 +77,7 @@ abstract class Class140_Sub4 extends GameObject { int anInt2826 = -1; private int anInt2827 = 0; int anInt2828 = 0; - int anInt2829; + public int anInt2829; private int anInt2830 = 0; int anInt2831; int anInt2832 = 0; @@ -87,7 +87,7 @@ abstract class Class140_Sub4 extends GameObject { int[] anIntArray2836 = new int[4]; int textColor = 0; int anInt2838 = 0; - static AbstractSprite[] aAbstractSpriteArray2839; + public static AbstractSprite[] aAbstractSpriteArray2839; int anInt2840; int anInt2842 = -1; @@ -146,7 +146,7 @@ abstract class Class140_Sub4 extends GameObject { this.anInt2819 = var2 * 64 + 128 * this.anIntArray2767[0]; if(HDToolKit.highDetail && Class102.player == this) { - Class3_Sub13_Sub14.method236(); + TextureOperation31.method236(); } } catch (RuntimeException var9) { @@ -224,8 +224,8 @@ abstract class Class140_Sub4 extends GameObject { } Class3_Sub28_Sub9.anInt3623 = 0; - Class3_Sub13_Sub16.anInt3198 = 0; - Class3_Sub13_Sub9.anInt3111 = 0; + TextureOperation15.anInt3198 = 0; + TextureOperation16.anInt3111 = 0; RenderAnimationDefinition var4 = this.method1965(); int var5 = var4.anInt395; int var6 = var4.anInt381; @@ -256,9 +256,9 @@ abstract class Class140_Sub4 extends GameObject { int var30 = var28 > var23?var23:var28; int var31 = var28 > var18?var18:var28; int var32 = var23 <= var13?var23:var13; - Class3_Sub13_Sub16.anInt3198 = 2047 & (int)(325.95D * Math.atan2(var29 - var30, var6)); - if(Class3_Sub13_Sub16.anInt3198 != 0) { - var2.method1896(Class3_Sub13_Sub16.anInt3198); + TextureOperation15.anInt3198 = 2047 & (int)(325.95D * Math.atan2(var29 - var30, var6)); + if(TextureOperation15.anInt3198 != 0) { + var2.method1896(TextureOperation15.anInt3198); } Class3_Sub28_Sub9.anInt3623 = 2047 & (int)(325.95D * Math.atan2(-var31 + var32, var5)); @@ -266,14 +266,14 @@ abstract class Class140_Sub4 extends GameObject { var2.method1886(Class3_Sub28_Sub9.anInt3623); } - Class3_Sub13_Sub9.anInt3111 = var28 + var13; - if(Class3_Sub13_Sub9.anInt3111 > var23 + var18) { - Class3_Sub13_Sub9.anInt3111 = var23 + var18; + TextureOperation16.anInt3111 = var28 + var13; + if(TextureOperation16.anInt3111 > var23 + var18) { + TextureOperation16.anInt3111 = var23 + var18; } - Class3_Sub13_Sub9.anInt3111 = (Class3_Sub13_Sub9.anInt3111 >> 1) - this.anInt2831; - if(Class3_Sub13_Sub9.anInt3111 != 0) { - var2.method1897(0, Class3_Sub13_Sub9.anInt3111, 0); + TextureOperation16.anInt3111 = (TextureOperation16.anInt3111 >> 1) - this.anInt2831; + if(TextureOperation16.anInt3111 != 0) { + var2.method1897(0, TextureOperation16.anInt3111, 0); } } diff --git a/Client/src/main/java/org/runite/client/Class140_Sub6.java b/Client/src/main/java/org/runite/client/Class140_Sub6.java index 570c28df1..ad7717310 100644 --- a/Client/src/main/java/org/runite/client/Class140_Sub6.java +++ b/Client/src/main/java/org/runite/client/Class140_Sub6.java @@ -105,7 +105,7 @@ final class Class140_Sub6 extends GameObject { this.aDouble2913 += this.aDouble2908 * (double)var2; } - this.anInt2924 = 1024 + (int)(325.949D * Math.atan2(this.aDouble2895, this.aDouble2918)) & 2047; + this.anInt2924 = 1024 + (int)(325.949D * Math.atan2(this.aDouble2895, this.aDouble2918)) & 0x7FF; this.anInt2917 = 2047 & (int)(325.949D * Math.atan2(this.aDouble2913, this.aDouble2921)); if(this.aClass142_2923 != null) { diff --git a/Client/src/main/java/org/runite/client/Class140_Sub7.java b/Client/src/main/java/org/runite/client/Class140_Sub7.java index c48e74df4..8dd7f8e2c 100644 --- a/Client/src/main/java/org/runite/client/Class140_Sub7.java +++ b/Client/src/main/java/org/runite/client/Class140_Sub7.java @@ -40,7 +40,7 @@ public final class Class140_Sub7 extends GameObject { } else { int var8 = 0; byte var7 = 0; - Class3_Sub13_Sub38.anIntArray3456[var7] = var2; + TextureOperation38.anIntArray3456[var7] = var2; if(var0 >= -9) { method2031((byte)-29, false, 59, 52, null, 75); } @@ -50,11 +50,11 @@ public final class Class140_Sub7 extends GameObject { Class158.aByteArrayArrayArray2008[WorldListCountry.localPlane][var2][var3] = var6; while(var23 != var8) { - int var10 = (16740943 & Class3_Sub13_Sub38.anIntArray3456[var8]) >> 16; - int var11 = 255 & Class3_Sub13_Sub38.anIntArray3456[var8] >> 24; - int var9 = Class3_Sub13_Sub38.anIntArray3456[var8] & '\uffff'; + int var10 = (16740943 & TextureOperation38.anIntArray3456[var8]) >> 16; + int var11 = 255 & TextureOperation38.anIntArray3456[var8] >> 24; + int var9 = TextureOperation38.anIntArray3456[var8] & 65535; int var13 = (Class45.anIntArray729[var8] & 16721603) >> 16; - int var12 = Class45.anIntArray729[var8] & '\uffff'; + int var12 = Class45.anIntArray729[var8] & 65535; var8 = 4095 & 1 + var8; boolean var14 = false; boolean var15 = false; @@ -150,8 +150,8 @@ public final class Class140_Sub7 extends GameObject { if(!var14) { if(var9 >= 1 && Class158.aByteArrayArrayArray2008[WorldListCountry.localPlane][-1 + var9][var12] != var6) { - Class3_Sub13_Sub38.anIntArray3456[var23] = Class3_Sub13_Sub29.bitwiseOr(Class3_Sub13_Sub29.bitwiseOr(var9 - 1, 1179648), -754974720); - Class45.anIntArray729[var23] = Class3_Sub13_Sub29.bitwiseOr(var12, 1245184); + TextureOperation38.anIntArray3456[var23] = TextureOperation3.bitwiseOr(TextureOperation3.bitwiseOr(var9 - 1, 1179648), -754974720); + Class45.anIntArray729[var23] = TextureOperation3.bitwiseOr(var12, 1245184); var23 = 1 + var23 & 4095; Class158.aByteArrayArrayArray2008[WorldListCountry.localPlane][var9 - 1][var12] = var6; } @@ -159,22 +159,22 @@ public final class Class140_Sub7 extends GameObject { ++var12; if(104 > var12) { if(var9 + -1 >= 0 && Class158.aByteArrayArrayArray2008[WorldListCountry.localPlane][-1 + var9][var12] != var6 && (Unsorted.aByteArrayArrayArray113[WorldListCountry.localPlane][var9][var12] & 4) == 0 && (Unsorted.aByteArrayArrayArray113[WorldListCountry.localPlane][-1 + var9][var12 + -1] & 4) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var23] = Class3_Sub13_Sub29.bitwiseOr(1375731712, Class3_Sub13_Sub29.bitwiseOr(1179648, -1 + var9)); - Class45.anIntArray729[var23] = Class3_Sub13_Sub29.bitwiseOr(var12, 1245184); + TextureOperation38.anIntArray3456[var23] = TextureOperation3.bitwiseOr(1375731712, TextureOperation3.bitwiseOr(1179648, -1 + var9)); + Class45.anIntArray729[var23] = TextureOperation3.bitwiseOr(var12, 1245184); Class158.aByteArrayArrayArray2008[WorldListCountry.localPlane][-1 + var9][var12] = var6; var23 = 1 + var23 & 4095; } if(var6 != Class158.aByteArrayArrayArray2008[WorldListCountry.localPlane][var9][var12]) { - Class3_Sub13_Sub38.anIntArray3456[var23] = Class3_Sub13_Sub29.bitwiseOr(318767104, Class3_Sub13_Sub29.bitwiseOr(var9, 5373952)); - Class45.anIntArray729[var23] = Class3_Sub13_Sub29.bitwiseOr(5439488, var12); + TextureOperation38.anIntArray3456[var23] = TextureOperation3.bitwiseOr(318767104, TextureOperation3.bitwiseOr(var9, 5373952)); + Class45.anIntArray729[var23] = TextureOperation3.bitwiseOr(5439488, var12); var23 = 4095 & 1 + var23; Class158.aByteArrayArrayArray2008[WorldListCountry.localPlane][var9][var12] = var6; } if(1 + var9 < 104 && Class158.aByteArrayArrayArray2008[WorldListCountry.localPlane][var9 + 1][var12] != var6 && 0 == (Unsorted.aByteArrayArrayArray113[WorldListCountry.localPlane][var9][var12] & 4) && (Unsorted.aByteArrayArrayArray113[WorldListCountry.localPlane][1 + var9][var12 - 1] & 4) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var23] = Class3_Sub13_Sub29.bitwiseOr(-1845493760, Class3_Sub13_Sub29.bitwiseOr(5373952, var9 + 1)); - Class45.anIntArray729[var23] = Class3_Sub13_Sub29.bitwiseOr(5439488, var12); + TextureOperation38.anIntArray3456[var23] = TextureOperation3.bitwiseOr(-1845493760, TextureOperation3.bitwiseOr(5373952, var9 + 1)); + Class45.anIntArray729[var23] = TextureOperation3.bitwiseOr(5439488, var12); Class158.aByteArrayArrayArray2008[WorldListCountry.localPlane][var9 - -1][var12] = var6; var23 = 4095 & var23 - -1; } @@ -182,8 +182,8 @@ public final class Class140_Sub7 extends GameObject { --var12; if(104 > 1 + var9 && var6 != Class158.aByteArrayArrayArray2008[WorldListCountry.localPlane][var9 - -1][var12]) { - Class3_Sub13_Sub38.anIntArray3456[var23] = Class3_Sub13_Sub29.bitwiseOr(Class3_Sub13_Sub29.bitwiseOr(1 + var9, 9568256), 1392508928); - Class45.anIntArray729[var23] = Class3_Sub13_Sub29.bitwiseOr(var12, 9633792); + TextureOperation38.anIntArray3456[var23] = TextureOperation3.bitwiseOr(TextureOperation3.bitwiseOr(1 + var9, 9568256), 1392508928); + Class45.anIntArray729[var23] = TextureOperation3.bitwiseOr(var12, 9633792); Class158.aByteArrayArrayArray2008[WorldListCountry.localPlane][1 + var9][var12] = var6; var23 = var23 + 1 & 4095; } @@ -191,22 +191,22 @@ public final class Class140_Sub7 extends GameObject { --var12; if(var12 >= 0) { if(0 <= var9 + -1 && Class158.aByteArrayArrayArray2008[WorldListCountry.localPlane][-1 + var9][var12] != var6 && (Unsorted.aByteArrayArrayArray113[WorldListCountry.localPlane][var9][var12] & 4) == 0 && (Unsorted.aByteArrayArrayArray113[WorldListCountry.localPlane][var9 + -1][1 + var12] & 4) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var23] = Class3_Sub13_Sub29.bitwiseOr(Class3_Sub13_Sub29.bitwiseOr(-1 + var9, 13762560), 301989888); - Class45.anIntArray729[var23] = Class3_Sub13_Sub29.bitwiseOr(var12, 13828096); + TextureOperation38.anIntArray3456[var23] = TextureOperation3.bitwiseOr(TextureOperation3.bitwiseOr(-1 + var9, 13762560), 301989888); + Class45.anIntArray729[var23] = TextureOperation3.bitwiseOr(var12, 13828096); Class158.aByteArrayArrayArray2008[WorldListCountry.localPlane][-1 + var9][var12] = var6; var23 = 4095 & var23 - -1; } if(var6 != Class158.aByteArrayArrayArray2008[WorldListCountry.localPlane][var9][var12]) { - Class3_Sub13_Sub38.anIntArray3456[var23] = Class3_Sub13_Sub29.bitwiseOr(Class3_Sub13_Sub29.bitwiseOr(var9, 13762560), -1828716544); - Class45.anIntArray729[var23] = Class3_Sub13_Sub29.bitwiseOr(13828096, var12); + TextureOperation38.anIntArray3456[var23] = TextureOperation3.bitwiseOr(TextureOperation3.bitwiseOr(var9, 13762560), -1828716544); + Class45.anIntArray729[var23] = TextureOperation3.bitwiseOr(13828096, var12); var23 = var23 - -1 & 4095; Class158.aByteArrayArrayArray2008[WorldListCountry.localPlane][var9][var12] = var6; } if(var9 - -1 < 104 && Class158.aByteArrayArrayArray2008[WorldListCountry.localPlane][var9 + 1][var12] != var6 && (4 & Unsorted.aByteArrayArrayArray113[WorldListCountry.localPlane][var9][var12]) == 0 && (Unsorted.aByteArrayArrayArray113[WorldListCountry.localPlane][1 + var9][1 + var12] & 4) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var23] = Class3_Sub13_Sub29.bitwiseOr(-771751936, Class3_Sub13_Sub29.bitwiseOr(var9 - -1, 9568256)); - Class45.anIntArray729[var23] = Class3_Sub13_Sub29.bitwiseOr(9633792, var12); + TextureOperation38.anIntArray3456[var23] = TextureOperation3.bitwiseOr(-771751936, TextureOperation3.bitwiseOr(var9 - -1, 9568256)); + Class45.anIntArray729[var23] = TextureOperation3.bitwiseOr(9633792, var12); Class158.aByteArrayArrayArray2008[WorldListCountry.localPlane][var9 + 1][var12] = var6; var23 = 4095 & 1 + var23; } @@ -249,8 +249,8 @@ public final class Class140_Sub7 extends GameObject { } byte[] var4 = new byte[var3]; - var0.index += Class3_Sub13_Sub9.aClass36_3112.method1017(0, var3, var4, var0.buffer, var0.index); - return Class3_Sub13_Sub3.bufferToString(var4, var3, 0); + var0.index += TextureOperation16.aClass36_3112.method1017(0, var3, var4, var0.buffer, var0.index); + return TextureOperation33.bufferToString(var4, var3, 0); } catch (Exception var6) { return TextCore.aClass94_2018; } diff --git a/Client/src/main/java/org/runite/client/Class143.java b/Client/src/main/java/org/runite/client/Class143.java index f1eb042af..6dd8b7ee5 100644 --- a/Client/src/main/java/org/runite/client/Class143.java +++ b/Client/src/main/java/org/runite/client/Class143.java @@ -18,11 +18,11 @@ public final class Class143 { int var16; for (var16 = var12; var8 > var16; ++var16) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var16], var14, 97, var15, var5); + TextureOperation18.method282(Class38.anIntArrayArray663[var16], var14, 97, var15, var5); } for (var16 = var13; var9 < var16; --var16) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var16], var14, 94, var15, var5); + TextureOperation18.method282(Class38.anIntArrayArray663[var16], var14, 94, var15, var5); } int var10 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var4 + var7, Class101.anInt1425); @@ -30,9 +30,9 @@ public final class Class143 { for (var16 = var8; var9 >= var16; ++var16) { int[] var17 = Class38.anIntArrayArray663[var16]; - Class3_Sub13_Sub23_Sub1.method282(var17, var14, 105, var10, var5); - Class3_Sub13_Sub23_Sub1.method282(var17, var10, 111, var11, var1); - Class3_Sub13_Sub23_Sub1.method282(var17, var11, 109, var15, var5); + TextureOperation18.method282(var17, var14, 105, var10, var5); + TextureOperation18.method282(var17, var10, 111, var11, var1); + TextureOperation18.method282(var17, var11, 109, var15, var5); } } catch (RuntimeException var18) { diff --git a/Client/src/main/java/org/runite/client/Class145.java b/Client/src/main/java/org/runite/client/Class145.java index 37c83f9d2..934205737 100644 --- a/Client/src/main/java/org/runite/client/Class145.java +++ b/Client/src/main/java/org/runite/client/Class145.java @@ -28,7 +28,7 @@ final class Class145 { } else if (1 == var5) { Class102.method1617(var0, var1, var4, var3, var2); } else { - Class3_Sub13_Sub3.method184(var4, var5, var3, var1, var0, var2); + TextureOperation33.method184(var4, var5, var3, var1, var0, var2); } } catch (RuntimeException var8) { @@ -58,7 +58,7 @@ final class Class145 { int var12; if (HDToolKit.highDetail) { if (Unsorted.anIntArrayArrayArray3605 == Class44.anIntArrayArrayArray723) { - var9 = Class3_Sub13_Sub9.anIntArrayArray3115[var3][var4]; + var9 = TextureOperation16.anIntArrayArray3115[var3][var4]; var10 = var9 & 16777215; if (var10 != Unsorted.anInt1244) { Unsorted.anInt1244 = var10; @@ -139,32 +139,32 @@ final class Class145 { } if (var21.aClass126_2240 != null) { - Class3_Sub13_Sub18.method259(var21.aClass126_2240, 0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var3, var4, Class8.method846(0, var3, var4)); + TextureOperation19.method259(var21.aClass126_2240, 0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var3, var4, Class8.method846(0, var3, var4)); } else if (var21.aClass35_2226 != null) { - Class3_Sub21.method395(var21.aClass35_2226, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var3, var4, Class8.method846(0, var3, var4)); + Class3_Sub21.method395(var21.aClass35_2226, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var3, var4, Class8.method846(0, var3, var4)); } var23 = var21.aClass70_2234; if (var23 != null) { if (HDToolKit.highDetail) { if ((var23.anInt1055 & var2.anInt2241) == 0) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3, var4); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3, var4); } else { - Class68.method1263(var23.anInt1055, anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var6, var3, var4); + Class68.method1263(var23.anInt1055, anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var6, var3, var4); } } - var23.aClass140_1049.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var23.anInt1054 - anInt2697, var23.anInt1057 - Unsorted.anInt3657, var23.anInt1045 - Class3_Sub13_Sub30.anInt3363, var23.aLong1048, var5, null); + var23.aClass140_1049.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var23.anInt1054 - anInt2697, var23.anInt1057 - Unsorted.anInt3657, var23.anInt1045 - TextureOperation13.anInt3363, var23.aLong1048, var5, null); } for (var11 = 0; var11 < var21.anInt2223; ++var11) { var25 = var21.aClass25Array2221[var11]; if (var25 != null) { if (HDToolKit.highDetail) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3, var4); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3, var4); } - var25.aClass140_479.animate(var25.anInt496, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var25.anInt482 - anInt2697, var25.anInt489 - Unsorted.anInt3657, var25.anInt484 - Class3_Sub13_Sub30.anInt3363, var25.aLong498, var5, null); + var25.aClass140_479.animate(var25.anInt496, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var25.anInt482 - anInt2697, var25.anInt489 - Unsorted.anInt3657, var25.anInt484 - TextureOperation13.anInt3363, var25.aLong498, var5, null); } } @@ -176,19 +176,19 @@ final class Class145 { var22 = false; if (var2.aClass126_2240 != null) { if (Class8.method846(var6, var3, var4)) { - Class3_Sub13_Sub18.method259(var2.aClass126_2240, var6, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var3, var4, true); + TextureOperation19.method259(var2.aClass126_2240, var6, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var3, var4, true); } else { var22 = true; - if (var2.aClass126_2240.anInt1664 != 12345678 || Class3_Sub13_Sub21.aBoolean3261 && var5 <= Class91.anInt1302) { - Class3_Sub13_Sub18.method259(var2.aClass126_2240, var6, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var3, var4, false); + if (var2.aClass126_2240.anInt1664 != 12345678 || TextureOperation37.aBoolean3261 && var5 <= Class91.anInt1302) { + TextureOperation19.method259(var2.aClass126_2240, var6, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var3, var4, false); } } } else if (var2.aClass35_2226 != null) { if (Class8.method846(var6, var3, var4)) { - Class3_Sub21.method395(var2.aClass35_2226, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var3, var4, true); + Class3_Sub21.method395(var2.aClass35_2226, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var3, var4, true); } else { var22 = true; - Class3_Sub21.method395(var2.aClass35_2226, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var3, var4, false); + Class3_Sub21.method395(var2.aClass35_2226, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var3, var4, false); } } @@ -200,10 +200,10 @@ final class Class145 { } if (HDToolKit.highDetail) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3, var4); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3, var4); } - var24.object.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var24.anInt324 - anInt2697, var24.anInt326 - Unsorted.anInt3657, var24.anInt330 - Class3_Sub13_Sub30.anInt3363, var24.aLong328, var5, null); + var24.object.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var24.anInt324 - anInt2697, var24.anInt326 - Unsorted.anInt3657, var24.anInt330 - TextureOperation13.anInt3363, var24.aLong328, var5, null); if (HDToolKit.highDetail && var24.aBoolean329) { HDToolKit.method1832(var8); } @@ -228,7 +228,7 @@ final class Class145 { } var11 = NPC.anIntArray3997[var10]; - var2.anInt2241 = Class3_Sub13_Sub26.anIntArray3321[var10]; + var2.anInt2241 = TextureOperation35.anIntArray3321[var10]; } if (var26 != null) { @@ -248,24 +248,24 @@ final class Class145 { var2.anInt2232 = 12 - var2.anInt2229; } else { var2.anInt2227 = 9; - var2.anInt2229 = Class3_Sub13_Sub23_Sub1.anIntArray4035[var10]; + var2.anInt2229 = TextureOperation18.anIntArray4035[var10]; var2.anInt2232 = 9 - var2.anInt2229; } if ((var26.anInt1055 & var11) != 0 && Class164_Sub1.method2239(var6, var3, var4, var26.anInt1055)) { if (HDToolKit.highDetail) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3, var4); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3, var4); } - var26.aClass140_1049.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var26.anInt1054 - anInt2697, var26.anInt1057 - Unsorted.anInt3657, var26.anInt1045 - Class3_Sub13_Sub30.anInt3363, var26.aLong1048, var5, null); + var26.aClass140_1049.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var26.anInt1054 - anInt2697, var26.anInt1057 - Unsorted.anInt3657, var26.anInt1045 - TextureOperation13.anInt3363, var26.aLong1048, var5, null); } if ((var26.anInt1059 & var11) != 0 && Class164_Sub1.method2239(var6, var3, var4, var26.anInt1059)) { if (HDToolKit.highDetail) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3, var4); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3, var4); } - var26.aClass140_1052.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var26.anInt1054 - anInt2697, var26.anInt1057 - Unsorted.anInt3657, var26.anInt1045 - Class3_Sub13_Sub30.anInt3363, var26.aLong1048, var5, null); + var26.aClass140_1052.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var26.anInt1054 - anInt2697, var26.anInt1057 - Unsorted.anInt3657, var26.anInt1045 - TextureOperation13.anInt3363, var26.aLong1048, var5, null); } } @@ -276,14 +276,14 @@ final class Class145 { if ((var13.anInt432 & var11) != 0) { if (HDToolKit.highDetail) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3, var4); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3, var4); } - var13.aClass140_429.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var13.anInt424 - anInt2697 + var13.anInt430, var13.anInt425 - Unsorted.anInt3657, var13.anInt427 - Class3_Sub13_Sub30.anInt3363 + var13.anInt426, var13.aLong428, var5, null); + var13.aClass140_429.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var13.anInt424 - anInt2697 + var13.anInt430, var13.anInt425 - Unsorted.anInt3657, var13.anInt427 - TextureOperation13.anInt3363 + var13.anInt426, var13.aLong428, var5, null); } else if (var13.anInt432 == 256) { var14 = var13.anInt424 - anInt2697; var15 = var13.anInt425 - Unsorted.anInt3657; - var16 = var13.anInt427 - Class3_Sub13_Sub30.anInt3363; + var16 = var13.anInt427 - TextureOperation13.anInt3363; var17 = var13.anInt420; if (var17 == 1 || var17 == 2) { var18 = -var14; @@ -300,16 +300,16 @@ final class Class145 { if (var19 < var18) { if (HDToolKit.highDetail) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3, var4); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3, var4); } - var13.aClass140_429.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var14 + var13.anInt430, var15, var16 + var13.anInt426, var13.aLong428, var5, null); + var13.aClass140_429.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var14 + var13.anInt430, var15, var16 + var13.anInt426, var13.aLong428, var5, null); } else if (var13.aClass140_423 != null) { if (HDToolKit.highDetail) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3, var4); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3, var4); } - var13.aClass140_423.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var14, var15, var16, var13.aLong428, var5, null); + var13.aClass140_423.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var14, var15, var16, var13.aLong428, var5, null); } } @@ -326,10 +326,10 @@ final class Class145 { } if (HDToolKit.highDetail) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3, var4); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3, var4); } - var30.object.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var30.anInt324 - anInt2697, var30.anInt326 - Unsorted.anInt3657, var30.anInt330 - Class3_Sub13_Sub30.anInt3363, var30.aLong328, var5, null); + var30.object.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var30.anInt324 - anInt2697, var30.anInt326 - Unsorted.anInt3657, var30.anInt330 - TextureOperation13.anInt3363, var30.aLong328, var5, null); if (HDToolKit.highDetail && var30.aBoolean329) { HDToolKit.method1832(var8); } @@ -338,19 +338,19 @@ final class Class145 { Class72 var28 = var2.aClass72_2245; if (var28 != null && var28.anInt1077 == 0) { if (HDToolKit.highDetail) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3, var4); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3, var4); } if (var28.aClass140_1067 != null) { - var28.aClass140_1067.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var28.anInt1078 - anInt2697, var28.anInt1068 - Unsorted.anInt3657, var28.anInt1075 - Class3_Sub13_Sub30.anInt3363, var28.aLong1079, var5, null); + var28.aClass140_1067.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var28.anInt1078 - anInt2697, var28.anInt1068 - Unsorted.anInt3657, var28.anInt1075 - TextureOperation13.anInt3363, var28.aLong1079, var5, null); } if (var28.aClass140_1069 != null) { - var28.aClass140_1069.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var28.anInt1078 - anInt2697, var28.anInt1068 - Unsorted.anInt3657, var28.anInt1075 - Class3_Sub13_Sub30.anInt3363, var28.aLong1079, var5, null); + var28.aClass140_1069.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var28.anInt1078 - anInt2697, var28.anInt1068 - Unsorted.anInt3657, var28.anInt1075 - TextureOperation13.anInt3363, var28.aLong1079, var5, null); } if (var28.aClass140_1073 != null) { - var28.aClass140_1073.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var28.anInt1078 - anInt2697, var28.anInt1068 - Unsorted.anInt3657, var28.anInt1075 - Class3_Sub13_Sub30.anInt3363, var28.aLong1079, var5, null); + var28.aClass140_1073.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var28.anInt1078 - anInt2697, var28.anInt1068 - Unsorted.anInt3657, var28.anInt1075 - TextureOperation13.anInt3363, var28.aLong1079, var5, null); } } } @@ -406,44 +406,44 @@ final class Class145 { { if ((var23.aLong1048 & 1032192L) == 16384L) { var11 = var23.anInt1054 - anInt2697; - var12 = var23.anInt1045 - Class3_Sub13_Sub30.anInt3363; + var12 = var23.anInt1045 - TextureOperation13.anInt3363; var27 = (int) (var23.aLong1048 >> 20 & 3L); if (var27 == 0) { var11 -= 64; var12 += 64; - if (var12 < var11 && var3 > 0 && var4 < Class3_Sub13_Sub15.anInt3179 - 1) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3 - 1, var4 + 1); + if (var12 < var11 && var3 > 0 && var4 < TextureOperation17.anInt3179 - 1) { + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3 - 1, var4 + 1); break label736; } } else if (var27 == 1) { var11 += 64; var12 += 64; - if (var12 < -var11 && var3 < Unsorted.anInt1234 - 1 && var4 < Class3_Sub13_Sub15.anInt3179 - 1) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3 + 1, var4 + 1); + if (var12 < -var11 && var3 < Unsorted.anInt1234 - 1 && var4 < TextureOperation17.anInt3179 - 1) { + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3 + 1, var4 + 1); break label736; } } else if (var27 == 2) { var11 += 64; var12 -= 64; if (var12 > var11 && var3 < Unsorted.anInt1234 - 1 && var4 > 0) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3 + 1, var4 - 1); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3 + 1, var4 - 1); break label736; } } else { var11 -= 64; var12 -= 64; if (var12 > -var11 && var3 > 0 && var4 > 0) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3 - 1, var4 - 1); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3 - 1, var4 - 1); break label736; } } } - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3, var4); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3, var4); } } - var23.aClass140_1049.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var23.anInt1054 - anInt2697, var23.anInt1057 - Unsorted.anInt3657, var23.anInt1045 - Class3_Sub13_Sub30.anInt3363, var23.aLong1048, var5, null); + var23.aClass140_1049.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var23.anInt1054 - anInt2697, var23.anInt1057 - Unsorted.anInt3657, var23.anInt1045 - TextureOperation13.anInt3363, var23.aLong1048, var5, null); } var2.anInt2227 = 0; @@ -523,9 +523,9 @@ final class Class145 { var12 = var27; } else if (var34.anInt487 == var11) { var15 = var34.anInt482 - anInt2697; - var16 = var34.anInt484 - Class3_Sub13_Sub30.anInt3363; + var16 = var34.anInt484 - TextureOperation13.anInt3363; var17 = Unsorted.aClass25Array4060[var12].anInt482 - anInt2697; - var18 = Unsorted.aClass25Array4060[var12].anInt484 - Class3_Sub13_Sub30.anInt3363; + var18 = Unsorted.aClass25Array4060[var12].anInt484 - TextureOperation13.anInt3363; if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { var12 = var27; } @@ -539,12 +539,12 @@ final class Class145 { Class25 var32 = Unsorted.aClass25Array4060[var12]; var32.anInt490 = Class3_Sub28_Sub1.anInt3539; - if (!Class3_Sub13_Sub11.method222(var6, var32.anInt483, var32.anInt495, var32.anInt478, var32.anInt481, var32.aClass140_479.method1871())) { + if (!TextureOperation1.method222(var6, var32.anInt483, var32.anInt495, var32.anInt478, var32.anInt481, var32.aClass140_479.method1871())) { if (HDToolKit.highDetail) { if ((var32.aLong498 & 1032192L) == 147456L) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3, var4); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3, var4); var14 = var32.anInt482 - anInt2697; - var15 = var32.anInt484 - Class3_Sub13_Sub30.anInt3363; + var15 = var32.anInt484 - TextureOperation13.anInt3363; var16 = (int) (var32.aLong498 >> 20 & 3L); if (var16 != 1 && var16 != 3) { if (var15 > var14) { @@ -558,11 +558,11 @@ final class Class145 { Class68.method1272(var5, var3, var4 + 1, var3 + 1, var4); } } else { - Class68.method1266(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var32.anInt483, var32.anInt478, var32.anInt495, var32.anInt481); + Class68.method1266(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var32.anInt483, var32.anInt478, var32.anInt495, var32.anInt481); } } - var32.aClass140_479.animate(var32.anInt496, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var32.anInt482 - anInt2697, var32.anInt489 - Unsorted.anInt3657, var32.anInt484 - Class3_Sub13_Sub30.anInt3363, var32.aLong498, var5, null); + var32.aClass140_479.animate(var32.anInt496, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var32.anInt482 - anInt2697, var32.anInt489 - Unsorted.anInt3657, var32.anInt484 - TextureOperation13.anInt3363, var32.aLong498, var5, null); } for (var14 = var32.anInt483; var14 <= var32.anInt495; ++var14) { @@ -619,19 +619,19 @@ final class Class145 { Class72 var29 = var2.aClass72_2245; if (var29 != null && var29.anInt1077 != 0) { if (HDToolKit.highDetail) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3, var4); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3, var4); } if (var29.aClass140_1067 != null) { - var29.aClass140_1067.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var29.anInt1078 - anInt2697, var29.anInt1068 - Unsorted.anInt3657 - var29.anInt1077, var29.anInt1075 - Class3_Sub13_Sub30.anInt3363, var29.aLong1079, var5, null); + var29.aClass140_1067.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var29.anInt1078 - anInt2697, var29.anInt1068 - Unsorted.anInt3657 - var29.anInt1077, var29.anInt1075 - TextureOperation13.anInt3363, var29.aLong1079, var5, null); } if (var29.aClass140_1069 != null) { - var29.aClass140_1069.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var29.anInt1078 - anInt2697, var29.anInt1068 - Unsorted.anInt3657 - var29.anInt1077, var29.anInt1075 - Class3_Sub13_Sub30.anInt3363, var29.aLong1079, var5, null); + var29.aClass140_1069.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var29.anInt1078 - anInt2697, var29.anInt1068 - Unsorted.anInt3657 - var29.anInt1077, var29.anInt1075 - TextureOperation13.anInt3363, var29.aLong1079, var5, null); } if (var29.aClass140_1073 != null) { - var29.aClass140_1073.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var29.anInt1078 - anInt2697, var29.anInt1068 - Unsorted.anInt3657 - var29.anInt1077, var29.anInt1075 - Class3_Sub13_Sub30.anInt3363, var29.aLong1079, var5, null); + var29.aClass140_1073.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var29.anInt1078 - anInt2697, var29.anInt1068 - Unsorted.anInt3657 - var29.anInt1077, var29.anInt1075 - TextureOperation13.anInt3363, var29.aLong1079, var5, null); } } @@ -640,14 +640,14 @@ final class Class145 { if (var36 != null && Class166.method2256(var6, var3, var4, var36.aClass140_429.method1871())) { if ((var36.anInt432 & var2.anInt2241) != 0) { if (HDToolKit.highDetail) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3, var4); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3, var4); } - var36.aClass140_429.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var36.anInt424 - anInt2697 + var36.anInt430, var36.anInt425 - Unsorted.anInt3657, var36.anInt427 - Class3_Sub13_Sub30.anInt3363 + var36.anInt426, var36.aLong428, var5, null); + var36.aClass140_429.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var36.anInt424 - anInt2697 + var36.anInt430, var36.anInt425 - Unsorted.anInt3657, var36.anInt427 - TextureOperation13.anInt3363 + var36.anInt426, var36.aLong428, var5, null); } else if (var36.anInt432 == 256) { var11 = var36.anInt424 - anInt2697; var12 = var36.anInt425 - Unsorted.anInt3657; - var27 = var36.anInt427 - Class3_Sub13_Sub30.anInt3363; + var27 = var36.anInt427 - TextureOperation13.anInt3363; var14 = var36.anInt420; if (var14 == 1 || var14 == 2) { var15 = -var11; @@ -663,16 +663,16 @@ final class Class145 { if (var16 >= var15) { if (HDToolKit.highDetail) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3, var4); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3, var4); } - var36.aClass140_429.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var11 + var36.anInt430, var12, var27 + var36.anInt426, var36.aLong428, var5, null); + var36.aClass140_429.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var11 + var36.anInt430, var12, var27 + var36.anInt426, var36.aLong428, var5, null); } else if (var36.aClass140_423 != null) { if (HDToolKit.highDetail) { - Class68.method1268(anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var5, var3, var4); + Class68.method1268(anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var5, var3, var4); } - var36.aClass140_423.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var11, var12, var27, var36.aLong428, var5, null); + var36.aClass140_423.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var11, var12, var27, var36.aLong428, var5, null); } } } @@ -681,18 +681,18 @@ final class Class145 { if (var31 != null) { if ((var31.anInt1059 & var2.anInt2241) != 0 && Class164_Sub1.method2239(var6, var3, var4, var31.anInt1059)) { if (HDToolKit.highDetail) { - Class68.method1263(var31.anInt1059, anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var6, var3, var4); + Class68.method1263(var31.anInt1059, anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var6, var3, var4); } - var31.aClass140_1052.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var31.anInt1054 - anInt2697, var31.anInt1057 - Unsorted.anInt3657, var31.anInt1045 - Class3_Sub13_Sub30.anInt3363, var31.aLong1048, var5, null); + var31.aClass140_1052.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var31.anInt1054 - anInt2697, var31.anInt1057 - Unsorted.anInt3657, var31.anInt1045 - TextureOperation13.anInt3363, var31.aLong1048, var5, null); } if ((var31.anInt1055 & var2.anInt2241) != 0 && Class164_Sub1.method2239(var6, var3, var4, var31.anInt1055)) { if (HDToolKit.highDetail) { - Class68.method1263(var31.anInt1055, anInt2697, Unsorted.anInt3657, Class3_Sub13_Sub30.anInt3363, var6, var3, var4); + Class68.method1263(var31.anInt1055, anInt2697, Unsorted.anInt3657, TextureOperation13.anInt3363, var6, var3, var4); } - var31.aClass140_1049.animate(0, Class60.anInt936, Unsorted.anInt1037, Class3_Sub13_Sub34.anInt3417, anInt3153, var31.anInt1054 - anInt2697, var31.anInt1057 - Unsorted.anInt3657, var31.anInt1045 - Class3_Sub13_Sub30.anInt3363, var31.aLong1048, var5, null); + var31.aClass140_1049.animate(0, Class60.anInt936, Unsorted.anInt1037, TextureOperation25.anInt3417, anInt3153, var31.anInt1054 - anInt2697, var31.anInt1057 - Unsorted.anInt3657, var31.anInt1045 - TextureOperation13.anInt3363, var31.aLong1048, var5, null); } } } @@ -764,7 +764,7 @@ final class Class145 { try { Class29 var2 = (Class29) Class136.aReferenceCache_1772.get(var1); if (var2 == null) { - byte[] var3 = Class3_Sub13_Sub13.aClass153_3154.getFile(16, var1); + byte[] var3 = TextureOperation20.aClass153_3154.getFile(16, var1); { var2 = new Class29(); if (null != var3) { @@ -803,19 +803,19 @@ final class Class145 { int var11; for (var11 = var2; var7 > var11; ++var11) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var11], var6, -91, var1, var3); + TextureOperation18.method282(Class38.anIntArrayArray663[var11], var6, -91, var1, var3); } for (var11 = var4; var8 < var11; --var11) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var11], var6, -113, var1, var3); + TextureOperation18.method282(Class38.anIntArrayArray663[var11], var6, -113, var1, var3); } int var10 = -var5 + var1; for (var11 = var7; var11 <= var8; ++var11) { int[] var12 = Class38.anIntArrayArray663[var11]; - Class3_Sub13_Sub23_Sub1.method282(var12, var6, -111, var9, var3); - Class3_Sub13_Sub23_Sub1.method282(var12, var10, -124, var1, var3); + TextureOperation18.method282(var12, var6, -111, var9, var3); + TextureOperation18.method282(var12, var10, -124, var1, var3); } } catch (RuntimeException var13) { diff --git a/Client/src/main/java/org/runite/client/Class146.java b/Client/src/main/java/org/runite/client/Class146.java index ba5b7d056..d63b81a07 100644 --- a/Client/src/main/java/org/runite/client/Class146.java +++ b/Client/src/main/java/org/runite/client/Class146.java @@ -14,7 +14,7 @@ abstract class Class146 { static void updateInterfacePacketCounter(int packetCounter) { try { - Class113.interfacePacketCounter = packetCounter + 1 & '\uffff'; + Class113.interfacePacketCounter = packetCounter + 1 & 65535; RenderAnimationDefinition.aBoolean402 = true; } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "uc.D(" + packetCounter + ',' + (byte) -25 + ')'); @@ -45,14 +45,14 @@ abstract class Class146 { int var14; int var15; int var29; - for (int var12 = Class3_Sub13_Sub35.anInt3419; var12 < Class3_Sub17.anInt2456; ++var12) { + for (int var12 = TextureOperation22.anInt3419; var12 < Class3_Sub17.anInt2456; ++var12) { Class3_Sub2[][] var13 = Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var12]; for (var14 = Class163_Sub1_Sub1.anInt4006; var14 < Unsorted.anInt67; ++var14) { for (var15 = Unsorted.anInt3603; var15 < Class126.anInt1665; ++var15) { Class3_Sub2 var16 = var13[var14][var15]; if (var16 != null) { - if (Class23.aBooleanArrayArray457[var14 - Class97.anInt1375 + Class3_Sub13_Sub39.anInt3466][var15 - Class145.anInt3340 + Class3_Sub13_Sub39.anInt3466] && (var3 == null || var12 < var4 || var3[var12][var14][var15] != var5)) { + if (Class23.aBooleanArrayArray457[var14 - Class97.anInt1375 + TextureOperation8.anInt3466][var15 - Class145.anInt3340 + TextureOperation8.anInt3466] && (var3 == null || var12 < var4 || var3[var12][var14][var15] != var5)) { var16.aBoolean2222 = true; var16.aBoolean2225 = true; var16.aBoolean2236 = var16.anInt2223 > 0; @@ -105,7 +105,7 @@ abstract class Class146 { if (var22) { Class3_Sub22.method403(); Class3_Sub28_Sub4.method551(-1, 3); - Class3_Sub13_Sub17.aBoolean3207 = true; + TextureOperation23.aBoolean3207 = true; WaterShader.method2254(); Unsorted.anInt1244 = -1; Class145.anInt3072 = -1; @@ -124,7 +124,7 @@ abstract class Class146 { WaterShader.method2253(); } else { - for (var14 = Class3_Sub13_Sub35.anInt3419; var14 < Class3_Sub17.anInt2456; ++var14) { + for (var14 = TextureOperation22.anInt3419; var14 < Class3_Sub17.anInt2456; ++var14) { for (var15 = 0; var15 < Class3_Sub23.aClass3_Sub11ArrayArray2542[var14].length; ++var15) { Class3_Sub11 var25 = Class3_Sub23.aClass3_Sub11ArrayArray2542[var14][var15]; float var33 = 201.5F - 50.0F * (float) var14 - (var25.aBoolean2364 ? 1.0F : 0.5F); @@ -137,7 +137,7 @@ abstract class Class146 { if (var14 == 0 && Unsorted.anInt1137 > 0) { HDToolKit.method1832(101.5F); - Class141.method2038(Class97.anInt1375, Class145.anInt3340, Class3_Sub13_Sub39.anInt3466, Class23.aBooleanArrayArray457); + Class141.method2038(Class97.anInt1375, Class145.anInt3340, TextureOperation8.anInt3466, Class23.aBooleanArrayArray457); } } @@ -154,14 +154,14 @@ abstract class Class146 { Class3_Sub2[][] var27; int var34; int var32; - for (var23 = Class3_Sub13_Sub35.anInt3419; var23 < Class3_Sub17.anInt2456; ++var23) { + for (var23 = TextureOperation22.anInt3419; var23 < Class3_Sub17.anInt2456; ++var23) { var27 = Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var23]; - for (var15 = -Class3_Sub13_Sub39.anInt3466; var15 <= 0; ++var15) { + for (var15 = -TextureOperation8.anInt3466; var15 <= 0; ++var15) { var32 = Class97.anInt1375 + var15; var29 = Class97.anInt1375 - var15; if (var32 >= Class163_Sub1_Sub1.anInt4006 || var29 < Unsorted.anInt67) { - for (var34 = -Class3_Sub13_Sub39.anInt3466; var34 <= 0; ++var34) { + for (var34 = -TextureOperation8.anInt3466; var34 <= 0; ++var34) { var19 = Class145.anInt3340 + var34; var20 = Class145.anInt3340 - var34; if (var32 >= Class163_Sub1_Sub1.anInt4006) { @@ -198,7 +198,7 @@ abstract class Class146 { if (anInt3 == 0) { if (!var22) { - Class3_Sub13_Sub21.aBoolean3261 = false; + TextureOperation37.aBoolean3261 = false; } return; @@ -208,14 +208,14 @@ abstract class Class146 { } } - for (var23 = Class3_Sub13_Sub35.anInt3419; var23 < Class3_Sub17.anInt2456; ++var23) { + for (var23 = TextureOperation22.anInt3419; var23 < Class3_Sub17.anInt2456; ++var23) { var27 = Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var23]; - for (var15 = -Class3_Sub13_Sub39.anInt3466; var15 <= 0; ++var15) { + for (var15 = -TextureOperation8.anInt3466; var15 <= 0; ++var15) { var32 = Class97.anInt1375 + var15; var29 = Class97.anInt1375 - var15; if (var32 >= Class163_Sub1_Sub1.anInt4006 || var29 < Unsorted.anInt67) { - for (var34 = -Class3_Sub13_Sub39.anInt3466; var34 <= 0; ++var34) { + for (var34 = -TextureOperation8.anInt3466; var34 <= 0; ++var34) { var19 = Class145.anInt3340 + var34; var20 = Class145.anInt3340 - var34; if (var32 >= Class163_Sub1_Sub1.anInt4006) { @@ -252,7 +252,7 @@ abstract class Class146 { if (anInt3 == 0) { if (!var22) { - Class3_Sub13_Sub21.aBoolean3261 = false; + TextureOperation37.aBoolean3261 = false; } return; @@ -262,7 +262,7 @@ abstract class Class146 { } } - Class3_Sub13_Sub21.aBoolean3261 = false; + TextureOperation37.aBoolean3261 = false; } abstract int method2078(); diff --git a/Client/src/main/java/org/runite/client/Class15.java b/Client/src/main/java/org/runite/client/Class15.java index 7662bca19..c8d9d6f7e 100644 --- a/Client/src/main/java/org/runite/client/Class15.java +++ b/Client/src/main/java/org/runite/client/Class15.java @@ -3,12 +3,12 @@ package org.runite.client; import java.util.Calendar; import java.util.Date; -final class Class15 implements Runnable { +public final class Class15 implements Runnable { static short[][] aShortArrayArray344; static int anInt4034 = -8 + (int) (17.0D * Math.random()); static boolean aBoolean346; - static int[] localNPCIndexes = new int['\u8000']; + public static int[] localNPCIndexes = new int[32768]; static Class64 aClass64_351; volatile boolean aBoolean345 = false; Signlink aClass87_350; @@ -82,7 +82,7 @@ final class Class15 implements Runnable { int var8 = var1.readUnsignedByte(); int var9 = var1.readUnsignedByte(); - int var10 = -Class3_Sub13_Sub21.anInt3256 + var8 * 64; + int var10 = -TextureOperation37.anInt3256 + var8 * 64; int var11 = -1 + Class108.anInt1460 - var9 * 64 + Unsorted.anInt65; if (var10 >= 0 && 0 <= -63 + var11 && Class23.anInt455 > var10 - -63 && var11 < Class108.anInt1460) { for (var12 = 0; var12 < 64; ++var12) { @@ -128,7 +128,7 @@ final class Class15 implements Runnable { var15 = var12 + -5; if (var15 >= 0) { - var35 = var4[var15][var34] & 255; + var35 = var4[var15][var34] & 0xFF; if (0 < var35) { MapUnderlayColorDefinition var17 = Class158_Sub1.method629(-1 + var35); var28[var34] -= var17.anInt1408; @@ -212,7 +212,7 @@ final class Class15 implements Runnable { int[] var5 = new int[var3]; for (int var6 = 0; var6 < var3; ++var6) { - var5[var6] = Class3_Sub13_Sub38.spritePalette[Unsorted.bitwiseAnd(255, var4[var6])]; + var5[var6] = TextureOperation38.spritePalette[Unsorted.bitwiseAnd(255, var4[var6])]; } if (HDToolKit.highDetail) { @@ -248,14 +248,14 @@ final class Class15 implements Runnable { static int[][] method895(int var4) { try { int[][] var9 = new int[256][64]; - Class3_Sub13_Sub4 var10 = new Class3_Sub13_Sub4(); + TextureOperation34 var10 = new TextureOperation34(); var10.anInt3062 = (int) ((float) 0.4 * 4096.0F); var10.anInt3058 = 3; var10.anInt3056 = 4; var10.aBoolean3065 = false; var10.anInt3060 = 8; var10.method158(16251); - Class3_Sub13_Sub3.method180(122, 256, 64); + TextureOperation33.method180(122, 256, 64); for (int var11 = 0; var11 < 256; ++var11) { var10.method186(var11, var9[var11]); diff --git a/Client/src/main/java/org/runite/client/Class151_Sub1.java b/Client/src/main/java/org/runite/client/Class151_Sub1.java index a51cf0f81..787b27bdf 100644 --- a/Client/src/main/java/org/runite/client/Class151_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class151_Sub1.java @@ -362,12 +362,12 @@ final class Class151_Sub1 extends ResourceProvider { if (var4 instanceof CacheResourceRequest) { try { if (var5 != null && var5.length > 2) { - Class3_Sub13_Sub12.CRC32.reset(); - Class3_Sub13_Sub12.CRC32.update(var5, 0, -2 + var5.length); - expectedCRC = (int) Class3_Sub13_Sub12.CRC32.getValue(); + TextureOperation24.CRC32.reset(); + TextureOperation24.CRC32.update(var5, 0, -2 + var5.length); + expectedCRC = (int) TextureOperation24.CRC32.getValue(); if (this.table.archiveCRCs[archiveIndex] == expectedCRC) { - int var8 = (var5[-2 + var5.length] << 8 & '\uff00') - -(255 & var5[-1 + var5.length]); - if (('\uffff' & this.table.archiveRevisions[archiveIndex]) == var8) { + int var8 = (var5[-2 + var5.length] << 8 & 65280) - -(255 & var5[-1 + var5.length]); + if ((65535 & this.table.archiveRevisions[archiveIndex]) == var8) { if (1 != this.aByteArray2949[archiveIndex]) { ++this.anInt2948; @@ -417,13 +417,13 @@ final class Class151_Sub1 extends ResourceProvider { throw new RuntimeException(); } - Class3_Sub13_Sub12.CRC32.reset(); - Class3_Sub13_Sub12.CRC32.update(var5, 0, var5.length - 2); - expectedCRC = (int) Class3_Sub13_Sub12.CRC32.getValue(); + TextureOperation24.CRC32.reset(); + TextureOperation24.CRC32.update(var5, 0, var5.length - 2); + expectedCRC = (int) TextureOperation24.CRC32.getValue(); if (expectedCRC != this.table.archiveCRCs[archiveIndex]) { - Class3_Sub13_Sub12.CRC32.reset(); - Class3_Sub13_Sub12.CRC32.update(var5, 0, var5.length - 4); - expectedCRC = (int) Class3_Sub13_Sub12.CRC32.getValue(); + TextureOperation24.CRC32.reset(); + TextureOperation24.CRC32.update(var5, 0, var5.length - 4); + expectedCRC = (int) TextureOperation24.CRC32.getValue(); if (expectedCRC != this.table.archiveCRCs[archiveIndex]) { throw new RuntimeException("CRC mismatch - [found=" + this.table.archiveCRCs[archiveIndex] + ", expected=" + expectedCRC + "]!"); diff --git a/Client/src/main/java/org/runite/client/Class155.java b/Client/src/main/java/org/runite/client/Class155.java index 320e7b197..4ead4d314 100644 --- a/Client/src/main/java/org/runite/client/Class155.java +++ b/Client/src/main/java/org/runite/client/Class155.java @@ -51,7 +51,7 @@ class Class155 { } } - if (var2 < Unsorted.anInt1234 && var3 < Class3_Sub13_Sub15.anInt3179) { + if (var2 < Unsorted.anInt1234 && var3 < TextureOperation17.anInt3179) { var4 = Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var1][var2 + 1][var3 + 1]; if (var4 != null && var4.aClass12_2230 != null && var4.aClass12_2230.object.method1865()) { var0.method1866(var4.aClass12_2230.object, 128, 0, 128, true); diff --git a/Client/src/main/java/org/runite/client/Class155_Sub1.java b/Client/src/main/java/org/runite/client/Class155_Sub1.java index 93f6031f9..058853164 100644 --- a/Client/src/main/java/org/runite/client/Class155_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class155_Sub1.java @@ -29,7 +29,7 @@ final class Class155_Sub1 extends Class155 { } final void method2150(int var1) throws Exception { - if(var1 > '\u8000') { + if(var1 > 32768) { throw new IllegalArgumentException(); } else { anInterface1_2970.method3(this.anInt2969, 25349, var1); diff --git a/Client/src/main/java/org/runite/client/Class158.java b/Client/src/main/java/org/runite/client/Class158.java index 3d3772f42..5a75ccde5 100644 --- a/Client/src/main/java/org/runite/client/Class158.java +++ b/Client/src/main/java/org/runite/client/Class158.java @@ -16,7 +16,7 @@ public abstract class Class158 { static void method2180(CacheIndex var0, CacheIndex var1) { Unsorted.aClass153_4048 = var0; - Class3_Sub13_Sub18.aClass153_3214 = var1; + TextureOperation19.aClass153_3214 = var1; } static void method2183(int parent, boolean notifyScripts, int parentWidth, int parentHeight, RSInterface[] ifaces) { @@ -80,7 +80,7 @@ public abstract class Class158 { } - abstract void method2179(Graphics var3); + public abstract void method2179(Graphics var3); final void method2182() { Class74.setBuffer(this.anIntArray2007, this.anInt2012, this.anInt2011); diff --git a/Client/src/main/java/org/runite/client/Class158_Sub1.java b/Client/src/main/java/org/runite/client/Class158_Sub1.java index d63d6fb87..8d5ca6645 100644 --- a/Client/src/main/java/org/runite/client/Class158_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class158_Sub1.java @@ -283,7 +283,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv for(var11 = 0; 104 > var11; ++var11) { var37 = var10 - -5; if(var37 < 104) { - var13 = 255 & Class3_Sub13_Sub36.aByteArrayArrayArray3430[var8][var37][var11]; + var13 = 255 & TextureOperation36.aByteArrayArrayArray3430[var8][var37][var11]; if(var13 > 0) { MapUnderlayColorDefinition var39 = method629(-1 + var13); Class129.anIntArray1695[var11] += var39.anInt1408; @@ -296,7 +296,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv var13 = -5 + var10; if(0 <= var13) { - var14 = 255 & Class3_Sub13_Sub36.aByteArrayArrayArray3430[var8][var13][var11]; + var14 = 255 & TextureOperation36.aByteArrayArrayArray3430[var8][var13][var11]; if(var14 > 0) { MapUnderlayColorDefinition var42 = method629(-1 + var14); Class129.anIntArray1695[var11] -= var42.anInt1408; @@ -349,8 +349,8 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv Class85.anInt1174 = var8; } - var37 = 255 & Class3_Sub13_Sub36.aByteArrayArrayArray3430[var8][var10][var11]; - var13 = aByteArrayArrayArray1828[var8][var10][var11] & 255; + var37 = 255 & TextureOperation36.aByteArrayArrayArray3430[var8][var10][var11]; + var13 = aByteArrayArrayArray1828[var8][var10][var11] & 0xFF; if(0 < var37 || var13 > 0) { var15 = Class44.anIntArrayArrayArray723[var8][var10 + 1][var11]; var14 = Class44.anIntArrayArrayArray723[var8][var10][var11]; @@ -362,12 +362,12 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv var47 = false; } - if(var13 > 0 && !Class3_Sub13_Sub37.method350((byte)-73, var13 + -1).aBoolean2102) { + if(var13 > 0 && !TextureOperation10.method350((byte)-73, var13 + -1).aBoolean2102) { var47 = false; } if(var47 && var14 == var15 && var16 == var14 && var14 == var44) { - Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var11] = Class3_Sub13_Sub29.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var11], 4); + Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var11] = TextureOperation3.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var11], 4); } } @@ -399,15 +399,15 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv 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]); } - if(HDToolKit.highDetail && !var1 && Class3_Sub13_Sub9.anIntArrayArray3115 != null && 0 == var8) { + if(HDToolKit.highDetail && !var1 && TextureOperation16.anIntArrayArray3115 != null && 0 == var8) { for(var24 = var10 + -1; var10 - -1 >= var24; ++var24) { for(int var52 = -1 + var11; var52 <= 1 + var11; ++var52) { if((var24 != var10 || var11 != var52) && var24 >= 0 && var24 < 104 && 0 <= var52 && var52 < 104) { - int var54 = aByteArrayArrayArray1828[var8][var24][var52] & 255; + int var54 = aByteArrayArrayArray1828[var8][var24][var52] & 0xFF; if(var54 != 0) { - Class168 var53 = Class3_Sub13_Sub37.method350((byte)-25, -1 + var54); + Class168 var53 = TextureOperation10.method350((byte)-25, -1 + var54); if(var53.anInt2095 != -1 && 4 == Class51.anInterface2_838.method18(var53.anInt2095, 255)) { - Class3_Sub13_Sub9.anIntArrayArray3115[var10][var11] = var53.anInt2094 + (var53.anInt2101 << 24); + TextureOperation16.anIntArrayArray3115[var10][var11] = var53.anInt2094 + (var53.anInt2101 << 24); continue label754; } } @@ -418,23 +418,23 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv } else { var24 = 1 + Unsorted.aByteArrayArrayArray1328[var8][var10][var11]; byte var25 = PacketParser.aByteArrayArrayArray81[var8][var10][var11]; - Class168 var26 = Class3_Sub13_Sub37.method350((byte)-105, var13 + -1); + Class168 var26 = TextureOperation10.method350((byte)-105, var13 + -1); int var27; int var29; int var28; - if(HDToolKit.highDetail && !var1 && null != Class3_Sub13_Sub9.anIntArrayArray3115 && 0 == var8) { + if(HDToolKit.highDetail && !var1 && null != TextureOperation16.anIntArrayArray3115 && 0 == var8) { if(-1 != var26.anInt2095 && Class51.anInterface2_838.method18(var26.anInt2095, 255) == 4) { - Class3_Sub13_Sub9.anIntArrayArray3115[var10][var11] = (var26.anInt2101 << 24) + var26.anInt2094; + TextureOperation16.anIntArrayArray3115[var10][var11] = (var26.anInt2101 << 24) + var26.anInt2094; } else { label722: for(var27 = var10 + -1; 1 + var10 >= var27; ++var27) { for(var28 = var11 + -1; 1 + var11 >= var28; ++var28) { if((var27 != var10 || var11 != var28) && var27 >= 0 && var27 < 104 && var28 >= 0 && var28 < 104) { - var29 = aByteArrayArrayArray1828[var8][var27][var28] & 255; + var29 = aByteArrayArrayArray1828[var8][var27][var28] & 0xFF; if(var29 != 0) { - Class168 var30 = Class3_Sub13_Sub37.method350((byte)-14, -1 + var29); + Class168 var30 = TextureOperation10.method350((byte)-14, -1 + var29); if(var30.anInt2095 != -1 && Class51.anInterface2_838.method18(var30.anInt2095, 255) == 4) { - Class3_Sub13_Sub9.anIntArrayArray3115[var10][var11] = var30.anInt2094 + (var30.anInt2101 << 24); + TextureOperation16.anIntArrayArray3115[var10][var11] = var30.anInt2094 + (var30.anInt2101 << 24); break label722; } } @@ -471,7 +471,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv } } else { var28 = -1; - var29 = Class51.anIntArray834[LinkableRSString.method729((byte)-126, Class51.anInterface2_838.method15(var27, '\uffff'), 96)]; + var29 = Class51.anIntArray834[LinkableRSString.method729((byte)-126, Class51.anInterface2_838.method15(var27, 65535), 96)]; } if(var26.anInt2098 >= 0) { @@ -518,11 +518,11 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv Class3_Sub11[] var50; if(var1) { - var50 = Class3_Sub13_Sub27.method298(Unsorted.aByteArrayArrayArray113, Unsorted.aByteArrayArrayArray1328[var8], Class3_Sub13_Sub36.aByteArrayArrayArray3430[var8], var35, var40, Class3_Sub13_Sub9.anIntArrayArray3115, aByteArrayArrayArray1828[var8], PacketParser.aByteArrayArrayArray81[var8], var38, var8, var43, var34, Class44.anIntArrayArrayArray723[var8], Class58.anIntArrayArrayArray914[0]); + var50 = TextureOperation7.method298(Unsorted.aByteArrayArrayArray113, Unsorted.aByteArrayArrayArray1328[var8], TextureOperation36.aByteArrayArrayArray3430[var8], var35, var40, TextureOperation16.anIntArrayArray3115, aByteArrayArrayArray1828[var8], PacketParser.aByteArrayArrayArray81[var8], var38, var8, var43, var34, Class44.anIntArrayArrayArray723[var8], Class58.anIntArrayArrayArray914[0]); Class61.method1213(var8, var50); } else { - var50 = Class3_Sub13_Sub27.method298(Unsorted.aByteArrayArrayArray113, Unsorted.aByteArrayArrayArray1328[var8], Class3_Sub13_Sub36.aByteArrayArrayArray3430[var8], var35, var40, null, aByteArrayArrayArray1828[var8], PacketParser.aByteArrayArrayArray81[var8], var38, var8, var43, var34, Class44.anIntArrayArrayArray723[var8], null); - Class3_Sub11[] var46 = Class1.method70(var40, var38, Class44.anIntArrayArrayArray723[var8], var8, var43, PacketParser.aByteArrayArrayArray81[var8], var35, Unsorted.aByteArrayArrayArray1328[var8], Class3_Sub13_Sub36.aByteArrayArrayArray3430[var8], aByteArrayArrayArray1828[var8], Unsorted.aByteArrayArrayArray113); + var50 = TextureOperation7.method298(Unsorted.aByteArrayArrayArray113, Unsorted.aByteArrayArrayArray1328[var8], TextureOperation36.aByteArrayArrayArray3430[var8], var35, var40, null, aByteArrayArrayArray1828[var8], PacketParser.aByteArrayArrayArray81[var8], var38, var8, var43, var34, Class44.anIntArrayArrayArray723[var8], null); + Class3_Sub11[] var46 = Class1.method70(var40, var38, Class44.anIntArrayArrayArray723[var8], var8, var43, PacketParser.aByteArrayArrayArray81[var8], var35, Unsorted.aByteArrayArrayArray1328[var8], TextureOperation36.aByteArrayArrayArray3430[var8], aByteArrayArrayArray1828[var8], Unsorted.aByteArrayArrayArray113); Class3_Sub11[] var49 = new Class3_Sub11[var50.length - -var46.length]; for(var44 = 0; var44 < var50.length; ++var44) { @@ -534,11 +534,11 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv } Class61.method1213(var8, var49); - Class129.method1769(var43, Class3_Sub13_Sub36.aByteArrayArrayArray3430[var8], PacketParser.aByteArrayArrayArray81[var8], Class68.aClass43Array1021, var8, Class68.anInt1032, var40, Unsorted.aByteArrayArrayArray1328[var8], aByteArrayArrayArray1828[var8], Class44.anIntArrayArrayArray723[var8], var38); + Class129.method1769(var43, TextureOperation36.aByteArrayArrayArray3430[var8], PacketParser.aByteArrayArrayArray81[var8], Class68.aClass43Array1021, var8, Class68.anInt1032, var40, Unsorted.aByteArrayArrayArray1328[var8], aByteArrayArrayArray1828[var8], Class44.anIntArrayArrayArray723[var8], var38); } } - Class3_Sub13_Sub36.aByteArrayArrayArray3430[var8] = null; + TextureOperation36.aByteArrayArrayArray3430[var8] = null; aByteArrayArrayArray1828[var8] = null; Unsorted.aByteArrayArrayArray1328[var8] = null; PacketParser.aByteArrayArrayArray81[var8] = null; @@ -749,7 +749,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv byte var14 = 0; boolean var16 = false; int var15 = 0; - Class3_Sub13_Sub38.anIntArray3456[var14] = var2; + TextureOperation38.anIntArray3456[var14] = var2; int var27 = var14 + 1; Class45.anIntArray729[var14] = var10; int[][] var17 = AtmosphereParser.aClass91Array1182[WorldListCountry.localPlane].anIntArrayArray1304; @@ -757,7 +757,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv int var18; while(var15 != var27) { var13 = Class45.anIntArray729[var15]; - var12 = Class3_Sub13_Sub38.anIntArray3456[var15]; + var12 = TextureOperation38.anIntArray3456[var15]; var15 = 4095 & var15 + 1; if(var12 == var0 && var13 == var4) { var16 = true; @@ -783,7 +783,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv var18 = 1 + Class97.anIntArrayArray1373[var12][var13]; if(0 < var12 && Class84.anIntArrayArray1160[var12 + -1][var13] == 0 && (19661064 & var17[var12 + -1][var13]) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var27] = -1 + var12; + TextureOperation38.anIntArray3456[var27] = -1 + var12; Class45.anIntArray729[var27] = var13; var27 = var27 - -1 & 4095; Class84.anIntArrayArray1160[-1 + var12][var13] = 2; @@ -791,7 +791,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv } if(103 > var12 && Class84.anIntArrayArray1160[var12 + 1][var13] == 0 && (var17[var12 + 1][var13] & 19661184) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var27] = var12 - -1; + TextureOperation38.anIntArray3456[var27] = var12 - -1; Class45.anIntArray729[var27] = var13; var27 = 1 + var27 & 4095; Class84.anIntArrayArray1160[var12 - -1][var13] = 8; @@ -799,7 +799,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv } if(var13 > 0 && Class84.anIntArrayArray1160[var12][var13 - 1] == 0 && (19661058 & var17[var12][-1 + var13]) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var27] = var12; + TextureOperation38.anIntArray3456[var27] = var12; Class45.anIntArray729[var27] = -1 + var13; Class84.anIntArrayArray1160[var12][var13 - 1] = 1; var27 = var27 + 1 & 4095; @@ -807,7 +807,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv } if(103 > var13 && Class84.anIntArrayArray1160[var12][1 + var13] == 0 && (19661088 & var17[var12][var13 + 1]) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var27] = var12; + TextureOperation38.anIntArray3456[var27] = var12; Class45.anIntArray729[var27] = var13 - -1; var27 = 1 + var27 & 4095; Class84.anIntArrayArray1160[var12][1 + var13] = 4; @@ -815,7 +815,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv } if(var12 > 0 && var13 > 0 && Class84.anIntArrayArray1160[-1 + var12][var13 - 1] == 0 && (var17[var12 - 1][-1 + var13] & 19661070) == 0 && (19661064 & var17[var12 - 1][var13]) == 0 && (19661058 & var17[var12][-1 + var13]) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var27] = -1 + var12; + TextureOperation38.anIntArray3456[var27] = -1 + var12; Class45.anIntArray729[var27] = var13 + -1; var27 = 1 + var27 & 4095; Class84.anIntArrayArray1160[-1 + var12][-1 + var13] = 3; @@ -823,7 +823,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv } if(var12 < 103 && 0 < var13 && Class84.anIntArrayArray1160[var12 - -1][var13 - 1] == 0 && 0 == (19661187 & var17[var12 - -1][-1 + var13]) && (19661184 & var17[var12 - -1][var13]) == 0 && (19661058 & var17[var12][-1 + var13]) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var27] = var12 + 1; + TextureOperation38.anIntArray3456[var27] = var12 + 1; Class45.anIntArray729[var27] = -1 + var13; var27 = 4095 & var27 + 1; Class84.anIntArrayArray1160[1 + var12][var13 + -1] = 9; @@ -831,7 +831,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv } if(0 < var12 && var13 < 103 && 0 == Class84.anIntArrayArray1160[var12 + -1][var13 + 1] && 0 == (19661112 & var17[var12 + -1][1 + var13]) && 0 == (var17[var12 + -1][var13] & 19661064) && (19661088 & var17[var12][1 + var13]) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var27] = var12 - 1; + TextureOperation38.anIntArray3456[var27] = var12 - 1; Class45.anIntArray729[var27] = 1 + var13; Class84.anIntArrayArray1160[-1 + var12][var13 - -1] = 6; var27 = 4095 & 1 + var27; @@ -839,7 +839,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv } if(var12 < 103 && var13 < 103 && Class84.anIntArrayArray1160[var12 - -1][1 + var13] == 0 && (19661280 & var17[1 + var12][var13 + 1]) == 0 && (var17[1 + var12][var13] & 19661184) == 0 && (19661088 & var17[var12][var13 - -1]) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var27] = var12 + 1; + TextureOperation38.anIntArray3456[var27] = var12 + 1; Class45.anIntArray729[var27] = var13 - -1; Class84.anIntArrayArray1160[var12 + 1][1 + var13] = 12; var27 = var27 - -1 & 4095; @@ -900,14 +900,14 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv } byte var28 = 0; - Class3_Sub13_Sub38.anIntArray3456[var28] = var12; + TextureOperation38.anIntArray3456[var28] = var12; var15 = var28 + 1; Class45.anIntArray729[var28] = var13; for(var18 = var19 = Class84.anIntArrayArray1160[var12][var13]; var2 != var12 || var13 != var10; var18 = Class84.anIntArrayArray1160[var12][var13]) { if(var19 != var18) { var19 = var18; - Class3_Sub13_Sub38.anIntArray3456[var15] = var12; + TextureOperation38.anIntArray3456[var15] = var12; Class45.anIntArray729[var15++] = var13; } @@ -929,7 +929,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv } if(var15 > 0) { - Class3_Sub13_Sub27.method299(100, var15, var5); + TextureOperation7.method299(100, var15, var5); return true; } else return var5 != 1; } catch (RuntimeException var26) { @@ -937,9 +937,8 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv } } - final void method2179(Graphics var3) { + public final void method2179(Graphics var3) { try { - this.method2190(); var3.drawImage(this.anImage2009, 0, 0, this); } catch (RuntimeException var6) { @@ -952,7 +951,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv this.anInt2011 = var1; this.anIntArray2007 = new int[var3 * var1 + 1]; this.anInt2012 = var3; - this.aColorModel2979 = new DirectColorModel(32, 16711680, '\uff00', 255); + this.aColorModel2979 = new DirectColorModel(32, 16711680, 65280, 255); this.anImage2009 = var4.createImage(this); this.method2190(); var4.prepareImage(this.anImage2009, this); diff --git a/Client/src/main/java/org/runite/client/Class158_Sub2.java b/Client/src/main/java/org/runite/client/Class158_Sub2.java index 8b7034f69..bb8313117 100644 --- a/Client/src/main/java/org/runite/client/Class158_Sub2.java +++ b/Client/src/main/java/org/runite/client/Class158_Sub2.java @@ -15,7 +15,7 @@ public final class Class158_Sub2 extends Class158 { private Component aComponent2983; - final void method2179(Graphics var3) { + public final void method2179(Graphics var3) { var3.drawImage(this.anImage2009, 0, 0, this.aComponent2983); } @@ -24,7 +24,7 @@ public final class Class158_Sub2 extends Class158 { this.anInt2011 = var1; this.anInt2012 = var3; DataBufferInt var5 = new DataBufferInt(this.anIntArray2007, this.anIntArray2007.length); - DirectColorModel var6 = new DirectColorModel(32, 16711680, '\uff00', 255); + DirectColorModel var6 = new DirectColorModel(32, 16711680, 65280, 255); WritableRaster var7 = Raster.createWritableRaster(var6.createCompatibleSampleModel(this.anInt2012, this.anInt2011), var5, null); this.anImage2009 = new BufferedImage(var6, var7, false, new Hashtable<>()); this.aComponent2983 = var4; diff --git a/Client/src/main/java/org/runite/client/Class159.java b/Client/src/main/java/org/runite/client/Class159.java index c045de409..4276d1c5f 100644 --- a/Client/src/main/java/org/runite/client/Class159.java +++ b/Client/src/main/java/org/runite/client/Class159.java @@ -2,13 +2,13 @@ package org.runite.client; import org.rs09.client.data.ReferenceCache; -final class Class159 { +public final class Class159 { static ReferenceCache aReferenceCache_2016 = new ReferenceCache(100); static int[] anIntArray2017 = new int[]{1, 2, 4, 8}; static int anInt2020 = 0; static int[] anIntArray2021 = new int[2]; - static int localPlayerCount = 0; + public static int localPlayerCount = 0; static int anInt2023 = 0; static int anInt2024 = 0; static int[] anIntArray1681; @@ -57,7 +57,7 @@ final class Class159 { if (Class161.anIntArray2026.length < Class72.anInt1071) { Class72.anInt1071 -= Class161.anIntArray2026.length; var3 = (int) (12.0D * Math.random()); - Class3_Sub13_Sub10.method215((byte) -119, Class163_Sub2_Sub1.aClass109_Sub1Array4027[var3]); + TextureOperation30.method215((byte) -119, Class163_Sub2_Sub1.aClass109_Sub1Array4027[var3]); } var3 = 0; diff --git a/Client/src/main/java/org/runite/client/Class161.java b/Client/src/main/java/org/runite/client/Class161.java index 991438f4b..78762be4d 100644 --- a/Client/src/main/java/org/runite/client/Class161.java +++ b/Client/src/main/java/org/runite/client/Class161.java @@ -1,10 +1,10 @@ package org.runite.client; -final class Class161 { +public final class Class161 { static int[] anIntArray2026; static int anInt2027 = -1; - static int anInt2028 = 0; + public static int anInt2028 = 0; static Class33 aClass33_2034; static RSString aClass94_2035 = null; @@ -46,9 +46,9 @@ final class Class161 { int var36 = (-1 + var6) * var27; int[] var39 = Class38.anIntArrayArray663[var2]; - Class3_Sub13_Sub23_Sub1.method282(var39, -var4 + var1, -87, -var11 + var1, var3); - Class3_Sub13_Sub23_Sub1.method282(var39, -var11 + var1, -66, var1 - -var11, var0); - Class3_Sub13_Sub23_Sub1.method282(var39, var1 - -var11, -68, var4 + var1, var3); + TextureOperation18.method282(var39, -var4 + var1, -87, -var11 + var1, var3); + TextureOperation18.method282(var39, -var11 + var1, -66, var1 - -var11, var0); + TextureOperation18.method282(var39, var1 - -var11, -68, var4 + var1, var3); while (var9 > 0) { if (var23 < 0) { @@ -107,15 +107,15 @@ final class Class161 { if (var40) { int var45 = var1 + var10; int var46 = -var10 + var1; - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var41], var44, -93, var46, var3); - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var41], var46, 121, var45, var0); - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var41], var45, -47, var43, var3); - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var42], var44, 124, var46, var3); - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var42], var46, -73, var45, var0); - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var42], var45, 111, var43, var3); + TextureOperation18.method282(Class38.anIntArrayArray663[var41], var44, -93, var46, var3); + TextureOperation18.method282(Class38.anIntArrayArray663[var41], var46, 121, var45, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var41], var45, -47, var43, var3); + TextureOperation18.method282(Class38.anIntArrayArray663[var42], var44, 124, var46, var3); + TextureOperation18.method282(Class38.anIntArrayArray663[var42], var46, -73, var45, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var42], var45, 111, var43, var3); } else { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var41], var44, 96, var43, var3); - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var42], var44, 124, var43, var3); + TextureOperation18.method282(Class38.anIntArrayArray663[var41], var44, 96, var43, var3); + TextureOperation18.method282(Class38.anIntArrayArray663[var42], var44, 124, var43, var3); } } diff --git a/Client/src/main/java/org/runite/client/Class163.java b/Client/src/main/java/org/runite/client/Class163.java index 5554d6ae6..d3774b46f 100644 --- a/Client/src/main/java/org/runite/client/Class163.java +++ b/Client/src/main/java/org/runite/client/Class163.java @@ -4,11 +4,11 @@ import org.rs09.client.data.NodeCache; import java.util.Objects; -class Class163 { +public class Class163 { static NodeCache aClass47_2041 = new NodeCache(64); static int[] anIntArray2043 = new int[]{8, 11, 4, 6, 9, 7, 10, 0}; - static int localNPCCount = 0; + public static int localNPCCount = 0; static void method2209(byte var0, int var1, int var2) { @@ -27,7 +27,7 @@ class Class163 { } var7 <<= var5; - Class3_Sub13_Sub23.method281(var1 << var5 & var7 | ~var7 & Class57.varpArray[var4], var4); + TextureOperation39.method281(var1 << var5 & var7 | ~var7 & Class57.varpArray[var4], var4); } catch (RuntimeException var8) { throw ClientErrorException.clientError(var8, "wd.K(" + var0 + ',' + var1 + ',' + var2 + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class163_Sub1.java b/Client/src/main/java/org/runite/client/Class163_Sub1.java index d161dd791..e4c08911e 100644 --- a/Client/src/main/java/org/runite/client/Class163_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class163_Sub1.java @@ -18,14 +18,14 @@ public class Class163_Sub1 extends Class163 { try { Class58.method1194(); if(30 == Class143.gameStage || Class143.gameStage == 25) { - ++Class3_Sub13_Sub23_Sub1.anInt4032; - if(Class3_Sub13_Sub23_Sub1.anInt4032 >= 50 || var1) { - Class3_Sub13_Sub23_Sub1.anInt4032 = 0; + ++TextureOperation18.anInt4032; + if(TextureOperation18.anInt4032 >= 50 || var1) { + TextureOperation18.anInt4032 = 0; if(!Class3_Sub28_Sub18.aBoolean3769 && Class3_Sub15.activeConnection != null) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(93); + TextureOperation12.outgoingBuffer.putOpcode(93); try { - Class3_Sub15.activeConnection.sendBytes(Class3_Sub13_Sub1.outgoingBuffer.buffer, Class3_Sub13_Sub1.outgoingBuffer.index); - Class3_Sub13_Sub1.outgoingBuffer.index = 0; + Class3_Sub15.activeConnection.sendBytes(TextureOperation12.outgoingBuffer.buffer, TextureOperation12.outgoingBuffer.index); + TextureOperation12.outgoingBuffer.index = 0; } catch (IOException var3) { Class3_Sub28_Sub18.aBoolean3769 = true; } @@ -39,96 +39,94 @@ public class Class163_Sub1 extends Class163 { } } - static void method2211(int var0) { + static void method2211() { try { - if(var0 == -48) { - if(null == Class67.aClass11_1017) { - if(null == Class56.aClass11_886) { - int var1 = Unsorted.anInt3644; - int var3; - int var4; - if(Class38_Sub1.aBoolean2615) { - int var11; - if(var1 != 1) { - var3 = Unsorted.anInt1709; - var11 = Class126.anInt1676; - if(AbstractIndexedSprite.anInt1462 - 10 > var11 || Class3_Sub28_Sub3.anInt3552 + (AbstractIndexedSprite.anInt1462 - -10) < var11 || var3 < -10 + Class3_Sub13_Sub33.anInt3395 || Class3_Sub28_Sub1.anInt3537 + (Class3_Sub13_Sub33.anInt3395 - -10) < var3) { - Class38_Sub1.aBoolean2615 = false; - Class75.method1340(AbstractIndexedSprite.anInt1462, Class3_Sub28_Sub3.anInt3552, Class3_Sub13_Sub33.anInt3395, Class3_Sub28_Sub1.anInt3537); - } - } - - if(var1 == 1) { - var11 = AbstractIndexedSprite.anInt1462; - var3 = Class3_Sub13_Sub33.anInt3395; - var4 = Class3_Sub28_Sub3.anInt3552; - int var12 = anInt2993; - int var13 = Class38_Sub1.anInt2614; - int var7 = -1; - - for(int var8 = 0; var8 < Unsorted.menuOptionCount; ++var8) { - int var9; - if(Unsorted.aBoolean1951) { - var9 = 15 * (Unsorted.menuOptionCount + -1 + -var8) + 35 + var3; - } else { - var9 = 15 * (-var8 + (Unsorted.menuOptionCount - 1)) + var3 + 31; - } - - if(var11 < var12 && var12 < var11 - -var4 && var9 + -13 < var13 && var13 < 3 + var9) { - var7 = var8; - } - } - - if(var7 != -1) { - Class3_Sub30_Sub1.method806(var7); - } - + if(null == Class67.aClass11_1017) { + if(null == Class56.aClass11_886) { + int var1 = Unsorted.anInt3644; + int var3; + int var4; + if(Class38_Sub1.aBoolean2615) { + int var11; + if(var1 != 1) { + var3 = Unsorted.anInt1709; + var11 = Class126.anInt1676; + if(Class21.anInt1462 - 10 > var11 || Class21.anInt3552 + (Class21.anInt1462 - -10) < var11 || var3 < -10 + Class21.anInt3395 || Class21.anInt3537 + (Class21.anInt3395 - -10) < var3) { Class38_Sub1.aBoolean2615 = false; - Class75.method1340(AbstractIndexedSprite.anInt1462, Class3_Sub28_Sub3.anInt3552, Class3_Sub13_Sub33.anInt3395, Class3_Sub28_Sub1.anInt3537); - } - } else { - if(var1 == 1 && 0 < Unsorted.menuOptionCount) { - short var2 = Class3_Sub13_Sub7.aShortArray3095[-1 + Unsorted.menuOptionCount]; - if(var2 == 25 || var2 == 23 || 48 == var2 || var2 == 7 || 13 == var2 || var2 == 47 || var2 == 5 || var2 == 43 || var2 == 35 || var2 == 58 || var2 == 22 || var2 == 1006) { - var3 = Class117.anIntArray1613[-1 + Unsorted.menuOptionCount]; - var4 = Class27.anIntArray512[Unsorted.menuOptionCount + -1]; - RSInterface var5 = Class7.getRSInterface(var4); - Class3_Sub1 var6 = Client.method44(Objects.requireNonNull(var5)); - if(var6.method100() || var6.method93()) { - Class40.anInt677 = 0; - Class72.aBoolean1074 = false; - if(Class67.aClass11_1017 != null) { - Class20.method909(Class67.aClass11_1017); - } - - Class67.aClass11_1017 = Class7.getRSInterface(var4); - Class129_Sub1.anInt2693 = anInt2993; - Unsorted.anInt40 = Class38_Sub1.anInt2614; - PacketParser.anInt86 = var3; - Class20.method909(Class67.aClass11_1017); - return; - } - } - } - - if(var1 == 1 && (Unsorted.anInt998 == 1 && 2 < Unsorted.menuOptionCount || Class3_Sub13_Sub39.method353(Unsorted.menuOptionCount + -1, 0))) { - var1 = 2; - } - - if(var1 == 2 && Unsorted.menuOptionCount > 0 || Unsorted.anInt3660 == 1) { - Class132.method1801(); - } - - if(1 == var1 && Unsorted.menuOptionCount > 0 || Unsorted.anInt3660 == 2) { - Class3_Sub13_Sub8.method203(100); + Class21.method1340(Class21.anInt1462, Class21.anInt3552, Class21.anInt3395, Class21.anInt3537); } } + if(var1 == 1) { + var11 = Class21.anInt1462; + var3 = Class21.anInt3395; + var4 = Class21.anInt3552; + int var12 = anInt2993; + int var13 = Class38_Sub1.anInt2614; + int var7 = -1; + + for(int var8 = 0; var8 < Unsorted.menuOptionCount; ++var8) { + int var9; + if(Unsorted.aBoolean1951) { + var9 = 15 * (Unsorted.menuOptionCount + -1 + -var8) + 35 + var3; + } else { + var9 = 15 * (-var8 + (Unsorted.menuOptionCount - 1)) + var3 + 31; + } + + if(var11 < var12 && var12 < var11 - -var4 && var9 + -13 < var13 && var13 < 3 + var9) { + var7 = var8; + } + } + + if(var7 != -1) { + Class3_Sub30_Sub1.method806(var7); + } + + Class38_Sub1.aBoolean2615 = false; + Class21.method1340(Class21.anInt1462, Class21.anInt3552, Class21.anInt3395, Class21.anInt3537); + } + } else { + if(var1 == 1 && 0 < Unsorted.menuOptionCount) { + short var2 = TextureOperation27.aShortArray3095[-1 + Unsorted.menuOptionCount]; + if(var2 == 25 || var2 == 23 || 48 == var2 || var2 == 7 || 13 == var2 || var2 == 47 || var2 == 5 || var2 == 43 || var2 == 35 || var2 == 58 || var2 == 22 || var2 == 1006) { + var3 = Class117.anIntArray1613[-1 + Unsorted.menuOptionCount]; + var4 = Class27.anIntArray512[Unsorted.menuOptionCount + -1]; + RSInterface var5 = Class7.getRSInterface(var4); + Class3_Sub1 var6 = Client.method44(Objects.requireNonNull(var5)); + if(var6.method100() || var6.method93()) { + Class40.anInt677 = 0; + Class72.aBoolean1074 = false; + if(Class67.aClass11_1017 != null) { + Class20.method909(Class67.aClass11_1017); + } + + Class67.aClass11_1017 = Class7.getRSInterface(var4); + Class129_Sub1.anInt2693 = anInt2993; + Unsorted.anInt40 = Class38_Sub1.anInt2614; + PacketParser.anInt86 = var3; + Class20.method909(Class67.aClass11_1017); + return; + } + } + } + + if(var1 == 1 && (Unsorted.anInt998 == 1 && 2 < Unsorted.menuOptionCount || TextureOperation8.method353(Unsorted.menuOptionCount + -1, 0))) { + var1 = 2; + } + + if(var1 == 2 && Unsorted.menuOptionCount > 0 || Unsorted.anInt3660 == 1) { + Class132.method1801(); + } + + if(1 == var1 && Unsorted.menuOptionCount > 0 || Unsorted.anInt3660 == 2) { + TextureOperation9.method203(100); + } } + } } } catch (RuntimeException var10) { - throw ClientErrorException.clientError(var10, "ah.A(" + var0 + ')'); + throw ClientErrorException.clientError(var10, "ah.A(" + -48 + ')'); } } diff --git a/Client/src/main/java/org/runite/client/Class163_Sub1_Sub1.java b/Client/src/main/java/org/runite/client/Class163_Sub1_Sub1.java index e2041a109..d1c65f2c8 100644 --- a/Client/src/main/java/org/runite/client/Class163_Sub1_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class163_Sub1_Sub1.java @@ -11,7 +11,7 @@ public final class Class163_Sub1_Sub1 extends Class163_Sub1 { static byte[] aByteArray4005 = new byte[]{(byte) 95, (byte) 97, (byte) 98, (byte) 99, (byte) 100, (byte) 101, (byte) 102, (byte) 103, (byte) 104, (byte) 105, (byte) 106, (byte) 107, (byte) 108, (byte) 109, (byte) 110, (byte) 111, (byte) 112, (byte) 113, (byte) 114, (byte) 115, (byte) 116, (byte) 117, (byte) 118, (byte) 119, (byte) 120, (byte) 121, (byte) 122, (byte) 48, (byte) 49, (byte) 50, (byte) 51, (byte) 52, (byte) 53, (byte) 54, (byte) 55, (byte) 56, (byte) 57}; static int anInt4006; - static boolean[] aBooleanArray4008 = new boolean[100]; + public static boolean[] aBooleanArray4008 = new boolean[100]; static int[] anIntArray4009 = new int[5]; static int[][] anIntArrayArray4010 = new int[104][104]; static int anInt2246 = 0; @@ -37,8 +37,8 @@ public final class Class163_Sub1_Sub1 extends Class163_Sub1 { static void method2215(Component var0) { try { - var0.removeKeyListener(Class3_Sub13_Sub3.aClass148_3049); - var0.removeFocusListener(Class3_Sub13_Sub3.aClass148_3049); + var0.removeKeyListener(TextureOperation33.aClass148_3049); + var0.removeFocusListener(TextureOperation33.aClass148_3049); KeyboardListener.anInt2384 = -1; } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "ch.G(" + (var0 != null ? "{...}" : "null") + ',' + -9320 + ')'); @@ -89,7 +89,7 @@ public final class Class163_Sub1_Sub1 extends Class163_Sub1 { Class3_Sub15.activeConnection = new Connection((Socket) Class3_Sub9.aClass64_2318.anObject974, Class38.signlink); Class3_Sub9.aClass64_2318 = null; - Class3_Sub15.activeConnection.sendBytes(Class3_Sub13_Sub1.outgoingBuffer.buffer, Class3_Sub13_Sub1.outgoingBuffer.index); + Class3_Sub15.activeConnection.sendBytes(TextureOperation12.outgoingBuffer.buffer, TextureOperation12.outgoingBuffer.index); if (WorldListEntry.aClass155_2627 != null) { WorldListEntry.aClass155_2627.method2159(83); } diff --git a/Client/src/main/java/org/runite/client/Class163_Sub2.java b/Client/src/main/java/org/runite/client/Class163_Sub2.java index 28f59b724..1d7b8b45e 100644 --- a/Client/src/main/java/org/runite/client/Class163_Sub2.java +++ b/Client/src/main/java/org/runite/client/Class163_Sub2.java @@ -37,7 +37,7 @@ class Class163_Sub2 extends Class163 { int var6 = var0.readUnsignedByte(); int var7 = var0.readUnsignedByte(); int var9 = -(var7 * 64) - (-Unsorted.anInt65 - Class108.anInt1460 + 1); - int var8 = var6 * 64 + -Class3_Sub13_Sub21.anInt3256; + int var8 = var6 * 64 + -TextureOperation37.anInt3256; byte var2; int var10; if(var8 >= 0 && (var9 - 63) >= 0 && Class23.anInt455 > (var8 + 63) && var9 < Class108.anInt1460) { diff --git a/Client/src/main/java/org/runite/client/Class163_Sub2_Sub1.java b/Client/src/main/java/org/runite/client/Class163_Sub2_Sub1.java index 3a20fcd28..1f0f087ae 100644 --- a/Client/src/main/java/org/runite/client/Class163_Sub2_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class163_Sub2_Sub1.java @@ -43,9 +43,9 @@ final class Class163_Sub2_Sub1 extends Class163_Sub2 { for(Class96[] var7 = ClientErrorException.aClass96Array2114; var8 < var7.length; ++var8) { Class96 var9 = var7[var8]; if(null != var9 && var9.anInt1360 == 2) { - Unsorted.method1724(var0 >> 1, var5, (-Class82.anInt1152 + var9.anInt1347 << 7) - -var9.anInt1350, var9.anInt1353 * 2, var2 >> 1, var9.anInt1346 + (var9.anInt1356 + -Class131.anInt1716 << 7), (byte)-114, var4); + Unsorted.method1724(var0 >> 1, var5, (-Texture.anInt1152 + var9.anInt1347 << 7) - -var9.anInt1350, var9.anInt1353 * 2, var2 >> 1, var9.anInt1346 + (var9.anInt1356 + -Class131.anInt1716 << 7), (byte)-114, var4); if(-1 < Class32.anInt590 && Class44.anInt719 % 20 < 10) { - Class166.aAbstractSpriteArray2072[var9.anInt1351].drawAt(-12 + var1 + Class32.anInt590, -28 + var6 - -Class82.anInt2208); + Class166.aAbstractSpriteArray2072[var9.anInt1351].drawAt(-12 + var1 + Class32.anInt590, -28 + var6 - -Texture.anInt2208); } } } @@ -94,7 +94,7 @@ final class Class163_Sub2_Sub1 extends Class163_Sub2 { for(int var14 = 0; Class3_Sub24_Sub3.anIntArray3494.length > var14; ++var14) { if(var13 == Class3_Sub24_Sub3.anIntArray3494[var14] && var4[var14] != null) { - Class3_Sub13_Sub30.parseObjectMapping(AtmosphereParser.aClass91Array1182, var5, var4[var14], var9, var10, 8 * var6, var7 * 8, var0, (var11 & 7) * 8, 8 * (7 & var12)); + TextureOperation13.parseObjectMapping(AtmosphereParser.aClass91Array1182, var5, var4[var14], var9, var10, 8 * var6, var7 * 8, var0, (var11 & 7) * 8, 8 * (7 & var12)); break; } } diff --git a/Client/src/main/java/org/runite/client/Class163_Sub3.java b/Client/src/main/java/org/runite/client/Class163_Sub3.java index 758709a4b..35314cca3 100644 --- a/Client/src/main/java/org/runite/client/Class163_Sub3.java +++ b/Client/src/main/java/org/runite/client/Class163_Sub3.java @@ -28,18 +28,18 @@ final class Class163_Sub3 extends Class163 { int var1; for(var1 = 0; Class139.anInt1829 > var1; ++var1) { int var2 = Class3_Sub7.anIntArray2292[var1]; - if(Class44.anInt719 != Class3_Sub13_Sub22.players[var2].anInt2838) { - if(0 < Class3_Sub13_Sub22.players[var2].anInt3969) { - Class162.method2203(Class3_Sub13_Sub22.players[var2]); + if(Class44.anInt719 != TextureOperation0.players[var2].anInt2838) { + if(0 < TextureOperation0.players[var2].anInt3969) { + Class162.method2203(TextureOperation0.players[var2]); } - Class3_Sub13_Sub22.players[var2] = null; + TextureOperation0.players[var2] = null; } } if(GraphicDefinition.incomingBuffer.index == Unsorted.incomingPacketLength) { for(var1 = 0; var1 < Class159.localPlayerCount; ++var1) { - if(null == Class3_Sub13_Sub22.players[Class56.localPlayerIndexes[var1]]) { + if(null == TextureOperation0.players[Class56.localPlayerIndexes[var1]]) { // throw new RuntimeException("gpp2 pos:" + var1 + " size:" + Class159.anInt2022); // System.err.println("gpp2 pos:" + var1 + " size:" + Class159.anInt2022); System.err.println("Local player was null - index: " + Class56.localPlayerIndexes[var1] + ", list index: " + var1 + ", list size: " + Class159.localPlayerCount); @@ -59,7 +59,7 @@ final class Class163_Sub3 extends Class163 { static void method2229(long var0) { try { if(var0 != 0) { - if((100 > Class8.anInt104 || Class3_Sub13_Sub29.disableGEBoxes) && Class8.anInt104 < 200) { + if((100 > Class8.anInt104 || TextureOperation3.disableGEBoxes) && Class8.anInt104 < 200) { RSString var3 = Objects.requireNonNull(Unsorted.method1052(var0)).longToRSString(); int var4; @@ -88,8 +88,8 @@ final class Class163_Sub3 extends Class163 { Unsorted.aBooleanArray73[Class8.anInt104] = false; ++Class8.anInt104; Class110.anInt1472 = PacketParser.anInt3213; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(120); - Class3_Sub13_Sub1.outgoingBuffer.writeLong(var0); + TextureOperation12.outgoingBuffer.putOpcode(120); + TextureOperation12.outgoingBuffer.writeLong(var0); } } else { Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasFriendsListFull, -1); diff --git a/Client/src/main/java/org/runite/client/Class164_Sub1.java b/Client/src/main/java/org/runite/client/Class164_Sub1.java index ffac2dc68..7fba505ec 100644 --- a/Client/src/main/java/org/runite/client/Class164_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class164_Sub1.java @@ -2,7 +2,6 @@ package org.runite.client; class Class164_Sub1 extends Class164 { - static Class158 aClass158_3009; private int anInt3010; static short[] aShortArray3011 = new short[]{(short)6798, (short)8741, (short)25238, (short)4626, (short)4550}; static int anInt3012 = 0; @@ -37,7 +36,7 @@ class Class164_Sub1 extends Class164 { int var11 = -Class77.anInt1111 + var7; int var12 = (int)Math.sqrt(var11 * var11 + var9 * var9); Class139.anInt1823 = 2047 & (int)(Math.atan2(var10, var12) * 325.949D); - Class3_Sub13_Sub25.anInt3315 = 2047 & (int)(Math.atan2(var9, var11) * -325.949D); + TextureOperation28.anInt3315 = 2047 & (int)(Math.atan2(var9, var11) * -325.949D); if(128 > Class139.anInt1823) { Class139.anInt1823 = 128; } @@ -64,118 +63,118 @@ class Class164_Sub1 extends Class164 { if(var3 < 16) { if(var3 == 1) { if(var4 > Class145.anInt2697) { - if(!Class3_Sub13_Sub37.method349(var4, var6, var5)) { + if(!TextureOperation10.method349(var4, var6, var5)) { return true; } - if(!Class3_Sub13_Sub37.method349(var4, var6, var5 + 128)) { + if(!TextureOperation10.method349(var4, var6, var5 + 128)) { return true; } } if(var0 > 0) { - if(!Class3_Sub13_Sub37.method349(var4, var7, var5)) { + if(!TextureOperation10.method349(var4, var7, var5)) { return true; } - if(!Class3_Sub13_Sub37.method349(var4, var7, var5 + 128)) { + if(!TextureOperation10.method349(var4, var7, var5 + 128)) { return true; } } - if(!Class3_Sub13_Sub37.method349(var4, var8, var5)) { + if(!TextureOperation10.method349(var4, var8, var5)) { return true; } - return !Class3_Sub13_Sub37.method349(var4, var8, var5 + 128); + return !TextureOperation10.method349(var4, var8, var5 + 128); } if(var3 == 2) { - if(var5 < Class3_Sub13_Sub30.anInt3363) { - if(!Class3_Sub13_Sub37.method349(var4, var6, var5 + 128)) { + if(var5 < TextureOperation13.anInt3363) { + if(!TextureOperation10.method349(var4, var6, var5 + 128)) { return true; } - if(!Class3_Sub13_Sub37.method349(var4 + 128, var6, var5 + 128)) { + if(!TextureOperation10.method349(var4 + 128, var6, var5 + 128)) { return true; } } if(var0 > 0) { - if(!Class3_Sub13_Sub37.method349(var4, var7, var5 + 128)) { + if(!TextureOperation10.method349(var4, var7, var5 + 128)) { return true; } - if(!Class3_Sub13_Sub37.method349(var4 + 128, var7, var5 + 128)) { + if(!TextureOperation10.method349(var4 + 128, var7, var5 + 128)) { return true; } } - if(!Class3_Sub13_Sub37.method349(var4, var8, var5 + 128)) { + if(!TextureOperation10.method349(var4, var8, var5 + 128)) { return true; } - return !Class3_Sub13_Sub37.method349(var4 + 128, var8, var5 + 128); + return !TextureOperation10.method349(var4 + 128, var8, var5 + 128); } if(var3 == 4) { if(var4 < Class145.anInt2697) { - if(!Class3_Sub13_Sub37.method349(var4 + 128, var6, var5)) { + if(!TextureOperation10.method349(var4 + 128, var6, var5)) { return true; } - if(!Class3_Sub13_Sub37.method349(var4 + 128, var6, var5 + 128)) { + if(!TextureOperation10.method349(var4 + 128, var6, var5 + 128)) { return true; } } if(var0 > 0) { - if(!Class3_Sub13_Sub37.method349(var4 + 128, var7, var5)) { + if(!TextureOperation10.method349(var4 + 128, var7, var5)) { return true; } - if(!Class3_Sub13_Sub37.method349(var4 + 128, var7, var5 + 128)) { + if(!TextureOperation10.method349(var4 + 128, var7, var5 + 128)) { return true; } } - if(!Class3_Sub13_Sub37.method349(var4 + 128, var8, var5)) { + if(!TextureOperation10.method349(var4 + 128, var8, var5)) { return true; } - return !Class3_Sub13_Sub37.method349(var4 + 128, var8, var5 + 128); + return !TextureOperation10.method349(var4 + 128, var8, var5 + 128); } if(var3 == 8) { - if(var5 > Class3_Sub13_Sub30.anInt3363) { - if(!Class3_Sub13_Sub37.method349(var4, var6, var5)) { + if(var5 > TextureOperation13.anInt3363) { + if(!TextureOperation10.method349(var4, var6, var5)) { return true; } - if(!Class3_Sub13_Sub37.method349(var4 + 128, var6, var5)) { + if(!TextureOperation10.method349(var4 + 128, var6, var5)) { return true; } } if(var0 > 0) { - if(!Class3_Sub13_Sub37.method349(var4, var7, var5)) { + if(!TextureOperation10.method349(var4, var7, var5)) { return true; } - if(!Class3_Sub13_Sub37.method349(var4 + 128, var7, var5)) { + if(!TextureOperation10.method349(var4 + 128, var7, var5)) { return true; } } - if(!Class3_Sub13_Sub37.method349(var4, var8, var5)) { + if(!TextureOperation10.method349(var4, var8, var5)) { return true; } - return !Class3_Sub13_Sub37.method349(var4 + 128, var8, var5); + return !TextureOperation10.method349(var4 + 128, var8, var5); } } - return !Class3_Sub13_Sub37.method349(var4 + 64, var9, var5 + 64) || (var3 == 16 ? !Class3_Sub13_Sub37.method349(var4, var8, var5 + 128) : (var3 == 32 ? !Class3_Sub13_Sub37.method349(var4 + 128, var8, var5 + 128) : (var3 == 64 ? !Class3_Sub13_Sub37.method349(var4 + 128, var8, var5) : (var3 == 128 && !Class3_Sub13_Sub37.method349(var4, var8, var5))))); + return !TextureOperation10.method349(var4 + 64, var9, var5 + 64) || (var3 == 16 ? !TextureOperation10.method349(var4, var8, var5 + 128) : (var3 == 32 ? !TextureOperation10.method349(var4 + 128, var8, var5 + 128) : (var3 == 64 ? !TextureOperation10.method349(var4 + 128, var8, var5) : (var3 == 128 && !TextureOperation10.method349(var4, var8, var5))))); } else { return true; } diff --git a/Client/src/main/java/org/runite/client/Class164_Sub1_Sub1.java b/Client/src/main/java/org/runite/client/Class164_Sub1_Sub1.java index bf41ea48b..b8541f9ef 100644 --- a/Client/src/main/java/org/runite/client/Class164_Sub1_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class164_Sub1_Sub1.java @@ -7,7 +7,7 @@ final class Class164_Sub1_Sub1 extends Class164_Sub1 { final void method2242(int var1, byte var2) { int var3 = var1 * 2; - var2 = (byte)(127 + ((var2 & 255) >> 1)); + var2 = (byte)(127 + ((var2 & 0xFF) >> 1)); this.aByteArray4028[var3++] = var2; this.aByteArray4028[var3] = var2; } diff --git a/Client/src/main/java/org/runite/client/Class164_Sub2.java b/Client/src/main/java/org/runite/client/Class164_Sub2.java index 7c120162c..facddc989 100644 --- a/Client/src/main/java/org/runite/client/Class164_Sub2.java +++ b/Client/src/main/java/org/runite/client/Class164_Sub2.java @@ -4,11 +4,11 @@ import org.rs09.client.Linkable; import java.util.Objects; -class Class164_Sub2 extends Class164 { +public class Class164_Sub2 extends Class164 { private int anInt3018; static Class33 aClass33_3019; - static int anInt3020 = 0; + public static int anInt3020 = 0; private final int anInt3021; private final int anInt3022; private int anInt3024; @@ -95,7 +95,7 @@ class Class164_Sub2 extends Class164 { } if(var8 == 1) { - var9 = Class3_Sub13_Sub15.anIntArray3185[var4[var6++]]; + var9 = TextureOperation17.anIntArray3185[var4[var6++]]; } if(var8 == 17) { @@ -192,7 +192,7 @@ class Class164_Sub2 extends Class164 { } if(var8 == 19) { - var9 = (Class102.player.anInt2829 >> 7) - -Class82.anInt1152; + var9 = (Class102.player.anInt2829 >> 7) - -Texture.anInt1152; } if(var8 == 20) { diff --git a/Client/src/main/java/org/runite/client/Class164_Sub2_Sub1.java b/Client/src/main/java/org/runite/client/Class164_Sub2_Sub1.java index 5d28b80e7..132e752be 100644 --- a/Client/src/main/java/org/runite/client/Class164_Sub2_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class164_Sub2_Sub1.java @@ -17,7 +17,7 @@ final class Class164_Sub2_Sub1 extends Class164_Sub2 { final void method2244(int var1, byte var2) { int var3 = var1 * 2; - int var4 = var2 & 255; + int var4 = var2 & 0xFF; this.aByteArray4029[var3++] = (byte)(3 * var4 >> 5); this.aByteArray4029[var3] = (byte)(var4 >> 2); } diff --git a/Client/src/main/java/org/runite/client/Class166.java b/Client/src/main/java/org/runite/client/Class166.java index 9c6e31405..1dd173432 100644 --- a/Client/src/main/java/org/runite/client/Class166.java +++ b/Client/src/main/java/org/runite/client/Class166.java @@ -22,7 +22,7 @@ final class Class166 { if (Class8.method846(var0, var1, var2)) { int var4 = var1 << 7; int var5 = var2 << 7; - return !Class3_Sub13_Sub37.method349(var4 + 1, Class44.anIntArrayArrayArray723[var0][var1][var2] + var3, var5 + 1) || !Class3_Sub13_Sub37.method349(var4 + 128 - 1, Class44.anIntArrayArrayArray723[var0][var1 + 1][var2] + var3, var5 + 1) || !Class3_Sub13_Sub37.method349(var4 + 128 - 1, Class44.anIntArrayArrayArray723[var0][var1 + 1][var2 + 1] + var3, var5 + 128 - 1) || !Class3_Sub13_Sub37.method349(var4 + 1, Class44.anIntArrayArrayArray723[var0][var1][var2 + 1] + var3, var5 + 128 - 1); + return !TextureOperation10.method349(var4 + 1, Class44.anIntArrayArrayArray723[var0][var1][var2] + var3, var5 + 1) || !TextureOperation10.method349(var4 + 128 - 1, Class44.anIntArrayArrayArray723[var0][var1 + 1][var2] + var3, var5 + 1) || !TextureOperation10.method349(var4 + 128 - 1, Class44.anIntArrayArrayArray723[var0][var1 + 1][var2 + 1] + var3, var5 + 128 - 1) || !TextureOperation10.method349(var4 + 1, Class44.anIntArrayArrayArray723[var0][var1][var2 + 1] + var3, var5 + 128 - 1); } else { return true; } @@ -43,25 +43,25 @@ final class Class166 { boolean var4 = false; for (int var5 = 0; Class159.localPlayerCount > var5; ++var5) { - Player var6 = Class3_Sub13_Sub22.players[Class56.localPlayerIndexes[var5]]; + Player var6 = TextureOperation0.players[Class56.localPlayerIndexes[var5]]; if (null != var6 && null != var6.displayName && var6.displayName.equalsStringIgnoreCase(var3)) { var4 = true; Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var6.anIntArray2767[0], 1, 0, 2, var6.anIntArray2755[0], Class102.player.anIntArray2767[0]); if (1 == var0) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(68); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(Class56.localPlayerIndexes[var5]); + TextureOperation12.outgoingBuffer.putOpcode(68); + TextureOperation12.outgoingBuffer.writeShort128LE(Class56.localPlayerIndexes[var5]); } else if (4 == var0) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(180); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(Class56.localPlayerIndexes[var5]); + TextureOperation12.outgoingBuffer.putOpcode(180); + TextureOperation12.outgoingBuffer.writeShort128LE(Class56.localPlayerIndexes[var5]); } else if (5 == var0) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(4); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(Class56.localPlayerIndexes[var5]); + TextureOperation12.outgoingBuffer.putOpcode(4); + TextureOperation12.outgoingBuffer.writeShortLE(Class56.localPlayerIndexes[var5]); } else if (var0 == 6) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(133); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(Class56.localPlayerIndexes[var5]); + TextureOperation12.outgoingBuffer.putOpcode(133); + TextureOperation12.outgoingBuffer.writeShortLE(Class56.localPlayerIndexes[var5]); } else if (var0 == 7) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(114); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(Class56.localPlayerIndexes[var5]); + TextureOperation12.outgoingBuffer.putOpcode(114); + TextureOperation12.outgoingBuffer.writeShort128LE(Class56.localPlayerIndexes[var5]); } break; } @@ -80,9 +80,9 @@ final class Class166 { try { Object var1; if (HDToolKit.highDetail) { - var1 = new HDIndexedSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[0], Unsorted.anIntArray2591[0], Class140_Sub7.anIntArray2931[0], Unsorted.anIntArray3076[0], Class163_Sub1.aByteArrayArray2987[0], Class3_Sub13_Sub38.spritePalette); + var1 = new HDIndexedSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[0], Unsorted.anIntArray2591[0], Class140_Sub7.anIntArray2931[0], Unsorted.anIntArray3076[0], Class163_Sub1.aByteArrayArray2987[0], TextureOperation38.spritePalette); } else { - var1 = new LDIndexedSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[0], Unsorted.anIntArray2591[0], Class140_Sub7.anIntArray2931[0], Unsorted.anIntArray3076[0], Class163_Sub1.aByteArrayArray2987[0], Class3_Sub13_Sub38.spritePalette); + var1 = new LDIndexedSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[0], Unsorted.anIntArray2591[0], Class140_Sub7.anIntArray2931[0], Unsorted.anIntArray3076[0], Class163_Sub1.aByteArrayArray2987[0], TextureOperation38.spritePalette); } Class39.method1035((byte) 116); diff --git a/Client/src/main/java/org/runite/client/Class167.java b/Client/src/main/java/org/runite/client/Class167.java index 2bec997bb..d4f99ee74 100644 --- a/Client/src/main/java/org/runite/client/Class167.java +++ b/Client/src/main/java/org/runite/client/Class167.java @@ -91,7 +91,7 @@ public final class Class167 { if (var0) { Class75_Sub2.aClass3_Sub2ArrayArrayArray2638 = Class166.aClass3_Sub2ArrayArrayArray2065; Class44.anIntArrayArrayArray723 = Unsorted.anIntArrayArrayArray3605; - Class3_Sub23.aClass3_Sub11ArrayArray2542 = Class3_Sub13_Sub28.aClass3_Sub11ArrayArray3346; + Class3_Sub23.aClass3_Sub11ArrayArray2542 = TextureOperation32.aClass3_Sub11ArrayArray3346; } else { Class75_Sub2.aClass3_Sub2ArrayArrayArray2638 = Unsorted.aClass3_Sub2ArrayArrayArray4070; Class44.anIntArrayArrayArray723 = Class58.anIntArrayArrayArray914; @@ -164,7 +164,7 @@ public final class Class167 { Unsorted.aByteArrayArrayArray1328[var8][var5][var4] = (byte) ((-2 + var9) / 4); PacketParser.aByteArrayArrayArray81[var8][var5][var4] = (byte) Unsorted.bitwiseAnd(-2 + var9 + var7, 3); } else if (var9 > 81) { - Class3_Sub13_Sub36.aByteArrayArrayArray3430[var8][var5][var4] = (byte) (-81 + var9); + TextureOperation36.aByteArrayArrayArray3430[var8][var5][var4] = (byte) (-81 + var9); } else if (!var2) { Unsorted.aByteArrayArrayArray113[var8][var5][var4] = (byte) (var9 - 49); } @@ -225,7 +225,7 @@ public final class Class167 { Class3_Sub15.activeConnection = null; } - Class3_Sub13_Sub30.method313((byte) 110); + TextureOperation13.method313((byte) 110); Class32.method995(); int var1; @@ -240,7 +240,7 @@ public final class Class167 { Class129.anInt1691 = -1; Class164_Sub1.method2241((byte) -77, true); LinkableRSString.isDynamicSceneGraph = false; - Class82.anInt1152 = 0; + Texture.anInt1152 = 0; Unsorted.anInt3606 = 0; Class3_Sub7.anInt2294 = 0; Class131.anInt1716 = 0; @@ -256,7 +256,7 @@ public final class Class167 { } for (var1 = 0; var1 < 2048; ++var1) { - Class3_Sub13_Sub22.players[var1] = null; + TextureOperation0.players[var1] = null; Class65.aClass3_Sub30Array986[var1] = null; } @@ -267,15 +267,15 @@ public final class Class167 { for (var1 = 0; 4 > var1; ++var1) { for (int var2 = 0; var2 < 104; ++var2) { for (int var3 = 0; var3 < 104; ++var3) { - Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[var1][var2][var3] = null; + TextureOperation0.aClass61ArrayArrayArray3273[var1][var2][var3] = null; } } } Class3_Sub28_Sub5.method560(); Class113.interfacePacketCounter = 0; - Class3_Sub13_Sub2.method176(var0 + -161); - Class3_Sub13_Sub11.method219(true); + TextureOperation6.method176(var0 + -161); + TextureOperation1.method219(true); } catch (RuntimeException var4) { throw ClientErrorException.clientError(var4, "wj.C(" + var0 + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class168.java b/Client/src/main/java/org/runite/client/Class168.java index 35ec29fac..cc14bc2ee 100644 --- a/Client/src/main/java/org/runite/client/Class168.java +++ b/Client/src/main/java/org/runite/client/Class168.java @@ -5,7 +5,6 @@ import org.rs09.client.rendering.Toolkit; final class Class168 { static RSInterface aClass11_2091 = null; - static Font bold; static int anInt2099 = 0; int anInt2090 = 128; boolean aBoolean2092 = false; @@ -699,7 +698,7 @@ final class Class168 { } int var3 = iface.componentHash >>> 16; - Class80 var4 = new Class80<>(Class3_Sub13_Sub17.aHashTable_3208); + Class80 var4 = new Class80<>(TextureOperation23.aHashTable_3208); for (Class3_Sub31 var2 = var4.method1393(); null != var2; var2 = var4.method1392()) { if (var2.anInt2602 == var3) { @@ -735,9 +734,9 @@ final class Class168 { 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); - Class3_Sub13_Sub23_Sub1.method282(var15, var16, 102, var18, var4); - Class3_Sub13_Sub23_Sub1.method282(var15, var18, -44, var19, var0); - Class3_Sub13_Sub23_Sub1.method282(var15, var19, -61, var17, var4); + TextureOperation18.method282(var15, var16, 102, var18, var4); + TextureOperation18.method282(var15, var18, -44, var19, var0); + TextureOperation18.method282(var15, var19, -61, var17, var4); } int var14 = -1; @@ -768,11 +767,11 @@ final class Class168 { 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) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var16], var18, -53, var17, var4); + TextureOperation18.method282(Class38.anIntArrayArray663[var16], var18, -53, var17, var4); } if (var24 >= Class159.anInt2020) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var24], var18, 96, var17, var4); + TextureOperation18.method282(Class38.anIntArrayArray663[var24], var18, 96, var17, var4); } } else { var17 = GameObject.anIntArray1838[var9]; @@ -782,16 +781,16 @@ final class Class168 { var21 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, -var17 + var6, Class101.anInt1425); if (Class57.anInt902 >= var16) { var22 = Class38.anIntArrayArray663[var16]; - Class3_Sub13_Sub23_Sub1.method282(var22, var19, 116, var21, var4); - Class3_Sub13_Sub23_Sub1.method282(var22, var21, 125, var20, var0); - Class3_Sub13_Sub23_Sub1.method282(var22, var20, 87, var18, var4); + 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]; - Class3_Sub13_Sub23_Sub1.method282(var22, var19, 110, var21, var4); - Class3_Sub13_Sub23_Sub1.method282(var22, var21, -114, var20, var0); - Class3_Sub13_Sub23_Sub1.method282(var22, var20, -88, var18, var4); + TextureOperation18.method282(var22, var19, 110, var21, var4); + TextureOperation18.method282(var22, var21, -114, var20, var0); + TextureOperation18.method282(var22, var20, -88, var18, var4); } } } @@ -811,24 +810,24 @@ final class Class168 { var21 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var6 - var19, Class101.anInt1425); if (Class57.anInt902 >= var16) { var22 = Class38.anIntArrayArray663[var16]; - Class3_Sub13_Sub23_Sub1.method282(var22, var18, 126, var21, var4); - Class3_Sub13_Sub23_Sub1.method282(var22, var21, 103, var20, var0); - Class3_Sub13_Sub23_Sub1.method282(var22, var20, -61, var17, var4); + 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]; - Class3_Sub13_Sub23_Sub1.method282(var22, var18, 102, var21, var4); - Class3_Sub13_Sub23_Sub1.method282(var22, var21, -94, var20, var0); - Class3_Sub13_Sub23_Sub1.method282(var22, var20, 99, var17, var4); + 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) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var16], var18, 94, var17, var4); + TextureOperation18.method282(Class38.anIntArrayArray663[var16], var18, 94, var17, var4); } if (var24 >= Class159.anInt2020) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var24], var18, 126, var17, var4); + TextureOperation18.method282(Class38.anIntArrayArray663[var24], var18, 126, var17, var4); } } } @@ -884,7 +883,7 @@ final class Class168 { var1 = true; for (int var2 = 0; -1 + Unsorted.menuOptionCount > var2; ++var2) { - if (Class3_Sub13_Sub7.aShortArray3095[var2] < 1000 && Class3_Sub13_Sub7.aShortArray3095[1 + var2] > 1000) { + 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]; @@ -901,12 +900,12 @@ final class Class168 { var5 = Class114.anIntArray1578[var2]; Class114.anIntArray1578[var2] = Class114.anIntArray1578[1 + var2]; Class114.anIntArray1578[var2 - -1] = var5; - short var6 = Class3_Sub13_Sub7.aShortArray3095[var2]; - Class3_Sub13_Sub7.aShortArray3095[var2] = Class3_Sub13_Sub7.aShortArray3095[1 + var2]; - Class3_Sub13_Sub7.aShortArray3095[var2 + 1] = var6; - long var7 = Class3_Sub13_Sub22.aLongArray3271[var2]; - Class3_Sub13_Sub22.aLongArray3271[var2] = Class3_Sub13_Sub22.aLongArray3271[var2 + 1]; - Class3_Sub13_Sub22.aLongArray3271[var2 - -1] = var7; + short var6 = TextureOperation27.aShortArray3095[var2]; + TextureOperation27.aShortArray3095[var2] = TextureOperation27.aShortArray3095[1 + var2]; + TextureOperation27.aShortArray3095[var2 + 1] = var6; + long var7 = TextureOperation0.aLongArray3271[var2]; + TextureOperation0.aLongArray3271[var2] = TextureOperation0.aLongArray3271[var2 + 1]; + TextureOperation0.aLongArray3271[var2 - -1] = var7; } } } @@ -950,7 +949,7 @@ final class Class168 { this.anInt2095 = var3.readUnsignedByte(); } else if (3 == var2) { this.anInt2095 = var3.readUnsignedShort(); - if (this.anInt2095 == '\uffff') { + if (this.anInt2095 == 65535) { this.anInt2095 = -1; } } else if (5 == var2) { @@ -958,7 +957,7 @@ final class Class168 { } else if (var2 == 7) { this.anInt2098 = RSInterface.method869(116, var3.readMedium()); } else if (var2 == 8) { - Class3_Sub13_Sub6.anInt3081 = var4; + TextureOperation26.anInt3081 = var4; } else if (var2 == 9) { this.anInt2090 = var3.readUnsignedShort(); } else if (var2 == 10) { diff --git a/Client/src/main/java/org/runite/client/Class17.java b/Client/src/main/java/org/runite/client/Class17.java index ebab1a3d8..59f22bcc7 100644 --- a/Client/src/main/java/org/runite/client/Class17.java +++ b/Client/src/main/java/org/runite/client/Class17.java @@ -13,47 +13,47 @@ final class Class17 { RenderAnimationDefinition var2 = var1.method1965(); int var4; int var5; - if (var1.anInt2772 != -1 && '\u8000' > var1.anInt2772) { + if (var1.anInt2772 != -1 && 32768 > var1.anInt2772) { NPC var3 = NPC.npcs[var1.anInt2772]; if (var3 != null) { var5 = -var3.anInt2829 + var1.anInt2829; var4 = -var3.anInt2819 + var1.anInt2819; if (0 != var4 || 0 != var5) { - var1.anInt2806 = (int) (Math.atan2(var4, var5) * 325.949D) & 2047; + var1.anInt2806 = (int) (Math.atan2(var4, var5) * 325.949D) & 0x7FF; } } } int var6; int var9; - if (var1.anInt2772 >= '\u8000') { + if (var1.anInt2772 >= 32768) { var9 = -32768 + var1.anInt2772; if (Class3_Sub1.localIndex == var9) { var9 = 2047; } - Player var10 = Class3_Sub13_Sub22.players[var9]; + Player var10 = TextureOperation0.players[var9]; if (null != var10) { var6 = -var10.anInt2829 + var1.anInt2829; var5 = -var10.anInt2819 + var1.anInt2819; if (var5 != 0 || var6 != 0) { - var1.anInt2806 = (int) (Math.atan2(var5, var6) * 325.949D) & 2047; + var1.anInt2806 = (int) (Math.atan2(var5, var6) * 325.949D) & 0x7FF; } } } if ((0 != var1.anInt2786 || 0 != var1.anInt2762) && (var1.anInt2816 == 0 || var1.anInt2824 > 0)) { var9 = var1.anInt2819 + -((-Class131.anInt1716 + (var1.anInt2786 - Class131.anInt1716)) * 64); - var4 = -((-Class82.anInt1152 + (var1.anInt2762 - Class82.anInt1152)) * 64) + var1.anInt2829; + var4 = -((-Texture.anInt1152 + (var1.anInt2762 - Texture.anInt1152)) * 64) + var1.anInt2829; if (var9 != 0 || var4 != 0) { - var1.anInt2806 = (int) (Math.atan2(var9, var4) * 325.949D) & 2047; + var1.anInt2806 = (int) (Math.atan2(var9, var4) * 325.949D) & 0x7FF; } var1.anInt2762 = 0; var1.anInt2786 = 0; } - var9 = var1.anInt2806 - var1.anInt2785 & 2047; + var9 = var1.anInt2806 - var1.anInt2785 & 0x7FF; if (var9 == 0) { var1.anInt2789 = 0; var1.anInt2821 = 0; @@ -106,10 +106,10 @@ final class Class17 { if (var1.anInt2808 != var4) { var1.anInt2791 = 0; var1.anInt2808 = var4; - var5 = -var1.anInt2780 + var4 & '\uffff'; + var5 = -var1.anInt2780 + var4 & 65535; var6 = var1.anInt2821 * var1.anInt2821 / (var2.anInt369 * 2); int var7; - if (var1.anInt2821 > 0 && var6 <= var5 && -var6 + var5 < '\u8000') { + if (var1.anInt2821 > 0 && var6 <= var5 && -var6 + var5 < 32768) { var1.anInt2803 = var5 / 2; var1.aBoolean2769 = true; var7 = var2.anInt357 * var2.anInt357 / (var2.anInt369 * 2); @@ -120,7 +120,7 @@ final class Class17 { if (var7 < var1.anInt2803) { var1.anInt2803 = -var7 + var5; } - } else if (0 > var1.anInt2821 && var6 <= -var5 + 65536 && 65536 + -var5 + -var6 < '\u8000') { + } else if (0 > var1.anInt2821 && var6 <= -var5 + 65536 && 65536 + -var5 + -var6 < 32768) { var1.anInt2803 = (-var5 + 65536) / 2; var1.aBoolean2769 = true; var7 = var2.anInt357 * var2.anInt357 / (var2.anInt369 * 2); @@ -137,7 +137,7 @@ final class Class17 { } if (var1.anInt2821 == 0) { - var5 = -var1.anInt2780 + var1.anInt2808 & '\uffff'; + var5 = -var1.anInt2780 + var1.anInt2808 & 65535; if (var5 < var2.anInt369) { var1.anInt2780 = var1.anInt2808; } else { @@ -191,7 +191,7 @@ final class Class17 { } var1.anInt2780 += var1.anInt2821; - var1.anInt2780 &= '\uffff'; + var1.anInt2780 &= 65535; if (0 >= var1.anInt2821) { var1.anInt2791 -= var1.anInt2821; } else { diff --git a/Client/src/main/java/org/runite/client/Class2.java b/Client/src/main/java/org/runite/client/Class2.java index 629aa8bf8..358a559fb 100644 --- a/Client/src/main/java/org/runite/client/Class2.java +++ b/Client/src/main/java/org/runite/client/Class2.java @@ -23,7 +23,7 @@ public final class Class2 { * by 90 degrees clockwise. */ public final LDIndexedSprite getSprite(int rotations) { - LDIndexedSprite sprite = (LDIndexedSprite) Class3_Sub13_Sub31.aReferenceCache_3369.get(rotations << 16 | this.sprite); + LDIndexedSprite sprite = (LDIndexedSprite) TextureOperation2.aReferenceCache_3369.get(rotations << 16 | this.sprite); if (sprite != null) { return sprite; } @@ -39,7 +39,7 @@ public final class Class2 { sprite.rotateClockwise(); } - Class3_Sub13_Sub31.aReferenceCache_3369.put(sprite, rotations << 16 | this.sprite); + TextureOperation2.aReferenceCache_3369.put(sprite, rotations << 16 | this.sprite); } return sprite; diff --git a/Client/src/main/java/org/runite/client/Class21.java b/Client/src/main/java/org/runite/client/Class21.java index 23f7b2a32..81ecc7493 100644 --- a/Client/src/main/java/org/runite/client/Class21.java +++ b/Client/src/main/java/org/runite/client/Class21.java @@ -3,16 +3,20 @@ package org.runite.client; import org.rs09.client.config.GameConfig; -final class Class21 { +public final class Class21 { static boolean aBoolean440 = false; static int[] maskUpdateIndexes = new int[2048]; static int anInt443; + public static int anInt3537; + public static int anInt3552; + public static int anInt3395; + public static int anInt1462; static void method912() { try { - Class3_Sub13_Sub1.outgoingBuffer.index = 0; + TextureOperation12.outgoingBuffer.index = 0; Class7.anInt2166 = -1; Class38_Sub1.aBoolean2615 = false; Unsorted.incomingPacketLength = 0; @@ -27,9 +31,9 @@ final class Class21 { Unsorted.incomingOpcode = -1; int var1; - for (var1 = 0; Class3_Sub13_Sub22.players.length > var1; ++var1) { - if (null != Class3_Sub13_Sub22.players[var1]) { - Class3_Sub13_Sub22.players[var1].anInt2772 = -1; + for (var1 = 0; TextureOperation0.players.length > var1; ++var1) { + if (null != TextureOperation0.players[var1]) { + TextureOperation0.players[var1].anInt2772 = -1; } } @@ -47,7 +51,7 @@ final class Class21 { Unsorted.aBooleanArray3674[var1] = true; } - Class3_Sub13_Sub8.method204(-3); + TextureOperation9.method204(-3); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "dh.F(" + false + ')'); } @@ -70,8 +74,8 @@ final class Class21 { Class3_Sub31 var4 = new Class3_Sub31(); var4.anInt2603 = walkable; var4.anInt2602 = interfaceId; - Class3_Sub13_Sub17.aHashTable_3208.put(interfaceHash, var4); - Class3_Sub13_Sub13.method232(interfaceId); + TextureOperation23.aHashTable_3208.put(interfaceHash, var4); + TextureOperation20.method232(interfaceId); RSInterface var5 = Class7.getRSInterface(interfaceHash); if (var5 == null) { System.out.println("Invalid interface opened - [window=" + (interfaceHash >> 16) + ", child=" + (interfaceHash & 0xFF) + ", id=" + interfaceId + "]"); @@ -79,43 +83,43 @@ final class Class21 { Class20.method909(var5); } - if (null != Class3_Sub13_Sub7.aClass11_3087) { - Class20.method909(Class3_Sub13_Sub7.aClass11_3087); - Class3_Sub13_Sub7.aClass11_3087 = null; + if (null != TextureOperation27.aClass11_3087) { + Class20.method909(TextureOperation27.aClass11_3087); + TextureOperation27.aClass11_3087 = null; } int var6 = Unsorted.menuOptionCount; int var7; for (var7 = 0; var6 > var7; ++var7) { - if (Unsorted.method73(Class3_Sub13_Sub7.aShortArray3095[var7])) { + if (Unsorted.method73(TextureOperation27.aShortArray3095[var7])) { Class3_Sub25.method509(var7); } } if (1 == Unsorted.menuOptionCount) { Class38_Sub1.aBoolean2615 = false; - Class75.method1340(AbstractIndexedSprite.anInt1462, Class3_Sub28_Sub3.anInt3552, Class3_Sub13_Sub33.anInt3395, Class3_Sub28_Sub1.anInt3537); + method1340(anInt1462, anInt3552, anInt3395, anInt3537); } else { - Class75.method1340(AbstractIndexedSprite.anInt1462, Class3_Sub28_Sub3.anInt3552, Class3_Sub13_Sub33.anInt3395, Class3_Sub28_Sub1.anInt3537); - var7 = Class168.bold.method682(RSString.parse(GameConfig.RCM_TITLE)); + method1340(anInt1462, anInt3552, anInt3395, anInt3537); + var7 = FontType.bold.method682(RSString.parse(GameConfig.RCM_TITLE)); for (int var8 = 0; Unsorted.menuOptionCount > var8; ++var8) { - int var9 = Class168.bold.method682(Unsorted.method802(var8)); + int var9 = FontType.bold.method682(Unsorted.method802(var8)); if (var7 < var9) { var7 = var9; } } - Class3_Sub28_Sub3.anInt3552 = 8 + var7; - Class3_Sub28_Sub1.anInt3537 = 15 * Unsorted.menuOptionCount + (!Unsorted.aBoolean1951 ? 22 : 26); + anInt3552 = 8 + var7; + anInt3537 = 15 * Unsorted.menuOptionCount + (!Unsorted.aBoolean1951 ? 22 : 26); } if (var5 != null) { Unsorted.method2104(var5, false, 55); } - Class3_Sub13_Sub12.method226(interfaceId); + TextureOperation24.method226(interfaceId); if (Class3_Sub28_Sub12.anInt3655 != -1) { Class3_Sub8.method124(6422 ^ 6509, 1, Class3_Sub28_Sub12.anInt3655); } @@ -149,4 +153,17 @@ final class Class21 { } } + public static void method1340(int var0, int var1, int var3, int var4) { + try { + + for (int var5 = 0; var5 < Class3_Sub28_Sub3.anInt3557; ++var5) { + if (var0 < Class3_Sub28_Sub18.anIntArray3768[var5] + Class155.anIntArray1969[var5] && Class155.anIntArray1969[var5] < var1 + var0 && Class140_Sub4.anIntArray2794[var5] + Player.anIntArray3954[var5] > var3 && Player.anIntArray3954[var5] < var3 - -var4) { + Unsorted.aBooleanArray3674[var5] = true; + } + } + + } catch (RuntimeException var6) { + throw ClientErrorException.clientError(var6, "kf.I(" + var0 + ',' + var1 + ',' + (byte) -40 + ',' + var3 + ',' + var4 + ')'); + } + } } diff --git a/Client/src/main/java/org/runite/client/Class22.java b/Client/src/main/java/org/runite/client/Class22.java index 5351da4ed..50408ac2e 100644 --- a/Client/src/main/java/org/runite/client/Class22.java +++ b/Client/src/main/java/org/runite/client/Class22.java @@ -13,7 +13,7 @@ public final class Class22 { static int anInt451 = 0; private static int anInt450 = 0; - static void method921() { + public static void method921() { aHDSprite_447 = null; } @@ -185,7 +185,7 @@ public final class Class22 { method921(); } - static void method936(HDSprite var0) { + public static void method936(HDSprite var0) { if (var0.height == anInt451 - anInt448) { aHDSprite_447 = var0; } else { diff --git a/Client/src/main/java/org/runite/client/Class23.java b/Client/src/main/java/org/runite/client/Class23.java index c31e23434..3c263f438 100644 --- a/Client/src/main/java/org/runite/client/Class23.java +++ b/Client/src/main/java/org/runite/client/Class23.java @@ -31,14 +31,14 @@ public final class Class23 { var1.writeByte(Class25.aBoolean488 ? 1 : 0); var1.writeByte(!RSInterface.aBoolean236 ? 0 : 1); var1.writeByte(!WorldListEntry.aBoolean2623 ? 0 : 1); - var1.writeByte(Class3_Sub13_Sub22.aBoolean3275 ? 1 : 0); + var1.writeByte(TextureOperation0.aBoolean3275 ? 1 : 0); var1.writeByte(!Class140_Sub6.aBoolean2910 ? 0 : 1); var1.writeByte(Unsorted.anInt1137); var1.writeByte(!Class106.aBoolean1441 ? 0 : 1); var1.writeByte(Class128.aBoolean1685 ? 1 : 0); var1.writeByte(Class38.aBoolean661 ? 1 : 0); var1.writeByte(Class3_Sub28_Sub9.anInt3622); - var1.writeByte(!Class3_Sub13_Sub15.aBoolean3184 ? 0 : 1); + var1.writeByte(!TextureOperation17.aBoolean3184 ? 0 : 1); var1.writeByte(CS2Script.anInt2453); var1.writeByte(Unsorted.anInt120); var1.writeByte(Sprites.anInt340); diff --git a/Client/src/main/java/org/runite/client/Class24.java b/Client/src/main/java/org/runite/client/Class24.java index 9afb44e26..a50367de7 100644 --- a/Client/src/main/java/org/runite/client/Class24.java +++ b/Client/src/main/java/org/runite/client/Class24.java @@ -85,7 +85,7 @@ public final class Class24 { static void renderLocalNPCs() { try { - GraphicDefinition.incomingBuffer.setBitAccess((byte) -98); + GraphicDefinition.incomingBuffer.setBitAccess(); int var1 = GraphicDefinition.incomingBuffer.getBits(8); int var2; if (var1 < Class163.localNPCCount) { @@ -157,7 +157,7 @@ public final class Class24 { static void method949(int var0, int var2, int var3, int var4) { try { int var6 = 0; - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var4], -var2 + var0, 100, var0 - -var2, var3); + TextureOperation18.method282(Class38.anIntArrayArray663[var4], -var2 + var0, 100, var0 - -var2, var3); int var8 = -var2; int var7 = var2; int var9 = -1; @@ -173,16 +173,16 @@ public final class Class24 { int[] var11 = Class38.anIntArrayArray663[var4 - var7]; int var12 = var0 - -var6; int var13 = -var6 + var0; - Class3_Sub13_Sub23_Sub1.method282(var10, var13, 115, var12, var3); - Class3_Sub13_Sub23_Sub1.method282(var11, var13, 114, var12, var3); + TextureOperation18.method282(var10, var13, 115, var12, var3); + TextureOperation18.method282(var11, var13, 114, var12, var3); } int var16 = var7 + var0; int var15 = -var7 + var0; int[] var17 = Class38.anIntArrayArray663[var4 - -var6]; int[] var18 = Class38.anIntArrayArray663[-var6 + var4]; - Class3_Sub13_Sub23_Sub1.method282(var17, var15, -61, var16, var3); - Class3_Sub13_Sub23_Sub1.method282(var18, var15, -93, var16, var3); + TextureOperation18.method282(var17, var15, -61, var16, var3); + TextureOperation18.method282(var18, var15, -93, var16, var3); } } catch (RuntimeException var14) { @@ -195,16 +195,16 @@ public final class Class24 { if (2 <= Unsorted.menuOptionCount || Class164_Sub1.anInt3012 != 0 || GameObject.aBoolean1837) { RSString var4 = Class3_Sub28_Sub1.method531(); if (var0 == null) { - int var5 = Class168.bold.method683(var4, 4 + var3, var2 - -15, aRandom3088, Class38_Sub1.anInt2618); - Class75.method1340(4 + var3, Class168.bold.method682(var4) + var5, var2, 15); + int var5 = FontType.bold.method683(var4, 4 + var3, var2 - -15, aRandom3088, Class38_Sub1.anInt2618); + Class21.method1340(4 + var3, FontType.bold.method682(var4) + var5, var2, 15); } else { - Font var7 = var0.method868(Class3_Sub13_Sub22.nameIconsSpriteArray); + Font var7 = var0.method868(TextureOperation0.nameIconsSpriteArray); if (null == var7) { - var7 = Class168.bold; + var7 = FontType.bold; } var7.method702(var4, var3, var2, var0.width, var0.height, var0.anInt218, var0.anInt287, var0.anInt194, var0.anInt225, aRandom3088, Class38_Sub1.anInt2618, Player.anIntArray3951); - Class75.method1340(Player.anIntArray3951[0], Player.anIntArray3951[2], Player.anIntArray3951[1], Player.anIntArray3951[3]); + Class21.method1340(Player.anIntArray3951[0], Player.anIntArray3951[2], Player.anIntArray3951[1], Player.anIntArray3951[3]); } } @@ -216,7 +216,7 @@ public final class Class24 { static void method951() { try { Class3_Sub28_Sub18.aBoolean3769 = false; - Class3_Sub13_Sub34.anInt3413 = 0; + TextureOperation25.anInt3413 = 0; Client.messageToDisplay = -3; Class50.anInt820 = 0; LoginHandler.loginStage = 1; diff --git a/Client/src/main/java/org/runite/client/Class29.java b/Client/src/main/java/org/runite/client/Class29.java index 09feb50c8..7d3e4c61f 100644 --- a/Client/src/main/java/org/runite/client/Class29.java +++ b/Client/src/main/java/org/runite/client/Class29.java @@ -10,11 +10,11 @@ final class Class29 { static void method968(int var0) { try { - int[] var1 = new int[Class3_Sub13_Sub23.itemDefinitionSize]; + int[] var1 = new int[TextureOperation39.itemDefinitionSize]; int var2 = 0; int var3; - for (var3 = 0; Class3_Sub13_Sub23.itemDefinitionSize > var3; ++var3) { + for (var3 = 0; TextureOperation39.itemDefinitionSize > var3; ++var3) { ItemDefinition var4 = ItemDefinition.getItemDefinition(var3); if (var4.anInt793 >= 0 || var4.anInt761 >= 0) { var1[var2++] = var3; diff --git a/Client/src/main/java/org/runite/client/Class32.java b/Client/src/main/java/org/runite/client/Class32.java index 1cf9bfee1..de9b6b79f 100644 --- a/Client/src/main/java/org/runite/client/Class32.java +++ b/Client/src/main/java/org/runite/client/Class32.java @@ -40,7 +40,7 @@ final class Class32 { if (Unsorted.aClass3_Sub2ArrayArrayArray4070 != null) { for (var0 = 0; var0 < Unsorted.aClass3_Sub2ArrayArrayArray4070.length; ++var0) { for (var1 = 0; var1 < Unsorted.anInt1234; ++var1) { - for (var2 = 0; var2 < Class3_Sub13_Sub15.anInt3179; ++var2) { + for (var2 = 0; var2 < TextureOperation17.anInt3179; ++var2) { Unsorted.aClass3_Sub2ArrayArrayArray4070[var0][var1][var2] = null; } } @@ -51,14 +51,14 @@ final class Class32 { if (Class166.aClass3_Sub2ArrayArrayArray2065 != null) { for (var0 = 0; var0 < Class166.aClass3_Sub2ArrayArrayArray2065.length; ++var0) { for (var1 = 0; var1 < Unsorted.anInt1234; ++var1) { - for (var2 = 0; var2 < Class3_Sub13_Sub15.anInt3179; ++var2) { + for (var2 = 0; var2 < TextureOperation17.anInt3179; ++var2) { Class166.aClass3_Sub2ArrayArrayArray2065[var0][var1][var2] = null; } } } } - Class3_Sub13_Sub28.aClass3_Sub11ArrayArray3346 = null; + TextureOperation32.aClass3_Sub11ArrayArray3346 = null; Class3_Sub4.anInt2249 = 0; if (Class3_Sub28_Sub8.aClass113Array3610 != null) { } @@ -82,10 +82,10 @@ final class Class32 { static void method996() { try { - KeyboardListener var1 = Class3_Sub13_Sub3.aClass148_3049; + KeyboardListener var1 = TextureOperation33.aClass148_3049; synchronized (var1) { Class3_Sub28_Sub9.anInt3620 = Class134.anInt1762; - ++Class3_Sub13_Sub33.anInt3398; + ++TextureOperation29.anInt3398; int var2; if (KeyboardListener.anInt2384 < 0) { for (var2 = 0; var2 < 112; ++var2) { diff --git a/Client/src/main/java/org/runite/client/Class33.java b/Client/src/main/java/org/runite/client/Class33.java index 7e7fc0c56..8df327484 100644 --- a/Client/src/main/java/org/runite/client/Class33.java +++ b/Client/src/main/java/org/runite/client/Class33.java @@ -91,13 +91,13 @@ final class Class33 { private void method1000(int[] var1, byte[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { for (int var10 = -var7; var10 < 0; ++var10) { for (int var11 = -var6; var11 < 0; ++var11) { - int var12 = var2[var4++] & 255; + int var12 = var2[var4++] & 0xFF; if (var12 > 30) { if (var12 >= 230) { var1[var5++] = var3; } else { int var13 = var1[var5]; - var1[var5++] = ((var3 & 16711935) * var12 + (var13 & 16711935) * (256 - var12) & -16711936) + ((var3 & '\uff00') * var12 + (var13 & '\uff00') * (256 - var12) & 16711680) >> 8; + var1[var5++] = ((var3 & 16711935) * var12 + (var13 & 16711935) * (256 - var12) & -16711936) + ((var3 & 65280) * var12 + (var13 & 65280) * (256 - var12) & 16711680) >> 8; } } else { ++var5; @@ -322,7 +322,7 @@ final class Class33 { for (var19 = var16; var19 < var18; ++var19) { for (var20 = var15; var20 < var17; ++var20) { - var21 = var13[var20 + var19 * var6] & 255; + var21 = var13[var20 + var19 * var6] & 0xFF; if (var21 > 30 && var21 < 230) { this.aBoolean595 = true; } diff --git a/Client/src/main/java/org/runite/client/Class34.java b/Client/src/main/java/org/runite/client/Class34.java index 55192132d..f4485c99b 100644 --- a/Client/src/main/java/org/runite/client/Class34.java +++ b/Client/src/main/java/org/runite/client/Class34.java @@ -16,8 +16,8 @@ final class Class34 { public Class34() { - this.anIntArray604[1] = '\uffff'; - this.anIntArray602[1] = '\uffff'; + this.anIntArray604[1] = 65535; + this.anIntArray602[1] = 65535; } final int method1007(int var1) { diff --git a/Client/src/main/java/org/runite/client/Class36.java b/Client/src/main/java/org/runite/client/Class36.java index e080a156c..cb9b4091e 100644 --- a/Client/src/main/java/org/runite/client/Class36.java +++ b/Client/src/main/java/org/runite/client/Class36.java @@ -55,7 +55,7 @@ final class Class36 { break; } - var3[var10] = Class3_Sub13_Sub29.bitwiseOr(var12, var11); + var3[var10] = TextureOperation3.bitwiseOr(var12, var11); } var9 = var8 | var7; @@ -141,7 +141,7 @@ final class Class36 { try { for (int var4 = 0; var4 < Client.anInt869; ++var4) { - Class168 var5 = Class3_Sub13_Sub37.method350((byte) 120, var4); + Class168 var5 = TextureOperation10.method350((byte) 120, var4); if (null != var5) { int var6 = var5.anInt2095; if (0 <= var6 && !Class51.anInterface2_838.method17(var6, 126)) { @@ -154,7 +154,7 @@ final class Class36 { int var10; if (var5.anInt2098 < 0) { if (var6 >= 0) { - var7 = Class51.anIntArray834[LinkableRSString.method729((byte) -74, Class51.anInterface2_838.method15(var6, '\uffff'), 96)]; + var7 = Class51.anIntArray834[LinkableRSString.method729((byte) -74, Class51.anInterface2_838.method15(var6, 65535), 96)]; } else if (-1 == var5.anInt2103) { var7 = -1; } else { @@ -198,7 +198,7 @@ final class Class36 { int var8; for (var8 = var6 << 3; var1 > var5; ++var5) { - int var9 = var4[var5] & 255; + int var9 = var4[var5] & 0xFF; int var10 = this.anIntArray636[var9]; byte var11 = this.aByteArray635[var9]; if (0 == var11) { @@ -211,7 +211,7 @@ final class Class36 { int var14 = var12 + (var13 + var11 - 1 >> 3); var7 &= -var13 >> 31; var13 += 24; - var3[var12] = (byte) (var7 = Class3_Sub13_Sub29.bitwiseOr(var7, var10 >>> var13)); + var3[var12] = (byte) (var7 = TextureOperation3.bitwiseOr(var7, var10 >>> var13)); if (var14 > var12) { ++var12; var13 -= 8; diff --git a/Client/src/main/java/org/runite/client/Class37.java b/Client/src/main/java/org/runite/client/Class37.java index b6a87d5f5..20c04ce7e 100644 --- a/Client/src/main/java/org/runite/client/Class37.java +++ b/Client/src/main/java/org/runite/client/Class37.java @@ -62,17 +62,17 @@ final class Class37 { var19 = 1.0F; } - int var20 = (int) (var19 * (float) (var23 >> 16 & 255)); + int var20 = (int) (var19 * (float) (var23 >> 16 & 0xFF)); if (var20 > 255) { var20 = 255; } - int var21 = (int) (var19 * (float) (var23 >> 8 & 255)); + int var21 = (int) (var19 * (float) (var23 >> 8 & 0xFF)); if (var21 > 255) { var21 = 255; } - int var22 = (int) (var19 * (float) (var23 & 255)); + int var22 = (int) (var19 * (float) (var23 & 0xFF)); if (var22 > 255) { var22 = 255; } diff --git a/Client/src/main/java/org/runite/client/Class38.java b/Client/src/main/java/org/runite/client/Class38.java index ad13047bc..48920e8db 100644 --- a/Client/src/main/java/org/runite/client/Class38.java +++ b/Client/src/main/java/org/runite/client/Class38.java @@ -19,7 +19,7 @@ class Class38 { var2 = Class56.localPlayerIndexes[var1]; } - Player var3 = Class3_Sub13_Sub22.players[var2]; + Player var3 = TextureOperation0.players[var2]; if (var3 != null) { Unsorted.method68(var3.getSize(), var3); } @@ -32,8 +32,8 @@ class Class38 { static void method1029() { try { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(177); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class113.interfacePacketCounter); + TextureOperation12.outgoingBuffer.putOpcode(177); + TextureOperation12.outgoingBuffer.writeShort(Class113.interfacePacketCounter); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "fk.D(" + 0 + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class38_Sub1.java b/Client/src/main/java/org/runite/client/Class38_Sub1.java index 885a453f4..1df82fee3 100644 --- a/Client/src/main/java/org/runite/client/Class38_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class38_Sub1.java @@ -1,6 +1,6 @@ package org.runite.client; -final class Class38_Sub1 extends Class38 { +public final class Class38_Sub1 extends Class38 { static int[][][] anIntArrayArrayArray2609; static String accRegistryIp; @@ -12,12 +12,12 @@ final class Class38_Sub1 extends Class38 { static int anInt2618; - static void minimapIcons(RSInterface var0, AbstractSprite var1, int var2, int var3, int var4, int var6) { + public static void minimapIcons(RSInterface var0, AbstractSprite var1, int var2, int var3, int var4, int var6) { try { if(null != var1) { int var9 = var3 * var3 - -(var2 * var2); - int var7 = 2047 & Class3_Sub13_Sub8.anInt3102 + GraphicDefinition.CAMERA_DIRECTION;//Region turns Map Icons + NPC Dots stay static + int var7 = 2047 & TextureOperation9.anInt3102 + GraphicDefinition.CAMERA_DIRECTION;//Region turns Map Icons + NPC Dots stay static int var8 = Math.max(var0.width / 2, var0.height / 2) - -10; if(var8 * var8 >= var9) { int var10 = Class51.anIntArray840[var7]; diff --git a/Client/src/main/java/org/runite/client/Class39.java b/Client/src/main/java/org/runite/client/Class39.java index 25df2aa8a..a0163a990 100644 --- a/Client/src/main/java/org/runite/client/Class39.java +++ b/Client/src/main/java/org/runite/client/Class39.java @@ -32,7 +32,7 @@ public final class Class39 { var3 = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); plane = GraphicDefinition.incomingBuffer.readUnsigned128Byte(); var5 = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); - GraphicDefinition.incomingBuffer.setBitAccess((byte) 112); + GraphicDefinition.incomingBuffer.setBitAccess(); int var18; for (var6 = 0; var6 < 4; ++var6) { @@ -65,11 +65,11 @@ public final class Class39 { Client.anIntArray2200 = new int[var6]; Class40.aByteArrayArray3057 = new byte[var6][]; NPC.npcSpawnCacheIndices = null; - Class3_Sub13_Sub15.anIntArray3181 = new int[var6]; + TextureOperation17.anIntArray3181 = new int[var6]; Class3_Sub22.aByteArrayArray2521 = new byte[var6][]; Class164_Sub2.aByteArrayArray3027 = new byte[var6][]; Class3_Sub24_Sub3.anIntArray3494 = new int[var6]; - Class3_Sub13_Sub26.aByteArrayArray3335 = null; + TextureOperation35.aByteArrayArray3335 = null; Class40.aByteArrayArray3669 = new byte[var6][]; var6 = 0; @@ -92,11 +92,11 @@ public final class Class39 { if (var14 != -1) { Class3_Sub24_Sub3.anIntArray3494[var6] = var14; - int var16 = var14 & 255; + int var16 = var14 & 0xFF; var15 = ('\uff6c' & var14) >> 8; Client.anIntArray2200[var6] = CacheIndex.landscapesIndex.getArchiveForName(RSString.stringCombiner(new RSString[]{RSString.parse("m"), RSString.stringAnimator(var15), RSString.parse("_"), RSString.stringAnimator(var16)})); Class101.anIntArray1426[var6] = CacheIndex.landscapesIndex.getArchiveForName(RSString.stringCombiner(new RSString[]{RSString.parse("l"), RSString.stringAnimator(var15), RSString.parse("_"), RSString.stringAnimator(var16)})); - Class3_Sub13_Sub15.anIntArray3181[var6] = CacheIndex.landscapesIndex.getArchiveForName(RSString.stringCombiner(new RSString[]{RSString.parse("um"), RSString.stringAnimator(var15), RSString.parse("_"), RSString.stringAnimator(var16)})); + TextureOperation17.anIntArray3181[var6] = CacheIndex.landscapesIndex.getArchiveForName(RSString.stringCombiner(new RSString[]{RSString.parse("um"), RSString.stringAnimator(var15), RSString.parse("_"), RSString.stringAnimator(var16)})); Class3_Sub28_Sub5.anIntArray3587[var6] = CacheIndex.landscapesIndex.getArchiveForName(RSString.stringCombiner(new RSString[]{RSString.parse("ul"), RSString.stringAnimator(var15), RSString.parse("_"), RSString.stringAnimator(var16)})); ++var6; } @@ -124,8 +124,8 @@ public final class Class39 { var7 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); Class3_Sub24_Sub3.anIntArray3494 = new int[var3]; Class164_Sub2.aByteArrayArray3027 = new byte[var3][]; - Class3_Sub13_Sub26.aByteArrayArray3335 = null; - Class3_Sub13_Sub15.anIntArray3181 = new int[var3]; + TextureOperation35.aByteArrayArray3335 = null; + TextureOperation17.anIntArray3181 = new int[var3]; Class3_Sub22.aByteArrayArray2521 = new byte[var3][]; Class40.aByteArrayArray3057 = new byte[var3][]; NPC.npcSpawnCacheIndices = null; @@ -150,13 +150,13 @@ public final class Class39 { Class3_Sub24_Sub3.anIntArray3494[var3] = var11; Client.anIntArray2200[var3] = -1; Class101.anIntArray1426[var3] = -1; - Class3_Sub13_Sub15.anIntArray3181[var3] = -1; + TextureOperation17.anIntArray3181[var3] = -1; Class3_Sub28_Sub5.anIntArray3587[var3] = -1; } else { Class3_Sub24_Sub3.anIntArray3494[var3] = var11; Client.anIntArray2200[var3] = CacheIndex.landscapesIndex.getArchiveForName(RSString.stringCombiner(new RSString[]{RSString.parse("m"), RSString.stringAnimator(var9), RSString.parse("_"), RSString.stringAnimator(var10)})); Class101.anIntArray1426[var3] = CacheIndex.landscapesIndex.getArchiveForName(RSString.stringCombiner(new RSString[]{RSString.parse("l"), RSString.stringAnimator(var9), RSString.parse("_"), RSString.stringAnimator(var10)})); - Class3_Sub13_Sub15.anIntArray3181[var3] = CacheIndex.landscapesIndex.getArchiveForName(RSString.stringCombiner(new RSString[]{RSString.parse("um"), RSString.stringAnimator(var9), RSString.parse("_"), RSString.stringAnimator(var10)})); + TextureOperation17.anIntArray3181[var3] = CacheIndex.landscapesIndex.getArchiveForName(RSString.stringCombiner(new RSString[]{RSString.parse("um"), RSString.stringAnimator(var9), RSString.parse("_"), RSString.stringAnimator(var10)})); Class3_Sub28_Sub5.anIntArray3587[var3] = CacheIndex.landscapesIndex.getArchiveForName(RSString.stringCombiner(new RSString[]{RSString.parse("ul"), RSString.stringAnimator(var9), RSString.parse("_"), RSString.stringAnimator(var10)})); } @@ -182,7 +182,7 @@ public final class Class39 { Unsorted.anIntArray3076 = null; Class163_Sub1.aByteArrayArray2987 = null; Class164.anIntArray2048 = null; - Class3_Sub13_Sub38.spritePalette = null; + TextureOperation38.spritePalette = null; } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "g.E(" + var0 + ')'); } @@ -298,11 +298,11 @@ public final class Class39 { Class140_Sub7 var31 = new Class140_Sub7(); var31.anInt2930 = var5; var31.anInt2936 = var1; - if (Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4] == null) { - Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4] = new Class61(); + if (TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4] == null) { + TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4] = new Class61(); } - Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4].method1215(new WorldMap(var31)); + TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4].method1215(new WorldMap(var31)); Class128.method1760(var4, var3); } @@ -332,14 +332,14 @@ public final class Class39 { } var13 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - if (0 <= var2 && 0 <= var3 && 208 > var2 && 208 > var3 && var4 >= 0 && 0 <= var5 && var4 < 208 && var5 < 208 && var7 != '\uffff') { + if (0 <= var2 && 0 <= var3 && 208 > var2 && 208 > var3 && var4 >= 0 && 0 <= var5 && var4 < 208 && var5 < 208 && var7 != 65535) { var5 *= 64; var4 = 64 * var4; var3 = 64 * var3; var2 = 64 * var2; var36 = new Class140_Sub6(var7, WorldListCountry.localPlane, var2, var3, Class121.method1736(WorldListCountry.localPlane, 1, var2, var3) + -var8, Class44.anInt719 + var10, var11 + Class44.anInt719, var35, var13, var6, var28); var36.method2024(var5, Class44.anInt719 + var10, -var28 + Class121.method1736(WorldListCountry.localPlane, 1, var4, var5), var4); - Class3_Sub13_Sub30.aClass61_3364.method1215(new Class3_Sub28_Sub19(var36)); + TextureOperation13.aClass61_3364.method1215(new Class3_Sub28_Sub19(var36)); } } else if (Unsorted.incomingOpcode == 17) { @@ -353,7 +353,7 @@ public final class Class39 { var2 = var2 * 128 - -64; var3 = var3 * 128 - -64; Class140_Sub2 var32 = new Class140_Sub2(var4, WorldListCountry.localPlane, var2, var3, -var5 + Class121.method1736(WorldListCountry.localPlane, 1, var2, var3), var6, Class44.anInt719); - Class3_Sub13_Sub15.aClass61_3177.method1215(new Class3_Sub28_Sub2(var32)); + TextureOperation17.aClass61_3177.method1215(new Class3_Sub28_Sub2(var32)); } } else if (Unsorted.incomingOpcode == 179) { @@ -378,7 +378,7 @@ public final class Class39 { var6 = 3 & var4; var7 = Class75.anIntArray1107[var5]; var8 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - if ('\uffff' == var8) { + if (65535 == var8) { var8 = -1; } @@ -401,7 +401,7 @@ public final class Class39 { var13 = GraphicDefinition.incomingBuffer.readUnsignedShort(); var14 = GraphicDefinition.incomingBuffer.readSignedShortLE128(); if (!HDToolKit.highDetail) { - Class3_Sub13_Sub23.method280(var12, var13, var14, var11, var6, var9, var3, var25, var5, var2, var30, var10); + TextureOperation39.method280(var12, var13, var14, var11, var6, var9, var3, var25, var5, var2, var30, var10); } } @@ -413,7 +413,7 @@ public final class Class39 { var5 = GraphicDefinition.incomingBuffer.readUnsignedShort(); var6 = GraphicDefinition.incomingBuffer.readUnsignedShort(); if (0 <= var2 && var3 >= 0 && var2 < 104 && var3 < 104) { - Class61 var29 = Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var2][var3]; + Class61 var29 = TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var2][var3]; if (var29 != null) { for (WorldMap var34 = (WorldMap) var29.method1222(); var34 != null; var34 = (WorldMap) var29.method1221()) { Class140_Sub7 var33 = var34.aClass140_Sub7_3676; @@ -438,11 +438,11 @@ public final class Class39 { Class140_Sub7 var27 = new Class140_Sub7(); var27.anInt2930 = var5; var27.anInt2936 = var6; - if (null == Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4]) { - Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4] = new Class61(); + if (null == TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4]) { + TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4] = new Class61(); } - Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4].method1215(new WorldMap(var27)); + TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4].method1215(new WorldMap(var27)); Class128.method1760(var4, var3); } @@ -472,7 +472,7 @@ public final class Class39 { var4 = 128 * var4 + 64; var36 = new Class140_Sub6(var7, WorldListCountry.localPlane, var2, var3, Class121.method1736(WorldListCountry.localPlane, 1, var2, var3) + -var8, var10 + Class44.anInt719, var11 + Class44.anInt719, var35, var13, var6, var28); var36.method2024(var5, Class44.anInt719 + var10, Class121.method1736(WorldListCountry.localPlane, 1, var4, var5) - var28, var4); - Class3_Sub13_Sub30.aClass61_3364.method1215(new Class3_Sub28_Sub19(var36)); + TextureOperation13.aClass61_3364.method1215(new Class3_Sub28_Sub19(var36)); } } else if (Unsorted.incomingOpcode == 104) { @@ -494,7 +494,7 @@ public final class Class39 { var13 = -1; } - if (var2 >= 0 && var3 >= 0 && 208 > var2 && var3 < 208 && 0 <= var4 && var5 >= 0 && 208 > var4 && 208 > var5 && var8 != '\uffff') { + if (var2 >= 0 && var3 >= 0 && 208 > var2 && var3 < 208 && 0 <= var4 && var5 >= 0 && 208 > var4 && 208 > var5 && var8 != 65535) { var4 = 64 * var4; var2 *= 64; var5 *= 64; @@ -516,7 +516,7 @@ public final class Class39 { if (Class3_Sub1.localIndex == var18) { var16 = Class102.player; } else { - var16 = Class3_Sub13_Sub22.players[var18]; + var16 = TextureOperation0.players[var18]; } } @@ -538,7 +538,7 @@ public final class Class39 { Class140_Sub6 var37 = new Class140_Sub6(var8, WorldListCountry.localPlane, var2, var3, -var28 + Class121.method1736(WorldListCountry.localPlane, 1, var2, var3), var11 + Class44.anInt719, var35 + Class44.anInt719, var13, var14, var7, var10); var37.method2024(var5, var11 + Class44.anInt719, -var10 + Class121.method1736(WorldListCountry.localPlane, 1, var4, var5), var4); - Class3_Sub13_Sub30.aClass61_3364.method1215(new Class3_Sub28_Sub19(var37)); + TextureOperation13.aClass61_3364.method1215(new Class3_Sub28_Sub19(var37)); } } else if (97 == Unsorted.incomingOpcode) { @@ -572,7 +572,7 @@ public final class Class39 { var2 = ((113 & var1) >> 4) + Class65.currentChunkX; var4 = GraphicDefinition.incomingBuffer.readUnsignedShort(); if (var2 >= 0 && var3 >= 0 && 104 > var2 && 104 > var3) { - Class61 var24 = Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var2][var3]; + Class61 var24 = TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var2][var3]; if (var24 != null) { for (WorldMap var26 = (WorldMap) var24.method1222(); var26 != null; var26 = (WorldMap) var24.method1221()) { if (var26.aClass140_Sub7_3676.anInt2936 == (var4 & 32767)) { @@ -582,7 +582,7 @@ public final class Class39 { } if (var24.method1222() == null) { - Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var2][var3] = null; + TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var2][var3] = null; } Class128.method1760(var3, var2); diff --git a/Client/src/main/java/org/runite/client/Class3_Sub1.java b/Client/src/main/java/org/runite/client/Class3_Sub1.java index 0aca4757e..3c9c9ab00 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub1.java @@ -21,7 +21,7 @@ final class Class3_Sub1 extends Linkable { static void method90(int var0) { try { if (HDToolKit.highDetail) { - if (!Class3_Sub13_Sub34.aBoolean3416) { + if (!TextureOperation25.aBoolean3416) { Class3_Sub2[][][] var1 = Class75_Sub2.aClass3_Sub2ArrayArrayArray2638; for (Class3_Sub2[][] var3 : var1) { for (Class3_Sub2[] class3_sub2s : var3) { @@ -92,7 +92,7 @@ final class Class3_Sub1 extends Linkable { } } - Class3_Sub13_Sub34.aBoolean3416 = true; + TextureOperation25.aBoolean3416 = true; } } } catch (RuntimeException var9) { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub15.java b/Client/src/main/java/org/runite/client/Class3_Sub15.java index 9e9b0375a..66298a8b9 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub15.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub15.java @@ -291,7 +291,7 @@ public final class Class3_Sub15 extends Linkable { var22 = var2.method741(); } - this.aShortArray2434[var23] = (short)(this.aShortArray2434[var23] + Unsorted.bitwiseAnd('\u8000', -1 + var22 << 14)); + this.aShortArray2434[var23] = (short)(this.aShortArray2434[var23] + Unsorted.bitwiseAnd(32768, -1 + var22 << 14)); this.anIntArray2423[var23] = var22; --var20; } @@ -464,7 +464,7 @@ public final class Class3_Sub15 extends Linkable { var32 = (var30 - var48) * var46 + (var30 - var48) / 2; for(var33 = var48; var30 > var33; ++var33) { - var34 = Class3_Sub13_Sub32.method319(var32, -125, -var48 + var30); + var34 = TextureOperation14.method319(var32, -125, -var48 + var30); var32 += var31 + -var46; this.aByteArray2430[var33] = (byte)(var34 * this.aByteArray2430[var33] - -32 >> 6); } @@ -510,9 +510,9 @@ public final class Class3_Sub15 extends Linkable { var29 += 2; for(var33 = var48; var30 > var33; ++var33) { - var34 = Class3_Sub13_Sub32.method319(var32, -116, -var48 + var30); + var34 = TextureOperation14.method319(var32, -116, -var48 + var30); var32 += -var47 + var45; - int var35 = var34 + (this.aByteArray2422[var33] & 255); + int var35 = var34 + (this.aByteArray2422[var33] & 0xFF); if(var35 < 0) { var35 = 0; } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub19.java b/Client/src/main/java/org/runite/client/Class3_Sub19.java index d5cedc425..802319929 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub19.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub19.java @@ -3,173 +3,173 @@ package org.runite.client; import org.rs09.client.Linkable; import org.rs09.client.rendering.Toolkit; -final class Class3_Sub19 extends Linkable { +public final class Class3_Sub19 extends Linkable { - static int[] anIntArray3693 = new int[1000]; + public static int[] anIntArray3693 = new int[1000]; byte aByte2472; - RSString aClass94_2473; - static int anInt2475 = 0; - RSString aClass94_2476; - int anInt2478; + RSString aClass94_2473; + static int anInt2475 = 0; + RSString aClass94_2476; + int anInt2478; - static Class75_Sub2 method384(DataBuffer var0) { - try { + static Class75_Sub2 method384(DataBuffer var0) { + try { - return new Class75_Sub2(var0.readSignedShort(), var0.readSignedShort(), var0.readSignedShort(), var0.readSignedShort(), var0.readMedium(), var0.readMedium(), var0.readUnsignedByte()); - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "kl.C(" + (var0 != null?"{...}":"null") + ',' + (byte) 80 + ')'); - } - } + return new Class75_Sub2(var0.readSignedShort(), var0.readSignedShort(), var0.readSignedShort(), var0.readSignedShort(), var0.readMedium(), var0.readMedium(), var0.readUnsignedByte()); + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "kl.C(" + (var0 != null ? "{...}" : "null") + ',' + (byte) 80 + ')'); + } + } - static boolean method385(int var1) { - try { - byte var3 = 0; - int var5; - int var6; - int var7; - int var8; - if(null == Class27.aClass3_Sub28_Sub16_Sub2_518) { - if(HDToolKit.highDetail || null == Class49.aAbstractSprite_812) { - Class27.aClass3_Sub28_Sub16_Sub2_518 = new Class3_Sub28_Sub16_Sub2(512, 512); + static boolean method385(int var1) { + try { + byte var3 = 0; + int var5; + int var6; + int var7; + int var8; + if (null == Class27.aClass3_Sub28_Sub16_Sub2_518) { + if (HDToolKit.highDetail || null == Class49.aAbstractSprite_812) { + Class27.aClass3_Sub28_Sub16_Sub2_518 = new Class3_Sub28_Sub16_Sub2(512, 512); + } else { + Class27.aClass3_Sub28_Sub16_Sub2_518 = (Class3_Sub28_Sub16_Sub2) Class49.aAbstractSprite_812; + } + + int[] var4 = Class27.aClass3_Sub28_Sub16_Sub2_518.anIntArray4081; + var5 = var4.length; + + for (var6 = 0; var5 > var6; ++var6) { + var4[var6] = 1; + } + + for (var6 = var3 + 1; -1 + -var3 + 104 > var6; ++var6) { + var7 = 4 * 512 * (var3 + 103 + -var6) + 24628; + + for (var8 = 1; 104 + -1 > var8; ++var8) { + if ((Unsorted.aByteArrayArrayArray113[var1][var8][var6] & 24) == 0) { + Unsorted.method1469(var4, var7, 512, var1, var8, var6); + } + + if (var1 < 3 && 0 != (Unsorted.aByteArrayArrayArray113[1 + var1][var8][var6] & 8)) { + Unsorted.method1469(var4, var7, 512, var1 + 1, var8, var6); + } + + var7 += 4; + } + } + + MouseListeningClass.anInt1924 = 0; + + for (var6 = 0; 104 > var6; ++var6) { + for (var7 = 0; 104 > var7; ++var7) { + long var20 = Class3_Sub2.method104(WorldListCountry.localPlane, var6, var7 - -var3); + if (var20 != 0) { + ObjectDefinition var10 = ObjectDefinition.getObjectDefinition((int) (var20 >>> 32) & Integer.MAX_VALUE); + int var11 = var10.MapIcon; + int var12; + if (null != var10.ChildrenIds) { + for (var12 = 0; var12 < var10.ChildrenIds.length; ++var12) { + if (-1 != var10.ChildrenIds[var12]) { + ObjectDefinition var13 = ObjectDefinition.getObjectDefinition(var10.ChildrenIds[var12]); + if (0 <= var13.MapIcon) { + var11 = var13.MapIcon; + break; + } + } + } + } + + if (var11 >= 0) { + int var21 = var3 + var7; + var12 = var6; + if (22 != var11 && var11 != 29 && 34 != var11 && var11 != 36 && 46 != var11 && var11 != 47 && var11 != 48) { + int[][] var14 = AtmosphereParser.aClass91Array1182[WorldListCountry.localPlane].anIntArrayArray1304; + + for (int var15 = 0; var15 < 10; ++var15) { + int var16 = (int) (Math.random() * 4.0D); + if (var16 == 0 && var12 > 0 && var12 > var6 - 3 && (var14[var12 - 1][var21] & 19661064) == 0) { + --var12; + } + + if (var16 == 1 && var12 < 103 && var12 < 3 + var6 && (var14[var12 - -1][var21] & 19661184) == 0) { + ++var12; + } + + if (2 == var16 && var21 > 0 && var21 > -3 + var7 && 0 == (var14[var12][-1 + var21] & 19661058)) { + --var21; + } + + if (3 == var16 && var21 < 103 && var7 - -3 > var21 && 0 == (19661088 & var14[var12][1 + var21])) { + ++var21; + } + } + } + + anIntArray3693[MouseListeningClass.anInt1924] = var10.objectId; + Class84.anIntArray1163[MouseListeningClass.anInt1924] = var12; + Unsorted.anIntArray4050[MouseListeningClass.anInt1924] = var21 + -var3; + ++MouseListeningClass.anInt1924; + } + } + } + } + } + + Class27.aClass3_Sub28_Sub16_Sub2_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; + + for (var6 = 1; var6 < 103; ++var6) { + for (var7 = 1; 103 > var7; ++var7) { + if (0 == (Unsorted.aByteArrayArrayArray113[var1][var7][var6 - -var3] & 24) && !Unsorted.method1529(var3, var7, var18, var6, var5, var1)) { + if (HDToolKit.highDetail) { + Toolkit.JAVA_TOOLKIT.resetBuffer(); + } else { + Unsorted.aClass158_3009.method2182(); + } + + return false; + } + + if (var1 < 3 && (Unsorted.aByteArrayArrayArray113[1 + var1][var7][var6 + var3] & 8) != 0 && !Unsorted.method1529(var3, var7, var18, var6, var5, 1 + var1)) { + if (HDToolKit.highDetail) { + Toolkit.JAVA_TOOLKIT.resetBuffer(); + } else { + Unsorted.aClass158_3009.method2182(); + } + + return false; + } + } + } + + if (HDToolKit.highDetail) { + int[] var19 = Class27.aClass3_Sub28_Sub16_Sub2_518.anIntArray4081; + var7 = var19.length; + + for (var8 = 0; var7 > var8; ++var8) { + if (var19[var8] == 0) { + var19[var8] = 1; + } + } + + Class49.aAbstractSprite_812 = new HDSprite(Class27.aClass3_Sub28_Sub16_Sub2_518); } else { - Class27.aClass3_Sub28_Sub16_Sub2_518 = (Class3_Sub28_Sub16_Sub2)Class49.aAbstractSprite_812; + Class49.aAbstractSprite_812 = Class27.aClass3_Sub28_Sub16_Sub2_518; } - int[] var4 = Class27.aClass3_Sub28_Sub16_Sub2_518.anIntArray4081; - var5 = var4.length; - - for(var6 = 0; var5 > var6; ++var6) { - var4[var6] = 1; + if (HDToolKit.highDetail) { + Toolkit.JAVA_TOOLKIT.resetBuffer(); + } else { + Unsorted.aClass158_3009.method2182(); } - for(var6 = var3 + 1; -1 + -var3 + 104 > var6; ++var6) { - var7 = 4 * 512 * (var3 + 103 + -var6) + 24628; - - for(var8 = 1; 104 + -1 > var8; ++var8) { - if((Unsorted.aByteArrayArrayArray113[var1][var8][var6] & 24) == 0) { - Unsorted.method1469(var4, var7, 512, var1, var8, var6); - } - - if(var1 < 3 && 0 != (Unsorted.aByteArrayArrayArray113[1 + var1][var8][var6] & 8)) { - Unsorted.method1469(var4, var7, 512, var1 + 1, var8, var6); - } - - var7 += 4; - } - } - - MouseListeningClass.anInt1924 = 0; - - for(var6 = 0; 104 > var6; ++var6) { - for(var7 = 0; 104 > var7; ++var7) { - long var20 = Class3_Sub2.method104(WorldListCountry.localPlane, var6, var7 - -var3); - if(var20 != 0) { - ObjectDefinition var10 = ObjectDefinition.getObjectDefinition((int)(var20 >>> 32) & Integer.MAX_VALUE); - int var11 = var10.MapIcon; - int var12; - if(null != var10.ChildrenIds) { - for(var12 = 0; var12 < var10.ChildrenIds.length; ++var12) { - if(-1 != var10.ChildrenIds[var12]) { - ObjectDefinition var13 = ObjectDefinition.getObjectDefinition(var10.ChildrenIds[var12]); - if(0 <= var13.MapIcon) { - var11 = var13.MapIcon; - break; - } - } - } - } - - if(var11 >= 0) { - int var21 = var3 + var7; - var12 = var6; - if(22 != var11 && var11 != 29 && 34 != var11 && var11 != 36 && 46 != var11 && var11 != 47 && var11 != 48) { - int[][] var14 = AtmosphereParser.aClass91Array1182[WorldListCountry.localPlane].anIntArrayArray1304; - - for(int var15 = 0; var15 < 10; ++var15) { - int var16 = (int)(Math.random() * 4.0D); - if(var16 == 0 && var12 > 0 && var12 > var6 - 3 && (var14[var12 - 1][var21] & 19661064) == 0) { - --var12; - } - - if(var16 == 1 && var12 < 103 && var12 < 3 + var6 && (var14[var12 - -1][var21] & 19661184) == 0) { - ++var12; - } - - if(2 == var16 && var21 > 0 && var21 > -3 + var7 && 0 == (var14[var12][-1 + var21] & 19661058)) { - --var21; - } - - if(3 == var16 && var21 < 103 && var7 - -3 > var21 && 0 == (19661088 & var14[var12][1 + var21])) { - ++var21; - } - } - } - - anIntArray3693[MouseListeningClass.anInt1924] = var10.objectId; - Class84.anIntArray1163[MouseListeningClass.anInt1924] = var12; - Unsorted.anIntArray4050[MouseListeningClass.anInt1924] = var21 + -var3; - ++MouseListeningClass.anInt1924; - } - } - } - } - } - - Class27.aClass3_Sub28_Sub16_Sub2_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; - - for(var6 = 1; var6 < 103; ++var6) { - for(var7 = 1; 103 > var7; ++var7) { - if(0 == (Unsorted.aByteArrayArrayArray113[var1][var7][var6 - -var3] & 24) && !Unsorted.method1529(var3, var7, var18, var6, var5, var1)) { - if(HDToolKit.highDetail) { - Toolkit.JAVA_TOOLKIT.resetBuffer(); - } else { - Class164_Sub1.aClass158_3009.method2182(); - } - - return false; - } - - if(var1 < 3 && (Unsorted.aByteArrayArrayArray113[1 + var1][var7][var6 + var3] & 8) != 0 && !Unsorted.method1529(var3, var7, var18, var6, var5, 1 + var1)) { - if(HDToolKit.highDetail) { - Toolkit.JAVA_TOOLKIT.resetBuffer(); - } else { - Class164_Sub1.aClass158_3009.method2182(); - } - - return false; - } - } - } - - if(HDToolKit.highDetail) { - int[] var19 = Class27.aClass3_Sub28_Sub16_Sub2_518.anIntArray4081; - var7 = var19.length; - - for(var8 = 0; var7 > var8; ++var8) { - if(var19[var8] == 0) { - var19[var8] = 1; - } - } - - Class49.aAbstractSprite_812 = new HDSprite(Class27.aClass3_Sub28_Sub16_Sub2_518); - } else { - Class49.aAbstractSprite_812 = Class27.aClass3_Sub28_Sub16_Sub2_518; - } - - if(HDToolKit.highDetail) { - Toolkit.JAVA_TOOLKIT.resetBuffer(); - } else { - Class164_Sub1.aClass158_3009.method2182(); - } - - Class27.aClass3_Sub28_Sub16_Sub2_518 = null; - return true; - } catch (RuntimeException var17) { - throw ClientErrorException.clientError(var17, "kl.B(" + 0 + ',' + var1 + ')'); - } - } + Class27.aClass3_Sub28_Sub16_Sub2_518 = null; + return true; + } catch (RuntimeException var17) { + throw ClientErrorException.clientError(var17, "kl.B(" + 0 + ',' + var1 + ')'); + } + } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub20.java b/Client/src/main/java/org/runite/client/Class3_Sub20.java index 50a07a63a..18f415fa5 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub20.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub20.java @@ -34,7 +34,7 @@ final class Class3_Sub20 extends Linkable { Class32.method995(); Class49.aAbstractSprite_812 = null; Class58.anInt909 = -1; - Class3_Sub13_Sub30.method313((byte)55); + TextureOperation13.method313((byte)55); aClass47_3801.clear(); ObjectDefinition.aClass136_1413 = new Class136(); ((Class102)Class51.anInterface2_838).method1618(); @@ -44,10 +44,10 @@ final class Class3_Sub20 extends Linkable { Class141.method2043(); Class65.method1240(); Unsorted.method1250(17, false); - Class3_Sub13_Sub17.method247((byte)51); + TextureOperation23.method247((byte)51); for(int var1 = 0; 2048 > var1; ++var1) { - Player var2 = Class3_Sub13_Sub22.players[var1]; + Player var2 = TextureOperation0.players[var1]; if(null != var2) { var2.anObject2796 = null; } @@ -70,7 +70,7 @@ final class Class3_Sub20 extends Linkable { } if(10 == Class143.gameStage) { - Class3_Sub13_Sub11.method219(false); + TextureOperation1.method219(false); } if(Class143.gameStage == 30) { @@ -85,14 +85,14 @@ final class Class3_Sub20 extends Linkable { static void method390(boolean var0, int var1, int var2, int var3, byte var4, int var5, int var6) { try { Unsorted.anInt3631 = var3; - Class3_Sub13_Sub34.anInt3414 = var2; + TextureOperation25.anInt3414 = var2; Unsorted.anInt30 = var6; Class163_Sub2_Sub1.anInt4021 = var1; Class146.anInt1904 = var5; if(var0 && Unsorted.anInt3631 >= 100) { NPC.anInt3995 = 128 * Unsorted.anInt30 + 64; Class77.anInt1111 = 128 * Class146.anInt1904 + 64; - Class7.anInt2162 = Class121.method1736(WorldListCountry.localPlane, 1, NPC.anInt3995, Class77.anInt1111) + -Class3_Sub13_Sub34.anInt3414; + Class7.anInt2162 = Class121.method1736(WorldListCountry.localPlane, 1, NPC.anInt3995, Class77.anInt1111) + -TextureOperation25.anInt3414; } // int var7 = 76 % ((-79 - var4) / 35); diff --git a/Client/src/main/java/org/runite/client/Class3_Sub21.java b/Client/src/main/java/org/runite/client/Class3_Sub21.java index 780507639..74ed9e12c 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub21.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub21.java @@ -46,7 +46,7 @@ final class Class3_Sub21 extends Linkable { for(var9 = 0; var9 < var8; ++var9) { var10 = var0.anIntArray627[var9] - Class145.anInt2697; var11 = var0.anIntArray615[var9] - Unsorted.anInt3657; - var12 = var0.anIntArray618[var9] - Class3_Sub13_Sub30.anInt3363; + var12 = var0.anIntArray618[var9] - TextureOperation13.anInt3363; var13 = var12 * var3 + var10 * var4 >> 16; var12 = var12 * var4 - var10 * var3 >> 16; var10 = var13; @@ -80,7 +80,7 @@ final class Class3_Sub21 extends Linkable { int var17 = Class35.anIntArray622[var11]; int var18 = Class35.anIntArray622[var12]; if((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { - if(Class3_Sub13_Sub21.aBoolean3261 && Class3_Sub13_Sub4.method185(Class49.anInt819 + Class51.anInt846, Class3_Sub13_Sub23_Sub1.anInt4039 + Class51.anInt835, var16, var17, var18, var13, var14, var15)) { + if(TextureOperation37.aBoolean3261 && TextureOperation34.method185(Class49.anInt819 + Class51.anInt846, TextureOperation18.anInt4039 + Class51.anInt835, var16, var17, var18, var13, var14, var15)) { Class27.anInt515 = var5; Unsorted.anInt999 = var6; } @@ -89,14 +89,14 @@ final class Class3_Sub21 extends Linkable { Class51.aBoolean849 = var13 < 0 || var14 < 0 || var15 < 0 || var13 > Class51.anInt847 || var14 > Class51.anInt847 || var15 > Class51.anInt847; if(var0.anIntArray616 != null && var0.anIntArray616[var9] != -1) { - if(Class3_Sub13_Sub22.aBoolean3275) { + if(TextureOperation0.aBoolean3275) { if(var0.aBoolean629) { Class51.method1135(var16, var17, var18, var13, var14, var15, var0.anIntArray625[var9], var0.anIntArray632[var9], var0.anIntArray631[var9], Class35.anIntArray614[0], Class35.anIntArray614[1], Class35.anIntArray614[3], Class35.anIntArray630[0], Class35.anIntArray630[1], Class35.anIntArray630[3], Class35.anIntArray628[0], Class35.anIntArray628[1], Class35.anIntArray628[3], var0.anIntArray616[var9]); } else { Class51.method1135(var16, var17, var18, var13, var14, var15, var0.anIntArray625[var9], var0.anIntArray632[var9], var0.anIntArray631[var9], Class35.anIntArray614[var10], Class35.anIntArray614[var11], Class35.anIntArray614[var12], Class35.anIntArray630[var10], Class35.anIntArray630[var11], Class35.anIntArray630[var12], Class35.anIntArray628[var10], Class35.anIntArray628[var11], Class35.anIntArray628[var12], var0.anIntArray616[var9]); } } else { - int var19 = Class51.anInterface2_838.method15(var0.anIntArray616[var9], '\uffff'); + int var19 = Class51.anInterface2_838.method15(var0.anIntArray616[var9], 65535); Class51.method1154(var16, var17, var18, var13, var14, var15, LoginHandler.method1753(var19, var0.anIntArray625[var9]), LoginHandler.method1753(var19, var0.anIntArray632[var9]), LoginHandler.method1753(var19, var0.anIntArray631[var9])); } } else if(var0.anIntArray625[var9] != 12345678) { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub22.java b/Client/src/main/java/org/runite/client/Class3_Sub22.java index 1280ada1c..1a5341f13 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub22.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub22.java @@ -45,37 +45,37 @@ final class Class3_Sub22 extends Linkable { if(var2 < 0) { var2 = 0; - } else if(var2 >= Class3_Sub13_Sub15.anInt3179 * 128) { - var2 = Class3_Sub13_Sub15.anInt3179 * 128 - 1; + } else if(var2 >= TextureOperation17.anInt3179 * 128) { + var2 = TextureOperation17.anInt3179 * 128 - 1; } Class60.anInt936 = Class51.anIntArray840[var3]; Unsorted.anInt1037 = Class51.anIntArray851[var3]; - Class3_Sub13_Sub34.anInt3417 = Class51.anIntArray840[var4]; + TextureOperation25.anInt3417 = Class51.anIntArray840[var4]; Class145.anInt3153 = Class51.anIntArray851[var4]; Class145.anInt2697 = var0; Unsorted.anInt3657 = var1; - Class3_Sub13_Sub30.anInt3363 = var2; + TextureOperation13.anInt3363 = var2; Class97.anInt1375 = var0 / 128; Class145.anInt3340 = var2 / 128; - Class163_Sub1_Sub1.anInt4006 = Class97.anInt1375 - Class3_Sub13_Sub39.anInt3466; + Class163_Sub1_Sub1.anInt4006 = Class97.anInt1375 - TextureOperation8.anInt3466; if(Class163_Sub1_Sub1.anInt4006 < 0) { Class163_Sub1_Sub1.anInt4006 = 0; } - Unsorted.anInt3603 = Class145.anInt3340 - Class3_Sub13_Sub39.anInt3466; + Unsorted.anInt3603 = Class145.anInt3340 - TextureOperation8.anInt3466; if(Unsorted.anInt3603 < 0) { Unsorted.anInt3603 = 0; } - Unsorted.anInt67 = Class97.anInt1375 + Class3_Sub13_Sub39.anInt3466; + Unsorted.anInt67 = Class97.anInt1375 + TextureOperation8.anInt3466; if(Unsorted.anInt67 > Unsorted.anInt1234) { Unsorted.anInt67 = Unsorted.anInt1234; } - Class126.anInt1665 = Class145.anInt3340 + Class3_Sub13_Sub39.anInt3466; - if(Class126.anInt1665 > Class3_Sub13_Sub15.anInt3179) { - Class126.anInt1665 = Class3_Sub13_Sub15.anInt3179; + Class126.anInt1665 = Class145.anInt3340 + TextureOperation8.anInt3466; + if(Class126.anInt1665 > TextureOperation17.anInt3179) { + Class126.anInt1665 = TextureOperation17.anInt3179; } short var15; @@ -87,13 +87,13 @@ final class Class3_Sub22 extends Linkable { int var17; int var16; - for(var16 = 0; var16 < Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466 + 2; ++var16) { - for(var17 = 0; var17 < Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466 + 2; ++var17) { - int var18 = (var16 - Class3_Sub13_Sub39.anInt3466 << 7) - (Class145.anInt2697 & 127); - int var19 = (var17 - Class3_Sub13_Sub39.anInt3466 << 7) - (Class3_Sub13_Sub30.anInt3363 & 127); - int var20 = Class97.anInt1375 - Class3_Sub13_Sub39.anInt3466 + var16; - int var21 = Class145.anInt3340 - Class3_Sub13_Sub39.anInt3466 + var17; - if(var20 >= 0 && var21 >= 0 && var20 < Unsorted.anInt1234 && var21 < Class3_Sub13_Sub15.anInt3179) { + for(var16 = 0; var16 < TextureOperation8.anInt3466 + TextureOperation8.anInt3466 + 2; ++var16) { + for(var17 = 0; var17 < TextureOperation8.anInt3466 + TextureOperation8.anInt3466 + 2; ++var17) { + int var18 = (var16 - TextureOperation8.anInt3466 << 7) - (Class145.anInt2697 & 127); + int var19 = (var17 - TextureOperation8.anInt3466 << 7) - (TextureOperation13.anInt3363 & 127); + int var20 = Class97.anInt1375 - TextureOperation8.anInt3466 + var16; + int var21 = Class145.anInt3340 - TextureOperation8.anInt3466 + var17; + if(var20 >= 0 && var21 >= 0 && var20 < Unsorted.anInt1234 && var21 < TextureOperation17.anInt3179) { int var22; if(Unsorted.anIntArrayArrayArray3605 == null) { var22 = Class58.anIntArrayArrayArray914[0][var20][var21] - Unsorted.anInt3657 + 128; @@ -109,8 +109,8 @@ final class Class3_Sub22 extends Linkable { } } - for(var16 = 0; var16 < Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466 + 1; ++var16) { - for(var17 = 0; var17 < Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466 + 1; ++var17) { + for(var16 = 0; var16 < TextureOperation8.anInt3466 + TextureOperation8.anInt3466 + 1; ++var16) { + for(var17 = 0; var17 < TextureOperation8.anInt3466 + TextureOperation8.anInt3466 + 1; ++var17) { Class23.aBooleanArrayArray457[var16][var17] = Class49.aBooleanArrayArray814[var16][var17] || Class49.aBooleanArrayArray814[var16 + 1][var17] || Class49.aBooleanArrayArray814[var16][var17 + 1] || Class49.aBooleanArrayArray814[var16 + 1][var17 + 1]; } } @@ -125,7 +125,7 @@ final class Class3_Sub22 extends Linkable { Class167.method2264(true); Class146.method2083(var0, var1, var2, null, 0, (byte)0, var13, var14); if(HDToolKit.highDetail) { - Class3_Sub13_Sub17.aBoolean3207 = false; + TextureOperation23.aBoolean3207 = false; Class3_Sub28_Sub4.method551(0, 0); Class92.method1512(null); Class68.method1265(); @@ -140,8 +140,8 @@ final class Class3_Sub22 extends Linkable { static void method400(long var0) { try { if((long) 0 != var0) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(104); - Class3_Sub13_Sub1.outgoingBuffer.writeLong(var0); + TextureOperation12.outgoingBuffer.putOpcode(104); + TextureOperation12.outgoingBuffer.writeLong(var0); } } catch (RuntimeException var4) { throw ClientErrorException.clientError(var4, "mf.F(" + var0 + ',' + 0 + ')'); diff --git a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub1.java b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub1.java index 97c94e501..abaff6d23 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub1.java @@ -317,7 +317,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { } this.anInt3480 += var2; - if(this.anInt3470 == 256 && (this.anInt3474 & 255) == 0) { + if(this.anInt3470 == 256 && (this.anInt3474 & 0xFF) == 0) { if(Unsorted.aBoolean2150) { var2 = method426(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, this.anInt3475, this.anInt3483, var6, var3, this); } else { @@ -341,7 +341,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { return var4; } - if(this.anInt3470 == 256 && (this.anInt3474 & 255) == 0) { + if(this.anInt3470 == 256 && (this.anInt3474 & 0xFF) == 0) { if(Unsorted.aBoolean2150) { return method420(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, var4, var3, this); } @@ -437,7 +437,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { for(var10 <<= 1; var5 < var10; var4 += var14) { var1 = var4 >> 8; var16 = var2[var1]; - var0 = (var16 << 8) + (var2[var1 + 1] - var16) * (var4 & 255); + var0 = (var16 << 8) + (var2[var1 + 1] - var16) * (var4 & 0xFF); var10001 = var5++; var3[var10001] += var0 * var6 >> 6; var6 += var8; @@ -454,7 +454,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { for(var1 = var15; var5 < var10; var4 += var14) { var16 = var2[var4 >> 8]; - var0 = (var16 << 8) + (var1 - var16) * (var4 & 255); + var0 = (var16 << 8) + (var1 - var16) * (var4 & 0xFF); var10001 = var5++; var3[var10001] += var0 * var6 >> 6; var6 += var8; @@ -490,7 +490,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { var1 = var4 >> 8; var14 = var2[var1]; var10001 = var5++; - var3[var10001] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255)) * var6 >> 6; + var3[var10001] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 0xFF)) * var6 >> 6; var6 += var7; var4 += var12; } @@ -502,7 +502,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { for(var1 = var13; var5 < var8; var4 += var12) { var14 = var2[var4 >> 8]; var10001 = var5++; - var3[var10001] += ((var14 << 8) + (var1 - var14) * (var4 & 255)) * var6 >> 6; + var3[var10001] += ((var14 << 8) + (var1 - var14) * (var4 & 0xFF)) * var6 >> 6; var6 += var7; } @@ -525,7 +525,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { var1 = var4 >> 8; byte var13 = var2[var1 - 1]; var10001 = var5++; - var3[var10001] += ((var13 << 8) + (var2[var1] - var13) * (var4 & 255)) * var6 >> 6; + var3[var10001] += ((var13 << 8) + (var2[var1] - var13) * (var4 & 0xFF)) * var6 >> 6; var4 += var11; } @@ -535,7 +535,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { for(var1 = var11; var5 < var7; var4 += var1) { var10001 = var5++; - var3[var10001] += ((var12 << 8) + (var2[var4 >> 8] - var12) * (var4 & 255)) * var6 >> 6; + var3[var10001] += ((var12 << 8) + (var2[var4 >> 8] - var12) * (var4 & 0xFF)) * var6 >> 6; } var10.anInt3474 = var4; @@ -920,7 +920,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { for(var8 <<= 1; var5 < var8; var4 += var12) { var1 = var4 >> 8; var14 = var2[var1]; - var0 = (var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255); + var0 = (var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 0xFF); var10001 = var5++; var3[var10001] += var0 * var6 >> 6; var10001 = var5++; @@ -935,7 +935,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { for(var1 = var13; var5 < var8; var4 += var12) { var14 = var2[var4 >> 8]; - var0 = (var14 << 8) + (var1 - var14) * (var4 & 255); + var0 = (var14 << 8) + (var1 - var14) * (var4 & 0xFF); var10001 = var5++; var3[var10001] += var0 * var6 >> 6; var10001 = var5++; @@ -1031,7 +1031,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { } this.anInt3480 += var2; - if(this.anInt3470 == -256 && (this.anInt3474 & 255) == 0) { + if(this.anInt3470 == -256 && (this.anInt3474 & 0xFF) == 0) { if(Unsorted.aBoolean2150) { var2 = method435(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, this.anInt3475, this.anInt3483, var6, var3, this); } else { @@ -1055,7 +1055,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { return var4; } - if(this.anInt3470 == -256 && (this.anInt3474 & 255) == 0) { + if(this.anInt3470 == -256 && (this.anInt3474 & 0xFF) == 0) { if(Unsorted.aBoolean2150) { return method447(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, var4, var3, this); } @@ -1106,7 +1106,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { for(var10 <<= 1; var5 < var10; var4 += var14) { var1 = var4 >> 8; byte var16 = var2[var1 - 1]; - var0 = (var16 << 8) + (var2[var1] - var16) * (var4 & 255); + var0 = (var16 << 8) + (var2[var1] - var16) * (var4 & 0xFF); var10001 = var5++; var3[var10001] += var0 * var6 >> 6; var6 += var8; @@ -1122,7 +1122,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { var10 <<= 1; for(var1 = var15; var5 < var10; var4 += var14) { - var0 = (var1 << 8) + (var2[var4 >> 8] - var1) * (var4 & 255); + var0 = (var1 << 8) + (var2[var4 >> 8] - var1) * (var4 & 0xFF); var10001 = var5++; var3[var10001] += var0 * var6 >> 6; var6 += var8; @@ -1259,7 +1259,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { var1 = var4 >> 8; byte var14 = var2[var1 - 1]; var10001 = var5++; - var3[var10001] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 255)) * var6 >> 6; + var3[var10001] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 0xFF)) * var6 >> 6; var6 += var7; var4 += var12; } @@ -1270,7 +1270,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { for(var1 = var12; var5 < var8; var4 += var1) { var10001 = var5++; - var3[var10001] += ((var13 << 8) + (var2[var4 >> 8] - var13) * (var4 & 255)) * var6 >> 6; + var3[var10001] += ((var13 << 8) + (var2[var4 >> 8] - var13) * (var4 & 0xFF)) * var6 >> 6; var6 += var7; } @@ -1353,7 +1353,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { for(var8 <<= 1; var5 < var8; var4 += var12) { var1 = var4 >> 8; byte var14 = var2[var1 - 1]; - var0 = (var14 << 8) + (var2[var1] - var14) * (var4 & 255); + var0 = (var14 << 8) + (var2[var1] - var14) * (var4 & 0xFF); var10001 = var5++; var3[var10001] += var0 * var6 >> 6; var10001 = var5++; @@ -1367,7 +1367,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { var8 <<= 1; for(var1 = var13; var5 < var8; var4 += var12) { - var0 = (var1 << 8) + (var2[var4 >> 8] - var1) * (var4 & 255); + var0 = (var1 << 8) + (var2[var4 >> 8] - var1) * (var4 & 0xFF); var10001 = var5++; var3[var10001] += var0 * var6 >> 6; var10001 = var5++; @@ -1423,7 +1423,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { var1 = var4 >> 8; var13 = var2[var1]; var10001 = var5++; - var3[var10001] += ((var13 << 8) + (var2[var1 + 1] - var13) * (var4 & 255)) * var6 >> 6; + var3[var10001] += ((var13 << 8) + (var2[var1 + 1] - var13) * (var4 & 0xFF)) * var6 >> 6; var4 += var11; } @@ -1434,7 +1434,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 { for(var1 = var12; var5 < var7; var4 += var11) { var13 = var2[var4 >> 8]; var10001 = var5++; - var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; + var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 0xFF)) * var6 >> 6; } var10.anInt3474 = var4; diff --git a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub3.java b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub3.java index 57e159954..d40829785 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub3.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub3.java @@ -79,7 +79,7 @@ final class Class3_Sub24_Sub3 extends Class3_Sub24 { try { if (var0 != null) { for (int var2 = 0; var2 < Class3_Sub28_Sub5.anInt3591; ++var2) { - if (var0.equalsStringIgnoreCase(Class3_Sub13_Sub27.aClass94Array3341[var2])) { + if (var0.equalsStringIgnoreCase(TextureOperation7.aClass94Array3341[var2])) { return true; } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub4.java b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub4.java index 38526ed33..b0f82a7e3 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub4.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub4.java @@ -50,8 +50,8 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { Class140_Sub7.aClass94Array2935[Unsorted.menuOptionCount] = var7; Class163_Sub2_Sub1.aClass94Array4016[Unsorted.menuOptionCount] = var4; Class114.anIntArray1578[Unsorted.menuOptionCount] = var0 == -1 ?Class3_Sub28_Sub5.anInt3590:var0; - Class3_Sub13_Sub7.aShortArray3095[Unsorted.menuOptionCount] = var6; - Class3_Sub13_Sub22.aLongArray3271[Unsorted.menuOptionCount] = var1; + TextureOperation27.aShortArray3095[Unsorted.menuOptionCount] = var6; + TextureOperation0.aLongArray3271[Unsorted.menuOptionCount] = var1; Class117.anIntArray1613[Unsorted.menuOptionCount] = var5; Class27.anIntArray512[Unsorted.menuOptionCount] = var8; ++Unsorted.menuOptionCount; @@ -188,7 +188,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { method1177(-1, 0L, (byte)-92, TextCore.emptyJagexString, 0, (short)51, var3.aClass94_289, var3.componentHash); } - if(var3.anInt318 == 6 && Class3_Sub13_Sub7.aClass11_3087 == null) { + if(var3.anInt318 == 6 && TextureOperation27.aClass11_3087 == null) { method1177(-1, 0L, (byte)-100, TextCore.emptyJagexString, -1, (short)41, var3.aClass94_289, var3.componentHash); } @@ -208,7 +208,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { if(var7 <= var2 && var0 >= var8 && 32 + var7 > var2 && var0 < var8 + 32) { Class99.aClass11_1402 = var3; - Class3_Sub13_Sub13.anInt2701 = var15; + TextureOperation20.anInt2701 = var15; if(var3.itemAmounts[var15] > 0) { Class3_Sub1 var9 = Client.method44(var3); ItemDefinition var10 = ItemDefinition.getItemDefinition(var3.itemAmounts[var15] + -1); @@ -325,7 +325,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { for(var15 = 9; var15 >= 5; --var15) { RSString var16 = Class120.method1732(var3, (byte)-71, var15); if(null != var16) { - method1177(Class3_Sub13_Sub2.method173((byte)126, var15, var3), var15 + 1, (byte)-85, var3.aClass94_277, var3.anInt191, (short)1003, var16, var3.componentHash); + method1177(TextureOperation6.method173((byte)126, var15, var3), var15 + 1, (byte)-85, var3.aClass94_277, var3.anInt191, (short)1003, var16, var3.componentHash); } } @@ -337,7 +337,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { for(var5 = 4; var5 >= 0; --var5) { RSString var17 = Class120.method1732(var3, (byte)-65, var5); if(var17 != null) { - method1177(Class3_Sub13_Sub2.method173((byte)53, var5, var3), var5 - -1, (byte)-48, var3.aClass94_277, var3.anInt191, (short)9, var17, var3.componentHash); + method1177(TextureOperation6.method173((byte)53, var5, var3), var5 - -1, (byte)-48, var3.aClass94_277, var3.anInt191, (short)9, var17, var3.componentHash); } } @@ -511,7 +511,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { var7.anInt2517 = var11.aByteArray2425[var4]; var7.anInt2520 = var4; var7.anInt2513 = var11.aByteArray2430[var4] * var1 * var1 * var11.anInt2424 - -1024 >> 11; - var7.anInt2503 = var11.aByteArray2422[var4] & 255; + var7.anInt2503 = var11.aByteArray2422[var4] & 0xFF; var7.anInt2510 = -(32767 & var11.aShortArray2434[var4]) + (var4 << 8); var7.anInt2506 = -1; var7.anInt2511 = 0; @@ -640,7 +640,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { if(var5 == 64) { if(64 <= var6) { - this.anIntArray3518[var4] = Class3_Sub13_Sub29.bitwiseOr(this.anIntArray3518[var4], 1); + this.anIntArray3518[var4] = TextureOperation3.bitwiseOr(this.anIntArray3518[var4], 1); } else { this.anIntArray3518[var4] = Unsorted.bitwiseAnd(this.anIntArray3518[var4], -2); } @@ -651,7 +651,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { this.method502(var4, (byte) 56 ^ -57); this.anIntArray3518[var4] = Unsorted.bitwiseAnd(this.anIntArray3518[var4], -3); } else { - this.anIntArray3518[var4] = Class3_Sub13_Sub29.bitwiseOr(this.anIntArray3518[var4], 2); + this.anIntArray3518[var4] = TextureOperation3.bitwiseOr(this.anIntArray3518[var4], 2); } } @@ -708,7 +708,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { if(var5 == 81) { if(var6 >= 64) { - this.anIntArray3518[var4] = Class3_Sub13_Sub29.bitwiseOr(this.anIntArray3518[var4], 4); + this.anIntArray3518[var4] = TextureOperation3.bitwiseOr(this.anIntArray3518[var4], 4); } else { this.method497(var4, -102); this.anIntArray3518[var4] = Unsorted.bitwiseAnd(this.anIntArray3518[var4], -5); @@ -736,7 +736,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { var5 = (var2 >> 9 & 16256) + ((32702 & var2) >> 8); this.method476(var4, var5); } else { - var3 = var2 & 255; + var3 = var2 & 0xFF; if (255 == var3) { this.method500(true, (byte) -40); } @@ -852,7 +852,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { var3.anInt2511 += (int)(0.5D + Math.pow(2.0D, (double)var7.anInt2067 * var9) * 128.0D); } - while(var7.aByteArray2064.length - 2 > var3.anInt2501 && var3.anInt2511 > ('\uff00' & var7.aByteArray2064[var3.anInt2501 - -2] << 8)) { + while(var7.aByteArray2064.length - 2 > var3.anInt2501 && var3.anInt2511 > (65280 & var7.aByteArray2064[var3.anInt2501 - -2] << 8)) { var3.anInt2501 += 2; } @@ -1256,8 +1256,8 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { var5 = var2.anInt2511; var6 = var3.aByteArray2064[1 + var2.anInt2501]; if(var3.aByteArray2064.length - 2 > var2.anInt2501) { - var8 = (var3.aByteArray2064[2 + var2.anInt2501] & 255) << 8; - var7 = '\uff00' & var3.aByteArray2064[var2.anInt2501] << 8; + var8 = (var3.aByteArray2064[2 + var2.anInt2501] & 0xFF) << 8; + var7 = 65280 & var3.aByteArray2064[var2.anInt2501] << 8; var6 += (var3.aByteArray2064[3 + var2.anInt2501] + -var6) * (var5 - var7) / (var8 + -var7); } @@ -1268,8 +1268,8 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { var5 = var2.anInt2506; var6 = var3.aByteArray2076[1 + var2.anInt2519]; if(-2 + var3.aByteArray2076.length > var2.anInt2519) { - var7 = '\uff00' & var3.aByteArray2076[var2.anInt2519] << 8; - var8 = (var3.aByteArray2076[var2.anInt2519 + 2] & 255) << 8; + var7 = 65280 & var3.aByteArray2076[var2.anInt2519] << 8; + var8 = (var3.aByteArray2076[var2.anInt2519 + 2] & 0xFF) << 8; var6 += (var5 - var7) * (-var6 + var3.aByteArray2076[3 + var2.anInt2519]) / (-var7 + var8); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub25.java b/Client/src/main/java/org/runite/client/Class3_Sub25.java index a74886f8d..a8d6603c2 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub25.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub25.java @@ -19,8 +19,8 @@ final class Class3_Sub25 extends Linkable { ArrayUtils.arraycopy(Class140_Sub7.aClass94Array2935, var1 + 1, Class140_Sub7.aClass94Array2935, var1, -var1 + Unsorted.menuOptionCount); ArrayUtils.arraycopy(Class163_Sub2_Sub1.aClass94Array4016, 1 + var1, Class163_Sub2_Sub1.aClass94Array4016, var1, Unsorted.menuOptionCount - var1); ArrayUtils.arraycopy(Class114.anIntArray1578, 1 + var1, Class114.anIntArray1578, var1, -var1 + Unsorted.menuOptionCount); - ArrayUtils.arraycopy(Class3_Sub13_Sub7.aShortArray3095, 1 + var1, Class3_Sub13_Sub7.aShortArray3095, var1, Unsorted.menuOptionCount + -var1); - ArrayUtils.arraycopy(Class3_Sub13_Sub22.aLongArray3271, 1 + var1, Class3_Sub13_Sub22.aLongArray3271, var1, -var1 + Unsorted.menuOptionCount); + ArrayUtils.arraycopy(TextureOperation27.aShortArray3095, 1 + var1, TextureOperation27.aShortArray3095, var1, Unsorted.menuOptionCount + -var1); + ArrayUtils.arraycopy(TextureOperation0.aLongArray3271, 1 + var1, TextureOperation0.aLongArray3271, var1, -var1 + Unsorted.menuOptionCount); ArrayUtils.arraycopy(Class117.anIntArray1613, var1 + 1, Class117.anIntArray1613, var1, -var1 + Unsorted.menuOptionCount); ArrayUtils.arraycopy(Class27.anIntArray512, 1 + var1, Class27.anIntArray512, var1, Unsorted.menuOptionCount + -var1); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub27.java b/Client/src/main/java/org/runite/client/Class3_Sub27.java index 19db10970..2fa56756f 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub27.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub27.java @@ -282,7 +282,7 @@ final class Class3_Sub27 extends Linkable { while(true) { int var63 = var1.method741(); var51.method771(var63); - int var64 = var1.buffer[var29++] & 255; + int var64 = var1.buffer[var29++] & 0xFF; boolean var65 = var64 != var62; var62 = var64 & 15; if(var64 == 7) { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub1.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub1.java index a5b93c117..b19f769d0 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub1.java @@ -1,229 +1,228 @@ package org.runite.client; + import org.rs09.client.Node; import java.awt.*; -import java.awt.image.ImageObserver; final class Class3_Sub28_Sub1 extends Node { - static boolean aBoolean3531 = false; - static Class3_Sub20 aClass3_Sub20_3532 = new Class3_Sub20(0, 0); + static boolean aBoolean3531 = false; + static Class3_Sub20 aClass3_Sub20_3532 = new Class3_Sub20(0, 0); static Image anImage2695; static FontMetrics aFontMetrics1822; int[] anIntArray3533; - int[] anIntArray3534; - int[] anIntArray3535; - static int anInt3536; - static int anInt3537; + int[] anIntArray3534; + int[] anIntArray3535; + static int anInt3536; RSString quickChatMenu; - static int anInt3539; - static int dropAction; - static int counter; - int[] anIntArray3540; + static int anInt3539; + static int dropAction; + static int counter; + int[] anIntArray3540; - final void method525() { - try { - int var2; - if(null != this.anIntArray3540) { - for(var2 = 0; var2 < this.anIntArray3540.length; ++var2) { - this.anIntArray3540[var2] = Class3_Sub13_Sub29.bitwiseOr(this.anIntArray3540[var2], '\u8000'); - } - } - - if(null != this.anIntArray3534) { - for(var2 = 0; this.anIntArray3534.length > var2; ++var2) { - this.anIntArray3534[var2] = Class3_Sub13_Sub29.bitwiseOr(this.anIntArray3534[var2], '\u8000'); - } - } - - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "bc.O(" + -85 + ')'); - } - } - - final int method526(int var1) { - try { - if (this.anIntArray3540 != null) { - for (int var3 = 0; this.anIntArray3540.length > var3; ++var3) { - if (var1 == this.anIntArray3533[var3]) { - return this.anIntArray3540[var3]; - } + final void method525() { + try { + int var2; + if (null != this.anIntArray3540) { + for (var2 = 0; var2 < this.anIntArray3540.length; ++var2) { + this.anIntArray3540[var2] = TextureOperation3.bitwiseOr(this.anIntArray3540[var2], 32768); + } } - } - return -1; - } catch (RuntimeException var4) { - throw ClientErrorException.clientError(var4, "bc.Q(" + var1 + ',' + 0 + ')'); - } - } - - private void method527(DataBuffer var1, int var3) { - try { - - if(var3 == 1) { - this.quickChatMenu = var1.readString(); - } else { - int var4; - int var5; - if(var3 == 2) { - var4 = var1.readUnsignedByte(); - this.anIntArray3534 = new int[var4]; - this.anIntArray3535 = new int[var4]; - - for(var5 = 0; var5 < var4; ++var5) { - this.anIntArray3534[var5] = var1.readUnsignedShort(); - this.anIntArray3535[var5] = Class3_Sub13_Sub33.method322(var1.readSignedByte()); - } - } else if (var3 == 3) { - var4 = var1.readUnsignedByte(); - this.anIntArray3540 = new int[var4]; - this.anIntArray3533 = new int[var4]; - - for (var5 = 0; var5 < var4; ++var5) { - this.anIntArray3540[var5] = var1.readUnsignedShort(); - this.anIntArray3533[var5] = Class3_Sub13_Sub33.method322(var1.readSignedByte()); - } - } - } - - } catch (RuntimeException var6) { - throw ClientErrorException.clientError(var6, "bc.E(" + (var1 != null?"{...}":"null") + ',' + 0 + ',' + var3 + ')'); - } - } - - final int method529(int var2) { - try { - if (null != this.anIntArray3534) { - for (int var4 = 0; this.anIntArray3534.length > var4; ++var4) { - if (var2 == this.anIntArray3535[var4]) { - return this.anIntArray3534[var4]; - } + if (null != this.anIntArray3534) { + for (var2 = 0; this.anIntArray3534.length > var2; ++var2) { + this.anIntArray3534[var2] = TextureOperation3.bitwiseOr(this.anIntArray3534[var2], 32768); + } } - } - return -1; - } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "bc.P(" + (byte) 50 + ',' + var2 + ')'); - } - } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "bc.O(" + -85 + ')'); + } + } - final void method530(DataBuffer var1) { - try { + final int method526(int var1) { + try { + if (this.anIntArray3540 != null) { + for (int var3 = 0; this.anIntArray3540.length > var3; ++var3) { + if (var1 == this.anIntArray3533[var3]) { + return this.anIntArray3540[var3]; + } + } - while(true) { - int var3 = var1.readUnsignedByte(); - if(var3 == 0) { - return; + } + return -1; + } catch (RuntimeException var4) { + throw ClientErrorException.clientError(var4, "bc.Q(" + var1 + ',' + 0 + ')'); + } + } + + private void method527(DataBuffer var1, int var3) { + try { + + if (var3 == 1) { + this.quickChatMenu = var1.readString(); + } else { + int var4; + int var5; + if (var3 == 2) { + var4 = var1.readUnsignedByte(); + this.anIntArray3534 = new int[var4]; + this.anIntArray3535 = new int[var4]; + + for (var5 = 0; var5 < var4; ++var5) { + this.anIntArray3534[var5] = var1.readUnsignedShort(); + this.anIntArray3535[var5] = TextureOperation29.method322(var1.readSignedByte()); + } + } else if (var3 == 3) { + var4 = var1.readUnsignedByte(); + this.anIntArray3540 = new int[var4]; + this.anIntArray3533 = new int[var4]; + + for (var5 = 0; var5 < var4; ++var5) { + this.anIntArray3540[var5] = var1.readUnsignedShort(); + this.anIntArray3533[var5] = TextureOperation29.method322(var1.readSignedByte()); + } + } } - this.method527(var1, var3); - } - } catch (RuntimeException var4) { - throw ClientErrorException.clientError(var4, "bc.D(" + (var1 != null?"{...}":"null") + ',' + (byte) 116 + ')'); - } - } + } catch (RuntimeException var6) { + throw ClientErrorException.clientError(var6, "bc.E(" + (var1 != null ? "{...}" : "null") + ',' + 0 + ',' + var3 + ')'); + } + } - static RSString method531() { - RSString var1; - if(Class164_Sub1.anInt3012 == 1 && Unsorted.menuOptionCount < 2) { + final int method529(int var2) { + try { + if (null != this.anIntArray3534) { + for (int var4 = 0; this.anIntArray3534.length > var4; ++var4) { + if (var2 == this.anIntArray3535[var4]) { + return this.anIntArray3534[var4]; + } + } + + } + return -1; + } catch (RuntimeException var5) { + throw ClientErrorException.clientError(var5, "bc.P(" + (byte) 50 + ',' + var2 + ')'); + } + } + + final void method530(DataBuffer var1) { + try { + + while (true) { + int var3 = var1.readUnsignedByte(); + if (var3 == 0) { + return; + } + + this.method527(var1, var3); + } + } catch (RuntimeException var4) { + throw ClientErrorException.clientError(var4, "bc.D(" + (var1 != null ? "{...}" : "null") + ',' + (byte) 116 + ')'); + } + } + + static RSString method531() { + RSString var1; + if (Class164_Sub1.anInt3012 == 1 && Unsorted.menuOptionCount < 2) { var1 = RSString.stringCombiner(new RSString[]{TextCore.HasUse, TextCore.Spacer, RenderAnimationDefinition.aClass94_378, TextCore.aClass94_1724}); - } else if(GameObject.aBoolean1837 && 2 > Unsorted.menuOptionCount) { + } else if (GameObject.aBoolean1837 && 2 > Unsorted.menuOptionCount) { var1 = RSString.stringCombiner(new RSString[]{Class3_Sub28_Sub9.aClass94_3621, TextCore.Spacer, TextCore.aClass94_676, TextCore.aClass94_1724}); - } else if(ClientCommands.shiftClickEnabled && ObjectDefinition.aBooleanArray1490[81] && Unsorted.menuOptionCount > 2 && !ObjectDefinition.aBooleanArray1490[82]) { + } else if (ClientCommands.shiftClickEnabled && ObjectDefinition.aBooleanArray1490[81] && Unsorted.menuOptionCount > 2 && !ObjectDefinition.aBooleanArray1490[82]) { for (counter = 2; counter < Unsorted.menuOptionCount; counter++) { - RSString option = (Unsorted.method802(Unsorted.menuOptionCount - counter)); - if (option.toString().contains("Drop") || option.toString().contains("Release")) { - ClientCommands.canDrop = true; - dropAction = counter; - break; - } else { - ClientCommands.canDrop = false; - } + RSString option = (Unsorted.method802(Unsorted.menuOptionCount - counter)); + if (option.toString().contains("Drop") || option.toString().contains("Release")) { + ClientCommands.canDrop = true; + dropAction = counter; + break; + } else { + ClientCommands.canDrop = false; + } } if (ClientCommands.canDrop) { - var1 = Unsorted.method802(Unsorted.menuOptionCount - dropAction); + var1 = Unsorted.method802(Unsorted.menuOptionCount - dropAction); } else { - var1 = Unsorted.method802(Unsorted.menuOptionCount - 1); + var1 = Unsorted.method802(Unsorted.menuOptionCount - 1); } - } else { + } else { var1 = Unsorted.method802(Unsorted.menuOptionCount - 1); - } + } - if(Unsorted.menuOptionCount > 2) { - var1 = RSString.stringCombiner(new RSString[] {var1, Class1.aClass94_58, RSString.stringAnimator(Unsorted.menuOptionCount - 2), TextCore.HasMoreOptions}); - } - return var1; - } + if (Unsorted.menuOptionCount > 2) { + var1 = RSString.stringCombiner(new RSString[]{var1, Class1.aClass94_58, RSString.stringAnimator(Unsorted.menuOptionCount - 2), TextCore.HasMoreOptions}); + } + return var1; + } - static void method532(int var0) { - try { - Class3_Sub25 var2 = (Class3_Sub25)Class3_Sub2.aHashTable_2220.get(var0); - if(null != var2) { - var2.unlink(); - } - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "bc.A(" + var0 + ',' + -28236 + ')'); - } - } - - static void updateLoadingBar(Color var0, boolean var2, RSString var3, int var4) { - try { - try { - Graphics var5 = GameShell.canvas.getGraphics(); - aFontMetrics1822 = GameShell.canvas.getFontMetrics(TextCore.Helvetica); - if(var2) { - var5.setColor(Color.black); - var5.fillRect(0, 0, Class23.canvasWidth, Class140_Sub7.canvasHeight); - } - - if(null == var0) { - var0 = ColorCore.loadingbarcolor; + static void method532(int var0) { + try { + Class3_Sub25 var2 = (Class3_Sub25) Class3_Sub2.aHashTable_2220.get(var0); + if (null != var2) { + var2.unlink(); } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "bc.A(" + var0 + ',' + -28236 + ')'); + } + } + static void updateLoadingBar(Color var0, boolean var2, RSString var3, int var4) { + try { try { - if(null == anImage2695) { - anImage2695 = GameShell.canvas.createImage(304, 34); - } + Graphics var5 = GameShell.canvas.getGraphics(); + aFontMetrics1822 = GameShell.canvas.getFontMetrics(TextCore.Helvetica); + if (var2) { + var5.setColor(Color.black); + var5.fillRect(0, 0, Class23.canvasWidth, Class140_Sub7.canvasHeight); + } - Graphics var6 = anImage2695.getGraphics(); - var6.setColor(var0); - var6.drawRect(0, 0, 303, 33); - var6.fillRect(2, 2, var4 * 3, 30); - var6.setColor(Color.black); - var6.drawRect(1, 1, 301, 31); - var6.fillRect(3 * var4 + 2, 2, -(3 * var4) + 300, 30); - var6.setFont(TextCore.Helvetica); - var6.setColor(Color.white); - var3.drawString(var6, 22, (-var3.method1575(aFontMetrics1822) + 304) / 2); - var5.drawImage(anImage2695, Class23.canvasWidth / 2 - 152, -18 + Class140_Sub7.canvasHeight / 2, null); - } catch (Exception var9) { - int var7 = -152 + Class23.canvasWidth / 2; - int var8 = -18 + Class140_Sub7.canvasHeight / 2; - var5.setColor(var0); - var5.drawRect(var7, var8, 303, 33); - var5.fillRect(var7 + 2, 2 + var8, 3 * var4, 30); - var5.setColor(Color.black); - var5.drawRect(1 + var7, var8 - -1, 301, 31); - var5.fillRect(3 * var4 + (var7 - -2), 2 + var8, 300 - var4 * 3, 30); - var5.setFont(TextCore.Helvetica); - var5.setColor(Color.white); - var3.drawString(var5, 22 + var8, var7 + (-var3.method1575(aFontMetrics1822) + 304) / 2); + if (null == var0) { + var0 = ColorCore.loadingbarcolor; + } + + try { + if (null == anImage2695) { + anImage2695 = GameShell.canvas.createImage(304, 34); + } + + Graphics var6 = anImage2695.getGraphics(); + var6.setColor(var0); + var6.drawRect(0, 0, 303, 33); + var6.fillRect(2, 2, var4 * 3, 30); + var6.setColor(Color.black); + var6.drawRect(1, 1, 301, 31); + var6.fillRect(3 * var4 + 2, 2, -(3 * var4) + 300, 30); + var6.setFont(TextCore.Helvetica); + var6.setColor(Color.white); + var3.drawString(var6, 22, (-var3.method1575(aFontMetrics1822) + 304) / 2); + var5.drawImage(anImage2695, Class23.canvasWidth / 2 - 152, -18 + Class140_Sub7.canvasHeight / 2, null); + } catch (Exception var9) { + int var7 = -152 + Class23.canvasWidth / 2; + int var8 = -18 + Class140_Sub7.canvasHeight / 2; + var5.setColor(var0); + var5.drawRect(var7, var8, 303, 33); + var5.fillRect(var7 + 2, 2 + var8, 3 * var4, 30); + var5.setColor(Color.black); + var5.drawRect(1 + var7, var8 - -1, 301, 31); + var5.fillRect(3 * var4 + (var7 - -2), 2 + var8, 300 - var4 * 3, 30); + var5.setFont(TextCore.Helvetica); + var5.setColor(Color.white); + var3.drawString(var5, 22 + var8, var7 + (-var3.method1575(aFontMetrics1822) + 304) / 2); + } + + if (Class167.aClass94_2083 != null) { + var5.setFont(TextCore.Helvetica); + var5.setColor(Color.white); + Class167.aClass94_2083.drawString(var5, Class140_Sub7.canvasHeight / 2 - 26, Class23.canvasWidth / 2 - Class167.aClass94_2083.method1575(aFontMetrics1822) / 2); + } + } catch (Exception var10) { + GameShell.canvas.repaint(); } - if(Class167.aClass94_2083 != null) { - var5.setFont(TextCore.Helvetica); - var5.setColor(Color.white); - Class167.aClass94_2083.drawString(var5, Class140_Sub7.canvasHeight / 2 - 26, Class23.canvasWidth / 2 - Class167.aClass94_2083.method1575(aFontMetrics1822) / 2); - } - } catch (Exception var10) { - GameShell.canvas.repaint(); - } - - } catch (RuntimeException var11) { - throw ClientErrorException.clientError(var11, "bc.C(" + (var0 != null?"{...}":"null") + ',' + false + ',' + var2 + ',' + (var3 != null?"{...}":"null") + ',' + var4 + ')'); - } - } + } catch (RuntimeException var11) { + throw ClientErrorException.clientError(var11, "bc.C(" + (var0 != null ? "{...}" : "null") + ',' + false + ',' + var2 + ',' + (var3 != null ? "{...}" : "null") + ',' + var4 + ')'); + } + } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub12.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub12.java index 3226c33ab..5d15e184a 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub12.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub12.java @@ -65,7 +65,7 @@ public final class Class3_Sub28_Sub12 extends Node { anIntArray1835[i] = anIntArray1835[i - 1]; } - ++Class3_Sub13_Sub9.anInt3114; + ++TextureOperation16.anInt3114; anIntArray3082[0] = type; aClass94Array3226[0] = var5; Class24.anInt472 = PacketParser.anInt3213; @@ -95,7 +95,7 @@ public final class Class3_Sub28_Sub12 extends Node { } static RSString method612(long var0) { - return Class3_Sub13_Sub8.method207(10, false, 116, var0); + return TextureOperation9.method207(10, false, 116, var0); } private void decode(DataBuffer buffer, int opcode) { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub16_Sub2.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub16_Sub2.java index 52332010d..2970b9cfb 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub16_Sub2.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub16_Sub2.java @@ -177,7 +177,7 @@ public class Class3_Sub28_Sub16_Sub2 extends AbstractSprite { if(var6 != 0) { var1 -= this.anInt3701 << 4; var2 -= this.anInt3698 << 4; - double var7 = (double)(var5 & '\uffff') * 9.587379924285257E-5D; + double var7 = (double)(var5 & 65535) * 9.587379924285257E-5D; int var9 = (int)Math.floor(Math.sin(var7) * (double)var6 + 0.5D); int var10 = (int)Math.floor(Math.cos(var7) * (double)var6 + 0.5D); int var11 = -var1 * var10 + -var2 * var9; @@ -890,7 +890,7 @@ public class Class3_Sub28_Sub16_Sub2 extends AbstractSprite { ++var5; } else { int var18 = var0[var5]; - var0[var5++] = ((var2 & 16711935) * var12 + (var18 & 16711935) * var13 & -16711936) + ((var2 & '\uff00') * var12 + (var18 & '\uff00') * var13 & 16711680) >> 8; + var0[var5++] = ((var2 & 16711935) * var12 + (var18 & 16711935) * var13 & -16711936) + ((var2 & 65280) * var12 + (var18 & 65280) * var13 & 16711680) >> 8; } var3 += var9; @@ -913,7 +913,7 @@ public class Class3_Sub28_Sub16_Sub2 extends AbstractSprite { ++var4; } else { int var13 = var0[var4]; - var0[var4++] = ((var2 & 16711935) * var9 + (var13 & 16711935) * var10 & -16711936) + ((var2 & '\uff00') * var9 + (var13 & '\uff00') * var10 & 16711680) >> 8; + var0[var4++] = ((var2 & 16711935) * var9 + (var13 & 16711935) * var10 & -16711936) + ((var2 & 65280) * var9 + (var13 & 65280) * var10 & 16711680) >> 8; } } @@ -981,7 +981,7 @@ public class Class3_Sub28_Sub16_Sub2 extends AbstractSprite { this.anInt3698 = this.anInt3706 - this.height - this.anInt3698; } - void drawMinimapRegion(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { + public void drawMinimapRegion(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { try { int var11 = -var3 / 2; int var12 = -var4 / 2; @@ -1136,7 +1136,7 @@ public class Class3_Sub28_Sub16_Sub2 extends AbstractSprite { this.anInt3701 = this.anInt3698 = 0; } - void method667(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int[] var9, int[] var10) { + public void method667(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int[] var9, int[] var10) { try { int var11 = -var3 / 2; int var12 = -var4 / 2; @@ -1255,7 +1255,7 @@ public class Class3_Sub28_Sub16_Sub2 extends AbstractSprite { for(int var4 = 0; var4 < this.anIntArray4081.length; ++var4) { int var5 = this.anIntArray4081[var4]; if(var5 != 0) { - int var6 = var5 >> 16 & 255; + int var6 = var5 >> 16 & 0xFF; var6 += var1; if(var6 < 1) { var6 = 1; @@ -1263,7 +1263,7 @@ public class Class3_Sub28_Sub16_Sub2 extends AbstractSprite { var6 = 255; } - int var7 = var5 >> 8 & 255; + int var7 = var5 >> 8 & 0xFF; var7 += var2; if(var7 < 1) { var7 = 1; @@ -1271,7 +1271,7 @@ public class Class3_Sub28_Sub16_Sub2 extends AbstractSprite { var7 = 255; } - int var8 = var5 & 255; + int var8 = var5 & 0xFF; var8 += var3; if(var8 < 1) { var8 = 1; diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub16_Sub2_Sub1.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub16_Sub2_Sub1.java index 4da6fa99d..510a5505a 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub16_Sub2_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub16_Sub2_Sub1.java @@ -26,7 +26,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 int var21 = Toolkit.JAVA_TOOLKIT.getBuffer()[var17]; int var22 = var20 >>> 24; int var23 = 256 - var22; - Toolkit.JAVA_TOOLKIT.getBuffer()[var17++] = ((var20 & 16711935) * var22 + (var21 & 16711935) * var23 & -16711936) + ((var20 & '\uff00') * var22 + (var21 & '\uff00') * var23 & 16711680) >>> 8; + Toolkit.JAVA_TOOLKIT.getBuffer()[var17++] = ((var20 & 16711935) * var22 + (var21 & 16711935) * var23 & -16711936) + ((var20 & 65280) * var22 + (var21 & 65280) * var23 & 16711680) >>> 8; var18 += var13; var19 -= var12; } @@ -139,7 +139,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 int var18 = var0[var5]; int var19 = (var17 >>> 24) * var12 >> 8; int var20 = 256 - var19; - var0[var5++] = ((var17 & 16711935) * var19 + (var18 & 16711935) * var20 & -16711936) + ((var17 & '\uff00') * var19 + (var18 & '\uff00') * var20 & 16711680) >>> 8; + var0[var5++] = ((var17 & 16711935) * var19 + (var18 & 16711935) * var20 & -16711936) + ((var17 & 65280) * var19 + (var18 & 65280) * var20 & 16711680) >>> 8; var3 += var9; } @@ -154,7 +154,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 if(var6 != 0) { var1 -= this.anInt3701 << 4; var2 -= this.anInt3698 << 4; - double var7 = (double)(var5 & '\uffff') * 9.587379924285257E-5D; + double var7 = (double)(var5 & 65535) * 9.587379924285257E-5D; int var9 = (int)Math.floor(Math.sin(var7) * (double)var6 + 0.5D); int var10 = (int)Math.floor(Math.cos(var7) * (double)var6 + 0.5D); int var11 = -var1 * var10 + -var2 * var9; @@ -280,7 +280,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 var39 = Toolkit.JAVA_TOOLKIT.getBuffer()[var34]; var40 = var38 >>> 24; var41 = 256 - var40; - Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & '\uff00') * var40 + (var39 & '\uff00') * var41 & 16711680) >>> 8; + Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & 65280) * var40 + (var39 & 65280) * var41 & 16711680) >>> 8; ++var37; } } @@ -310,7 +310,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 var39 = Toolkit.JAVA_TOOLKIT.getBuffer()[var34]; var40 = var38 >>> 24; var41 = 256 - var40; - Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & '\uff00') * var40 + (var39 & '\uff00') * var41 & 16711680) >>> 8; + Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & 65280) * var40 + (var39 & 65280) * var41 & 16711680) >>> 8; var36 += var26; ++var37; } @@ -342,7 +342,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 var39 = Toolkit.JAVA_TOOLKIT.getBuffer()[var34]; var40 = var38 >>> 24; var41 = 256 - var40; - Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & '\uff00') * var40 + (var39 & '\uff00') * var41 & 16711680) >>> 8; + Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & 65280) * var40 + (var39 & 65280) * var41 & 16711680) >>> 8; var36 += var26; ++var37; } @@ -376,7 +376,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 var39 = Toolkit.JAVA_TOOLKIT.getBuffer()[var34]; var40 = var38 >>> 24; var41 = 256 - var40; - Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & '\uff00') * var40 + (var39 & '\uff00') * var41 & 16711680) >>> 8; + Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & 65280) * var40 + (var39 & 65280) * var41 & 16711680) >>> 8; var35 += var27; ++var37; } @@ -420,7 +420,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 var39 = Toolkit.JAVA_TOOLKIT.getBuffer()[var34]; var40 = var38 >>> 24; var41 = 256 - var40; - Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & '\uff00') * var40 + (var39 & '\uff00') * var41 & 16711680) >>> 8; + Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & 65280) * var40 + (var39 & 65280) * var41 & 16711680) >>> 8; var35 += var27; var36 += var26; ++var37; @@ -465,7 +465,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 var39 = Toolkit.JAVA_TOOLKIT.getBuffer()[var34]; var40 = var38 >>> 24; var41 = 256 - var40; - Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & '\uff00') * var40 + (var39 & '\uff00') * var41 & 16711680) >>> 8; + Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & 65280) * var40 + (var39 & 65280) * var41 & 16711680) >>> 8; var35 += var27; var36 += var26; ++var37; @@ -499,7 +499,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 var39 = Toolkit.JAVA_TOOLKIT.getBuffer()[var34]; var40 = var38 >>> 24; var41 = 256 - var40; - Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & '\uff00') * var40 + (var39 & '\uff00') * var41 & 16711680) >>> 8; + Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & 65280) * var40 + (var39 & 65280) * var41 & 16711680) >>> 8; var35 += var27; ++var37; } @@ -543,7 +543,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 var39 = Toolkit.JAVA_TOOLKIT.getBuffer()[var34]; var40 = var38 >>> 24; var41 = 256 - var40; - Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & '\uff00') * var40 + (var39 & '\uff00') * var41 & 16711680) >>> 8; + Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & 65280) * var40 + (var39 & 65280) * var41 & 16711680) >>> 8; var35 += var27; var36 += var26; ++var37; @@ -588,7 +588,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 var39 = Toolkit.JAVA_TOOLKIT.getBuffer()[var34]; var40 = var38 >>> 24; var41 = 256 - var40; - Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & '\uff00') * var40 + (var39 & '\uff00') * var41 & 16711680) >>> 8; + Toolkit.JAVA_TOOLKIT.getBuffer()[var34++] = ((var38 & 16711935) * var40 + (var39 & 16711935) * var41 & -16711936) + ((var38 & 65280) * var40 + (var39 & 65280) * var41 & 16711680) >>> 8; var35 += var27; var36 += var26; ++var37; @@ -605,7 +605,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 } } - final void drawMinimapRegion(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { + public final void drawMinimapRegion(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { try { int var11 = -var3 / 2; int var12 = -var4 / 2; @@ -628,7 +628,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 int var23 = Toolkit.JAVA_TOOLKIT.getBuffer()[var19]; int var24 = var22 >>> 24; int var25 = 256 - var24; - Toolkit.JAVA_TOOLKIT.getBuffer()[var19++] = ((var22 & 16711935) * var24 + (var23 & 16711935) * var25 & -16711936) + ((var22 & '\uff00') * var24 + (var23 & '\uff00') * var25 & 16711680) >>> 8; + Toolkit.JAVA_TOOLKIT.getBuffer()[var19++] = ((var22 & 16711935) * var24 + (var23 & 16711935) * var25 & -16711936) + ((var22 & 65280) * var24 + (var23 & 65280) * var25 & 16711680) >>> 8; var20 += var14; var21 -= var13; } @@ -642,7 +642,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 } - final void method667(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int[] var9, int[] var10) { + public final void method667(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int[] var9, int[] var10) { try { int var11 = -var3 / 2; int var12 = -var4 / 2; @@ -665,7 +665,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 int var23 = Toolkit.JAVA_TOOLKIT.getBuffer()[var19]; int var24 = var22 >>> 24; int var25 = 256 - var24; - Toolkit.JAVA_TOOLKIT.getBuffer()[var19++] = ((var22 & 16711935) * var24 + (var23 & 16711935) * var25 & -16711936) + ((var22 & '\uff00') * var24 + (var23 & '\uff00') * var25 & 16711680) >>> 8; + Toolkit.JAVA_TOOLKIT.getBuffer()[var19++] = ((var22 & 16711935) * var24 + (var23 & 16711935) * var25 & -16711936) + ((var22 & 65280) * var24 + (var23 & 65280) * var25 & 16711680) >>> 8; var20 += var14; var21 -= var13; } @@ -758,7 +758,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 } else { int var13 = 256 - var12; int var14 = var0[var4]; - var0[var4++] = ((var2 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + ((var2 & '\uff00') * var12 + (var14 & '\uff00') * var13 & 16711680) >>> 8; + var0[var4++] = ((var2 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + ((var2 & 65280) * var12 + (var14 & 65280) * var13 & 16711680) >>> 8; } } @@ -931,7 +931,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 } else { int var13 = 256 - var12; int var14 = var0[var4]; - var0[var4++] = ((var2 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + ((var2 & '\uff00') * var12 + (var14 & '\uff00') * var13 & 16711680) >>> 8; + var0[var4++] = ((var2 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + ((var2 & 65280) * var12 + (var14 & 65280) * var13 & 16711680) >>> 8; } } @@ -948,7 +948,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 int var13 = 256 - var12; int var14 = var1[var3++]; int var15 = var0[var4]; - var0[var4++] = ((var14 & 16711935) * var12 + (var15 & 16711935) * var13 & -16711936) + ((var14 & '\uff00') * var12 + (var15 & '\uff00') * var13 & 16711680) >>> 8; + var0[var4++] = ((var14 & 16711935) * var12 + (var15 & 16711935) * var13 & -16711936) + ((var14 & 65280) * var12 + (var15 & 65280) * var13 & 16711680) >>> 8; } var4 += var7; @@ -971,7 +971,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2 } else { int var17 = 256 - var16; int var18 = var0[var5]; - var0[var5++] = ((var2 & 16711935) * var16 + (var18 & 16711935) * var17 & -16711936) + ((var2 & '\uff00') * var16 + (var18 & '\uff00') * var17 & 16711680) >>> 8; + var0[var5++] = ((var2 & 16711935) * var16 + (var18 & 16711935) * var17 & -16711936) + ((var2 & 65280) * var16 + (var18 & 65280) * var17 & 16711680) >>> 8; } var3 += var9; diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub17_Sub1.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub17_Sub1.java index 2850708a4..2ae7f75c0 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub17_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub17_Sub1.java @@ -110,7 +110,7 @@ public final class Class3_Sub28_Sub17_Sub1 extends Font { } private static void method706(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { - var2 = ((var2 & 16711935) * var9 & -16711936) + ((var2 & '\uff00') * var9 & 16711680) >> 8; + var2 = ((var2 & 16711935) * var9 & -16711936) + ((var2 & 65280) * var9 & 16711680) >> 8; var9 = 256 - var9; for(int var10 = -var6; var10 < 0; ++var10) { @@ -119,7 +119,7 @@ public final class Class3_Sub28_Sub17_Sub1 extends Font { ++var4; } else { int var12 = var0[var4]; - var0[var4++] = (((var12 & 16711935) * var9 & -16711936) + ((var12 & '\uff00') * var9 & 16711680) >> 8) + var2; + var0[var4++] = (((var12 & 16711935) * var9 & -16711936) + ((var12 & 65280) * var9 & 16711680) >> 8) + var2; } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub20.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub20.java index d58e8d098..42819fb8f 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub20.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub20.java @@ -18,7 +18,7 @@ final class Class3_Sub28_Sub20 extends Node { private final boolean aBoolean3787; private final int anInt3788; private final boolean aBoolean3789; - private final Class82 aClass82_3790; + private final Texture aTexture_3790; private int anInt3791; private int[] anIntArray3793; static Class118 aClass118_3794 = Class21.method913(); @@ -32,12 +32,12 @@ final class Class3_Sub28_Sub20 extends Node { final int[] method718(Interface2 var1, float var3, CacheIndex var4, boolean var5) { try { if(null == this.anIntArray3793 || this.aFloat3782 != var3) { - if(!this.aClass82_3790.method1408(var1, var4)) { + if(!this.aTexture_3790.method1408(var1, var4)) { return null; } int var6 = !var5?128:64; - this.anIntArray3793 = this.aClass82_3790.method1404(var6, this.aBoolean3800, var6, var3, var4, var1, true); + this.anIntArray3793 = this.aTexture_3790.method1404(var6, this.aBoolean3800, var6, var3, var4, var1, true); this.aFloat3782 = var3; if(this.aBoolean3789) { int[] var7 = new int[var6]; @@ -57,7 +57,7 @@ final class Class3_Sub28_Sub20 extends Node { --var14; int var12 = this.anIntArray3793[var14]; var7[var11] += Unsorted.bitwiseAnd(var12, 16726965) >> 16; - var8[var11] += Unsorted.bitwiseAnd('\uff72', var12) >> 8; + var8[var11] += Unsorted.bitwiseAnd(65394, var12) >> 8; var9[var11] += Unsorted.bitwiseAnd(var12, 255); } @@ -92,7 +92,7 @@ final class Class3_Sub28_Sub20 extends Node { --var27; var20 = var28 / 9; --var25; - var10[var25] = Class3_Sub13_Sub29.bitwiseOr(var22, Class3_Sub13_Sub29.bitwiseOr(var20 << 16, var21 << 8)); + var10[var25] = TextureOperation3.bitwiseOr(var22, TextureOperation3.bitwiseOr(var20 << 16, var21 << 8)); var28 += var7[var27] + -var7[var26]; var29 += var9[var27] - var9[var26]; var30 += -var8[var26] + var8[var27]; @@ -111,7 +111,7 @@ final class Class3_Sub28_Sub20 extends Node { --var14; int var24 = this.anIntArray3793[var14]; var7[var11] += (Unsorted.bitwiseAnd(var24, 16729186) >> 16) + -Unsorted.bitwiseAnd(var23 >> 16, 255); - var8[var11] += (Unsorted.bitwiseAnd('\uff8b', var24) >> 8) + -Unsorted.bitwiseAnd(255, var23 >> 8); + var8[var11] += (Unsorted.bitwiseAnd(65419, var24) >> 8) + -Unsorted.bitwiseAnd(255, var23 >> 8); var9[var11] += -Unsorted.bitwiseAnd(var23, 255) + Unsorted.bitwiseAnd(255, var24); } @@ -136,7 +136,7 @@ final class Class3_Sub28_Sub20 extends Node { final boolean method719(CacheIndex var1, Interface2 var2, boolean var4) { try { - if(this.aClass82_3790.method1408(var2, var1)) { + if(this.aTexture_3790.method1408(var2, var1)) { GL var5 = HDToolKit.gl; int var6 = !var4?128:64; int var7 = Class27.method961(); @@ -147,7 +147,7 @@ final class Class3_Sub28_Sub20 extends Node { this.anInt3791 = Class31.anInt582; this.anInt3795 = var8[0]; HDToolKit.bindTexture2D(this.anInt3795); - ByteBuffer var9 = ByteBuffer.wrap(this.aClass82_3790.method1407(var6, var6, this.aBoolean3800, var2, var1)); + ByteBuffer var9 = ByteBuffer.wrap(this.aTexture_3790.method1407(var6, var6, this.aBoolean3800, var2, var1)); if(2 == this.anInt3788) { GLU var14 = new GLU(); var14.gluBuild2DMipmaps(3553, 6408, var6, var6, 6408, 5121, var9); @@ -169,7 +169,7 @@ final class Class3_Sub28_Sub20 extends Node { break; } - var9 = ByteBuffer.wrap(this.aClass82_3790.method1407(var6, var6, this.aBoolean3800, var2, var1)); + var9 = ByteBuffer.wrap(this.aTexture_3790.method1407(var6, var6, this.aBoolean3800, var2, var1)); } } else { var5.glTexImage2D(3553, 0, 6408, var6, var6, 0, 6408, 5121, var9); @@ -216,9 +216,9 @@ final class Class3_Sub28_Sub20 extends Node { final int[] method720(boolean var2, Interface2 var3, CacheIndex var4) { try { - if(this.aClass82_3790.method1408(var3, var4)) { + if(this.aTexture_3790.method1408(var3, var4)) { int var5 = !var2?128:64; - return this.aClass82_3790.method1404(var5, this.aBoolean3800, var5, 1.0D, var4, var3, false); + return this.aTexture_3790.method1404(var5, this.aBoolean3800, var5, 1.0D, var4, var3, false); } else { return null; } @@ -229,7 +229,7 @@ final class Class3_Sub28_Sub20 extends Node { final boolean method722(Interface2 var2, CacheIndex var3) { try { - return this.aClass82_3790.method1408(var2, var3); + return this.aTexture_3790.method1408(var2, var3); } catch (RuntimeException var5) { throw ClientErrorException.clientError(var5, "uh.P(" + -5 + ',' + (var2 != null?"{...}":"null") + ',' + (var3 != null?"{...}":"null") + ')'); } @@ -272,15 +272,6 @@ final class Class3_Sub28_Sub20 extends Node { } } -// static void method724() { -// try { -// Class163_Sub2_Sub1.aReferenceCache_4015.clearSoftReferences(); -// -// } catch (RuntimeException var2) { -// throw ClientErrorException.clientError(var2, "uh.B(" + -109 + ')'); -// } -// } - protected final void finalize() throws Throwable { try { if(this.anInt3795 != -1) { @@ -345,7 +336,7 @@ final class Class3_Sub28_Sub20 extends Node { int var10; int var11; if(var8 > var9) { - var11 = '\u8000'; + var11 = 32768; var10 = var9 * 65536 / var8; while(var6 != var4) { @@ -378,7 +369,7 @@ final class Class3_Sub28_Sub20 extends Node { } } } else { - var11 = '\u8000'; + var11 = 32768; var10 = 65536 * var8 / var9; while(var7 != var5) { @@ -426,7 +417,7 @@ final class Class3_Sub28_Sub20 extends Node { Class3_Sub28_Sub20(DataBuffer var1) { try { - this.aClass82_3790 = new Class82(var1); + this.aTexture_3790 = new Texture(var1); this.aBoolean3789 = var1.readUnsignedByte() == 1; this.aBoolean3800 = 1 == var1.readUnsignedByte(); this.aBoolean3787 = var1.readUnsignedByte() == 1; diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub3.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub3.java index 9d30e4fc2..3e48512c5 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub3.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub3.java @@ -7,7 +7,6 @@ final class Class3_Sub28_Sub3 extends Node { int anInt3549 = 0; int anInt3550; static RSInterface aClass11_3551; - static int anInt3552; boolean aBoolean3553; RSString aClass94_3554; int anInt3555 = 12800; @@ -88,7 +87,7 @@ final class Class3_Sub28_Sub3 extends Node { var2 = var2.toLowercase(); int var4 = 0; short[] var3 = new short[16]; - int var6 = !var1?0:'\u8000'; + int var6 = !var1?0:32768; int var7 = (!var1?Class83.anInt1156:RenderAnimationDefinition.anInt377) + var6; for(int var8 = var6; var8 < var7; ++var8) { @@ -121,7 +120,7 @@ final class Class3_Sub28_Sub3 extends Node { var13[var14] = LinkableRSString.method733(var3[var14]).method554(); } - Class3_Sub13_Sub29.method307(var13, Class99.aShortArray1398, 100); + TextureOperation3.method307(var13, Class99.aShortArray1398, 100); } catch (RuntimeException var12) { throw ClientErrorException.clientError(var12, "bn.C(" + (byte) 123 + ',' + var1 + ',' + (var2 != null?"{...}":"null") + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub4.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub4.java index f910be702..ceca124fc 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub4.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub4.java @@ -54,7 +54,7 @@ final class Class3_Sub28_Sub4 extends Node { try { if(null != this.anIntArray3567) { for(int var2 = 0; var2 < this.anIntArray3567.length; ++var2) { - this.anIntArray3567[var2] = Class3_Sub13_Sub29.bitwiseOr(this.anIntArray3567[var2], '\u8000'); + this.anIntArray3567[var2] = TextureOperation3.bitwiseOr(this.anIntArray3567[var2], 32768); } } @@ -92,12 +92,12 @@ final class Class3_Sub28_Sub4 extends Node { } if(var2 == Class23.anInt453) { - if(0 != var2 && var1 != Class3_Sub13_Sub21.anInt3263) { + if(0 != var2 && var1 != TextureOperation37.anInt3263) { Unsorted.anShaderInterfaceArray70[var2].method23(var1); - Class3_Sub13_Sub21.anInt3263 = var1; + TextureOperation37.anInt3263 = var1; } } else { - if(Class3_Sub13_Sub17.aBoolean3207) { + if(TextureOperation23.aBoolean3207) { return; } @@ -112,7 +112,7 @@ final class Class3_Sub28_Sub4 extends Node { } Class23.anInt453 = var2; - Class3_Sub13_Sub21.anInt3263 = var1; + TextureOperation37.anInt3263 = var1; } } catch (RuntimeException var4) { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub5.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub5.java index eeb090f5b..83378bae8 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub5.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub5.java @@ -39,7 +39,7 @@ final class Class3_Sub28_Sub5 extends Node { if(var5 >= Class159.anInt2020 && Class57.anInt902 >= var5) { var21 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var2 + var4, Class101.anInt1425); var22 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, -var2 + var4, Class101.anInt1425); - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var5], var22, 91, var21, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var5], var22, 91, var21, var0); } for(int var20 = var15 * (-1 + var1); 0 < var7; var20 -= var15) { @@ -71,11 +71,11 @@ final class Class3_Sub28_Sub5 extends Node { int var23 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var6 + var4, Class101.anInt1425); int var24 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, -var6 + var4, Class101.anInt1425); if(var21 >= Class159.anInt2020) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var21], var24, 121, var23, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var21], var24, 121, var23, var0); } if(var22 <= Class57.anInt902) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var22], var24, -110, var23, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var22], var24, -110, var23, var0); } } } @@ -251,7 +251,7 @@ final class Class3_Sub28_Sub5 extends Node { while(Objects.requireNonNull(fileIds).length > var8) { byte[] var9 = cacheIndex0.getFile(frame, fileIds[var8]); - int skinId = 255 & var9[1] | (var9[0] & 255) << 8; + int skinId = 255 & var9[1] | (var9[0] & 0xFF) << 8; Class3_Sub17 var12 = (Class3_Sub17) var5.method1222(); Class3_Sub17 skin = null; diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub9.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub9.java index 5cdb78999..24d915f8a 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub9.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub9.java @@ -23,12 +23,12 @@ final class Class3_Sub28_Sub9 extends Node { byte[] var2 = Class163_Sub1.aByteArrayArray2987[0]; Object var3; - if(Class3_Sub13_Sub22.aBooleanArray3272[0]) { + if(TextureOperation0.aBooleanArray3272[0]) { byte[] var4 = Class163_Sub3.aByteArrayArray3005[0]; int[] var5 = new int[var1]; for(int var6 = 0; var6 < var1; ++var6) { - var5[var6] = Class3_Sub13_Sub29.bitwiseOr(Unsorted.bitwiseAnd(var4[var6] << 24, -16777216), Class3_Sub13_Sub38.spritePalette[Unsorted.bitwiseAnd(255, var2[var6])]); + var5[var6] = TextureOperation3.bitwiseOr(Unsorted.bitwiseAnd(var4[var6] << 24, -16777216), TextureOperation38.spritePalette[Unsorted.bitwiseAnd(255, var2[var6])]); } var3 = new Class3_Sub28_Sub16_Sub2_Sub1(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[0], Unsorted.anIntArray2591[0], Class140_Sub7.anIntArray2931[0], Unsorted.anIntArray3076[0], var5); @@ -36,7 +36,7 @@ final class Class3_Sub28_Sub9 extends Node { int[] var8 = new int[var1]; for(int var9 = 0; var9 < var1; ++var9) { - var8[var9] = Class3_Sub13_Sub38.spritePalette[Unsorted.bitwiseAnd(var2[var9], 255)]; + 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); @@ -78,15 +78,15 @@ final class Class3_Sub28_Sub9 extends Node { static void method581(CacheIndex var0, CacheIndex var2) { try { - TextureOperation.smallFont = Unsorted.method1300(Sprites.p11FullSpriteArchive, var2, var0); + FontType.smallFont = Unsorted.method1300(Sprites.p11FullSpriteArchive, var2, var0); if(HDToolKit.highDetail) { Class157.aClass3_Sub28_Sub17_Sub1_2000 = Class70.method1287(Sprites.p11FullSpriteArchive, var0, var2); } else { - Class157.aClass3_Sub28_Sub17_Sub1_2000 = (Class3_Sub28_Sub17_Sub1) TextureOperation.smallFont; + Class157.aClass3_Sub28_Sub17_Sub1_2000 = (Class3_Sub28_Sub17_Sub1) FontType.smallFont; } - Class126.plainFont = Unsorted.method1300(Sprites.p12FullSpriteArchive, var2, var0); - Class168.bold = Unsorted.method1300(Sprites.b12FullSpriteArchive, var2, var0); + FontType.plainFont = Unsorted.method1300(Sprites.p12FullSpriteArchive, var2, var0); + FontType.bold = Unsorted.method1300(Sprites.b12FullSpriteArchive, var2, var0); } catch (RuntimeException var4) { throw ClientErrorException.clientError(var4, "hn.D(" + (var0 != null?"{...}":"null") + ',' + 0 + ',' + (var2 != null?"{...}":"null") + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub30_Sub1.java b/Client/src/main/java/org/runite/client/Class3_Sub30_Sub1.java index 2c05c9b08..c929653e5 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub30_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub30_Sub1.java @@ -16,7 +16,7 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { static int anInt1473; static float aFloat1475; static int anInt1736; - static int[] anIntArray2709 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, '\uffff', 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; + static int[] anIntArray2709 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; static int anInt1971; private ISAACCipher isaacCipher; static int[] anIntArray3804 = new int[256]; @@ -37,43 +37,43 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { if(var1 >= 0) { int var2 = Class117.anIntArray1613[var1]; int var3 = Class27.anIntArray512[var1]; - int var4 = Class3_Sub13_Sub7.aShortArray3095[var1]; + int var4 = TextureOperation27.aShortArray3095[var1]; if(var4 >= 2000) { var4 -= 2000; } - long var6 = Class3_Sub13_Sub22.aLongArray3271[var1]; - int var5 = (int)Class3_Sub13_Sub22.aLongArray3271[var1]; + long var6 = TextureOperation0.aLongArray3271[var1]; + int var5 = (int) TextureOperation0.aLongArray3271[var1]; Player var8; if(31 == var4) { - var8 = Class3_Sub13_Sub22.players[var5]; + var8 = TextureOperation0.players[var5]; if(null != var8) { Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var8.anIntArray2767[0], 1, 0, 2, var8.anIntArray2755[0], Class102.player.anIntArray2767[0]); Class36.anInt638 = 2; Unsorted.anInt2958 = 0; Class70.anInt1053 = Class163_Sub1.anInt2993; Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(71); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); + TextureOperation12.outgoingBuffer.putOpcode(71); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); } } if(var4 == 46) { Class163_Sub2_Sub1.method2224(var6, var3, var2); - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(247); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(Class82.anInt1152 + var3); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var2 + Class131.anInt1716); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Integer.MAX_VALUE & (int)(var6 >>> 32)); + TextureOperation12.outgoingBuffer.putOpcode(247); + TextureOperation12.outgoingBuffer.writeShortLE(Texture.anInt1152 + var3); + TextureOperation12.outgoingBuffer.writeShort128LE(var2 + Class131.anInt1716); + TextureOperation12.outgoingBuffer.writeShort(Integer.MAX_VALUE & (int)(var6 >>> 32)); } if(var4 == 40) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(27); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(anInt1473); - Class3_Sub13_Sub1.outgoingBuffer.writeIntLE2(var3); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var2); - Class3_Sub13_Sub1.outgoingBuffer.writeIntLE2(Class3_Sub28_Sub18.anInt3764); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(Class164.anInt2050); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); + TextureOperation12.outgoingBuffer.putOpcode(27); + TextureOperation12.outgoingBuffer.writeShort(anInt1473); + TextureOperation12.outgoingBuffer.writeIntLE2(var3); + TextureOperation12.outgoingBuffer.writeShortLE(var2); + TextureOperation12.outgoingBuffer.writeIntLE2(Class3_Sub28_Sub18.anInt3764); + TextureOperation12.outgoingBuffer.writeShort128LE(Class164.anInt2050); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); anInt2330 = 0; Unsorted.aClass11_1933 = Class7.getRSInterface(var3); KeyboardListener.anInt1918 = var2; @@ -89,8 +89,8 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { Class36.anInt638 = 2; Unsorted.anInt2958 = 0; Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(30); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var5); + TextureOperation12.outgoingBuffer.putOpcode(30); + TextureOperation12.outgoingBuffer.writeShort(var5); } } @@ -102,29 +102,29 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { Unsorted.anInt2958 = 0; Class36.anInt638 = 2; Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(78); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var5); + TextureOperation12.outgoingBuffer.putOpcode(78); + TextureOperation12.outgoingBuffer.writeShortLE(var5); } } if(var4 == 44) { - var8 = Class3_Sub13_Sub22.players[var5]; + var8 = TextureOperation0.players[var5]; if(null != var8) { Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var8.anIntArray2767[0], 1, 0, 2, var8.anIntArray2755[0], Class102.player.anIntArray2767[0]); Class70.anInt1053 = Class163_Sub1.anInt2993; Class36.anInt638 = 2; Unsorted.anInt4062 = Class38_Sub1.anInt2614; Unsorted.anInt2958 = 0; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(133); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var5); + TextureOperation12.outgoingBuffer.putOpcode(133); + TextureOperation12.outgoingBuffer.writeShortLE(var5); } } if(var4 == 58) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(135); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var5); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var2); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV2(var3); + TextureOperation12.outgoingBuffer.putOpcode(135); + TextureOperation12.outgoingBuffer.putShortA(var5); + TextureOperation12.outgoingBuffer.putShortA(var2); + TextureOperation12.outgoingBuffer.writeIntV2(var3); anInt2330 = 0; Unsorted.aClass11_1933 = Class7.getRSInterface(var3); KeyboardListener.anInt1918 = var2; @@ -132,14 +132,14 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { if(var4 == 42) { Class163_Sub2_Sub1.method2224(var6, var3, var2); - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(254); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var2 + Class131.anInt1716); - Class3_Sub13_Sub1.outgoingBuffer.putShortA((int)(var6 >>> 32) & Integer.MAX_VALUE); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var3 - -Class82.anInt1152); + TextureOperation12.outgoingBuffer.putOpcode(254); + TextureOperation12.outgoingBuffer.writeShortLE(var2 + Class131.anInt1716); + TextureOperation12.outgoingBuffer.putShortA((int)(var6 >>> 32) & Integer.MAX_VALUE); + TextureOperation12.outgoingBuffer.writeShort(var3 - -Texture.anInt1152); } if(28 == var4) { - Class3_Sub13_Sub19.method264((byte)122); + TextureOperation4.method264((byte)122); } if(var4 == 45) { @@ -150,10 +150,10 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { Class36.anInt638 = 2; Unsorted.anInt2958 = 0; Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(239); - Class3_Sub13_Sub1.outgoingBuffer.writeIntLE2(anInt872); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(RSInterface.anInt278); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); + TextureOperation12.outgoingBuffer.putOpcode(239); + TextureOperation12.outgoingBuffer.writeIntLE2(anInt872); + TextureOperation12.outgoingBuffer.putShortA(RSInterface.anInt278); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); } } @@ -172,18 +172,18 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { Unsorted.anInt2958 = 0; Class36.anInt638 = 2; Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(66); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(Class131.anInt1716 + var2); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var5); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var3 - -Class82.anInt1152); + TextureOperation12.outgoingBuffer.putOpcode(66); + TextureOperation12.outgoingBuffer.writeShortLE(Class131.anInt1716 + var2); + TextureOperation12.outgoingBuffer.writeShort(var5); + TextureOperation12.outgoingBuffer.writeShort128LE(var3 - -Texture.anInt1152); } if(var4 == 1001) { Class163_Sub2_Sub1.method2224(var6, var3, var2); - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(170); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(Integer.MAX_VALUE & (int)(var6 >>> 32)); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var2 - -Class131.anInt1716); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var3 - -Class82.anInt1152); + TextureOperation12.outgoingBuffer.putOpcode(170); + TextureOperation12.outgoingBuffer.writeShort128LE(Integer.MAX_VALUE & (int)(var6 >>> 32)); + TextureOperation12.outgoingBuffer.writeShort128LE(var2 - -Class131.anInt1716); + TextureOperation12.outgoingBuffer.writeShort128LE(var3 - -Texture.anInt1152); } if(var4 == 1002) { @@ -191,8 +191,8 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { Class70.anInt1053 = Class163_Sub1.anInt2993; Unsorted.anInt4062 = Class38_Sub1.anInt2614; Unsorted.anInt2958 = 0; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(92); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); + TextureOperation12.outgoingBuffer.putOpcode(92); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); } RSInterface var13; @@ -201,8 +201,8 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { if(null != var13 && var13.itemIds[var2] >= 100000) { addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{RSString.stringAnimator(var13.itemIds[var2]), TextCore.aClass94_3777, ItemDefinition.getItemDefinition(var5).name}), -1); } else { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(92); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); + TextureOperation12.outgoingBuffer.putOpcode(92); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); } anInt2330 = 0; @@ -215,19 +215,19 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { Unsorted.method589(WorldListCountry.localPlane, var2, var3); } else if (var5 == 1) { if (0 < Player.rights && ObjectDefinition.aBooleanArray1490[82] && ObjectDefinition.aBooleanArray1490[81]) { - Class30.method979(Class131.anInt1716 + var2, Class82.anInt1152 + var3, WorldListCountry.localPlane); + Class30.method979(Class131.anInt1716 + var2, Texture.anInt1152 + var3, WorldListCountry.localPlane); } else if (Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, true, 0, 2, var2, 0, 0, 1, var3, Class102.player.anIntArray2767[0])) { - Class3_Sub13_Sub1.outgoingBuffer.writeByte(Class1.anInt56); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(Class58.anInt916); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(GraphicDefinition.CAMERA_DIRECTION); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(57); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(Class3_Sub13_Sub8.anInt3102); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(Class164_Sub2.anInt3020); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(89); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class102.player.anInt2819); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class102.player.anInt2829); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(Class129.anInt1692); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(63); + TextureOperation12.outgoingBuffer.writeByte(Class1.anInt56); + TextureOperation12.outgoingBuffer.writeByte(Class58.anInt916); + TextureOperation12.outgoingBuffer.writeShort(GraphicDefinition.CAMERA_DIRECTION); + TextureOperation12.outgoingBuffer.writeByte(57); + TextureOperation12.outgoingBuffer.writeByte(TextureOperation9.anInt3102); + TextureOperation12.outgoingBuffer.writeByte(Class164_Sub2.anInt3020); + TextureOperation12.outgoingBuffer.writeByte(89); + TextureOperation12.outgoingBuffer.writeShort(Class102.player.anInt2819); + TextureOperation12.outgoingBuffer.writeShort(Class102.player.anInt2829); + TextureOperation12.outgoingBuffer.writeByte(Class129.anInt1692); + TextureOperation12.outgoingBuffer.writeByte(63); } } } @@ -245,8 +245,8 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { } if(null != var9) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(72); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var9.npcId); + TextureOperation12.outgoingBuffer.putOpcode(72); + TextureOperation12.outgoingBuffer.writeShort(var9.npcId); } } } @@ -254,19 +254,19 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { if(var4 == 47) { if (MouseWheel.shiftDown) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(135); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var5); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var2); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV2(var3); + TextureOperation12.outgoingBuffer.putOpcode(135); + TextureOperation12.outgoingBuffer.putShortA(var5); + TextureOperation12.outgoingBuffer.putShortA(var2); + TextureOperation12.outgoingBuffer.writeIntV2(var3); anInt2330 = 0; Unsorted.aClass11_1933 = Class7.getRSInterface(var3); } else { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(156); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var2); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var5); - Class3_Sub13_Sub1.outgoingBuffer.writeIntLE2(var3); + TextureOperation12.outgoingBuffer.putOpcode(156); + TextureOperation12.outgoingBuffer.writeShort128LE(var2); + TextureOperation12.outgoingBuffer.putShortA(var5); + TextureOperation12.outgoingBuffer.writeIntLE2(var3); anInt2330 = 0; Unsorted.aClass11_1933 = Class7.getRSInterface(var3); } @@ -274,49 +274,49 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { } if(var4 == 3) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(253); - Class3_Sub13_Sub1.outgoingBuffer.writeIntLE2(anInt872); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var2); - Class3_Sub13_Sub1.outgoingBuffer.writeIntLE2(var3); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var5); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(RSInterface.anInt278); + TextureOperation12.outgoingBuffer.putOpcode(253); + TextureOperation12.outgoingBuffer.writeIntLE2(anInt872); + TextureOperation12.outgoingBuffer.writeShort128LE(var2); + TextureOperation12.outgoingBuffer.writeIntLE2(var3); + TextureOperation12.outgoingBuffer.putShortA(var5); + TextureOperation12.outgoingBuffer.writeShortLE(RSInterface.anInt278); anInt2330 = 0; Unsorted.aClass11_1933 = Class7.getRSInterface(var3); KeyboardListener.anInt1918 = var2; } if(var4 == 10) { - var8 = Class3_Sub13_Sub22.players[var5]; + var8 = TextureOperation0.players[var5]; if(var8 != null) { Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var8.anIntArray2767[0], 1, 0, 2, var8.anIntArray2755[0], Class102.player.anIntArray2767[0]); Class36.anInt638 = 2; Unsorted.anInt4062 = Class38_Sub1.anInt2614; Class70.anInt1053 = Class163_Sub1.anInt2993; Unsorted.anInt2958 = 0; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(4); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var5); + TextureOperation12.outgoingBuffer.putOpcode(4); + TextureOperation12.outgoingBuffer.writeShortLE(var5); } } - if(41 == var4 && Class3_Sub13_Sub7.aClass11_3087 == null) { + if(41 == var4 && TextureOperation27.aClass11_3087 == null) { Unsorted.method78(var2, var3); - Class3_Sub13_Sub7.aClass11_3087 = AbstractSprite.method638(var3, var2); - Class20.method909(Class3_Sub13_Sub7.aClass11_3087); + TextureOperation27.aClass11_3087 = AbstractSprite.method638(var3, var2); + Class20.method909(TextureOperation27.aClass11_3087); } if(49 == var4) { Class163_Sub2_Sub1.method2224(var6, var3, var2); - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(84); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(Integer.MAX_VALUE & (int)(var6 >>> 32)); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(Class82.anInt1152 + var3); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var2 - -Class131.anInt1716); + TextureOperation12.outgoingBuffer.putOpcode(84); + TextureOperation12.outgoingBuffer.writeShort128LE(Integer.MAX_VALUE & (int)(var6 >>> 32)); + TextureOperation12.outgoingBuffer.writeShort128LE(Texture.anInt1152 + var3); + TextureOperation12.outgoingBuffer.writeShortLE(var2 - -Class131.anInt1716); } if(var4 == 23) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(206); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var5);//itemId - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var2);//data - Class3_Sub13_Sub1.outgoingBuffer.writeIntLE2(var3);//slot + TextureOperation12.outgoingBuffer.putOpcode(206); + TextureOperation12.outgoingBuffer.putShortA(var5);//itemId + TextureOperation12.outgoingBuffer.writeShortLE(var2);//data + TextureOperation12.outgoingBuffer.writeIntLE2(var3);//slot anInt2330 = 0; Unsorted.aClass11_1933 = Class7.getRSInterface(var3); KeyboardListener.anInt1918 = var2; @@ -324,25 +324,25 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { if(var4 == 14) { Class163_Sub2_Sub1.method2224(var6, var3, var2); - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(134); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(Class131.anInt1716 + var2); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class164.anInt2050); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var3 - -Class82.anInt1152); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(anInt1473); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV2(Class3_Sub28_Sub18.anInt3764); - Class3_Sub13_Sub1.outgoingBuffer.putShortA((int)(var6 >>> 32) & Integer.MAX_VALUE); + TextureOperation12.outgoingBuffer.putOpcode(134); + TextureOperation12.outgoingBuffer.putShortA(Class131.anInt1716 + var2); + TextureOperation12.outgoingBuffer.writeShort(Class164.anInt2050); + TextureOperation12.outgoingBuffer.writeShortLE(var3 - -Texture.anInt1152); + TextureOperation12.outgoingBuffer.writeShort(anInt1473); + TextureOperation12.outgoingBuffer.writeIntV2(Class3_Sub28_Sub18.anInt3764); + TextureOperation12.outgoingBuffer.putShortA((int)(var6 >>> 32) & Integer.MAX_VALUE); } if(var4 == 37) { - var8 = Class3_Sub13_Sub22.players[var5]; + var8 = TextureOperation0.players[var5]; if(var8 != null) { Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var8.anIntArray2767[0], 1, 0, 2, var8.anIntArray2755[0], Class102.player.anIntArray2767[0]); Unsorted.anInt2958 = 0; Class36.anInt638 = 2; Unsorted.anInt4062 = Class38_Sub1.anInt2614; Class70.anInt1053 = Class163_Sub1.anInt2993; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(114); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); + TextureOperation12.outgoingBuffer.putOpcode(114); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); } } @@ -352,18 +352,18 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { if(var4 == 5) { if (MouseWheel.shiftDown) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(135); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var5); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var2); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV2(var3); + TextureOperation12.outgoingBuffer.putOpcode(135); + TextureOperation12.outgoingBuffer.putShortA(var5); + TextureOperation12.outgoingBuffer.putShortA(var2); + TextureOperation12.outgoingBuffer.writeIntV2(var3); anInt2330 = 0; Unsorted.aClass11_1933 = Class7.getRSInterface(var3); } else { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(55); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var5); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var2); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV1(var3); + TextureOperation12.outgoingBuffer.putOpcode(55); + TextureOperation12.outgoingBuffer.writeShortLE(var5); + TextureOperation12.outgoingBuffer.putShortA(var2); + TextureOperation12.outgoingBuffer.writeIntV1(var3); anInt2330 = 0; Unsorted.aClass11_1933 = Class7.getRSInterface(var3); @@ -385,10 +385,10 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { Class70.anInt1053 = Class163_Sub1.anInt2993; Unsorted.anInt2958 = 0; Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(228); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var5); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(Class131.anInt1716 + var2); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(Class82.anInt1152 + var3); + TextureOperation12.outgoingBuffer.putOpcode(228); + TextureOperation12.outgoingBuffer.writeShort(var5); + TextureOperation12.outgoingBuffer.writeShortLE(Class131.anInt1716 + var2); + TextureOperation12.outgoingBuffer.writeShort128LE(Texture.anInt1152 + var3); } if(var4 == 4) { @@ -399,8 +399,8 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { Unsorted.anInt2958 = 0; Unsorted.anInt4062 = Class38_Sub1.anInt2614; Class70.anInt1053 = Class163_Sub1.anInt2993; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(148); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var5); + TextureOperation12.outgoingBuffer.putOpcode(148); + TextureOperation12.outgoingBuffer.putShortA(var5); } } @@ -425,40 +425,40 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { } else { if(29 == var4) { - var8 = Class3_Sub13_Sub22.players[var5]; + var8 = TextureOperation0.players[var5]; if(null != var8) { Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var8.anIntArray2767[0], 1, 0, 2, var8.anIntArray2755[0], Class102.player.anIntArray2767[0]); Unsorted.anInt4062 = Class38_Sub1.anInt2614; Unsorted.anInt2958 = 0; Class36.anInt638 = 2; Class70.anInt1053 = Class163_Sub1.anInt2993; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(180); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); + TextureOperation12.outgoingBuffer.putOpcode(180); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); } } if(var4 == 35) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(161); - Class3_Sub13_Sub1.outgoingBuffer.writeIntLE2(var3); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var2); + TextureOperation12.outgoingBuffer.putOpcode(161); + TextureOperation12.outgoingBuffer.writeIntLE2(var3); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); + TextureOperation12.outgoingBuffer.writeShort128LE(var2); anInt2330 = 0; Unsorted.aClass11_1933 = Class7.getRSInterface(var3); KeyboardListener.anInt1918 = var2; } if(15 == var4) { - var8 = Class3_Sub13_Sub22.players[var5]; + var8 = TextureOperation0.players[var5]; if(var8 != null) { Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var8.anIntArray2767[0], 1, 0, 2, var8.anIntArray2755[0], Class102.player.anIntArray2767[0]); Unsorted.anInt2958 = 0; Class36.anInt638 = 2; Class70.anInt1053 = Class163_Sub1.anInt2993; Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(195); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(RSInterface.anInt278); - Class3_Sub13_Sub1.outgoingBuffer.writeIntLE2(anInt872); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); + TextureOperation12.outgoingBuffer.putOpcode(195); + TextureOperation12.outgoingBuffer.putShortA(RSInterface.anInt278); + TextureOperation12.outgoingBuffer.writeIntLE2(anInt872); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); } } @@ -476,17 +476,17 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { Class36.anInt638 = 2; Unsorted.anInt4062 = Class38_Sub1.anInt2614; Unsorted.anInt2958 = 0; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(109); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var3 - -Class82.anInt1152); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var2 + Class131.anInt1716); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); + TextureOperation12.outgoingBuffer.putOpcode(109); + TextureOperation12.outgoingBuffer.writeShortLE(var3 - -Texture.anInt1152); + TextureOperation12.outgoingBuffer.writeShort(var2 + Class131.anInt1716); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); } if(var4 == 25) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(81); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var2); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var5); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV1(var3); + TextureOperation12.outgoingBuffer.putOpcode(81); + TextureOperation12.outgoingBuffer.putShortA(var2); + TextureOperation12.outgoingBuffer.writeShort(var5); + TextureOperation12.outgoingBuffer.writeIntV1(var3); anInt2330 = 0; Unsorted.aClass11_1933 = Class7.getRSInterface(var3); KeyboardListener.anInt1918 = var2; @@ -500,15 +500,15 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { Class36.anInt638 = 2; Class70.anInt1053 = Class163_Sub1.anInt2993; Unsorted.anInt2958 = 0; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(218); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var5); + TextureOperation12.outgoingBuffer.putOpcode(218); + TextureOperation12.outgoingBuffer.writeShortLE(var5); } } int var12; if(var4 == 51) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(10); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var3); + TextureOperation12.outgoingBuffer.putOpcode(10); + TextureOperation12.outgoingBuffer.writeInt(var3); var13 = Class7.getRSInterface(var3); if(Objects.requireNonNull(var13).childDataBuffers != null && var13.childDataBuffers[0][0] == 5) { var12 = var13.childDataBuffers[0][1]; @@ -527,18 +527,18 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { Unsorted.anInt2958 = 0; Unsorted.anInt4062 = Class38_Sub1.anInt2614; Class70.anInt1053 = Class163_Sub1.anInt2993; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(115);//Item on NPC - Class3_Sub13_Sub1.outgoingBuffer.writeIntV2(Class3_Sub28_Sub18.anInt3764); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(anInt1473); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var5); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(Class164.anInt2050); + TextureOperation12.outgoingBuffer.putOpcode(115);//Item on NPC + TextureOperation12.outgoingBuffer.writeIntV2(Class3_Sub28_Sub18.anInt3764); + TextureOperation12.outgoingBuffer.writeShortLE(anInt1473); + TextureOperation12.outgoingBuffer.writeShortLE(var5); + TextureOperation12.outgoingBuffer.writeShort128LE(Class164.anInt2050); // System.out.println(Class3_Sub28_Sub18.anInt3764 + ", " + Class110.anInt1473 + ", " + var5 + ", " + Class164.anInt2050); } } if(59 == var4) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(10); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var3); + TextureOperation12.outgoingBuffer.putOpcode(10); + TextureOperation12.outgoingBuffer.writeInt(var3); var13 = Class7.getRSInterface(var3); if(Objects.requireNonNull(var13).childDataBuffers != null && var13.childDataBuffers[0][0] == 5) { var12 = var13.childDataBuffers[0][1]; @@ -557,13 +557,13 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { Unsorted.anInt2958 = 0; Unsorted.anInt4062 = Class38_Sub1.anInt2614; Class36.anInt638 = 2; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(101); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var2 - -Class131.anInt1716); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(anInt1473); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(Class164.anInt2050); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var5); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(Class82.anInt1152 + var3); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV2(Class3_Sub28_Sub18.anInt3764); + TextureOperation12.outgoingBuffer.putOpcode(101); + TextureOperation12.outgoingBuffer.writeShort128LE(var2 - -Class131.anInt1716); + TextureOperation12.outgoingBuffer.writeShortLE(anInt1473); + TextureOperation12.outgoingBuffer.writeShortLE(Class164.anInt2050); + TextureOperation12.outgoingBuffer.writeShortLE(var5); + TextureOperation12.outgoingBuffer.writeShort128LE(Texture.anInt1152 + var3); + TextureOperation12.outgoingBuffer.writeIntV2(Class3_Sub28_Sub18.anInt3764); } if(var4 == 1004) { @@ -571,8 +571,8 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { Class70.anInt1053 = Class163_Sub1.anInt2993; Class36.anInt638 = 2; Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(94); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); + TextureOperation12.outgoingBuffer.putOpcode(94); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); } if(11 == var4) { @@ -580,11 +580,11 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { CS2Script.anInt2440 = 1; Unsorted.method589(WorldListCountry.localPlane, var2, var3); } else if (1 == var5) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(131); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV2(anInt872); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(Class131.anInt1716 + var2); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(RSInterface.anInt278); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var3 + Class82.anInt1152); + TextureOperation12.outgoingBuffer.putOpcode(131); + TextureOperation12.outgoingBuffer.writeIntV2(anInt872); + TextureOperation12.outgoingBuffer.putShortA(Class131.anInt1716 + var2); + TextureOperation12.outgoingBuffer.writeShort128LE(RSInterface.anInt278); + TextureOperation12.outgoingBuffer.putShortA(var3 + Texture.anInt1152); } } @@ -596,32 +596,32 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { } if(var15) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(10); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var3); + TextureOperation12.outgoingBuffer.putOpcode(10); + TextureOperation12.outgoingBuffer.writeInt(var3); } } if(var4 == 1) { - var8 = Class3_Sub13_Sub22.players[var5]; + var8 = TextureOperation0.players[var5]; if(var8 != null) { Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var8.anIntArray2767[0], 1, 0, 2, var8.anIntArray2755[0], Class102.player.anIntArray2767[0]); Unsorted.anInt2958 = 0; Unsorted.anInt4062 = Class38_Sub1.anInt2614; Class36.anInt638 = 2; Class70.anInt1053 = Class163_Sub1.anInt2993; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(248); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class164.anInt2050); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(anInt1473); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV2(Class3_Sub28_Sub18.anInt3764); + TextureOperation12.outgoingBuffer.putOpcode(248); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); + TextureOperation12.outgoingBuffer.writeShort(Class164.anInt2050); + TextureOperation12.outgoingBuffer.writeShort(anInt1473); + TextureOperation12.outgoingBuffer.writeIntV2(Class3_Sub28_Sub18.anInt3764); } } if(var4 == 7) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(85); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV1(var3); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var2); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var5); + TextureOperation12.outgoingBuffer.putOpcode(85); + TextureOperation12.outgoingBuffer.writeIntV1(var3); + TextureOperation12.outgoingBuffer.writeShort(var2); + TextureOperation12.outgoingBuffer.putShortA(var5); anInt2330 = 0; Unsorted.aClass11_1933 = Class7.getRSInterface(var3); KeyboardListener.anInt1918 = var2; @@ -641,52 +641,52 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { Unsorted.anInt4062 = Class38_Sub1.anInt2614; Class70.anInt1053 = Class163_Sub1.anInt2993; Unsorted.anInt2958 = 0; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(48); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var2 - -Class131.anInt1716); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(Class82.anInt1152 + var3); + TextureOperation12.outgoingBuffer.putOpcode(48); + TextureOperation12.outgoingBuffer.putShortA(var2 - -Class131.anInt1716); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); + TextureOperation12.outgoingBuffer.writeShortLE(Texture.anInt1152 + var3); } if(var4 == 38) { Class163_Sub2_Sub1.method2224(var6, var3, var2); - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(233); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var3 + Class82.anInt1152); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(Class131.anInt1716 + var2); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(RSInterface.anInt278); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV1(anInt872); - Class3_Sub13_Sub1.outgoingBuffer.putShortA((int)(var6 >>> 32) & Integer.MAX_VALUE); + TextureOperation12.outgoingBuffer.putOpcode(233); + TextureOperation12.outgoingBuffer.writeShort128LE(var3 + Texture.anInt1152); + TextureOperation12.outgoingBuffer.putShortA(Class131.anInt1716 + var2); + TextureOperation12.outgoingBuffer.writeShort128LE(RSInterface.anInt278); + TextureOperation12.outgoingBuffer.writeIntV1(anInt872); + TextureOperation12.outgoingBuffer.putShortA((int)(var6 >>> 32) & Integer.MAX_VALUE); } if(var4 == 13) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(6); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var3); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var2); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var5); + TextureOperation12.outgoingBuffer.putOpcode(6); + TextureOperation12.outgoingBuffer.writeInt(var3); + TextureOperation12.outgoingBuffer.putShortA(var2); + TextureOperation12.outgoingBuffer.writeShortLE(var5); anInt2330 = 0; Unsorted.aClass11_1933 = Class7.getRSInterface(var3); KeyboardListener.anInt1918 = var2; } if(57 == var4) { - var8 = Class3_Sub13_Sub22.players[var5]; + var8 = TextureOperation0.players[var5]; if(null != var8) { Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var8.anIntArray2767[0], 1, 0, 2, var8.anIntArray2755[0], Class102.player.anIntArray2767[0]); Class36.anInt638 = 2; Unsorted.anInt4062 = Class38_Sub1.anInt2614; Class70.anInt1053 = Class163_Sub1.anInt2993; Unsorted.anInt2958 = 0; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(175); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var5); + TextureOperation12.outgoingBuffer.putOpcode(175); + TextureOperation12.outgoingBuffer.putShortA(var5); } } if(var4 == 22) { if (MouseWheel.shiftDown) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(135); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var5); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(var2); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV2(var3); + TextureOperation12.outgoingBuffer.putOpcode(135); + TextureOperation12.outgoingBuffer.putShortA(var5); + TextureOperation12.outgoingBuffer.putShortA(var2); + TextureOperation12.outgoingBuffer.writeIntV2(var3); anInt2330 = 0; Unsorted.aClass11_1933 = Class7.getRSInterface(var3); KeyboardListener.anInt1918 = var2; @@ -708,40 +708,40 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { } else { if(var4 == 50) { Class163_Sub2_Sub1.method2224(var6, var3, var2); - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(194); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var3 + Class82.anInt1152); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(Class131.anInt1716 + var2); - Class3_Sub13_Sub1.outgoingBuffer.writeShort((int)(var6 >>> 32) & Integer.MAX_VALUE); + TextureOperation12.outgoingBuffer.putOpcode(194); + TextureOperation12.outgoingBuffer.writeShort128LE(var3 + Texture.anInt1152); + TextureOperation12.outgoingBuffer.writeShortLE(Class131.anInt1716 + var2); + TextureOperation12.outgoingBuffer.writeShort((int)(var6 >>> 32) & Integer.MAX_VALUE); } if(var4 == 48) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(154); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var2); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV1(var3); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); + TextureOperation12.outgoingBuffer.putOpcode(154); + TextureOperation12.outgoingBuffer.writeShortLE(var2); + TextureOperation12.outgoingBuffer.writeIntV1(var3); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); anInt2330 = 0; Unsorted.aClass11_1933 = Class7.getRSInterface(var3); KeyboardListener.anInt1918 = var2; } if(var4 == 30) { - var8 = Class3_Sub13_Sub22.players[var5]; + var8 = TextureOperation0.players[var5]; if(null != var8) { Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var8.anIntArray2767[0], 1, 0, 2, var8.anIntArray2755[0], Class102.player.anIntArray2767[0]); Unsorted.anInt2958 = 0; Class70.anInt1053 = Class163_Sub1.anInt2993; Unsorted.anInt4062 = Class38_Sub1.anInt2614; Class36.anInt638 = 2; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(68); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); + TextureOperation12.outgoingBuffer.putOpcode(68); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); } } if(var4 == 43) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(153); - Class3_Sub13_Sub1.outgoingBuffer.writeIntLE2(var3); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var2); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var5); + TextureOperation12.outgoingBuffer.putOpcode(153); + TextureOperation12.outgoingBuffer.writeIntLE2(var3); + TextureOperation12.outgoingBuffer.writeShortLE(var2); + TextureOperation12.outgoingBuffer.writeShortLE(var5); anInt2330 = 0; Unsorted.aClass11_1933 = Class7.getRSInterface(var3); KeyboardListener.anInt1918 = var2; @@ -757,20 +757,20 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { Class70.anInt1053 = Class163_Sub1.anInt2993; Class36.anInt638 = 2; Unsorted.anInt2958 = 0; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(73); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV1(anInt872); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class82.anInt1152 + var3); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var2 + Class131.anInt1716); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(RSInterface.anInt278); + TextureOperation12.outgoingBuffer.putOpcode(73); + TextureOperation12.outgoingBuffer.writeIntV1(anInt872); + TextureOperation12.outgoingBuffer.writeShort(Texture.anInt1152 + var3); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); + TextureOperation12.outgoingBuffer.writeShort128LE(var2 + Class131.anInt1716); + TextureOperation12.outgoingBuffer.writeShortLE(RSInterface.anInt278); } if(var4 == 12) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(82); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(RSInterface.anInt278); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV1(var3); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(anInt872); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var2); + TextureOperation12.outgoingBuffer.putOpcode(82); + TextureOperation12.outgoingBuffer.writeShort(RSInterface.anInt278); + TextureOperation12.outgoingBuffer.writeIntV1(var3); + TextureOperation12.outgoingBuffer.writeInt(anInt872); + TextureOperation12.outgoingBuffer.writeShort128LE(var2); } if(var4 == 36) { @@ -778,24 +778,24 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { ObjectDefinition.anInt1521 = 1; Unsorted.method589(WorldListCountry.localPlane, var2, var3); } else if (Player.rights > 0 && ObjectDefinition.aBooleanArray1490[82] && ObjectDefinition.aBooleanArray1490[81]) { - Class30.method979(var2 + Class131.anInt1716, Class82.anInt1152 - -var3, WorldListCountry.localPlane); + Class30.method979(var2 + Class131.anInt1716, Texture.anInt1152 - -var3, WorldListCountry.localPlane); } else { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(179); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var3 + Class82.anInt1152); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var2 + Class131.anInt1716); + TextureOperation12.outgoingBuffer.putOpcode(179); + TextureOperation12.outgoingBuffer.writeShort(var3 + Texture.anInt1152); + TextureOperation12.outgoingBuffer.writeShort(var2 + Class131.anInt1716); } } if(6 == var4) { - var8 = Class3_Sub13_Sub22.players[var5]; + var8 = TextureOperation0.players[var5]; if(var8 != null) { Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var8.anIntArray2767[0], 1, 0, 2, var8.anIntArray2755[0], Class102.player.anIntArray2767[0]); Unsorted.anInt4062 = Class38_Sub1.anInt2614; Unsorted.anInt2958 = 0; Class36.anInt638 = 2; Class70.anInt1053 = Class163_Sub1.anInt2993; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(106); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var5); + TextureOperation12.outgoingBuffer.putOpcode(106); + TextureOperation12.outgoingBuffer.writeShort(var5); } } @@ -813,10 +813,10 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { Unsorted.anInt2958 = 0; Class70.anInt1053 = Class163_Sub1.anInt2993; Class36.anInt638 = 2; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(33); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var5); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class131.anInt1716 + var2); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(Class82.anInt1152 + var3); + TextureOperation12.outgoingBuffer.putOpcode(33); + TextureOperation12.outgoingBuffer.writeShort(var5); + TextureOperation12.outgoingBuffer.writeShort(Class131.anInt1716 + var2); + TextureOperation12.outgoingBuffer.writeShortLE(Texture.anInt1152 + var3); } if(var4 == 16) { @@ -827,8 +827,8 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { Unsorted.anInt2958 = 0; Unsorted.anInt4062 = Class38_Sub1.anInt2614; Class36.anInt638 = 2; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(3); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); + TextureOperation12.outgoingBuffer.putOpcode(3); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); } } @@ -866,11 +866,11 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { } } - final void setBitAccess(byte var1) { + final void setBitAccess() { try { this.headiconsPrayerSpriteArchive6 = this.index * 8; } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "i.R(" + var1 + ')'); + throw ClientErrorException.clientError(var3, "i.R(" + ')'); } } @@ -880,9 +880,9 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { static int method809(int var0, int var1, int var2, int var3) { try { - if(Class3_Sub13_Sub32.aBoolean3387) { + if(TextureOperation14.aBoolean3387) { var0 = 1000000; - Class3_Sub13_Sub32.aBoolean3387 = false; + TextureOperation14.aBoolean3387 = false; } AtmosphereParser var5 = AtmosphereParser.aAtmosphereParserArrayArray1581[var3][var1]; @@ -898,8 +898,8 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { float var9 = var5.aFloat1189; if(var6 != Class60.anInt932 || Class3_Sub17.aFloat2457 != var7 || aFloat3044 != var8 || var9 != RSInterface.aFloat246 || anInt1345 != var10 || anInt1736 != var11) { Class3_Sub17.aFloat2457 = var7; - Class3_Sub13_Sub36.aFloat3435 = Class3_Sub13_Sub36.aFloat3424; - Class3_Sub13_Sub8.aFloat3105 = Class30.aFloat578; + TextureOperation36.aFloat3435 = TextureOperation36.aFloat3424; + TextureOperation9.aFloat3105 = Class30.aFloat578; Class60.anInt932 = var6; anInt1971 = Class3_Sub28_Sub12.anInt3652; anInt1407 = Unsorted.anInt689; @@ -921,19 +921,19 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { float var15 = (float) Unsorted.anInt72 / 65536.0F; int var13 = Unsorted.anInt72 >> 8; int var12 = -Unsorted.anInt72 + 65536 >> 8; - Class3_Sub28_Sub12.anInt3652 = (-16711936 & var13 * (anInt1345 & 16711935) + (16711935 & anInt1971) * var12) + (16711680 & var12 * (anInt1971 & '\uff00') + ('\uff00' & anInt1345) * var13) >> 8; + Class3_Sub28_Sub12.anInt3652 = (-16711936 & var13 * (anInt1345 & 16711935) + (16711935 & anInt1971) * var12) + (16711680 & var12 * (anInt1971 & 65280) + (65280 & anInt1345) * var13) >> 8; float var14 = (float)(65536 - Unsorted.anInt72) / 65536.0F; - Class30.aFloat578 = var14 * Class3_Sub13_Sub8.aFloat3105 + var15 * Class3_Sub17.aFloat2457; - Class3_Sub13_Sub36.aFloat3424 = Class3_Sub13_Sub36.aFloat3435 * var14 + var15 * aFloat3044; + Class30.aFloat578 = var14 * TextureOperation9.aFloat3105 + var15 * Class3_Sub17.aFloat2457; + TextureOperation36.aFloat3424 = TextureOperation36.aFloat3435 * var14 + var15 * aFloat3044; Class12.aFloat319 = var15 * RSInterface.aFloat246 + var14 * aFloat1475; - Unsorted.anInt1950 = (16711680 & (Class60.anInt932 & '\uff00') * var13 + var12 * (anInt4037 & '\uff00')) + ((16711935 & anInt4037) * var12 - -((Class60.anInt932 & 16711935) * var13) & -16711936) >> 8; + Unsorted.anInt1950 = (16711680 & (Class60.anInt932 & 65280) * var13 + var12 * (anInt4037 & 65280)) + ((16711935 & anInt4037) * var12 - -((Class60.anInt932 & 16711935) * var13) & -16711936) >> 8; Unsorted.anInt689 = var13 * anInt1736 + var12 * anInt1407 >> 8; } - Class92.setLightParams(Unsorted.anInt1950, Class30.aFloat578, Class3_Sub13_Sub36.aFloat3424, Class12.aFloat319); + Class92.setLightParams(Unsorted.anInt1950, Class30.aFloat578, TextureOperation36.aFloat3424, Class12.aFloat319); Class92.setFogValues(Class3_Sub28_Sub12.anInt3652, Unsorted.anInt689); - Class92.setLightPosition((float)Class46.anInt741, (float) Class3_Sub13_Sub11.anInt3274, (float) AtmosphereParser.anInt1191); + Class92.setLightPosition((float)Class46.anInt741, (float) TextureOperation1.anInt3274, (float) AtmosphereParser.anInt1191); Class92.method1504(); return Class3_Sub28_Sub12.anInt3652; } catch (RuntimeException var16) { @@ -1039,8 +1039,8 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { static void method819() { try { - Class3_Sub31 var1 = Class3_Sub13_Sub17.aHashTable_3208.first(); - for(; var1 != null; var1 = Class3_Sub13_Sub17.aHashTable_3208.next()) { + Class3_Sub31 var1 = TextureOperation23.aHashTable_3208.first(); + for(; var1 != null; var1 = TextureOperation23.aHashTable_3208.next()) { int var2 = var1.anInt2602; if(Unsorted.loadInterface(var2)) { boolean var3 = true; diff --git a/Client/src/main/java/org/runite/client/Class3_Sub4.java b/Client/src/main/java/org/runite/client/Class3_Sub4.java index 7e22691ac..82594a890 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub4.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub4.java @@ -22,26 +22,26 @@ final class Class3_Sub4 extends Linkable { static void initializeScene(int var3, boolean var4) { Unsorted.anInt1234 = 104; - Class3_Sub13_Sub15.anInt3179 = 104; - Class3_Sub13_Sub39.anInt3466 = var3; - Unsorted.aClass3_Sub2ArrayArrayArray4070 = new Class3_Sub2[4][Unsorted.anInt1234][Class3_Sub13_Sub15.anInt3179]; - Class58.anIntArrayArrayArray914 = new int[4][Unsorted.anInt1234 + 1][Class3_Sub13_Sub15.anInt3179 + 1]; + TextureOperation17.anInt3179 = 104; + TextureOperation8.anInt3466 = var3; + Unsorted.aClass3_Sub2ArrayArrayArray4070 = new Class3_Sub2[4][Unsorted.anInt1234][TextureOperation17.anInt3179]; + Class58.anIntArrayArrayArray914 = new int[4][Unsorted.anInt1234 + 1][TextureOperation17.anInt3179 + 1]; if (HDToolKit.highDetail) { Client.aClass3_Sub11ArrayArray2199 = new Class3_Sub11[4][]; } if (var4) { - Class166.aClass3_Sub2ArrayArrayArray2065 = new Class3_Sub2[1][Unsorted.anInt1234][Class3_Sub13_Sub15.anInt3179]; - Class3_Sub13_Sub9.anIntArrayArray3115 = new int[Unsorted.anInt1234][Class3_Sub13_Sub15.anInt3179]; - Unsorted.anIntArrayArrayArray3605 = new int[1][Unsorted.anInt1234 + 1][Class3_Sub13_Sub15.anInt3179 + 1]; + Class166.aClass3_Sub2ArrayArrayArray2065 = new Class3_Sub2[1][Unsorted.anInt1234][TextureOperation17.anInt3179]; + TextureOperation16.anIntArrayArray3115 = new int[Unsorted.anInt1234][TextureOperation17.anInt3179]; + Unsorted.anIntArrayArrayArray3605 = new int[1][Unsorted.anInt1234 + 1][TextureOperation17.anInt3179 + 1]; if (HDToolKit.highDetail) { - Class3_Sub13_Sub28.aClass3_Sub11ArrayArray3346 = new Class3_Sub11[1][]; + TextureOperation32.aClass3_Sub11ArrayArray3346 = new Class3_Sub11[1][]; } } else { Class166.aClass3_Sub2ArrayArrayArray2065 = null; - Class3_Sub13_Sub9.anIntArrayArray3115 = null; + TextureOperation16.anIntArrayArray3115 = null; Unsorted.anIntArrayArrayArray3605 = null; - Class3_Sub13_Sub28.aClass3_Sub11ArrayArray3346 = null; + TextureOperation32.aClass3_Sub11ArrayArray3346 = null; } Class167.method2264(false); @@ -49,13 +49,13 @@ final class Class3_Sub4 extends Linkable { anInt2249 = 0; Class145.aClass113Array1895 = new Class113[500]; Class72.anInt1672 = 0; - Class81.anIntArrayArrayArray1142 = new int[4][Unsorted.anInt1234 + 1][Class3_Sub13_Sub15.anInt3179 + 1]; + Class81.anIntArrayArrayArray1142 = new int[4][Unsorted.anInt1234 + 1][TextureOperation17.anInt3179 + 1]; SequenceDefinition.aClass25Array1868 = new Class25[5000]; Unsorted.anInt3070 = 0; Unsorted.aClass25Array4060 = new Class25[100]; - Class23.aBooleanArrayArray457 = new boolean[Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466 + 1][Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466 + 1]; - Class49.aBooleanArrayArray814 = new boolean[Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466 + 2][Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466 + 2]; - Unsorted.aByteArrayArrayArray1774 = new byte[4][Unsorted.anInt1234][Class3_Sub13_Sub15.anInt3179]; + Class23.aBooleanArrayArray457 = new boolean[TextureOperation8.anInt3466 + TextureOperation8.anInt3466 + 1][TextureOperation8.anInt3466 + TextureOperation8.anInt3466 + 1]; + Class49.aBooleanArrayArray814 = new boolean[TextureOperation8.anInt3466 + TextureOperation8.anInt3466 + 2][TextureOperation8.anInt3466 + TextureOperation8.anInt3466 + 2]; + Unsorted.aByteArrayArrayArray1774 = new byte[4][Unsorted.anInt1234][TextureOperation17.anInt3179]; } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub5.java b/Client/src/main/java/org/runite/client/Class3_Sub5.java index af070e20e..83cc57794 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub5.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub5.java @@ -24,7 +24,7 @@ final class Class3_Sub5 extends Linkable { if (var0 < -47) { for (int var9 = 0; var9 < Class119.aClass131_1624.anInt1720; ++var9) { if (Class119.aClass131_1624.method1787(var9)) { - int var10 = -Class3_Sub13_Sub21.anInt3256 + Class119.aClass131_1624.aShortArray1727[var9]; + int var10 = -TextureOperation37.anInt3256 + Class119.aClass131_1624.aShortArray1727[var9]; int var11 = Unsorted.anInt65 - (Class119.aClass131_1624.aShortArray1718[var9] - -1 - Class108.anInt1460); int var12 = var1 + (-var1 + var4) * (var10 - var3) / (-var3 + var7); int var14 = Class119.aClass131_1624.method1791(var9, 8); @@ -91,7 +91,7 @@ final class Class3_Sub5 extends Linkable { } if (null != var16) { - int var17 = TextureOperation.smallFont.method691(Class119.aClass131_1624.aClass94Array1721[var9], null, Class158_Sub1.aClass94Array2977); + int var17 = FontType.smallFont.method691(Class119.aClass131_1624.aClass94Array1721[var9], null, Class158_Sub1.aClass94Array2977); var13 -= var16.method998() * (var17 + -1) / 2; var13 += var16.method1006() / 2; @@ -222,7 +222,7 @@ final class Class3_Sub5 extends Linkable { if (var0) { var4 = Class102.player; } else { - var4 = Class3_Sub13_Sub22.players[Class56.localPlayerIndexes[var3]]; + var4 = TextureOperation0.players[Class56.localPlayerIndexes[var3]]; } if (null != var4 && var4.hasDefinitions()) { @@ -273,7 +273,7 @@ final class Class3_Sub5 extends Linkable { var4 = Class102.player; var16 = 8791798054912L; } else { - var4 = Class3_Sub13_Sub22.players[Class56.localPlayerIndexes[var3]]; + var4 = TextureOperation0.players[Class56.localPlayerIndexes[var3]]; var16 = (long) Class56.localPlayerIndexes[var3] << 32; } @@ -347,7 +347,7 @@ final class Class3_Sub5 extends Linkable { if (null != var4.anObject2796 && var4.anInt2797 <= Class44.anInt719 && Class44.anInt719 < var4.anInt2778) { var4.aBoolean3968 = false; var4.anInt2831 = Class121.method1736(WorldListCountry.localPlane, 1, var4.anInt2819, var4.anInt2829); - Class3_Sub13_Sub25.method292(WorldListCountry.localPlane, var4.anInt2819, var4.anInt2829, var4.anInt2831, var4, var4.anInt2785, var16, var4.anInt2788, var4.anInt2777, var4.anInt2818, var4.anInt2817); + TextureOperation28.method292(WorldListCountry.localPlane, var4.anInt2819, var4.anInt2829, var4.anInt2831, var4, var4.anInt2785, var16, var4.anInt2788, var4.anInt2777, var4.anInt2818, var4.anInt2817); } else { var4.anInt2831 = Class121.method1736(WorldListCountry.localPlane, 1, var4.anInt2819, var4.anInt2829); Class20.method907(WorldListCountry.localPlane, var4.anInt2819, var4.anInt2829, var4.anInt2831, 64 * (var7 - 1) + 60, var4, var4.anInt2785, var16, var4.aBoolean2810); @@ -363,27 +363,27 @@ final class Class3_Sub5 extends Linkable { static void method117() { try { if (0 > Class3_Sub28_Sub1.anInt3536) { - Class3_Sub13_Sub30.anInt3362 = -1; + TextureOperation13.anInt3362 = -1; Class3_Sub28_Sub1.anInt3536 = 0; - Class82.anInt1150 = -1; + Texture.anInt1150 = -1; } if (Class23.anInt455 < Class3_Sub28_Sub1.anInt3536) { - Class3_Sub13_Sub30.anInt3362 = -1; + TextureOperation13.anInt3362 = -1; Class3_Sub28_Sub1.anInt3536 = Class23.anInt455; - Class82.anInt1150 = -1; + Texture.anInt1150 = -1; } if (Class3_Sub4.anInt2251 < 0) { - Class82.anInt1150 = -1; - Class3_Sub13_Sub30.anInt3362 = -1; + Texture.anInt1150 = -1; + TextureOperation13.anInt3362 = -1; Class3_Sub4.anInt2251 = 0; } if (Class108.anInt1460 < Class3_Sub4.anInt2251) { Class3_Sub4.anInt2251 = Class108.anInt1460; - Class3_Sub13_Sub30.anInt3362 = -1; - Class82.anInt1150 = -1; + TextureOperation13.anInt3362 = -1; + Texture.anInt1150 = -1; } } catch (RuntimeException var2) { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub8.java b/Client/src/main/java/org/runite/client/Class3_Sub8.java index addb7117b..80659f93c 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub8.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub8.java @@ -2,7 +2,6 @@ package org.runite.client; import org.rs09.client.Linkable; import org.rs09.client.config.GameConfig; -import org.rs09.client.rendering.Toolkit; import java.util.Objects; @@ -34,226 +33,13 @@ final class Class3_Sub8 extends Linkable { } } - static void displayMinimap(int var0, byte var1, int var2, int var3, RSInterface var4) { - try { - Class58.method1194(); - if(HDToolKit.highDetail) { - Class22.setClipping(var3, var2, var3 + var4.width, var2 + var4.height); - } else { - Class74.setClipping(var3, var2, var3 - -var4.width, var2 + var4.height); - } - - if(2 != Class161.anInt2028 && 5 != Class161.anInt2028 && Class49.aAbstractSprite_812 != null) { - int var19 = Class3_Sub13_Sub8.anInt3102 + GraphicDefinition.CAMERA_DIRECTION & 2047;//Region Rotation (relative to player camera) - int var6 = Class102.player.anInt2819 / 32 + 48;//Minimap X Axis (relative to player) Used as offset - int var7 = -(Class102.player.anInt2829 / 32) + 464;//Minimap Y Axis (relative to player) Used as offset - 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); - } - - int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - int var17; - int var16; - if(null != Class3_Sub13_Sub35.aClass131_3421) { - for(int var8 = 0; var8 < Class3_Sub13_Sub35.aClass131_3421.anInt1720; ++var8) { - if(Class3_Sub13_Sub35.aClass131_3421.method1789(var8, var1 ^ 553)) { - var9 = 2 + 4 * (Class3_Sub13_Sub35.aClass131_3421.aShortArray1727[var8] + -Class131.anInt1716) + -(Class102.player.anInt2819 / 32); - var11 = Class51.anIntArray840[var19]; - var12 = Class51.anIntArray851[var19]; - Font var15 = TextureOperation.smallFont; - var11 = var11 * 256 / (256 + Class164_Sub2.anInt3020); - var10 = 2 + 4 * (-Class82.anInt1152 + Class3_Sub13_Sub35.aClass131_3421.aShortArray1718[var8]) - Class102.player.anInt2829 / 32; - var12 = var12 * 256 / (256 + Class164_Sub2.anInt3020); - var14 = -(var9 * var11) + var10 * var12 >> 16; - if(Class3_Sub13_Sub35.aClass131_3421.method1791(var8, var1 + -51) == 1) { - var15 = Class126.plainFont; - } - - if(2 == Class3_Sub13_Sub35.aClass131_3421.method1791(var8, 8)) { - var15 = Class168.bold; - } - - var13 = var11 * var10 - -(var12 * var9) >> 16; - var16 = var15.method680(Class3_Sub13_Sub35.aClass131_3421.aClass94Array1721[var8], 100); - var13 -= var16 / 2; - if(-var4.width <= var13 && var13 <= var4.width && var14 >= -var4.height && var14 <= var4.height) { - var17 = 16777215; - if(Class3_Sub13_Sub35.aClass131_3421.anIntArray1725[var8] != -1) { - var17 = Class3_Sub13_Sub35.aClass131_3421.anIntArray1725[var8]; - } - - if(HDToolKit.highDetail) { - Class22.method936((HDSprite) Objects.requireNonNull(var4.method866(false))); - } else { - Class74.method1314(var4.anIntArray207, var4.anIntArray291); - } - - var15.method693(Class3_Sub13_Sub35.aClass131_3421.aClass94Array1721[var8], var3 + var13 + var4.width / 2, var2 + var4.height / 2 + -var14, var16, 50, var17, 0, 1, 0, 0); - if(HDToolKit.highDetail) { - Class22.method921(); - } else { - Class74.method1310(); - } - } - } - } - } - - for(var9 = 0; MouseListeningClass.anInt1924 > var9; ++var9) { - var10 = -(Class102.player.anInt2819 / 32) + 2 + 4 * Class84.anIntArray1163[var9]; - var11 = -(Class102.player.anInt2829 / 32) + 2 + (Unsorted.anIntArray4050[var9] * 4); - ObjectDefinition var20 = ObjectDefinition.getObjectDefinition(Class3_Sub19.anIntArray3693[var9]); - if(null != var20.ChildrenIds) { - var20 = var20.method1685(var1 + -59); - if(null == var20 || var20.MapIcon == -1) { - continue; - } - } - - Class38_Sub1.minimapIcons(var4, Class140_Sub4.aAbstractSpriteArray2839[var20.MapIcon], var11, var10, var2, var3); - } - - for(var9 = 0; 104 > var9; ++var9) { - for(var10 = 0; var10 < 104; ++var10) { - Class61 var25 = Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var9][var10]; - if(null != var25) { - var12 = 2 + var9 * 4 + -(Class102.player.anInt2819 / 32); - var13 = -(Class102.player.anInt2829 / 32) + 2 + 4 * var10; - Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[0], var13, var12, var2, var3); - } - } - } - - for(var9 = 0; var9 < Class163.localNPCCount; ++var9) { - NPC var21 = NPC.npcs[Class15.localNPCIndexes[var9]]; - if(var21 != null && var21.hasDefinitions()) { - NPCDefinition var22 = var21.definition; - if(null != var22 && null != var22.childNPCs) { - var22 = var22.method1471((byte)-3); - } - - if(var22 != null && var22.aBoolean1285 && var22.aBoolean1270) { - var12 = var21.anInt2819 / 32 - Class102.player.anInt2819 / 32; - var13 = var21.anInt2829 / 32 + -(Class102.player.anInt2829 / 32); - if(var22.anInt1283 == -1) { - Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[1], var13, var12, var2, var3); - } else { - Class38_Sub1.minimapIcons(var4, Class140_Sub4.aAbstractSpriteArray2839[var22.anInt1283], var13, var12, var2, var3); - } - } - } - } - - for(var9 = 0; var9 < Class159.localPlayerCount; ++var9) { - Player var23 = Class3_Sub13_Sub22.players[Class56.localPlayerIndexes[var9]]; - if(null != var23 && var23.hasDefinitions()) { - var12 = var23.anInt2829 / 32 - Class102.player.anInt2829 / 32; - var11 = -(Class102.player.anInt2819 / 32) + var23.anInt2819 / 32; - long var29 = var23.displayName.toLong(); - boolean var28 = false; - - for(var16 = 0; var16 < Class8.anInt104; ++var16) { - if(Class50.aLongArray826[var16] == var29 && 0 != Unsorted.anIntArray882[var16]) { - var28 = true; - break; - } - } - - boolean var31 = false; - - for(var17 = 0; Unsorted.clanSize > var17; ++var17) { - if(var29 == PacketParser.aClass3_Sub19Array3694[var17].linkableKey) { - var31 = true; - break; - } - } - - boolean var32 = false; - if(Class102.player.teamId != 0 && 0 != var23.teamId && var23.teamId == Class102.player.teamId) { - var32 = true; - } - - if(var28) { - Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[3], var12, var11, var2, var3); - } else if(var31) { - Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[5], var12, var11, var2, var3); - } else if (var32) { - Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[4], var12, var11, var2, var3); - } else { - Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[2], var12, var11, var2, var3); - } - } - } - - Class96[] var24 = ClientErrorException.aClass96Array2114; - - for(var10 = 0; var24.length > var10; ++var10) { - Class96 var26 = var24[var10]; - if(null != var26 && var26.anInt1360 != 0 && Class44.anInt719 % 20 < 10) { - if(var26.anInt1360 == 1 && var26.anInt1359 >= 0 && var26.anInt1359 < NPC.npcs.length) { - NPC var27 = NPC.npcs[var26.anInt1359]; - if(null != var27) { - var13 = -(Class102.player.anInt2819 / 32) + var27.anInt2819 / 32; - var14 = var27.anInt2829 / 32 + -(Class102.player.anInt2829 / 32); - Class53.method1171(var26.anInt1351, var2, var3, var13, var14, var4); - } - } - - if(var26.anInt1360 == 2) { - var12 = (-Class131.anInt1716 + var26.anInt1356) * 4 + 2 - Class102.player.anInt2819 / 32; - var13 = -(Class102.player.anInt2829 / 32) + 2 + (-Class82.anInt1152 + var26.anInt1347) * 4; - Class53.method1171(var26.anInt1351, var2, var3, var12, var13, var4); - } - - if(var26.anInt1360 == 10 && var26.anInt1359 >= 0 && Class3_Sub13_Sub22.players.length > var26.anInt1359) { - Player var30 = Class3_Sub13_Sub22.players[var26.anInt1359]; - if(null != var30) { - var14 = var30.anInt2829 / 32 + -(Class102.player.anInt2829 / 32); - var13 = var30.anInt2819 / 32 + -(Class102.player.anInt2819 / 32); - Class53.method1171(var26.anInt1351, var2, var3, var13, var14, var4); - } - } - } - } - - if(Class65.anInt987 != 0) { - var9 = 4 * Class65.anInt987 + (2 - Class102.player.anInt2819 / 32); - var10 = 2 + 4 * Class45.anInt733 - Class102.player.anInt2829 / 32; - Class38_Sub1.minimapIcons(var4, Class45.aAbstractSprite_736, var10, var9, var2, var3); - } - Toolkit.getActiveToolkit().method934(-1 + (var3 - -(var4.width / 2)), -1 + var2 - -(var4.height / 2), 3, 3, 16777215); - - } else if(HDToolKit.highDetail) { - AbstractSprite var5 = var4.method866(false); - if(null != var5) { - var5.drawAt(var3, var2); - } - } else { - Class74.method1332(var3, var2, var4.anIntArray207, var4.anIntArray291); - } - - if(var1 == 59) { - Class163_Sub1_Sub1.aBooleanArray4008[var0] = true; - } - } catch (RuntimeException var18) { - throw ClientErrorException.clientError(var18, "ed.B(" + var0 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + (var4 != null?"{...}":"null") + ')'); - } - } - static void method126(boolean var0, int var1, int var2, int var3, int var4) { try { if(!var0) { if(Class101.anInt1425 <= var4 && var4 <= Class3_Sub28_Sub18.anInt3765) { var2 = Class40.method1040(Class57.anInt902, var2, Class159.anInt2020); var1 = Class40.method1040(Class57.anInt902, var1, Class159.anInt2020); - Class3_Sub13_Sub16.method244(var2, var4, var1, var3); + TextureOperation15.method244(var2, var4, var1, var3); } } @@ -377,7 +163,7 @@ final class Class3_Sub8 extends Linkable { var3 = CS2Script.anInt2453; } else { int var4 = 128 * (255 & anIntArray3083[var1]); - int var7 = anIntArray3083[var1] >> 8 & 255; + int var7 = anIntArray3083[var1] >> 8 & 0xFF; int var5 = 255 & anIntArray3083[var1] >> 16; int var8 = -Class102.player.anInt2829 + 64 + 128 * var7; if(var8 < 0) { @@ -425,8 +211,8 @@ final class Class3_Sub8 extends Linkable { Class83.aBoolean1158 = false; } else if(Unsorted.anInt120 != 0 && Class129.anInt1691 != -1 && Class79.method1391((byte) -92 + 91)) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(137); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(Class129.anInt1691); + TextureOperation12.outgoingBuffer.putOpcode(137); + TextureOperation12.outgoingBuffer.writeInt(Class129.anInt1691); Class129.anInt1691 = -1; } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub9.java b/Client/src/main/java/org/runite/client/Class3_Sub9.java index af30f506f..9af1222a3 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub9.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub9.java @@ -93,7 +93,7 @@ final class Class3_Sub9 extends Linkable { static void method135(int var0, int var1, int var2, int var4, int var5) { try { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var0], var1 - var2, -76, var2 + var1, var5); + TextureOperation18.method282(Class38.anIntArrayArray663[var0], var1 - var2, -76, var2 + var1, var5); int var6 = 0; int var8 = var2 * var2; int var9 = var4 * var4; @@ -139,8 +139,8 @@ final class Class3_Sub9 extends Linkable { var13 += -var20; int var24 = var1 + -var6; var20 -= var15; - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var21], var24, -110, var23, var5); - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var22], var24, 112, var23, var5); + TextureOperation18.method282(Class38.anIntArrayArray663[var21], var24, -110, var23, var5); + TextureOperation18.method282(Class38.anIntArrayArray663[var22], var24, 112, var23, var5); } } catch (RuntimeException var25) { diff --git a/Client/src/main/java/org/runite/client/Class40.java b/Client/src/main/java/org/runite/client/Class40.java index 7c1ace244..d2d224806 100644 --- a/Client/src/main/java/org/runite/client/Class40.java +++ b/Client/src/main/java/org/runite/client/Class40.java @@ -1,6 +1,7 @@ package org.runite.client; import org.rs09.client.config.GameConfig; +import org.runite.client.drawcalls.LoadingBox; final class Class40 { @@ -25,9 +26,9 @@ final class Class40 { static void method1041(long var0, RSString name) { try { // System.out.println("Class 40 " + var0 + ", " + var2 + ", " + name.toString()); - Class3_Sub13_Sub1.outgoingBuffer.index = 0; - Class3_Sub13_Sub1.outgoingBuffer.writeByte(186); - Class3_Sub13_Sub1.outgoingBuffer.writeString(name); + TextureOperation12.outgoingBuffer.index = 0; + TextureOperation12.outgoingBuffer.writeByte(186); + TextureOperation12.outgoingBuffer.writeString(name); // Class3_Sub13_Sub1.outgoingBuffer.putLong(var0, var2 + -2037463204); Unsorted.registryStage = 1; Class132.anInt1734 = 0; @@ -89,8 +90,8 @@ final class Class40 { } if (HDToolKit.highDetail) { - if (Class3_Sub13_Sub15.anIntArray3181[var2] != -1 && aByteArrayArray3669[var2] == null) { - aByteArrayArray3669[var2] = CacheIndex.landscapesIndex.getFile(Class3_Sub13_Sub15.anIntArray3181[var2], 0); + if (TextureOperation17.anIntArray3181[var2] != -1 && aByteArrayArray3669[var2] == null) { + aByteArrayArray3669[var2] = CacheIndex.landscapesIndex.getFile(TextureOperation17.anIntArray3181[var2], 0); if (null == aByteArrayArray3669[var2]) { var1 = false; ++anInt3293; @@ -106,25 +107,25 @@ final class Class40 { } } - if (null != NPC.npcSpawnCacheIndices && null == Class3_Sub13_Sub26.aByteArrayArray3335[var2] && NPC.npcSpawnCacheIndices[var2] != -1) { - Class3_Sub13_Sub26.aByteArrayArray3335[var2] = CacheIndex.landscapesIndex.getFile(NPC.npcSpawnCacheIndices[var2], 0, Class39.regionXteaKeys[var2]); - if (Class3_Sub13_Sub26.aByteArrayArray3335[var2] == null) { + if (null != NPC.npcSpawnCacheIndices && null == TextureOperation35.aByteArrayArray3335[var2] && NPC.npcSpawnCacheIndices[var2] != -1) { + TextureOperation35.aByteArrayArray3335[var2] = CacheIndex.landscapesIndex.getFile(NPC.npcSpawnCacheIndices[var2], 0, Class39.regionXteaKeys[var2]); + if (TextureOperation35.aByteArrayArray3335[var2] == null) { ++anInt3293; var1 = false; } } } - if (Class3_Sub13_Sub35.aClass131_3421 == null) { - if (null != Class3_Sub13_Sub21.aClass3_Sub28_Sub3_3264 && CacheIndex.worldmapIndex.method2135(RSString.stringCombiner(new RSString[]{Class3_Sub13_Sub21.aClass3_Sub28_Sub3_3264.aClass94_3561, TextCore.HasPlayerLabels}))) { - if (CacheIndex.worldmapIndex.method2127(RSString.stringCombiner(new RSString[]{Class3_Sub13_Sub21.aClass3_Sub28_Sub3_3264.aClass94_3561, TextCore.HasPlayerLabels}))) { - Class3_Sub13_Sub35.aClass131_3421 = Class81.getWorldMapArchive(RSString.stringCombiner(new RSString[]{Class3_Sub13_Sub21.aClass3_Sub28_Sub3_3264.aClass94_3561, TextCore.HasPlayerLabels}), CacheIndex.worldmapIndex); + if (TextureOperation22.aClass131_3421 == null) { + if (null != TextureOperation37.aClass3_Sub28_Sub3_3264 && CacheIndex.worldmapIndex.method2135(RSString.stringCombiner(new RSString[]{TextureOperation37.aClass3_Sub28_Sub3_3264.aClass94_3561, TextCore.HasPlayerLabels}))) { + if (CacheIndex.worldmapIndex.method2127(RSString.stringCombiner(new RSString[]{TextureOperation37.aClass3_Sub28_Sub3_3264.aClass94_3561, TextCore.HasPlayerLabels}))) { + TextureOperation22.aClass131_3421 = Class81.getWorldMapArchive(RSString.stringCombiner(new RSString[]{TextureOperation37.aClass3_Sub28_Sub3_3264.aClass94_3561, TextCore.HasPlayerLabels}), CacheIndex.worldmapIndex); } else { var1 = false; ++anInt3293; } } else { - Class3_Sub13_Sub35.aClass131_3421 = new Class131(0); + TextureOperation22.aClass131_3421 = new Class131(0); } } @@ -137,7 +138,7 @@ final class Class40 { for (var2 = 0; var2 < Class164_Sub2.aByteArrayArray3027.length; ++var2) { byte[] var3 = Class3_Sub22.aByteArrayArray2521[var2]; if (null != var3) { - var5 = -Class82.anInt1152 + (Class3_Sub24_Sub3.anIntArray3494[var2] & 255) * 64; + var5 = -Texture.anInt1152 + (Class3_Sub24_Sub3.anIntArray3494[var2] & 0xFF) * 64; var4 = -Class131.anInt1716 + (Class3_Sub24_Sub3.anIntArray3494[var2] >> 8) * 64; if (LinkableRSString.isDynamicSceneGraph) { var5 = 10; @@ -151,7 +152,7 @@ final class Class40 { var3 = aByteArrayArray3057[var2]; if (null != var3) { var4 = -Class131.anInt1716 + 64 * (Class3_Sub24_Sub3.anIntArray3494[var2] >> 8); - var5 = -Class82.anInt1152 + 64 * (Class3_Sub24_Sub3.anIntArray3494[var2] & 255); + var5 = -Texture.anInt1152 + 64 * (Class3_Sub24_Sub3.anIntArray3494[var2] & 0xFF); if (LinkableRSString.isDynamicSceneGraph) { var5 = 10; var4 = 10; @@ -164,11 +165,11 @@ final class Class40 { if (var1) { if (Class163_Sub2_Sub1.anInt4019 != 0) { - TextureOperation.method164(true, RSString.stringCombiner(new RSString[]{TextCore.LoadingPleaseWait2, TextCore.aClass94_2707})); + LoadingBox.draw(true, RSString.stringCombiner(new RSString[]{TextCore.LoadingPleaseWait2, TextCore.aClass94_2707})); } Class58.method1194(); - Class3_Sub13_Sub30.method313((byte) 58); + TextureOperation13.method313((byte) 58); boolean var11 = false; int var12; if (HDToolKit.highDetail && Class128.aBoolean1685) { @@ -223,12 +224,12 @@ final class Class40 { if (HDToolKit.highDetail) { var12 = Class102.player.anIntArray2767[0] >> 3; var4 = Class102.player.anIntArray2755[0] >> 3; - Class3_Sub13_Sub11.method220(var4, var12); + TextureOperation1.method220(var4, var12); } - Class3_Sub13_Sub6.method198(false); - if (null != Class3_Sub13_Sub26.aByteArrayArray3335) { - Class3_Sub13_Sub21.method272((byte) -124); + TextureOperation26.method198(false); + if (null != TextureOperation35.aByteArrayArray3335) { + TextureOperation37.method272((byte) -124); } } @@ -238,13 +239,13 @@ final class Class40 { if (HDToolKit.highDetail) { var12 = Class102.player.anIntArray2767[0] >> 3; var4 = Class102.player.anIntArray2755[0] >> 3; - Class3_Sub13_Sub11.method220(var4, var12); + TextureOperation1.method220(var4, var12); } Class163_Sub2_Sub1.method2223(false, (byte) -121); } - Class3_Sub13_Sub30.method313((byte) 90); + TextureOperation13.method313((byte) 90); Class163_Sub1.method2210(true); Class158_Sub1.method2189(AtmosphereParser.aClass91Array1182, false, 66); if (HDToolKit.highDetail) { @@ -273,7 +274,7 @@ final class Class40 { if (!LinkableRSString.isDynamicSceneGraph) { Unsorted.method1091(true, -121); Class163_Sub1.method2210(true); - Class3_Sub13_Sub6.method198(true); + TextureOperation26.method198(true); } if (LinkableRSString.isDynamicSceneGraph) { @@ -282,7 +283,7 @@ final class Class40 { Class163_Sub2_Sub1.method2223(true, (byte) -105); } - Class3_Sub13_Sub30.method313((byte) 102); + TextureOperation13.method313((byte) 102); Class163_Sub1.method2210(true); Class158_Sub1.method2189(AtmosphereParser.aClass91Array1182, true, 112); Class163_Sub1.method2210(true); @@ -307,11 +308,11 @@ final class Class40 { Unsorted.method792(); Class58.method1194(); method318(); - Class3_Sub13_Sub30.method313((byte) 100); - Class3_Sub13_Sub34.aBoolean3416 = false; + TextureOperation13.method313((byte) 100); + TextureOperation25.aBoolean3416 = false; if (GameShell.frame != null && null != Class3_Sub15.activeConnection && 25 == Class143.gameStage) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(20); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(1057001181); + TextureOperation12.outgoingBuffer.putOpcode(20); + TextureOperation12.outgoingBuffer.writeInt(1057001181); } if (!LinkableRSString.isDynamicSceneGraph) { @@ -335,7 +336,7 @@ final class Class40 { } else { Class117.method1719(30); if (null != Class3_Sub15.activeConnection) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(110); + TextureOperation12.outgoingBuffer.putOpcode(110); } } @@ -355,9 +356,9 @@ final class Class40 { static void method318() { try { - Class3_Sub4 var1 = (Class3_Sub4) Class3_Sub13_Sub6.aClass61_3075.method1222(); + Class3_Sub4 var1 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1222(); - for (; null != var1; var1 = (Class3_Sub4) Class3_Sub13_Sub6.aClass61_3075.method1221()) { + for (; null != var1; var1 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1221()) { if (var1.anInt2259 == -1) { var1.anInt2261 = 0; Class132.method1798(56, var1); diff --git a/Client/src/main/java/org/runite/client/Class41.java b/Client/src/main/java/org/runite/client/Class41.java index 6ebb8168f..ef05d4946 100644 --- a/Client/src/main/java/org/runite/client/Class41.java +++ b/Client/src/main/java/org/runite/client/Class41.java @@ -47,8 +47,8 @@ final class Class41 { this.aClass30_683.method984(-35, 6 * var1); this.aClass30_683.method978(0, aByteArray2040, 6); - int var5 = ((255 & aByteArray2040[3]) << 16) - (-(aByteArray2040[4] << 8 & '\uff00') + -(255 & aByteArray2040[5])); - int var4 = (aByteArray2040[2] & 255) + ('\uff00' & aByteArray2040[1] << 8) + (16711680 & aByteArray2040[0] << 16); + int var5 = ((255 & aByteArray2040[3]) << 16) - (-(aByteArray2040[4] << 8 & 65280) + -(255 & aByteArray2040[5])); + int var4 = (aByteArray2040[2] & 0xFF) + (65280 & aByteArray2040[1] << 8) + (16711680 & aByteArray2040[0] << 16); if (this.anInt687 < var4) { var10000 = null; return (byte[]) var10000; @@ -72,10 +72,10 @@ final class Class41 { } this.aClass30_681.method978(0, aByteArray2040, 8 + var10); - int var11 = (aByteArray2040[0] << 8 & '\uff00') - -(255 & aByteArray2040[1]); - int var12 = (aByteArray2040[3] & 255) + ('\uff00' & aByteArray2040[2] << 8); + int var11 = (aByteArray2040[0] << 8 & 65280) - -(255 & aByteArray2040[1]); + int var12 = (aByteArray2040[3] & 0xFF) + (65280 & aByteArray2040[2] << 8); int var14 = 255 & aByteArray2040[7]; - var13 = (aByteArray2040[6] & 255) + ('\uff00' & aByteArray2040[5] << 8) + (aByteArray2040[4] << 16 & 16711680); + var13 = (aByteArray2040[6] & 0xFF) + (65280 & aByteArray2040[5] << 8) + (aByteArray2040[4] << 16 & 16711680); if (var1 != var11 || var9 != var12 || this.cacheIndex != var14) { var10000 = null; return (byte[]) var10000; @@ -116,7 +116,7 @@ final class Class41 { this.aClass30_683.method984(-116, 6 * var3); this.aClass30_683.method978(0, aByteArray2040, 6); - var7 = (16711680 & aByteArray2040[3] << 16) + ('\uff00' & aByteArray2040[4] << 8) + (aByteArray2040[5] & 255); + var7 = (16711680 & aByteArray2040[3] << 16) + (65280 & aByteArray2040[4] << 8) + (aByteArray2040[5] & 0xFF); if (var7 <= 0 || (long) var7 > this.aClass30_681.method976(0) / 520L) { return false; } @@ -157,10 +157,10 @@ final class Class41 { break label146; } - var10 = ((aByteArray2040[4] & 255) << 16) + ('\uff00' & aByteArray2040[5] << 8) - -(aByteArray2040[6] & 255); - var11 = (255 & aByteArray2040[1]) + ((aByteArray2040[0] & 255) << 8); + var10 = ((aByteArray2040[4] & 0xFF) << 16) + (65280 & aByteArray2040[5] << 8) - -(aByteArray2040[6] & 0xFF); + var11 = (255 & aByteArray2040[1]) + ((aByteArray2040[0] & 0xFF) << 8); int var13 = 255 & aByteArray2040[7]; - int var12 = (aByteArray2040[3] & 255) + (aByteArray2040[2] << 8 & '\uff00'); + int var12 = (aByteArray2040[3] & 0xFF) + (aByteArray2040[2] << 8 & 65280); if (var11 != var3 || var12 != var9 || var13 != this.cacheIndex) { return false; } diff --git a/Client/src/main/java/org/runite/client/Class43.java b/Client/src/main/java/org/runite/client/Class43.java index 5489831bf..8332ae5bb 100644 --- a/Client/src/main/java/org/runite/client/Class43.java +++ b/Client/src/main/java/org/runite/client/Class43.java @@ -96,7 +96,7 @@ public final class Class43 { } for (int var4 = 0; var4 < var1; ++var4) { - var3[var4] = Class3_Sub13_Sub38.spritePalette[Unsorted.bitwiseAnd(var2[var4], 255)]; + var3[var4] = TextureOperation38.spritePalette[Unsorted.bitwiseAnd(var2[var4], 255)]; } Object var6; @@ -144,7 +144,7 @@ public final class Class43 { final void method1063(boolean var1, int var2) { try { - int var5 = this.anInt714 + var2 * this.anInt709 / 50 & 2047; + int var5 = this.anInt714 + var2 * this.anInt709 / 50 & 0x7FF; int var6 = this.anInt694; int var4; if (var6 == 1) { diff --git a/Client/src/main/java/org/runite/client/Class44.java b/Client/src/main/java/org/runite/client/Class44.java index 33e51ab68..9b2db9886 100644 --- a/Client/src/main/java/org/runite/client/Class44.java +++ b/Client/src/main/java/org/runite/client/Class44.java @@ -8,7 +8,7 @@ import java.io.*; public abstract class Class44 { static int paramModeWhere = 0; - static int anInt719 = 0; + public static int anInt719 = 0; static int[][][] anIntArrayArrayArray720; static int[][][] anIntArrayArrayArray723; static byte[] aClass8343; diff --git a/Client/src/main/java/org/runite/client/Class45.java b/Client/src/main/java/org/runite/client/Class45.java index 8210bb95e..f8341df73 100644 --- a/Client/src/main/java/org/runite/client/Class45.java +++ b/Client/src/main/java/org/runite/client/Class45.java @@ -2,13 +2,13 @@ package org.runite.client; import java.util.Objects; -final class Class45 { +public final class Class45 { static int[] anIntArray729 = new int[4096]; static float aFloat730; - static int anInt733 = 0; + public static int anInt733 = 0; static int anInt734 = 0; - static AbstractSprite aAbstractSprite_736; + public static AbstractSprite aAbstractSprite_736; static DataBuffer aClass3_Sub30_2030 = new DataBuffer(new byte[5000]); @@ -23,12 +23,12 @@ final class Class45 { chatIcon = GraphicDefinition.incomingBuffer.readUnsignedByte(); int var6 = GraphicDefinition.incomingBuffer.readUnsignedByte(); var7 = GraphicDefinition.incomingBuffer.index; - boolean var8 = ('\u8000' & var4) != 0; + boolean var8 = (32768 & var4) != 0; if (null != var3.displayName && var3.class52 != null) { long var9 = var3.displayName.toLong(); boolean var11 = false; if (chatIcon <= 1) { - if (!var8 && (Class3_Sub15.aBoolean2433 && !Class121.aBoolean1641 || Class3_Sub13_Sub14.aBoolean3166)) { + if (!var8 && (Class3_Sub15.aBoolean2433 && !Class121.aBoolean1641 || TextureOperation31.aBoolean3166)) { var11 = true; } else { for (int var12 = 0; var12 < Class3_Sub28_Sub5.anInt3591; ++var12) { @@ -56,7 +56,7 @@ final class Class45 { } var3.textSpoken = message.trim(1); - var3.textEffect = var4 & 255; + var3.textEffect = var4 & 0xFF; var3.textCycle = 150; var3.textColor = var4 >> 8; if (chatIcon >= 2) { @@ -153,7 +153,7 @@ final class Class45 { for (int var22 = 0; var22 < var4; ++var22) { int var23 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - if ('\uffff' == var23) { + if (65535 == var23) { var23 = -1; } @@ -168,7 +168,7 @@ final class Class45 { //Ordinal: 9 Graphic if ((256 & var0) != 0) { var4 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - if (var4 == '\uffff') { + if (var4 == 65535) { var4 = -1; } @@ -179,7 +179,7 @@ final class Class45 { } if (var21) { - var3.anInt2759 = (chatIcon & '\uffff') + Class44.anInt719; + var3.anInt2759 = (chatIcon & 65535) + Class44.anInt719; var3.anInt2761 = 0; var3.anInt2805 = 0; var3.anInt2842 = var4; @@ -220,14 +220,14 @@ final class Class45 { Unsorted.anIntArray3076 = new int[Class95.anInt1338]; Class140_Sub7.anIntArray2931 = new int[Class95.anInt1338]; Class164.anIntArray2048 = new int[Class95.anInt1338]; - Class3_Sub13_Sub22.aBooleanArray3272 = new boolean[Class95.anInt1338]; + TextureOperation0.aBooleanArray3272 = new boolean[Class95.anInt1338]; Class163_Sub3.aByteArrayArray3005 = new byte[Class95.anInt1338][]; Unsorted.anIntArray2591 = new int[Class95.anInt1338]; Class163_Sub1.aByteArrayArray2987 = new byte[Class95.anInt1338][]; var2.index = -(8 * Class95.anInt1338) + var0.length - 7; Class3_Sub15.anInt2426 = var2.readUnsignedShort(); Class133.anInt1748 = var2.readUnsignedShort(); - int var3 = (var2.readUnsignedByte() & 255) - -1; + int var3 = (var2.readUnsignedByte() & 0xFF) - -1; int var4; for (var4 = 0; Class95.anInt1338 > var4; ++var4) { @@ -247,12 +247,12 @@ final class Class45 { } var2.index = -(8 * Class95.anInt1338) + var0.length + -7 + 3 + -(var3 * 3); - Class3_Sub13_Sub38.spritePalette = new int[var3]; + TextureOperation38.spritePalette = new int[var3]; for (var4 = 1; var3 > var4; ++var4) { - Class3_Sub13_Sub38.spritePalette[var4] = var2.readMedium(); - if (0 == Class3_Sub13_Sub38.spritePalette[var4]) { - Class3_Sub13_Sub38.spritePalette[var4] = 1; + TextureOperation38.spritePalette[var4] = var2.readMedium(); + if (0 == TextureOperation38.spritePalette[var4]) { + TextureOperation38.spritePalette[var4] = 1; } } @@ -298,7 +298,7 @@ final class Class45 { } } - Class3_Sub13_Sub22.aBooleanArray3272[var4] = var10; + TextureOperation0.aBooleanArray3272[var4] = var10; } } catch (RuntimeException var15) { diff --git a/Client/src/main/java/org/runite/client/Class46.java b/Client/src/main/java/org/runite/client/Class46.java index 2b2bd7026..ddd1aa4f0 100644 --- a/Client/src/main/java/org/runite/client/Class46.java +++ b/Client/src/main/java/org/runite/client/Class46.java @@ -12,7 +12,7 @@ final class Class46 { static void method1087(int var0, int var1) { try { Class3_Sub30_Sub1.method819(); - Class3_Sub13_Sub17.method252(); + TextureOperation23.method252(); if (var0 < 38) { anInt741 = 118; } diff --git a/Client/src/main/java/org/runite/client/Class49.java b/Client/src/main/java/org/runite/client/Class49.java index f85c7b1cc..b48436e75 100644 --- a/Client/src/main/java/org/runite/client/Class49.java +++ b/Client/src/main/java/org/runite/client/Class49.java @@ -2,14 +2,15 @@ package org.runite.client; import org.rs09.client.data.NodeCache; import org.rs09.client.rendering.Toolkit; +import org.runite.client.drawcalls.ContextMenu; import java.io.DataInputStream; import java.net.URL; import java.util.Random; -final class Class49 { +public final class Class49 { - static AbstractSprite aAbstractSprite_812; + public static AbstractSprite aAbstractSprite_812; static boolean[][] aBooleanArrayArray814; static int anInt815 = 0; static int anInt817; @@ -153,11 +154,11 @@ final class Class49 { var3 = InterfaceWidget.a("@", "%40", var3); var3 = InterfaceWidget.a("&", "%26", var3); var3 = InterfaceWidget.a("#", "%23", var3); - if (Class3_Sub13_Sub10.aClass87_3125.gameApplet == null) { + if (TextureOperation30.aClass87_3125.gameApplet == null) { return; } - Class64 var4 = Class3_Sub13_Sub10.aClass87_3125.method1439(false, new URL(Class3_Sub13_Sub10.aClass87_3125.gameApplet.getCodeBase(), "clienterror.ws?c=&u=" + PacketParser.aLong3202 + "&v1=" + Signlink.javaVendor + "&v2=" + Signlink.javaVersion + "&e=" + var3)); + Class64 var4 = TextureOperation30.aClass87_3125.method1439(false, new URL(TextureOperation30.aClass87_3125.gameApplet.getCodeBase(), "clienterror.ws?c=&u=" + PacketParser.aLong3202 + "&v1=" + Signlink.javaVendor + "&v2=" + Signlink.javaVersion + "&e=" + var3)); while (var4.anInt978 == 0) { TimeUtils.sleep(1L); @@ -186,7 +187,7 @@ final class Class49 { try { if (!Class38_Sub1.aBoolean2615) { if (Unsorted.anInt3660 != 0) { - NPCDefinition.anInt1297 = Class3_Sub13_Sub39.anInt3460; + NPCDefinition.anInt1297 = TextureOperation8.anInt3460; Class38_Sub1.anInt2612 = Class168.anInt2099; } else if (Unsorted.anInt3644 == 0) { NPCDefinition.anInt1297 = Class126.anInt1676; @@ -199,7 +200,7 @@ final class Class49 { Unsorted.menuOptionCount = 1; Class140_Sub7.aClass94Array2935[0] = TextCore.HasCancel; Class163_Sub2_Sub1.aClass94Array4016[0] = TextCore.emptyJagexString; - Class3_Sub13_Sub7.aShortArray3095[0] = 1005; + TextureOperation27.aShortArray3095[0] = 1005; Class114.anIntArray1578[0] = Class3_Sub28_Sub5.anInt3590; } @@ -243,22 +244,22 @@ final class Class49 { if (Unsorted.aBoolean1951) { WorldListEntry.buildWorldListInterface(); } else { - Class84.rightClickContextMenuDraw(); + ContextMenu.draw(); } } else if (null == AbstractSprite.aClass11_3708) { if (Class53.anInt865 != -1) { Class24.method950(null, -86, Unsorted.anInt2567, Class53.anInt865); } } else { - Class24.method950(AbstractSprite.aClass11_3708, -120, ClientErrorException.anInt2115, Class3_Sub13_Sub23_Sub1.anInt4041); + Class24.method950(AbstractSprite.aClass11_3708, -120, ClientErrorException.anInt2115, TextureOperation18.anInt4041); } - var1 = Class38_Sub1.aBoolean2615 ? -1 : Class3_Sub13_Sub35.method335(var0 + 16859); + var1 = Class38_Sub1.aBoolean2615 ? -1 : TextureOperation22.method335(var0 + 16859); if (var1 == -1) { var1 = Class161.anInt2027; } - Class3_Sub13_Sub13.method229(var1); + TextureOperation20.method229(var1); if (CS2Script.anInt2440 == 1) { CS2Script.anInt2440 = 2; } @@ -295,7 +296,7 @@ final class Class49 { int var8 = -1; int var9 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var2 + var4, Class101.anInt1425); int var10 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var4 - var2, Class101.anInt1425); - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var1], var10, -98, var9, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var1], var10, -98, var9, var0); while (var6 > var5) { var8 += 2; @@ -313,11 +314,11 @@ final class Class49 { var13 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var4 - -var5, Class101.anInt1425); var14 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, -var5 + var4, Class101.anInt1425); if (Class57.anInt902 >= var12) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var12], var14, 111, var13, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var12], var14, 111, var13, var0); } if (Class159.anInt2020 <= var11) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var11], var14, -84, var13, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var11], var14, -84, var13, var0); } } } @@ -329,11 +330,11 @@ final class Class49 { var13 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var4 - -var6, Class101.anInt1425); var14 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, -var6 + var4, Class101.anInt1425); if (var12 <= Class57.anInt902) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var12], var14, 90, var13, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var12], var14, 90, var13, var0); } if (var11 >= Class159.anInt2020) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var11], var14, -103, var13, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var11], var14, -103, var13, var0); } } } diff --git a/Client/src/main/java/org/runite/client/Class50.java b/Client/src/main/java/org/runite/client/Class50.java index 2bb4484c7..6eb5c7419 100644 --- a/Client/src/main/java/org/runite/client/Class50.java +++ b/Client/src/main/java/org/runite/client/Class50.java @@ -1,10 +1,10 @@ package org.runite.client; -final class Class50 { +public final class Class50 { static int anInt820 = 0; static AbstractSprite aAbstractSprite_824; - static long[] aLongArray826 = new long[200]; + public static long[] aLongArray826 = new long[200]; static int anInt828 = 0; int anInt821; int anInt823; diff --git a/Client/src/main/java/org/runite/client/Class51.java b/Client/src/main/java/org/runite/client/Class51.java index cf5dc5992..7d343bd27 100644 --- a/Client/src/main/java/org/runite/client/Class51.java +++ b/Client/src/main/java/org/runite/client/Class51.java @@ -2,21 +2,21 @@ package org.runite.client; import org.rs09.client.rendering.Toolkit; -final class Class51 { +public final class Class51 { private static final int[] anIntArray839 = new int[512]; static int[] anIntArray834 = new int[65536]; static int anInt835; static boolean aBoolean837 = false; static Interface2 anInterface2_838; - static int[] anIntArray840 = new int[2048]; + public static int[] anIntArray840 = new int[2048]; static int[] anIntArray841 = new int[2048]; static boolean aBoolean843 = true; static int anInt846; static int anInt847; static boolean aBoolean849 = false; static int anInt850 = 0; - static int[] anIntArray851 = new int[2048]; + public static int[] anIntArray851 = new int[2048]; private static int[] anIntArray836 = new int[1024]; private static boolean aBoolean842 = false; private static int anInt844; @@ -26,7 +26,7 @@ final class Class51 { static { int var0; for (var0 = 1; var0 < 512; ++var0) { - anIntArray839[var0] = '\u8000' / var0; + anIntArray839[var0] = 32768 / var0; } for (var0 = 1; var0 < 2048; ++var0) { @@ -48,7 +48,7 @@ final class Class51 { int[] var19 = anInterface2_838.method13(var18, true, aFloat848); int var20; if (var19 == null) { - var20 = anInterface2_838.method15(var18, '\uffff'); + var20 = anInterface2_838.method15(var18, 65535); method1154(var0, var1, var2, var3, var4, var5, method1136(var20, var6), method1136(var20, var7), method1136(var20, var8)); } else { aBoolean845 = anInterface2_838.method14((byte) -106, var18); @@ -1295,7 +1295,7 @@ final class Class51 { } } } else { - var20 = anInterface2_838.method15(var18, '\uffff'); + var20 = anInterface2_838.method15(var18, 65535); aBoolean837 = true; method1154(var0, var1, var2, var3, var4, var5, method1136(var20, var6), method1136(var20, var7), method1136(var20, var8)); } @@ -1378,28 +1378,28 @@ final class Class51 { if (var17 > 0) { do { var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var18 = var20; var19 = var21; var9 += var12; @@ -1426,7 +1426,7 @@ final class Class51 { if (var17 > 0) { do { var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; --var17; } while (var17 > 0); @@ -1435,49 +1435,49 @@ final class Class51 { if (var17 > 0) { do { if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; @@ -1507,7 +1507,7 @@ final class Class51 { if (var17 > 0) { do { if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; @@ -1551,28 +1551,28 @@ final class Class51 { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var18 = var20; var19 = var21; var9 += var12; @@ -1599,7 +1599,7 @@ final class Class51 { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; --var17; } while (var17 > 0); @@ -1608,49 +1608,49 @@ final class Class51 { if (var17 > 0) { do { if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; @@ -1680,7 +1680,7 @@ final class Class51 { if (var17 > 0) { do { if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; @@ -1754,28 +1754,28 @@ final class Class51 { if (var17 > 0) { do { var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var7 += var8; var15 = var7 >> 8; @@ -1787,7 +1787,7 @@ final class Class51 { if (var17 > 0) { do { var3 = var1[(var2 & 4032) + (var2 >>> 26)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; --var17; } while (var17 > 0); @@ -1796,49 +1796,49 @@ final class Class51 { if (var17 > 0) { do { if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; @@ -1853,7 +1853,7 @@ final class Class51 { if (var17 > 0) { do { if ((var3 = var1[(var2 & 4032) + (var2 >>> 26)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; @@ -1897,28 +1897,28 @@ final class Class51 { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; var7 += var8; var15 = var7 >> 8; @@ -1930,7 +1930,7 @@ final class Class51 { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4++] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; var2 += var16; --var17; } while (var17 > 0); @@ -1939,49 +1939,49 @@ final class Class51 { if (var17 > 0) { do { if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; @@ -1996,7 +1996,7 @@ final class Class51 { if (var17 > 0) { do { if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & '\uff00') * var15 & 16711680) >> 8; + var0[var4] = ((var3 & 16711935) * var15 & -16711936) + ((var3 & 65280) * var15 & 16711680) >> 8; } ++var4; @@ -2528,15 +2528,15 @@ final class Class51 { do { var2 = anIntArray834[var6 >> 8]; var6 += var7; - var2 = ((var2 & 16711935) * var9 >> 8 & 16711935) + ((var2 & '\uff00') * var9 >> 8 & '\uff00'); + var2 = ((var2 & 16711935) * var9 >> 8 & 16711935) + ((var2 & 65280) * var9 >> 8 & 65280); var10 = var0[var1]; - var0[var1++] = var2 + ((var10 & 16711935) * var8 >> 8 & 16711935) + ((var10 & '\uff00') * var8 >> 8 & '\uff00'); + var0[var1++] = var2 + ((var10 & 16711935) * var8 >> 8 & 16711935) + ((var10 & 65280) * var8 >> 8 & 65280); var10 = var0[var1]; - var0[var1++] = var2 + ((var10 & 16711935) * var8 >> 8 & 16711935) + ((var10 & '\uff00') * var8 >> 8 & '\uff00'); + var0[var1++] = var2 + ((var10 & 16711935) * var8 >> 8 & 16711935) + ((var10 & 65280) * var8 >> 8 & 65280); var10 = var0[var1]; - var0[var1++] = var2 + ((var10 & 16711935) * var8 >> 8 & 16711935) + ((var10 & '\uff00') * var8 >> 8 & '\uff00'); + var0[var1++] = var2 + ((var10 & 16711935) * var8 >> 8 & 16711935) + ((var10 & 65280) * var8 >> 8 & 65280); var10 = var0[var1]; - var0[var1++] = var2 + ((var10 & 16711935) * var8 >> 8 & 16711935) + ((var10 & '\uff00') * var8 >> 8 & '\uff00'); + var0[var1++] = var2 + ((var10 & 16711935) * var8 >> 8 & 16711935) + ((var10 & 65280) * var8 >> 8 & 65280); --var3; } while (var3 > 0); } @@ -2544,11 +2544,11 @@ final class Class51 { var3 = var5 - var4 & 3; if (var3 > 0) { var2 = anIntArray834[var6 >> 8]; - var2 = ((var2 & 16711935) * var9 >> 8 & 16711935) + ((var2 & '\uff00') * var9 >> 8 & '\uff00'); + var2 = ((var2 & 16711935) * var9 >> 8 & 16711935) + ((var2 & 65280) * var9 >> 8 & 65280); do { var10 = var0[var1]; - var0[var1++] = var2 + ((var10 & 16711935) * var8 >> 8 & 16711935) + ((var10 & '\uff00') * var8 >> 8 & '\uff00'); + var0[var1++] = var2 + ((var10 & 16711935) * var8 >> 8 & 16711935) + ((var10 & 65280) * var8 >> 8 & 65280); --var3; } while (var3 > 0); } @@ -2569,9 +2569,9 @@ final class Class51 { do { var2 = anIntArray834[var6 >> 8]; var6 += var7; - var2 = ((var2 & 16711935) * var9 >> 8 & 16711935) + ((var2 & '\uff00') * var9 >> 8 & '\uff00'); + var2 = ((var2 & 16711935) * var9 >> 8 & 16711935) + ((var2 & 65280) * var9 >> 8 & 65280); var10 = var0[var1]; - var0[var1++] = var2 + ((var10 & 16711935) * var8 >> 8 & 16711935) + ((var10 & '\uff00') * var8 >> 8 & '\uff00'); + var0[var1++] = var2 + ((var10 & 16711935) * var8 >> 8 & 16711935) + ((var10 & 65280) * var8 >> 8 & 65280); --var3; } while (var3 > 0); } @@ -3068,7 +3068,7 @@ final class Class51 { } else { int var6 = anInt850; int var7 = 256 - anInt850; - var2 = ((var2 & 16711935) * var7 >> 8 & 16711935) + ((var2 & '\uff00') * var7 >> 8 & '\uff00'); + var2 = ((var2 & 16711935) * var7 >> 8 & 16711935) + ((var2 & 65280) * var7 >> 8 & 65280); while (true) { --var3; @@ -3083,18 +3083,18 @@ final class Class51 { } var8 = var0[var1]; - var0[var1++] = var2 + ((var8 & 16711935) * var6 >> 8 & 16711935) + ((var8 & '\uff00') * var6 >> 8 & '\uff00'); + var0[var1++] = var2 + ((var8 & 16711935) * var6 >> 8 & 16711935) + ((var8 & 65280) * var6 >> 8 & 65280); } } var8 = var0[var1]; - var0[var1++] = var2 + ((var8 & 16711935) * var6 >> 8 & 16711935) + ((var8 & '\uff00') * var6 >> 8 & '\uff00'); + var0[var1++] = var2 + ((var8 & 16711935) * var6 >> 8 & 16711935) + ((var8 & 65280) * var6 >> 8 & 65280); var8 = var0[var1]; - var0[var1++] = var2 + ((var8 & 16711935) * var6 >> 8 & 16711935) + ((var8 & '\uff00') * var6 >> 8 & '\uff00'); + var0[var1++] = var2 + ((var8 & 16711935) * var6 >> 8 & 16711935) + ((var8 & 65280) * var6 >> 8 & 65280); var8 = var0[var1]; - var0[var1++] = var2 + ((var8 & 16711935) * var6 >> 8 & 16711935) + ((var8 & '\uff00') * var6 >> 8 & '\uff00'); + var0[var1++] = var2 + ((var8 & 16711935) * var6 >> 8 & 16711935) + ((var8 & 65280) * var6 >> 8 & 65280); var8 = var0[var1]; - var0[var1++] = var2 + ((var8 & 16711935) * var6 >> 8 & 16711935) + ((var8 & '\uff00') * var6 >> 8 & '\uff00'); + var0[var1++] = var2 + ((var8 & 16711935) * var6 >> 8 & 16711935) + ((var8 & 65280) * var6 >> 8 & 65280); } } } diff --git a/Client/src/main/java/org/runite/client/Class52.java b/Client/src/main/java/org/runite/client/Class52.java index 02e3b43c9..eac15480c 100644 --- a/Client/src/main/java/org/runite/client/Class52.java +++ b/Client/src/main/java/org/runite/client/Class52.java @@ -48,7 +48,7 @@ final class Class52 { Class84.anIntArrayArray1160[var9][var12] = 99; Class97.anIntArrayArray1373[var9][var12] = 0; byte var15 = 0; - Class3_Sub13_Sub38.anIntArray3456[var15] = var9; + TextureOperation38.anIntArray3456[var15] = var9; int var28 = var15 + 1; Class45.anIntArray729[var15] = var12; int var16 = 0; @@ -59,7 +59,7 @@ final class Class52 { int var20; label410: while (var28 != var16) { - var13 = Class3_Sub13_Sub38.anIntArray3456[var16]; + var13 = TextureOperation38.anIntArray3456[var16]; var14 = Class45.anIntArray729[var16]; var16 = 1 + var16 & 4095; if (var13 == var6 && var0 == var14) { @@ -90,7 +90,7 @@ final class Class52 { while (true) { if (-1 + var5 <= var20) { - Class3_Sub13_Sub38.anIntArray3456[var28] = -1 + var13; + TextureOperation38.anIntArray3456[var28] = -1 + var13; Class45.anIntArray729[var28] = var14; Class84.anIntArrayArray1160[-1 + var13][var14] = 2; var28 = 4095 & 1 + var28; @@ -111,7 +111,7 @@ final class Class52 { while (true) { if (var20 >= -1 + var5) { - Class3_Sub13_Sub38.anIntArray3456[var28] = var13 + 1; + TextureOperation38.anIntArray3456[var28] = var13 + 1; Class45.anIntArray729[var28] = var14; Class84.anIntArrayArray1160[var13 + 1][var14] = 8; Class97.anIntArrayArray1373[var13 + 1][var14] = var19; @@ -132,7 +132,7 @@ final class Class52 { while (true) { if (-1 + var5 <= var20) { - Class3_Sub13_Sub38.anIntArray3456[var28] = var13; + TextureOperation38.anIntArray3456[var28] = var13; Class45.anIntArray729[var28] = -1 + var14; Class84.anIntArrayArray1160[var13][-1 + var14] = 1; var28 = 4095 & 1 + var28; @@ -153,7 +153,7 @@ final class Class52 { while (true) { if (var20 >= (var5 - 1)) { - Class3_Sub13_Sub38.anIntArray3456[var28] = var13; + TextureOperation38.anIntArray3456[var28] = var13; Class45.anIntArray729[var28] = var14 + 1; Class84.anIntArrayArray1160[var13][1 + var14] = 4; Class97.anIntArrayArray1373[var13][1 + var14] = var19; @@ -174,7 +174,7 @@ final class Class52 { while (true) { if (var5 - 1 <= var20) { - Class3_Sub13_Sub38.anIntArray3456[var28] = var13 - 1; + TextureOperation38.anIntArray3456[var28] = var13 - 1; Class45.anIntArray729[var28] = -1 + var14; var28 = 4095 & var28 + 1; Class84.anIntArrayArray1160[var13 + -1][-1 + var14] = 3; @@ -195,7 +195,7 @@ final class Class52 { while (true) { if ((-1 + var5) <= var20) { - Class3_Sub13_Sub38.anIntArray3456[var28] = 1 + var13; + TextureOperation38.anIntArray3456[var28] = 1 + var13; Class45.anIntArray729[var28] = -1 + var14; var28 = 1 + var28 & 4095; Class84.anIntArrayArray1160[var13 - -1][-1 + var14] = 9; @@ -216,7 +216,7 @@ final class Class52 { while (true) { if (-1 + var5 <= var20) { - Class3_Sub13_Sub38.anIntArray3456[var28] = var13 - 1; + TextureOperation38.anIntArray3456[var28] = var13 - 1; Class45.anIntArray729[var28] = var14 + 1; var28 = 4095 & var28 - -1; Class84.anIntArrayArray1160[-1 + var13][1 + var14] = 6; @@ -239,7 +239,7 @@ final class Class52 { } } - Class3_Sub13_Sub38.anIntArray3456[var28] = 1 + var13; + TextureOperation38.anIntArray3456[var28] = 1 + var13; Class45.anIntArray729[var28] = var14 - -1; Class84.anIntArrayArray1160[1 + var13][1 + var14] = 12; Class97.anIntArrayArray1373[1 + var13][1 + var14] = var19; @@ -297,13 +297,13 @@ final class Class52 { } byte var29 = 0; - Class3_Sub13_Sub38.anIntArray3456[var29] = var13; + TextureOperation38.anIntArray3456[var29] = var13; var16 = var29 + 1; Class45.anIntArray729[var29] = var14; for (var19 = var20 = Class84.anIntArrayArray1160[var13][var14]; var9 != var13 || var14 != var12; var19 = Class84.anIntArrayArray1160[var13][var14]) { if (var19 != var20) { - Class3_Sub13_Sub38.anIntArray3456[var16] = var13; + TextureOperation38.anIntArray3456[var16] = var13; var20 = var19; Class45.anIntArray729[var16++] = var14; } @@ -326,7 +326,7 @@ final class Class52 { if (0 >= var16) { return var3 != 1; } else { - Class3_Sub13_Sub27.method299(93, var16, var3); + TextureOperation7.method299(93, var16, var3); return true; } } catch (RuntimeException var27) { @@ -351,22 +351,22 @@ final class Class52 { final Model method1157(int var1, int var2, int var3, int var4, SequenceDefinition var5, int var6, int var7) { try { - long var9 = (long) var3 | (long) (var7 << 16) | (long) var2 << 32; + long var9 = (long) var3 | ((long) var7 << 16) | (long) var2 << 32; Model var11 = (Model) Unsorted.aReferenceCache_1131.get(var9); if (null == var11) { Model_Sub1[] var12 = new Model_Sub1[3]; int var13 = 0; - if (Class3_Sub13_Sub13.method231(var3).method948() || Class3_Sub13_Sub13.method231(var7).method948() || Class3_Sub13_Sub13.method231(var2).method948()) { + if (TextureOperation20.method231(var3).method948() || TextureOperation20.method231(var7).method948() || TextureOperation20.method231(var2).method948()) { return null; } - Model_Sub1 var14 = Class3_Sub13_Sub13.method231(var3).method941(); + Model_Sub1 var14 = TextureOperation20.method231(var3).method941(); var12[var13++] = var14; - var14 = Class3_Sub13_Sub13.method231(var7).method941(); + var14 = TextureOperation20.method231(var7).method941(); var12[var13++] = var14; - var14 = Class3_Sub13_Sub13.method231(var2).method941(); + var14 = TextureOperation20.method231(var2).method941(); var12[var13++] = var14; var14 = new Model_Sub1(var12, var13); @@ -446,9 +446,9 @@ final class Class52 { for (int var7 = 0; var7 < 8; ++var7) { for (int var8 = 0; Class25.anInt497 > var8; ++var8) { - Class24 var9 = Class3_Sub13_Sub13.method231(var8); + Class24 var9 = TextureOperation20.method231(var8); if (!var9.aBoolean476 && ((var3 ? CS2Script.anIntArray3228[var7] : Class3_Sub26.anIntArray2559[var7]) == var9.anInt466)) { - look[Class163.anIntArray2043[var7]] = Class3_Sub13_Sub29.bitwiseOr(Integer.MIN_VALUE, var8); + look[Class163.anIntArray2043[var7]] = TextureOperation3.bitwiseOr(Integer.MIN_VALUE, var8); break; } } @@ -488,8 +488,8 @@ final class Class52 { try { int var4 = Class163.anIntArray2043[var1]; if (this.lookInfo[var4] != 0) { - Class3_Sub13_Sub13.method231(var2); - this.lookInfo[var4] = Class3_Sub13_Sub29.bitwiseOr(var2, Integer.MIN_VALUE); + TextureOperation20.method231(var2); + this.lookInfo[var4] = TextureOperation3.bitwiseOr(var2, Integer.MIN_VALUE); this.method1158(); } } catch (RuntimeException var5) { @@ -512,7 +512,7 @@ final class Class52 { var13 ^= -4294967296L; var15[5] = 0; } else { - var15[5] = Class3_Sub13_Sub29.bitwiseOr(1073741824, var4.leftHandItem); + var15[5] = TextureOperation3.bitwiseOr(1073741824, var4.leftHandItem); var13 ^= (long) var15[5] << 32; } } @@ -522,7 +522,7 @@ final class Class52 { var15[3] = 0; var13 ^= 4294967295L; } else { - var15[3] = Class3_Sub13_Sub29.bitwiseOr(1073741824, var4.rightHandItem); + var15[3] = TextureOperation3.bitwiseOr(1073741824, var4.rightHandItem); var13 ^= var15[3]; } } @@ -551,7 +551,7 @@ final class Class52 { if (!ItemDefinition.getItemDefinition(1073741823 & var19).method1108(this.aBoolean864)) { var17 = true; } - } else if ((var19 < 0) && !Class3_Sub13_Sub13.method231(1073741823 & var19).method942()) { + } else if ((var19 < 0) && !TextureOperation20.method231(1073741823 & var19).method942()) { var17 = true; } } @@ -575,7 +575,7 @@ final class Class52 { Model_Sub1 var21; if ((var20 & 1073741824) == 0) { if (var20 < 0) { - var21 = Class3_Sub13_Sub13.method231(var20 & 1073741823).method947(); + var21 = TextureOperation20.method231(var20 & 1073741823).method947(); if (null != var21) { var39[var19] = var21; } @@ -611,7 +611,7 @@ final class Class52 { if (var24 == 0 && var25 == 0 && frame == 0) { var27[12] = -var45; var27[13] = -var22; - var27[0] = var27[4] = var27[8] = '\u8000'; + var27[0] = var27[4] = var27[8] = 32768; var27[14] = -var23; } else { var28 = Class51.anIntArray851[var24] >> 1; @@ -691,7 +691,7 @@ final class Class52 { var25 = var1[var22].anInt1891; frame = var41.frames[var24]; Class166.aClass3_Sub28_Sub5Array2070[var22] = Class3_Sub9.method133(frame >>> 16); - frame &= '\uffff'; + frame &= 65535; anIntArray1833[var22] = frame; if (Class166.aClass3_Sub28_Sub5Array2070[var22] != null) { var42 |= Class166.aClass3_Sub28_Sub5Array2070[var22].method561(frame, (byte) 119); @@ -704,7 +704,7 @@ final class Class52 { anIntArray3139[var22] = var1[var22].anInt1897; var47 = var41.frames[var25]; Class75.aClass3_Sub28_Sub5Array1103[var22] = Class3_Sub9.method133(var47 >>> 16); - var47 &= '\uffff'; + var47 &= 65535; anIntArray1679[var22] = var47; if (null != Class75.aClass3_Sub28_Sub5Array1103[var22]) { var42 |= Class75.aClass3_Sub28_Sub5Array1103[var22].method561(var47, (byte) 117); @@ -732,7 +732,7 @@ final class Class52 { var22 = var4.frames[var10]; var47 = var22 >>> 16; var46 = Class3_Sub9.method133(var47); - var22 &= '\uffff'; + var22 &= 65535; if (var46 != null) { var42 |= var46.method561(var22, (byte) 124); var38 |= var46.method559(var22); @@ -742,7 +742,7 @@ final class Class52 { if ((var4.aBoolean1846 || ClientCommands.tweeningEnabled) && var2 != -1 && var4.frames.length > var2) { var23 = var4.frames[var2]; var28 = var23 >>> 16; - var23 &= '\uffff'; + var23 &= 65535; var24 = var4.duration[var10]; if (var28 == var47) { var48 = var46; @@ -765,7 +765,7 @@ final class Class52 { if (var3 != null) { var47 = var3.frames[var11]; var32 = var47 >>> 16; - var47 &= '\uffff'; + var47 &= 65535; var49 = Class3_Sub9.method133(var32); if (null != var49) { var42 |= var49.method561(var47, (byte) 123); @@ -777,7 +777,7 @@ final class Class52 { var29 = var3.duration[var11]; var28 = var3.frames[var6]; var33 = var28 >>> 16; - var28 &= '\uffff'; + var28 &= 65535; if (var33 == var32) { var50 = var49; } else { @@ -840,7 +840,7 @@ final class Class52 { for (int var8 = 0; var8 < 12; ++var8) { var9 = this.lookInfo[var8]; if (0 == (1073741824 & var9)) { - if (var9 < 0 && Class3_Sub13_Sub13.method231(var9 & 1073741823).method948()) { + if (var9 < 0 && TextureOperation20.method231(var9 & 1073741823).method948()) { var7 = true; } } else if (!ItemDefinition.getItemDefinition(1073741823 & var9).method1102(this.aBoolean864)) { @@ -861,7 +861,7 @@ final class Class52 { Model_Sub1 var12; if ((1073741824 & var11) == 0) { if (0 != (Integer.MIN_VALUE & var11)) { - var12 = Class3_Sub13_Sub13.method231(1073741823 & var11).method941(); + var12 = TextureOperation20.method231(1073741823 & var11).method941(); var14[var9++] = var12; } } else { diff --git a/Client/src/main/java/org/runite/client/Class53.java b/Client/src/main/java/org/runite/client/Class53.java index 642a3cb57..c712e1a79 100644 --- a/Client/src/main/java/org/runite/client/Class53.java +++ b/Client/src/main/java/org/runite/client/Class53.java @@ -3,7 +3,7 @@ package org.runite.client; import java.io.*; -final class Class53 { +public final class Class53 { static int anInt865 = -1; static long aLong866 = 0L; @@ -15,7 +15,7 @@ final class Class53 { return var1 >>> 8; } - static void method1171(int var0, int var1, int var2, int var3, int var4, RSInterface var5) { + public static void method1171(int var0, int var1, int var2, int var3, int var4, RSInterface var5) { try { int var7 = var3 * var3 + var4 * var4; if (var7 <= 360000) { @@ -25,7 +25,7 @@ final class Class53 { Class38_Sub1.minimapIcons(var5, Class129_Sub1.aAbstractSpriteArray2690[var0], var4, var3, var1, var2); } else { var8 -= 10; - int var9 = 2047 & Class3_Sub13_Sub8.anInt3102 + GraphicDefinition.CAMERA_DIRECTION; + int var9 = 2047 & TextureOperation9.anInt3102 + GraphicDefinition.CAMERA_DIRECTION; int var11 = Class51.anIntArray851[var9]; int var10 = Class51.anIntArray840[var9]; var10 = var10 * 256 / (256 + Class164_Sub2.anInt3020); @@ -36,9 +36,9 @@ final class Class53 { int var16 = (int) (Math.sin(var14) * (double) var8); int var17 = (int) (Math.cos(var14) * (double) var8); if (HDToolKit.highDetail) { - ((HDSprite) Class3_Sub13_Sub39.aAbstractSpriteArray3458[var0]).method648(240, 240, (var5.width / 2 + var2 + var16) * 16, 16 * (-var17 + var5.height / 2 + var1), (int) (10430.378D * var14)); + ((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) Class3_Sub13_Sub39.aAbstractSpriteArray3458[var0]).method660(-10 + var16 + var5.width / 2 + var2, -10 + var5.height / 2 + var1 + -var17, var14); + ((Class3_Sub28_Sub16_Sub2) TextureOperation8.aAbstractSpriteArray3458[var0]).method660(-10 + var16 + var5.width / 2 + var2, -10 + var5.height / 2 + var1 + -var17, var14); } } diff --git a/Client/src/main/java/org/runite/client/Class56.java b/Client/src/main/java/org/runite/client/Class56.java index 0c4eab5b4..6251dd7d6 100644 --- a/Client/src/main/java/org/runite/client/Class56.java +++ b/Client/src/main/java/org/runite/client/Class56.java @@ -2,12 +2,12 @@ package org.runite.client; import org.rs09.client.data.NodeCache; -final class Class56 { +public final class Class56 { static Class3_Sub26 aClass3_Sub26_884 = new Class3_Sub26(0, 0); static NodeCache aClass47_885 = new NodeCache(128); static RSInterface aClass11_886 = null; - static int[] localPlayerIndexes = new int[2048]; + public static int[] localPlayerIndexes = new int[2048]; static Class106[] aClass106Array890; static int anInt893 = 0; @@ -103,7 +103,7 @@ final class Class56 { PacketParser.aByteArrayArrayArray81 = null; Class67.aByteArrayArrayArray1014 = null; Class158_Sub1.aByteArrayArrayArray1828 = null; - Class3_Sub13_Sub36.aByteArrayArrayArray3430 = null; + TextureOperation36.aByteArrayArrayArray3430 = null; Unsorted.anIntArray1138 = null; Class129.anIntArray1695 = null; Class3_Sub31.anIntArray2606 = null; @@ -119,7 +119,7 @@ final class Class56 { int var16; for (int var15 = var1; var15 < var1 + var3; ++var15) { for (var16 = var2; var16 < var2 + var4; ++var16) { - if (var15 < 0 || var16 < 0 || var15 >= Unsorted.anInt1234 || var16 >= Class3_Sub13_Sub15.anInt3179) { + if (var15 < 0 || var16 < 0 || var15 >= Unsorted.anInt1234 || var16 >= TextureOperation17.anInt3179) { return false; } @@ -174,8 +174,8 @@ final class Class56 { var22.anIntArray2237[var22.anInt2223] = var18; var22.anInt2228 |= var18; ++var22.anInt2223; - if (var13 && Class3_Sub13_Sub9.anIntArrayArray3115[var16][var21] != 0) { - var14 = Class3_Sub13_Sub9.anIntArrayArray3115[var16][var21]; + if (var13 && TextureOperation16.anIntArrayArray3115[var16][var21] != 0) { + var14 = TextureOperation16.anIntArrayArray3115[var16][var21]; } } } @@ -183,8 +183,8 @@ final class Class56 { if (var13 && var14 != 0) { for (var16 = var1; var16 < var1 + var3; ++var16) { for (var21 = var2; var21 < var2 + var4; ++var21) { - if (Class3_Sub13_Sub9.anIntArrayArray3115[var16][var21] == 0) { - Class3_Sub13_Sub9.anIntArrayArray3115[var16][var21] = var14; + if (TextureOperation16.anIntArrayArray3115[var16][var21] == 0) { + TextureOperation16.anIntArrayArray3115[var16][var21] = var14; } } } diff --git a/Client/src/main/java/org/runite/client/Class57.java b/Client/src/main/java/org/runite/client/Class57.java index 6c02968f3..823184a8b 100644 --- a/Client/src/main/java/org/runite/client/Class57.java +++ b/Client/src/main/java/org/runite/client/Class57.java @@ -2,7 +2,7 @@ package org.runite.client; public final class Class57 { - static AbstractSprite aAbstractSprite_895; + public static AbstractSprite aAbstractSprite_895; static int[] varpArray = new int[3500]; static int anInt902 = 100; static int[] anIntArray904 = new int[200]; diff --git a/Client/src/main/java/org/runite/client/Class58.java b/Client/src/main/java/org/runite/client/Class58.java index 635062d09..881674a7d 100644 --- a/Client/src/main/java/org/runite/client/Class58.java +++ b/Client/src/main/java/org/runite/client/Class58.java @@ -5,7 +5,7 @@ import org.rs09.client.config.GameConfig; import java.awt.*; -final class Class58 { +public final class Class58 { static int anInt909 = -1; static int[][][] anIntArrayArrayArray911 = new int[2][][]; @@ -15,7 +15,7 @@ final class Class58 { static Js5Worker aJs5Worker_917; - static void method1194() { + public static void method1194() { try { if (null != Class3_Sub21.aClass155_2491) { Class3_Sub21.aClass155_2491.method2153(); diff --git a/Client/src/main/java/org/runite/client/Class61.java b/Client/src/main/java/org/runite/client/Class61.java index abcf876e5..3a76b440c 100644 --- a/Client/src/main/java/org/runite/client/Class61.java +++ b/Client/src/main/java/org/runite/client/Class61.java @@ -3,7 +3,7 @@ package org.runite.client; import org.rs09.client.Linkable; import org.rs09.client.data.ReferenceCache; -final class Class61 { +public final class Class61 { static ReferenceCache aReferenceCache_939 = new ReferenceCache(4); Linkable aClass3_940 = new Linkable(); @@ -35,7 +35,7 @@ final class Class61 { Class3_Sub28_Sub9 var2 = (Class3_Sub28_Sub9) Class163.aClass47_2041.get(var1); if (null == var2) { - byte[] var3 = Class3_Sub13_Sub7.aClass153_3098.getFile(11, var1); + byte[] var3 = TextureOperation27.aClass153_3098.getFile(11, var1); var2 = new Class3_Sub28_Sub9(); if (var3 != null) { var2.method583(new DataBuffer(var3)); diff --git a/Client/src/main/java/org/runite/client/Class65.java b/Client/src/main/java/org/runite/client/Class65.java index 30518e9b0..d4134270b 100644 --- a/Client/src/main/java/org/runite/client/Class65.java +++ b/Client/src/main/java/org/runite/client/Class65.java @@ -3,11 +3,11 @@ package org.runite.client; import org.rs09.client.rendering.Toolkit; import org.rs09.client.util.ArrayUtils; -final class Class65 { +public final class Class65 { static Class61 aClass61_983 = new Class61(); static DataBuffer[] aClass3_Sub30Array986 = new DataBuffer[2048]; - static int anInt987 = 0; + public static int anInt987 = 0; static int currentChunkX; static int anInt991 = -1; static AbstractSprite[] aAbstractSpriteArray1825; @@ -37,9 +37,9 @@ final class Class65 { int var9 = Class3_Sub28_Sub3.method543(var4 + 1, var6, (byte) -104); int var10 = Class3_Sub28_Sub3.method543(var4, 1 + var6, (byte) -100); int var11 = Class3_Sub28_Sub3.method543(1 + var4, var6 + 1, (byte) -109); - int var12 = Class3_Sub13_Sub23.method275(var8, var9, var5, var0); - int var13 = Class3_Sub13_Sub23.method275(var10, var11, var5, var0); - return Class3_Sub13_Sub23.method275(var12, var13, var7, var0); + int var12 = TextureOperation39.method275(var8, var9, var5, var0); + int var13 = TextureOperation39.method275(var10, var11, var5, var0); + return TextureOperation39.method275(var12, var13, var7, var0); } catch (RuntimeException var14) { throw ClientErrorException.clientError(var14, "ja.G(" + var0 + ',' + var1 + ',' + var2 + ',' + 512 + ')'); } @@ -55,7 +55,7 @@ final class Class65 { aAbstractSpriteArray1825[4 + Unsorted.anInt2958 / 100].drawAt(Class70.anInt1053 + -8, -8 + Unsorted.anInt4062); } - Class3_Sub13_Sub37.method347(); + TextureOperation10.method347(); } catch (RuntimeException var6) { throw ClientErrorException.clientError(var6, "ja.A(" + var0 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + (byte) -121 + ')'); } @@ -112,8 +112,8 @@ final class Class65 { int var10; short var12; if (var8 >= ItemDefinition.aShort505) { - if (var8 > Class3_Sub13_Sub23_Sub1.aShort4038) { - var12 = Class3_Sub13_Sub23_Sub1.aShort4038; + if (var8 > TextureOperation18.aShort4038) { + var12 = TextureOperation18.aShort4038; var7 = var12 * var0 * 334 / (var3 * 512); if (var7 < CS2Script.aShort3241) { var7 = CS2Script.aShort3241; @@ -161,24 +161,24 @@ final class Class65 { static void method1240() { try { - Class126.plainFont = null; + FontType.plainFont = null; Class75_Sub3.aAbstractSpriteArray2656 = null; aAbstractSpriteArray1825 = null; - Class3_Sub13_Sub22.nameIconsSpriteArray = null; + TextureOperation0.nameIconsSpriteArray = null; Class157.aClass3_Sub28_Sub17_Sub1_2000 = null; Sprites.aClass3_Sub28_Sub16_Sub2Array2140 = null; Class140_Sub4.aAbstractSpriteArray2839 = null; Class129_Sub1.aAbstractSpriteArray2690 = null; NPC.aAbstractSpriteArray3977 = null; - Class168.bold = null; + FontType.bold = null; Class57.aAbstractSprite_895 = null; Unsorted.aAbstractSpriteArray1136 = null; - TextureOperation.smallFont = null; + FontType.smallFont = null; Class45.aAbstractSprite_736 = null; Unsorted.aAbstractSpriteArray996 = null; - Class3_Sub13_Sub39.aAbstractSpriteArray3458 = null; + TextureOperation8.aAbstractSpriteArray3458 = null; Class166.aAbstractSpriteArray2072 = null; - Class3_Sub13_Sub31.aAbstractSpriteArray3373 = null; + TextureOperation2.aAbstractSpriteArray3373 = null; GameObject.aClass109Array1831 = null; } catch (RuntimeException var2) { diff --git a/Client/src/main/java/org/runite/client/Class67.java b/Client/src/main/java/org/runite/client/Class67.java index 0e97b3ccf..dc357cccf 100644 --- a/Client/src/main/java/org/runite/client/Class67.java +++ b/Client/src/main/java/org/runite/client/Class67.java @@ -16,12 +16,12 @@ final class Class67 implements Runnable { static int method1258(byte var0) { try { - Class3_Sub13_Sub17.anInt1780 = 0; + TextureOperation23.anInt1780 = 0; if (var0 != -53) { method1258((byte) -35); } - return Class3_Sub13_Sub17.method251(); + return TextureOperation23.method251(); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "jd.D(" + var0 + ')'); } @@ -51,7 +51,7 @@ final class Class67 implements Runnable { method1260(23206, var4.componentHash, var4.aClass11Array262); } - Class3_Sub31 var5 = Class3_Sub13_Sub17.aHashTable_3208.get(var4.componentHash); + Class3_Sub31 var5 = TextureOperation23.aHashTable_3208.get(var4.componentHash); if (var5 != null) { Class52.method1160(-111, var5.anInt2602); } @@ -96,7 +96,7 @@ final class Class67 implements Runnable { var6 = var4.anInt237 << 16 >> 16; var4.anInt182 = 2047 & var10 + var4.anInt182; var6 *= Class106.anInt1446; - var4.anInt308 = var4.anInt308 - -var6 & 2047; + var4.anInt308 = var4.anInt308 - -var6 & 0x7FF; Class20.method909(var4); } } diff --git a/Client/src/main/java/org/runite/client/Class68.java b/Client/src/main/java/org/runite/client/Class68.java index d367287cf..baedbb422 100644 --- a/Client/src/main/java/org/runite/client/Class68.java +++ b/Client/src/main/java/org/runite/client/Class68.java @@ -81,7 +81,7 @@ final class Class68 { label101: while (var12 != 0) { - int var13 = (var12 & 255) - 1; + int var13 = (var12 & 0xFF) - 1; var12 >>>= 8; int var14; @@ -173,7 +173,7 @@ final class Class68 { int var9; label71: while (var7 != 0) { - var8 = (var7 & 255) - 1; + var8 = (var7 & 0xFF) - 1; var7 >>>= 8; for (var9 = 0; var9 < 4; ++var9) { @@ -265,7 +265,7 @@ final class Class68 { for (int var8 = var6; var8 <= var7; ++var8) { short var9 = var1.aShortArray706[var5++]; int var10 = (var1.anInt703 >> 7) - var1.anInt698 + (var9 >> 8); - int var11 = var10 + (var9 & 255) - 1; + int var11 = var10 + (var9 & 0xFF) - 1; if (var10 < 0) { var10 = 0; } @@ -276,9 +276,9 @@ final class Class68 { for (int var12 = var10; var12 <= var11; ++var12) { int var13 = anIntArrayArrayArray1027[var4][var12][var8]; - if ((var13 & 255) == 0) { + if ((var13 & 0xFF) == 0) { anIntArrayArrayArray1027[var4][var12][var8] = var13 | var0 + 1; - } else if ((var13 & '\uff00') == 0) { + } else if ((var13 & 65280) == 0) { anIntArrayArrayArray1027[var4][var12][var8] = var13 | var0 + 1 << 8; } else if ((var13 & 16711680) == 0) { anIntArrayArrayArray1027[var4][var12][var8] = var13 | var0 + 1 << 16; @@ -310,7 +310,7 @@ final class Class68 { int var7; while (var6 != 0) { - var7 = (var6 & 255) - 1; + var7 = (var6 & 0xFF) - 1; var6 >>>= 8; if (var7 == anIntArray1028[var5]) { continue label44; @@ -320,7 +320,7 @@ final class Class68 { var6 = anIntArrayArrayArray1027[var0][var3][var4]; while (var6 != 0) { - var7 = (var6 & 255) - 1; + var7 = (var6 & 0xFF) - 1; var6 >>>= 8; if (var7 == anIntArray1028[var5]) { continue label44; @@ -411,7 +411,7 @@ final class Class68 { while (var10 <= var9) { short var11 = var5.aShortArray706[var7++]; int var12 = (var5.anInt703 >> 7) - var5.anInt698 + (var11 >> 8); - int var13 = var12 + (var11 & 255) - 1; + int var13 = var12 + (var11 & 0xFF) - 1; if (var12 < Class163_Sub1_Sub1.anInt4006) { var12 = Class163_Sub1_Sub1.anInt4006; } diff --git a/Client/src/main/java/org/runite/client/Class7.java b/Client/src/main/java/org/runite/client/Class7.java index 82c98728c..bc0e55012 100644 --- a/Client/src/main/java/org/runite/client/Class7.java +++ b/Client/src/main/java/org/runite/client/Class7.java @@ -20,7 +20,7 @@ public final class Class7 implements Interface4 { try { int windowId = interfaceHash >> 16; - int componentId = '\uffff' & interfaceHash; + int componentId = 65535 & interfaceHash; if (GameObject.aClass11ArrayArray1834.length <= windowId || windowId < 0) { return null; } diff --git a/Client/src/main/java/org/runite/client/Class70.java b/Client/src/main/java/org/runite/client/Class70.java index 5bb1c02ed..f7c441b8a 100644 --- a/Client/src/main/java/org/runite/client/Class70.java +++ b/Client/src/main/java/org/runite/client/Class70.java @@ -21,9 +21,9 @@ final class Class70 { try { Class101.aClass153_1423 = var0; Class10.anInt154 = 1; - Class3_Sub13_Sub36.anInt3423 = var5; + TextureOperation36.anInt3423 = var5; Class132.anInt1741 = 0; - Class3_Sub13_Sub39.anInt3463 = var2; + TextureOperation8.anInt3463 = var2; Unsorted.aBoolean2311 = false; GraphicDefinition.anInt546 = 10000; diff --git a/Client/src/main/java/org/runite/client/Class72.java b/Client/src/main/java/org/runite/client/Class72.java index 38c7a2c1a..597928a12 100644 --- a/Client/src/main/java/org/runite/client/Class72.java +++ b/Client/src/main/java/org/runite/client/Class72.java @@ -50,16 +50,16 @@ final class Class72 { boolean var5; int var6; if (var1.anInt1554 == 1) { - var2 = var1.anInt1553 - Class97.anInt1375 + Class3_Sub13_Sub39.anInt3466; - if (var2 >= 0 && var2 <= Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466) { - var3 = var1.anInt1563 - Class145.anInt3340 + Class3_Sub13_Sub39.anInt3466; + var2 = var1.anInt1553 - Class97.anInt1375 + TextureOperation8.anInt3466; + if (var2 >= 0 && var2 <= TextureOperation8.anInt3466 + TextureOperation8.anInt3466) { + var3 = var1.anInt1563 - Class145.anInt3340 + TextureOperation8.anInt3466; if (var3 < 0) { var3 = 0; } - var4 = var1.anInt1566 - Class145.anInt3340 + Class3_Sub13_Sub39.anInt3466; - if (var4 > Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466) { - var4 = Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466; + var4 = var1.anInt1566 - Class145.anInt3340 + TextureOperation8.anInt3466; + if (var4 > TextureOperation8.anInt3466 + TextureOperation8.anInt3466) { + var4 = TextureOperation8.anInt3466 + TextureOperation8.anInt3466; } var5 = false; @@ -84,24 +84,24 @@ final class Class72 { var6 = -var6; } - var1.anInt1555 = (var1.anInt1560 - Class3_Sub13_Sub30.anInt3363 << 8) / var6; - var1.anInt1551 = (var1.anInt1550 - Class3_Sub13_Sub30.anInt3363 << 8) / var6; + var1.anInt1555 = (var1.anInt1560 - TextureOperation13.anInt3363 << 8) / var6; + var1.anInt1551 = (var1.anInt1550 - TextureOperation13.anInt3363 << 8) / var6; var1.anInt1561 = (var1.anInt1544 - Unsorted.anInt3657 << 8) / var6; var1.anInt1565 = (var1.anInt1548 - Unsorted.anInt3657 << 8) / var6; Class145.aClass113Array1895[anInt1672++] = var1; } } } else if (var1.anInt1554 == 2) { - var2 = var1.anInt1563 - Class145.anInt3340 + Class3_Sub13_Sub39.anInt3466; - if (var2 >= 0 && var2 <= Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466) { - var3 = var1.anInt1553 - Class97.anInt1375 + Class3_Sub13_Sub39.anInt3466; + var2 = var1.anInt1563 - Class145.anInt3340 + TextureOperation8.anInt3466; + if (var2 >= 0 && var2 <= TextureOperation8.anInt3466 + TextureOperation8.anInt3466) { + var3 = var1.anInt1553 - Class97.anInt1375 + TextureOperation8.anInt3466; if (var3 < 0) { var3 = 0; } - var4 = var1.anInt1547 - Class97.anInt1375 + Class3_Sub13_Sub39.anInt3466; - if (var4 > Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466) { - var4 = Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466; + var4 = var1.anInt1547 - Class97.anInt1375 + TextureOperation8.anInt3466; + if (var4 > TextureOperation8.anInt3466 + TextureOperation8.anInt3466) { + var4 = TextureOperation8.anInt3466 + TextureOperation8.anInt3466; } var5 = false; @@ -114,7 +114,7 @@ final class Class72 { } if (var5) { - var6 = Class3_Sub13_Sub30.anInt3363 - var1.anInt1560; + var6 = TextureOperation13.anInt3363 - var1.anInt1560; if (var6 > 32) { var1.anInt1564 = 3; } else { @@ -136,25 +136,25 @@ final class Class72 { } else if (var1.anInt1554 == 4) { var2 = var1.anInt1544 - Unsorted.anInt3657; if (var2 > 128) { - var3 = var1.anInt1563 - Class145.anInt3340 + Class3_Sub13_Sub39.anInt3466; + var3 = var1.anInt1563 - Class145.anInt3340 + TextureOperation8.anInt3466; if (var3 < 0) { var3 = 0; } - var4 = var1.anInt1566 - Class145.anInt3340 + Class3_Sub13_Sub39.anInt3466; - if (var4 > Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466) { - var4 = Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466; + var4 = var1.anInt1566 - Class145.anInt3340 + TextureOperation8.anInt3466; + if (var4 > TextureOperation8.anInt3466 + TextureOperation8.anInt3466) { + var4 = TextureOperation8.anInt3466 + TextureOperation8.anInt3466; } if (var3 <= var4) { - int var10 = var1.anInt1553 - Class97.anInt1375 + Class3_Sub13_Sub39.anInt3466; + int var10 = var1.anInt1553 - Class97.anInt1375 + TextureOperation8.anInt3466; if (var10 < 0) { var10 = 0; } - var6 = var1.anInt1547 - Class97.anInt1375 + Class3_Sub13_Sub39.anInt3466; - if (var6 > Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466) { - var6 = Class3_Sub13_Sub39.anInt3466 + Class3_Sub13_Sub39.anInt3466; + var6 = var1.anInt1547 - Class97.anInt1375 + TextureOperation8.anInt3466; + if (var6 > TextureOperation8.anInt3466 + TextureOperation8.anInt3466) { + var6 = TextureOperation8.anInt3466 + TextureOperation8.anInt3466; } boolean var7 = false; @@ -173,8 +173,8 @@ final class Class72 { var1.anInt1564 = 5; var1.anInt1549 = (var1.anInt1562 - Class145.anInt2697 << 8) / var2; var1.anInt1557 = (var1.anInt1545 - Class145.anInt2697 << 8) / var2; - var1.anInt1555 = (var1.anInt1560 - Class3_Sub13_Sub30.anInt3363 << 8) / var2; - var1.anInt1551 = (var1.anInt1550 - Class3_Sub13_Sub30.anInt3363 << 8) / var2; + var1.anInt1555 = (var1.anInt1560 - TextureOperation13.anInt3363 << 8) / var2; + var1.anInt1551 = (var1.anInt1550 - TextureOperation13.anInt3363 << 8) / var2; Class145.aClass113Array1895[anInt1672++] = var1; } } diff --git a/Client/src/main/java/org/runite/client/Class74.java b/Client/src/main/java/org/runite/client/Class74.java index 86e94ee0f..7b2fe1080 100644 --- a/Client/src/main/java/org/runite/client/Class74.java +++ b/Client/src/main/java/org/runite/client/Class74.java @@ -16,7 +16,7 @@ public final class Class74 { return Toolkit.JAVA_TOOLKIT.getBuffer(); } - static void method1310() { + public static void method1310() { anIntArray1097 = null; anIntArray1098 = null; } @@ -27,7 +27,7 @@ public final class Class74 { } } - static void method1314(int[] var0, int[] var1) { + public static void method1314(int[] var0, int[] var1) { if (var0.length == Toolkit.JAVA_TOOLKIT.clipBottom - Toolkit.JAVA_TOOLKIT.clipTop && var1.length == Toolkit.JAVA_TOOLKIT.clipBottom - Toolkit.JAVA_TOOLKIT.clipTop) { anIntArray1097 = var0; anIntArray1098 = var1; @@ -92,15 +92,15 @@ public final class Class74 { } int var5 = 256 - var4; - int var6 = (var3 >> 16 & 255) * var4; - int var7 = (var3 >> 8 & 255) * var4; - int var8 = (var3 & 255) * var4; + int var6 = (var3 >> 16 & 0xFF) * var4; + int var7 = (var3 >> 8 & 0xFF) * var4; + int var8 = (var3 & 0xFF) * var4; int var12 = var0 + var1 * Toolkit.JAVA_TOOLKIT.width; for (int var13 = 0; var13 < var2; ++var13) { - int var9 = (getBuffer()[var12] >> 16 & 255) * var5; - int var10 = (getBuffer()[var12] >> 8 & 255) * var5; - int var11 = (getBuffer()[var12] & 255) * var5; + int var9 = (getBuffer()[var12] >> 16 & 0xFF) * var5; + int var10 = (getBuffer()[var12] >> 8 & 0xFF) * var5; + int var11 = (getBuffer()[var12] & 0xFF) * var5; int var14 = (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8) + (var8 + var11 >> 8); getBuffer()[var12++] = var14; } @@ -211,15 +211,15 @@ public final class Class74 { } int var5 = 256 - var4; - int var6 = (var3 >> 16 & 255) * var4; - int var7 = (var3 >> 8 & 255) * var4; - int var8 = (var3 & 255) * var4; + int var6 = (var3 >> 16 & 0xFF) * var4; + int var7 = (var3 >> 8 & 0xFF) * var4; + int var8 = (var3 & 0xFF) * var4; int var12 = var0 + var1 * Toolkit.JAVA_TOOLKIT.width; for (int var13 = 0; var13 < var2; ++var13) { - int var9 = (getBuffer()[var12] >> 16 & 255) * var5; - int var10 = (getBuffer()[var12] >> 8 & 255) * var5; - int var11 = (getBuffer()[var12] & 255) * var5; + int var9 = (getBuffer()[var12] >> 16 & 0xFF) * var5; + int var10 = (getBuffer()[var12] >> 8 & 0xFF) * var5; + int var11 = (getBuffer()[var12] & 0xFF) * var5; int var14 = (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8) + (var8 + var11 >> 8); getBuffer()[var12] = var14; var12 += Toolkit.JAVA_TOOLKIT.width; @@ -257,7 +257,7 @@ public final class Class74 { int var6; if (var2 > var3) { var1 <<= 16; - var1 += '\u8000'; + var1 += 32768; var3 <<= 16; var5 = (int) Math.floor((double) var3 / (double) var2 + 0.5D); var2 += var0; @@ -281,7 +281,7 @@ public final class Class74 { } } else { var0 <<= 16; - var0 += '\u8000'; + var0 += 32768; var2 <<= 16; var5 = (int) Math.floor((double) var2 / (double) var3 + 0.5D); var3 += var1; @@ -411,8 +411,8 @@ public final class Class74 { } int var5 = 256 - var4; - int var6 = (16776960 >> 16 & 255) * var4; - int var7 = (16776960 >> 8 & 255) * var4; + int var6 = (16776960 >> 16 & 0xFF) * var4; + int var7 = (16776960 >> 8 & 0xFF) * var4; int var8 = 0; int var12 = var1 - var2; if (var12 < Toolkit.JAVA_TOOLKIT.clipTop) { @@ -461,9 +461,9 @@ public final class Class74 { var22 = var20 + var14 * Toolkit.JAVA_TOOLKIT.width; for (var23 = var20; var23 < var21; ++var23) { - var9 = (getBuffer()[var22] >> 16 & 255) * var5; - var10 = (getBuffer()[var22] >> 8 & 255) * var5; - var11 = (getBuffer()[var22] & 255) * var5; + var9 = (getBuffer()[var22] >> 16 & 0xFF) * var5; + var10 = (getBuffer()[var22] >> 8 & 0xFF) * var5; + var11 = (getBuffer()[var22] & 0xFF) * var5; var24 = (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8) + (var8 + var11 >> 8); getBuffer()[var22++] = var24; } @@ -497,9 +497,9 @@ public final class Class74 { var22 = var20 + var14 * Toolkit.JAVA_TOOLKIT.width; for (var23 = var20; var23 <= var21; ++var23) { - var9 = (getBuffer()[var22] >> 16 & 255) * var5; - var10 = (getBuffer()[var22] >> 8 & 255) * var5; - var11 = (getBuffer()[var22] & 255) * var5; + var9 = (getBuffer()[var22] >> 16 & 0xFF) * var5; + var10 = (getBuffer()[var22] >> 8 & 0xFF) * var5; + var11 = (getBuffer()[var22] & 0xFF) * var5; var24 = (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8) + (var8 + var11 >> 8); getBuffer()[var22++] = var24; } @@ -520,7 +520,7 @@ public final class Class74 { method1310(); } - static void method1332(int var0, int var1, int[] var3, int[] var4) { + public static void method1332(int var0, int var1, int[] var3, int[] var4) { int var5 = var0 + var1 * Toolkit.JAVA_TOOLKIT.width; for (var1 = 0; var1 < var3.length; ++var1) { diff --git a/Client/src/main/java/org/runite/client/Class75.java b/Client/src/main/java/org/runite/client/Class75.java index 8e7791d24..9313d63a7 100644 --- a/Client/src/main/java/org/runite/client/Class75.java +++ b/Client/src/main/java/org/runite/client/Class75.java @@ -63,20 +63,6 @@ abstract class Class75 { } } - static void method1340(int var0, int var1, int var3, int var4) { - try { - - for (int var5 = 0; var5 < Class3_Sub28_Sub3.anInt3557; ++var5) { - if (var0 < Class3_Sub28_Sub18.anIntArray3768[var5] + Class155.anIntArray1969[var5] && Class155.anIntArray1969[var5] < var1 + var0 && Class140_Sub4.anIntArray2794[var5] + Player.anIntArray3954[var5] > var3 && Player.anIntArray3954[var5] < var3 - -var4) { - Unsorted.aBooleanArray3674[var5] = true; - } - } - - } catch (RuntimeException var6) { - throw ClientErrorException.clientError(var6, "kf.I(" + var0 + ',' + var1 + ',' + (byte) -40 + ',' + var3 + ',' + var4 + ')'); - } - } - abstract void method1335(int var1, int var2, int var3); abstract void method1337(int var1, boolean var2, int var3); diff --git a/Client/src/main/java/org/runite/client/Class75_Sub1.java b/Client/src/main/java/org/runite/client/Class75_Sub1.java index e75ccaf2f..84e63fb1d 100644 --- a/Client/src/main/java/org/runite/client/Class75_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class75_Sub1.java @@ -93,7 +93,7 @@ final class Class75_Sub1 extends Class75 { int var5 = this.anInt2635 * var3 >> 12; int var6 = var1 * this.anInt2630 >> 12; int var7 = var1 * this.anInt2632 >> 12; - Class3_Sub13_Sub34.method330(this.anInt1104, -111, var7, var4, var6, var5); + TextureOperation25.method330(this.anInt1104, -111, var7, var4, var6, var5); } catch (RuntimeException var8) { throw ClientErrorException.clientError(var8, "ci.E(" + var1 + ',' + var2 + ',' + var3 + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class75_Sub2.java b/Client/src/main/java/org/runite/client/Class75_Sub2.java index ed9ebdf36..0b5b487ef 100644 --- a/Client/src/main/java/org/runite/client/Class75_Sub2.java +++ b/Client/src/main/java/org/runite/client/Class75_Sub2.java @@ -53,7 +53,7 @@ final class Class75_Sub2 extends Class75 { int var7 = this.anInt2647 * var1 >> 12; int var6 = this.anInt2644 * var1 >> 12; int var5 = this.anInt2636 * var2 >> 12; - Class3_Sub13_Sub12.method223(this.anInt1106, var4, var6, var7, this.anInt1104, this.anInt1101, var5); + TextureOperation24.method223(this.anInt1106, var4, var6, var7, this.anInt1104, this.anInt1101, var5); } catch (RuntimeException var8) { throw ClientErrorException.clientError(var8, "kc.D(" + var1 + ',' + var2 + ',' + var3 + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class75_Sub3.java b/Client/src/main/java/org/runite/client/Class75_Sub3.java index 1e10df0d1..957fd3ac8 100644 --- a/Client/src/main/java/org/runite/client/Class75_Sub3.java +++ b/Client/src/main/java/org/runite/client/Class75_Sub3.java @@ -44,13 +44,13 @@ final class Class75_Sub3 extends Class75 { Class3_Sub28_Sub4.aReferenceCache_3572.sweep(5); Class143.aReferenceCache_1874.sweep(5); Class67.aReferenceCache_1013.sweep(5); - Class82.aReferenceCache_1146.sweep(5); + Texture.aReferenceCache_1146.sweep(5); Class159.aReferenceCache_2016.sweep(5); CS2Script.aReferenceCache_2450.sweep(5); Class136.aReferenceCache_1772.sweep(5); RenderAnimationDefinition.aReferenceCache_1955.sweep(5); - Class3_Sub13_Sub34.aReferenceCache_3412.sweep(5); - Class3_Sub13_Sub31.aReferenceCache_3369.sweep(5); + TextureOperation25.aReferenceCache_3412.sweep(5); + TextureOperation2.aReferenceCache_3369.sweep(5); Class128.aReferenceCache_1683.sweep(5); Unsorted.aReferenceCache_684.sweep(5); Class163_Sub1.aReferenceCache_2984.sweep(5); @@ -61,7 +61,7 @@ final class Class75_Sub3 extends Class75 { Unsorted.aReferenceCache_743.sweep(50); Class61.aReferenceCache_939.sweep(5); Class158_Sub1.aReferenceCache_2982.sweep(5); - Class3_Sub13_Sub11.aReferenceCache_3130.sweep(5); + TextureOperation1.aReferenceCache_3130.sweep(5); Unsorted.aReferenceCache_1135.sweep(5); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "re.K(" + 26211 + ')'); @@ -112,12 +112,12 @@ final class Class75_Sub3 extends Class75 { for(int var2 = 0; Class95.anInt1338 > var2; ++var2) { byte[] var4 = Class163_Sub1.aByteArrayArray2987[var2]; int var3 = Unsorted.anIntArray3076[var2] * Class140_Sub7.anIntArray2931[var2]; - if(Class3_Sub13_Sub22.aBooleanArray3272[var2]) { + if(TextureOperation0.aBooleanArray3272[var2]) { int[] var6 = new int[var3]; byte[] var5 = Class163_Sub3.aByteArrayArray3005[var2]; for(int var7 = 0; var3 > var7; ++var7) { - var6[var7] = Class3_Sub13_Sub29.bitwiseOr(Class3_Sub13_Sub38.spritePalette[Unsorted.bitwiseAnd(var4[var7], 255)], Unsorted.bitwiseAnd(-16777216, var5[var7] << 24)); + var6[var7] = TextureOperation3.bitwiseOr(TextureOperation38.spritePalette[Unsorted.bitwiseAnd(var4[var7], 255)], Unsorted.bitwiseAnd(-16777216, var5[var7] << 24)); } if(HDToolKit.highDetail) { @@ -129,7 +129,7 @@ final class Class75_Sub3 extends Class75 { int[] var9 = new int[var3]; for(int var10 = 0; var3 > var10; ++var10) { - var9[var10] = Class3_Sub13_Sub38.spritePalette[Unsorted.bitwiseAnd(var4[var10], 255)]; + var9[var10] = TextureOperation38.spritePalette[Unsorted.bitwiseAnd(var4[var10], 255)]; } if(HDToolKit.highDetail) { diff --git a/Client/src/main/java/org/runite/client/Class75_Sub4.java b/Client/src/main/java/org/runite/client/Class75_Sub4.java index 5917b3f8c..b13450a41 100644 --- a/Client/src/main/java/org/runite/client/Class75_Sub4.java +++ b/Client/src/main/java/org/runite/client/Class75_Sub4.java @@ -75,7 +75,7 @@ public final class Class75_Sub4 extends Class75 { int var6 = this.anInt2672 * var1 >> 12; int var5 = var2 * this.anInt2666 >> 12; int var7 = this.anInt2669 * var1 >> 12; - Class3_Sub13_Sub5.method194(this.anInt1106, var7, this.anInt1101, this.anInt1104, var6, var5, var4); + TextureOperation21.method194(this.anInt1106, var7, this.anInt1101, this.anInt1104, var6, var5, var4); } } catch (RuntimeException var8) { throw ClientErrorException.clientError(var8, "ta.D(" + var1 + ',' + var2 + ',' + var3 + ')'); @@ -115,7 +115,7 @@ public final class Class75_Sub4 extends Class75 { if(var4 >= Class159.anInt2020 && var4 <= Class57.anInt902) { var0 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var0, Class101.anInt1425); var3 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var3, Class101.anInt1425); - Class3_Sub13_Sub32.method320(var1, var4, var3, (byte)-123, var0); + TextureOperation14.method320(var1, var4, var3, (byte)-123, var0); } } catch (RuntimeException var6) { diff --git a/Client/src/main/java/org/runite/client/Class77.java b/Client/src/main/java/org/runite/client/Class77.java index f959ff2e4..1eae06792 100644 --- a/Client/src/main/java/org/runite/client/Class77.java +++ b/Client/src/main/java/org/runite/client/Class77.java @@ -7,7 +7,7 @@ final class Class77 { static LDIndexedSprite method1364() { try { - LDIndexedSprite var1 = new LDIndexedSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[0], Unsorted.anIntArray2591[0], Class140_Sub7.anIntArray2931[0], Unsorted.anIntArray3076[0], Class163_Sub1.aByteArrayArray2987[0], Class3_Sub13_Sub38.spritePalette); + LDIndexedSprite var1 = new LDIndexedSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[0], Unsorted.anIntArray2591[0], Class140_Sub7.anIntArray2931[0], Unsorted.anIntArray3076[0], Class163_Sub1.aByteArrayArray2987[0], TextureOperation38.spritePalette); Class39.method1035((byte) 127); return var1; @@ -18,8 +18,8 @@ final class Class77 { static void method1367(int var0, int var1, int var2, byte var3, int var4, int var5) { try { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var2++], var5, 92, var1, var0); - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var4--], var5, 97, var1, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var2++], var5, 92, var1, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var4--], var5, 97, var1, var0); if (var3 >= 23) { for (int var6 = var2; var4 >= var6; ++var6) { int[] var7 = Class38.anIntArrayArray663[var6]; @@ -34,8 +34,8 @@ final class Class77 { static void method1368() { try { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(104); - Class3_Sub13_Sub1.outgoingBuffer.writeLong(0L); + TextureOperation12.outgoingBuffer.putOpcode(104); + TextureOperation12.outgoingBuffer.writeLong(0L); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "kh.D(" + -90 + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class78.java b/Client/src/main/java/org/runite/client/Class78.java index 99a08a62e..38429cfb3 100644 --- a/Client/src/main/java/org/runite/client/Class78.java +++ b/Client/src/main/java/org/runite/client/Class78.java @@ -110,7 +110,7 @@ final class Class78 { byte var2 = this.aClass3_Sub30_1113.buffer[this.aClass3_Sub30_1113.index]; int var5; if (var2 < 0) { - var5 = var2 & 255; + var5 = var2 & 0xFF; this.anIntArray1120[var1] = var5; ++this.aClass3_Sub30_1113.index; } else { @@ -120,7 +120,7 @@ final class Class78 { if (var5 == 240 || var5 == 247) { int var3 = this.aClass3_Sub30_1113.method741(); if (var5 == 247 && var3 > 0) { - int var4 = this.aClass3_Sub30_1113.buffer[this.aClass3_Sub30_1113.index] & 255; + int var4 = this.aClass3_Sub30_1113.buffer[this.aClass3_Sub30_1113.index] & 0xFF; if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { ++this.aClass3_Sub30_1113.index; this.anIntArray1120[var1] = var4; diff --git a/Client/src/main/java/org/runite/client/Class79.java b/Client/src/main/java/org/runite/client/Class79.java index c1b10973e..d9a8aef56 100644 --- a/Client/src/main/java/org/runite/client/Class79.java +++ b/Client/src/main/java/org/runite/client/Class79.java @@ -86,7 +86,7 @@ final class Class79 { Class25.aBoolean488 = 1 == var0.readUnsignedByte(); RSInterface.aBoolean236 = var0.readUnsignedByte() == 1; WorldListEntry.aBoolean2623 = var0.readUnsignedByte() == 1; - Class3_Sub13_Sub22.aBoolean3275 = var0.readUnsignedByte() == 1; + TextureOperation0.aBoolean3275 = var0.readUnsignedByte() == 1; Class140_Sub6.aBoolean2910 = 1 == var0.readUnsignedByte(); Unsorted.anInt1137 = var0.readUnsignedByte(); if (2 < Unsorted.anInt1137) { @@ -108,7 +108,7 @@ final class Class79 { } Unsorted.anInt3671 = Class3_Sub28_Sub9.anInt3622; - Class3_Sub13_Sub15.aBoolean3184 = var0.readUnsignedByte() == 1; + TextureOperation17.aBoolean3184 = var0.readUnsignedByte() == 1; CS2Script.anInt2453 = var0.readUnsignedByte(); if (CS2Script.anInt2453 > 127) { CS2Script.anInt2453 = 127; diff --git a/Client/src/main/java/org/runite/client/Class8.java b/Client/src/main/java/org/runite/client/Class8.java index d172d6278..216f136d8 100644 --- a/Client/src/main/java/org/runite/client/Class8.java +++ b/Client/src/main/java/org/runite/client/Class8.java @@ -2,11 +2,11 @@ package org.runite.client; import java.util.Objects; -final class Class8 { +public final class Class8 { static RSInterface[] aClass11Array1836; static int anInt101; - static int anInt104 = 0; + public static int anInt104 = 0; static CacheIndex aClass153_105; private final Js5Worker aJs5Worker_102; private final CacheResourceWorker aCacheResourceWorker_103; @@ -91,7 +91,7 @@ final class Class8 { static void method841() { try { aClass11Array1836 = null; - Class3_Sub13_Sub1.method171(-101, Class3_Sub28_Sub12.anInt3655, 0, Class23.canvasWidth, 0, -1, Class140_Sub7.canvasHeight, 0, 0); + TextureOperation12.method171(-101, Class3_Sub28_Sub12.anInt3655, 0, Class23.canvasWidth, 0, -1, Class140_Sub7.canvasHeight, 0, 0); if (aClass11Array1836 != null) { Unsorted.method1095(0, Unsorted.anInt1082, Unsorted.anInt3602, aClass11Array1836, Class23.canvasWidth, -1412584499, 0, Class140_Sub7.canvasHeight, (byte) 73, PacketParser.aClass11_88.anInt292); aClass11Array1836 = null; @@ -133,13 +133,13 @@ final class Class8 { TextCore.aClass94_106 = null; } - if (null == Class3_Sub13_Sub17.anIntArray3212 || null == Class75_Sub2.anIntArray2639) { - Class3_Sub13_Sub17.anIntArray3212 = new int[256]; + if (null == TextureOperation23.anIntArray3212 || null == Class75_Sub2.anIntArray2639) { + TextureOperation23.anIntArray3212 = new int[256]; Class75_Sub2.anIntArray2639 = new int[256]; for (int var1 = 0; 256 > var1; ++var1) { double var2 = (double) var1 / 255.0D * 6.283185307179586D; - Class3_Sub13_Sub17.anIntArray3212[var1] = (int) (Math.sin(var2) * 4096.0D); + TextureOperation23.anIntArray3212[var1] = (int) (Math.sin(var2) * 4096.0D); Class75_Sub2.anIntArray2639[var1] = (int) (4096.0D * Math.cos(var2)); } } @@ -170,7 +170,7 @@ final class Class8 { } else { int var4 = var1 << 7; int var5 = var2 << 7; - if (Class3_Sub13_Sub37.method349(var4 + 1, Class44.anIntArrayArrayArray723[var0][var1][var2], var5 + 1) && Class3_Sub13_Sub37.method349(var4 + 128 - 1, Class44.anIntArrayArrayArray723[var0][var1 + 1][var2], var5 + 1) && Class3_Sub13_Sub37.method349(var4 + 128 - 1, Class44.anIntArrayArrayArray723[var0][var1 + 1][var2 + 1], var5 + 128 - 1) && Class3_Sub13_Sub37.method349(var4 + 1, Class44.anIntArrayArrayArray723[var0][var1][var2 + 1], var5 + 128 - 1)) { + if (TextureOperation10.method349(var4 + 1, Class44.anIntArrayArrayArray723[var0][var1][var2], var5 + 1) && TextureOperation10.method349(var4 + 128 - 1, Class44.anIntArrayArrayArray723[var0][var1 + 1][var2], var5 + 1) && TextureOperation10.method349(var4 + 128 - 1, Class44.anIntArrayArrayArray723[var0][var1 + 1][var2 + 1], var5 + 128 - 1) && TextureOperation10.method349(var4 + 1, Class44.anIntArrayArrayArray723[var0][var1][var2 + 1], var5 + 128 - 1)) { Class81.anIntArrayArrayArray1142[var0][var1][var2] = Class3_Sub28_Sub1.anInt3539; return true; } else { diff --git a/Client/src/main/java/org/runite/client/Class81.java b/Client/src/main/java/org/runite/client/Class81.java index b27c37246..93870d408 100644 --- a/Client/src/main/java/org/runite/client/Class81.java +++ b/Client/src/main/java/org/runite/client/Class81.java @@ -90,10 +90,10 @@ final class Class81 { Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasOnOwnIgnoreList, -1); } else { Class114.ignores[Class3_Sub28_Sub5.anInt3591] = var1; - Class3_Sub13_Sub27.aClass94Array3341[Class3_Sub28_Sub5.anInt3591++] = Unsorted.method1052(var1); + TextureOperation7.aClass94Array3341[Class3_Sub28_Sub5.anInt3591++] = Unsorted.method1052(var1); Class110.anInt1472 = PacketParser.anInt3213; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(34); - Class3_Sub13_Sub1.outgoingBuffer.writeLong(var1); + TextureOperation12.outgoingBuffer.putOpcode(34); + TextureOperation12.outgoingBuffer.writeLong(var1); } } else { Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasIgnoreListFull, -1); diff --git a/Client/src/main/java/org/runite/client/Class83.java b/Client/src/main/java/org/runite/client/Class83.java index e2981e826..ce037c435 100644 --- a/Client/src/main/java/org/runite/client/Class83.java +++ b/Client/src/main/java/org/runite/client/Class83.java @@ -23,7 +23,7 @@ public final class Class83 { } } - static void method1410(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + static void method1410(int var0, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { try { int var11 = var4 - var6; int var12 = -var3 + var2; @@ -35,10 +35,6 @@ public final class Class83 { ++var12; } - if (var10 != -12541) { - getWindowType(); - } - int var13; int var14; int var15; @@ -58,8 +54,8 @@ public final class Class83 { int var33; int[][] var41; for (var13 = 0; var13 < var11; ++var13) { - var14 = var13 * var8 + var1 >> 16; - var15 = (var13 + 1) * var8 + var1 >> 16; + var14 = var13 * var8 >> 16; + var15 = (var13 + 1) * var8 >> 16; var16 = -var14 + var15; if (var16 > 0) { var17 = var13 - -var6 >> 6; @@ -71,11 +67,11 @@ public final class Class83 { byte[][] var23 = Class36.aByteArrayArrayArray640[var17]; byte[][] var43 = CS2Script.aByteArrayArrayArray2452[var17]; var15 += var5; - byte[][] var46 = Class3_Sub13_Sub33.aByteArrayArrayArray3390[var17]; + byte[][] var46 = TextureOperation29.aByteArrayArrayArray3390[var17]; for (var24 = 0; var12 > var24; ++var24) { - var25 = var7 * var24 + var9 >> 16; - var26 = var9 - -((1 + var24) * var7) >> 16; + var25 = var7 * var24 >> 16; + var26 = - -((1 + var24) * var7) >> 16; int var27 = -var25 + var26; if (var27 > 0) { var26 += var0; @@ -89,7 +85,7 @@ public final class Class83 { } else { if (Unsorted.aClass3_Sub28_Sub3_2600.anInt3550 == -1) { if ((var6 + var13 & 4) == (4 & var24 + var3)) { - var32 = anIntArray1161[1 + Class3_Sub13_Sub6.anInt3081]; + var32 = anIntArray1161[1 + TextureOperation26.anInt3081]; } else { var32 = 4936552; } @@ -107,7 +103,7 @@ public final class Class83 { } } - var33 = var45[var28] == null ? 0 : anIntArray1161[var45[var28][var31] & 255]; + var33 = var45[var28] == null ? 0 : anIntArray1161[var45[var28][var31] & 0xFF]; if (var32 == 0) { var32 = 1; } @@ -148,7 +144,7 @@ public final class Class83 { } if (var23[var28] != null) { - int var49 = var23[var28][var31] & 255; + int var49 = var23[var28][var31] & 0xFF; if (var49 != 0) { if (1 == var16) { var36 = var14; @@ -238,7 +234,7 @@ public final class Class83 { if (-1 != Unsorted.aClass3_Sub28_Sub3_2600.anInt3550) { var19 = Unsorted.aClass3_Sub28_Sub3_2600.anInt3550; } else if ((var13 - -var6 & 4) == (4 & var18 + var3)) { - var19 = anIntArray1161[1 + Class3_Sub13_Sub6.anInt3081]; + var19 = anIntArray1161[1 + TextureOperation26.anInt3081]; } else { var19 = 4936552; } @@ -247,8 +243,8 @@ public final class Class83 { var19 = 1; } - var20 = (var7 * var18 + var9 >> 16) + var0; - var21 = var0 + ((var18 + 1) * var7 + var9 >> 16); + var20 = (var7 * var18 >> 16) + var0; + var21 = var0 + ((var18 + 1) * var7 >> 16); var22 = var21 + -var20; Toolkit.JAVA_TOOLKIT.method934(var14, var20, var16, var22, var19); // Class74.method934(var14, var20, var16, var22, var19); @@ -259,8 +255,8 @@ public final class Class83 { } for (var13 = -2; 2 + var11 > var13; ++var13) { - var14 = var1 - -(var13 * var8) >> 16; - var15 = var8 * (var13 + 1) + var1 >> 16; + var14 = - -(var13 * var8) >> 16; + var15 = var8 * (var13 + 1) >> 16; var16 = -var14 + var15; if (var16 > 0) { var14 += var5; @@ -269,8 +265,8 @@ public final class Class83 { var41 = Class29.anIntArrayArrayArray558[var17]; for (var19 = -2; var12 - -2 > var19; ++var19) { - var20 = var9 - -(var19 * var7) >> 16; - var21 = var9 - -((var19 + 1) * var7) >> 16; + var20 = - -(var19 * var7) >> 16; + var21 = - -((var19 + 1) * var7) >> 16; var22 = var21 + -var20; if (var22 > 0) { var20 += var0; @@ -318,13 +314,13 @@ public final class Class83 { } } catch (RuntimeException var40) { - throw ClientErrorException.clientError(var40, "le.C(" + var0 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ',' + var7 + ',' + var8 + ',' + var9 + ',' + var10 + ')'); + throw ClientErrorException.clientError(var40, "le.C(" + var0 + ',' + 0 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ',' + var7 + ',' + var8 + ',' + 0 + ',' + -12541 + ')'); } } public static int getWindowType() { try { - if (Class3_Sub13_Sub10.aFrame3121 == null) { + if (TextureOperation30.aFrame3121 == null) { if (HDToolKit.highDetail && Class3_Sub15.aBoolean2427) { return 2; } else { diff --git a/Client/src/main/java/org/runite/client/Class84.java b/Client/src/main/java/org/runite/client/Class84.java index 31160c494..aca197218 100644 --- a/Client/src/main/java/org/runite/client/Class84.java +++ b/Client/src/main/java/org/runite/client/Class84.java @@ -1,13 +1,10 @@ package org.runite.client; -import org.rs09.client.config.GameConfig; -import org.rs09.client.rendering.Toolkit; - -final class Class84 { +public final class Class84 { static int[][] anIntArrayArray1160 = new int[104][104]; static Class61 aClass61_1162 = new Class61(); - static int[] anIntArray1163 = new int[1000]; + public static int[] anIntArray1163 = new int[1000]; static int anInt1164 = 0; static Class3_Sub28_Sub16_Sub2 aClass3_Sub28_Sub16_Sub2_1381; static int[] anIntArray1729 = new int[]{12543016, 15504954, 15914854, 16773818}; @@ -27,7 +24,7 @@ final class Class84 { } } - static void method1418(int var0, CacheIndex var1) { + static void method1418(CacheIndex var1) { try { Class163_Sub2_Sub1.aClass109_Sub1Array4027 = Unsorted.method619((byte) 65, NPC.anInt4001, var1); Class52.anIntArray861 = new int[256]; @@ -36,16 +33,16 @@ final class Class84 { for (var2 = 0; var2 < 3; ++var2) { int var4 = (anIntArray1729[1 + var2] & 16711680) >> 16; float var3 = (float) ((anIntArray1729[var2] & 16711680) >> 16); - float var6 = (float) (anIntArray1729[var2] >> 8 & 255); - float var9 = (float) (anIntArray1729[var2] & 255); + float var6 = (float) (anIntArray1729[var2] >> 8 & 0xFF); + float var9 = (float) (anIntArray1729[var2] & 0xFF); float var5 = ((float) var4 - var3) / 64.0F; - int var7 = (anIntArray1729[var2 + 1] & '\uff00') >> 8; + int var7 = (anIntArray1729[var2 + 1] & 65280) >> 8; float var8 = (-var6 + (float) var7) / 64.0F; - int var10 = anIntArray1729[var2 + 1] & 255; + int var10 = anIntArray1729[var2 + 1] & 0xFF; float var11 = ((float) var10 - var9) / 64.0F; for (int var12 = 0; var12 < 64; ++var12) { - Class52.anIntArray861[var12 + 64 * var2] = Class3_Sub13_Sub29.bitwiseOr((int) var9, Class3_Sub13_Sub29.bitwiseOr((int) var6 << 8, (int) var3 << 16)); + Class52.anIntArray861[var12 + 64 * var2] = TextureOperation3.bitwiseOr((int) var9, TextureOperation3.bitwiseOr((int) var6 << 8, (int) var3 << 16)); var6 += var8; var9 += var11; var3 += var5; @@ -56,73 +53,34 @@ final class Class84 { Class52.anIntArray861[var2] = anIntArray1729[3]; } - Class161.anIntArray2026 = new int['\u8000']; - Unsorted.anIntArray49 = new int['\u8000']; - Class3_Sub13_Sub10.method215((byte) -89, null); - Class3_Sub30_Sub1.anIntArray3805 = new int['\u8000']; - Class159.anIntArray1681 = new int['\u8000']; + Class161.anIntArray2026 = new int[32768]; + Unsorted.anIntArray49 = new int[32768]; + TextureOperation30.method215((byte) -89, null); + Class3_Sub30_Sub1.anIntArray3805 = new int[32768]; + Class159.anIntArray1681 = new int[32768]; aClass3_Sub28_Sub16_Sub2_1381 = new Class3_Sub28_Sub16_Sub2(128, 254); } catch (RuntimeException var13) { - throw ClientErrorException.clientError(var13, "lf.E(" + var0 + ',' + (var1 != null ? "{...}" : "null") + ')'); + throw ClientErrorException.clientError(var13, "lf.E(" + -110 + ',' + (var1 != null ? "{...}" : "null") + ')'); } } - static void rightClickContextMenuDraw() { - try { - int x = AbstractIndexedSprite.anInt1462; - int y = Class3_Sub13_Sub33.anInt3395; - int width = Class3_Sub28_Sub3.anInt3552; - int height = Class3_Sub28_Sub1.anInt3537; - int contextMenuColor = 6116423; //Context Menu RGB || 6116423 Classic || Old var5 || ColorCore.getHexColors() - Toolkit.getActiveToolkit().fillRect(1 + x, y + 18, width + -2, -19 + height, GameConfig.RCM_BG_COLOR, GameConfig.RCM_BG_OPACITY); - if (GameConfig.RS3_CONTEXT_STYLE) { - Toolkit.getActiveToolkit().fillRect(1 + x, 2 + y, width + -2, 16, GameConfig.RCM_TITLE_COLOR, GameConfig.RCM_TITLE_OPACITY); - Toolkit.getActiveToolkit().drawRect(1 + x, 1 + y, width + -2, height, GameConfig.RCM_BORDER_COLOR, GameConfig.RCM_BORDER_OPACITY); - } else { - Toolkit.getActiveToolkit().fillRect(1 + x, 2 + y, width + -2, 16, GameConfig.RCM_TITLE_COLOR, GameConfig.RCM_TITLE_OPACITY); - Toolkit.getActiveToolkit().drawRect(1 + x, y + 18, width + -2, -19 + height, GameConfig.RCM_BORDER_COLOR, GameConfig.RCM_BORDER_OPACITY); - } - - Class168.bold.method681(RSString.parse(GameConfig.RCM_TITLE), x - -3, y + 14, contextMenuColor, -1); - int var7 = Unsorted.anInt1709; - int var6 = Class126.anInt1676; - - for (int var8 = 0; var8 < Unsorted.menuOptionCount; ++var8) { - int var9 = (-var8 + -1 + Unsorted.menuOptionCount) * 15 + y - -31; - int var10 = 16777215; - if (var6 > x && x - -width > var6 && -13 + var9 < var7 && 3 + var9 > var7) { - var10 = 16776960; - } - - Class168.bold.method681(Unsorted.method802(var8), x - -3, var9, var10, 0); - } - - Unsorted.method1282(AbstractIndexedSprite.anInt1462, (byte) 107, Class3_Sub13_Sub33.anInt3395, Class3_Sub28_Sub1.anInt3537, Class3_Sub28_Sub3.anInt3552); - } catch (RuntimeException var11) { - throw ClientErrorException.clientError(var11, "lf.A(" + -117 + ')'); - } - } - - static void method1420(int var0, int var1, int var2, int var3, byte var4) { + static void method1420(int var0, int var1, int var2, int var3) { try { InterfaceWidget var5 = InterfaceWidget.getWidget(10, var0); var5.flagUpdate(); var5.anInt3597 = var2; var5.anInt3598 = var3; var5.anInt3596 = var1; - if (var4 >= -35) { - Unsorted.anInt1165 = 86; - } } catch (RuntimeException var6) { - throw ClientErrorException.clientError(var6, "lf.C(" + var0 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ')'); + throw ClientErrorException.clientError(var6, "lf.C(" + var0 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + (byte) -85 + ')'); } } static int method1421() { try { - return ((Class3_Sub13_Sub15.aBoolean3184 ? 1 : 0) << 19) + (((Class38.aBoolean661 ? 1 : 0) << 16) + ((!Class128.aBoolean1685 ? 0 : 1) << 15) + ((!Class106.aBoolean1441 ? 0 : 1) << 13) + ((Class140_Sub6.aBoolean2910 ? 1 : 0) << 10) + ((Class3_Sub13_Sub22.aBoolean3275 ? 1 : 0) << 9) + ((RSInterface.aBoolean236 ? 1 : 0) << 7) + ((!Class25.aBoolean488 ? 0 : 1) << 6) + ((KeyboardListener.aBoolean1905 ? 1 : 0) << 5) + (((!Unsorted.aBoolean3665 ? 0 : 1) << 3) + (Unsorted.anInt3625 & 7) - (-((!Unsorted.aBoolean3604 ? 0 : 1) << 4) + -((WorldListEntry.aBoolean2623 ? 1 : 0) << 8)) - (-(Unsorted.anInt1137 << 11 & 6144) + -((CS2Script.anInt2453 == 0 ? 0 : 1) << 20) - (((Unsorted.anInt120 != 0 ? 1 : 0) << 21) + ((Sprites.anInt340 == 0 ? 0 : 1) << 22)))) - -(Class127_Sub1.method1757() << 23)); + return ((TextureOperation17.aBoolean3184 ? 1 : 0) << 19) + (((Class38.aBoolean661 ? 1 : 0) << 16) + ((!Class128.aBoolean1685 ? 0 : 1) << 15) + ((!Class106.aBoolean1441 ? 0 : 1) << 13) + ((Class140_Sub6.aBoolean2910 ? 1 : 0) << 10) + ((TextureOperation0.aBoolean3275 ? 1 : 0) << 9) + ((RSInterface.aBoolean236 ? 1 : 0) << 7) + ((!Class25.aBoolean488 ? 0 : 1) << 6) + ((KeyboardListener.aBoolean1905 ? 1 : 0) << 5) + (((!Unsorted.aBoolean3665 ? 0 : 1) << 3) + (Unsorted.anInt3625 & 7) - (-((!Unsorted.aBoolean3604 ? 0 : 1) << 4) + -((WorldListEntry.aBoolean2623 ? 1 : 0) << 8)) - (-(Unsorted.anInt1137 << 11 & 6144) + -((CS2Script.anInt2453 == 0 ? 0 : 1) << 20) - (((Unsorted.anInt120 != 0 ? 1 : 0) << 21) + ((Sprites.anInt340 == 0 ? 0 : 1) << 22)))) - -(Class127_Sub1.method1757() << 23)); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "lf.F(" + -2 + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class85.java b/Client/src/main/java/org/runite/client/Class85.java index c28630e15..f5bfe3c25 100644 --- a/Client/src/main/java/org/runite/client/Class85.java +++ b/Client/src/main/java/org/runite/client/Class85.java @@ -11,7 +11,7 @@ final class Class85 { try { byte[] var4 = var2.method1568(); var1.method768(var4.length); - var1.index += Class3_Sub13_Sub9.aClass36_3112.method1015(var4.length, var1.buffer, var4, 0, var1.index); + var1.index += TextureOperation16.aClass36_3112.method1015(var4.length, var1.buffer, var4, 0, var1.index); } catch (RuntimeException var5) { throw ClientErrorException.clientError(var5, "lg.A(" + false + ',' + (var1 != null ? "{...}" : "null") + ',' + (var2 != null ? "{...}" : "null") + ')'); } @@ -20,17 +20,17 @@ final class Class85 { static AbstractIndexedSprite[] method1424(CacheIndex var0, int var3) { try { - return Class75_Sub4.method1351(var0, 0, var3) ? Class3_Sub13_Sub36.method343() : null; + return Class75_Sub4.method1351(var0, 0, var3) ? TextureOperation36.method343() : null; } catch (RuntimeException var5) { throw ClientErrorException.clientError(var5, "lg.C(" + (var0 != null ? "{...}" : "null") + ',' + (byte) -12 + ',' + 0 + ',' + var3 + ')'); } } static void method1425(int var0) { - Class3_Sub13_Sub35.anInt3419 = var0; + TextureOperation22.anInt3419 = var0; for (int var1 = 0; var1 < Unsorted.anInt1234; ++var1) { - for (int var2 = 0; var2 < Class3_Sub13_Sub15.anInt3179; ++var2) { + for (int var2 = 0; var2 < TextureOperation17.anInt3179; ++var2) { if (Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var0][var1][var2] == null) { Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var0][var1][var2] = new Class3_Sub2(var0, var1, var2); } diff --git a/Client/src/main/java/org/runite/client/Class91.java b/Client/src/main/java/org/runite/client/Class91.java index 7eab35dd0..e98f491d9 100644 --- a/Client/src/main/java/org/runite/client/Class91.java +++ b/Client/src/main/java/org/runite/client/Class91.java @@ -27,36 +27,9 @@ final class Class91 { } } - static void drawCompass(int var0, int var1, RSInterface var2, int var3) { - try { - if (HDToolKit.highDetail) { - Class22.setClipping(var0, var1, var2.width + var0, var2.height + var1); - } - - if (Class161.anInt2028 >= 3) { - if (HDToolKit.highDetail) { - AbstractSprite var5 = var2.method866(false); - if (null != var5) { - var5.drawAt(var0, var1); - } - } else { - Class74.method1332(var0, var1, var2.anIntArray207, var2.anIntArray291); - } - } 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); - } - - Class163_Sub1_Sub1.aBooleanArray4008[var3] = true; - } catch (RuntimeException var6) { - throw ClientErrorException.clientError(var6, "mj.K(" + var0 + ',' + var1 + ',' + (var2 != null ? "{...}" : "null") + ',' + var3 + ',' + (byte) 59 + ')'); - } - } - static boolean method1495(int var0, int var1, int var2, int var3, int var4) { - int var5 = var3 * Class3_Sub13_Sub34.anInt3417 + var0 * Class145.anInt3153 >> 16; - int var6 = var3 * Class145.anInt3153 - var0 * Class3_Sub13_Sub34.anInt3417 >> 16; + int var5 = var3 * TextureOperation25.anInt3417 + var0 * Class145.anInt3153 >> 16; + int var6 = var3 * Class145.anInt3153 - var0 * TextureOperation25.anInt3417 >> 16; int var7 = var1 * Class60.anInt936 + var6 * Unsorted.anInt1037 >> 16; int var8 = var1 * Unsorted.anInt1037 - var6 * Class60.anInt936 >> 16; if (var7 < 1) { @@ -182,7 +155,7 @@ final class Class91 { if (var1 == 1) { this.method1501((byte) 40, var4, var6, 2048); - this.method1501((byte) 88, 1 + var4, var6 - -1, '\u8000'); + this.method1501((byte) 88, 1 + var4, var6 - -1, 32768); } if (var1 == 2) { @@ -191,7 +164,7 @@ final class Class91 { } if (var1 == 3) { - this.method1501((byte) 90, var4, var6, '\u8000'); + this.method1501((byte) 90, var4, var6, 32768); this.method1501((byte) 47, var4 + -1, var6 + -1, 2048); } } @@ -333,7 +306,7 @@ final class Class91 { if (var1 == 1) { this.method1490(2048, var6, var5); - this.method1490('\u8000', 1 + var6, var5 + 1); + this.method1490(32768, 1 + var6, var5 + 1); } if (var1 == 2) { @@ -342,7 +315,7 @@ final class Class91 { } if (3 == var1) { - this.method1490('\u8000', var6, var5); + this.method1490(32768, var6, var5); this.method1490(2048, -1 + var6, var5 - 1); } } @@ -720,7 +693,7 @@ final class Class91 { private void method1490(int var1, int var3, int var4) { try { - this.anIntArrayArray1304[var3][var4] = Class3_Sub13_Sub29.bitwiseOr(this.anIntArrayArray1304[var3][var4], var1); + this.anIntArrayArray1304[var3][var4] = TextureOperation3.bitwiseOr(this.anIntArrayArray1304[var3][var4], var1); } catch (RuntimeException var6) { throw ClientErrorException.clientError(var6, "mj.J(" + var1 + ',' + (byte) -80 + ',' + var3 + ',' + var4 + ')'); } @@ -967,7 +940,7 @@ final class Class91 { try { var1 -= this.anInt1306; var3 -= this.anInt1309; - this.anIntArrayArray1304[var3][var1] = Class3_Sub13_Sub29.bitwiseOr(this.anIntArrayArray1304[var3][var1], 2097152); + this.anIntArrayArray1304[var3][var1] = TextureOperation3.bitwiseOr(this.anIntArrayArray1304[var3][var1], 2097152); } catch (RuntimeException var5) { throw ClientErrorException.clientError(var5, "mj.E(" + var1 + ',' + 7605 + ',' + var3 + ')'); } @@ -1034,7 +1007,7 @@ final class Class91 { int var8; int var9; if (var7 >= var6) { - var9 = '\u8000'; + var9 = 32768; var8 = 65536 * var6 / var7; while (var3 != var2) { @@ -1074,7 +1047,7 @@ final class Class91 { } } else { var8 = 65536 * var7 / var6; - var9 = '\u8000'; + var9 = 32768; while (var5 != var4) { if (var4 <= var5) { @@ -1167,7 +1140,7 @@ final class Class91 { try { var2 -= this.anInt1306; var1 -= this.anInt1309; - this.anIntArrayArray1304[var1][var2] = Class3_Sub13_Sub29.bitwiseOr(this.anIntArrayArray1304[var1][var2], 262144); + this.anIntArrayArray1304[var1][var2] = TextureOperation3.bitwiseOr(this.anIntArrayArray1304[var1][var2], 262144); } catch (RuntimeException var5) { throw ClientErrorException.clientError(var5, "mj.C(" + var1 + ',' + var2 + ',' + -5 + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class95.java b/Client/src/main/java/org/runite/client/Class95.java index a11ddda09..9e897cec3 100644 --- a/Client/src/main/java/org/runite/client/Class95.java +++ b/Client/src/main/java/org/runite/client/Class95.java @@ -12,7 +12,7 @@ public final class Class95 { try { if (var1 == var0 && var2 == var9 && var8 == var7 && var5 == var6) { - Class3_Sub13_Sub34.method330(var4, 3 + -111, var5, var0, var9, var7); + TextureOperation25.method330(var4, 3 + -111, var5, var0, var9, var7); } else { int var10 = var0; int var13 = 3 * var9; @@ -40,7 +40,7 @@ public final class Class95 { int var33 = var0 - -(var29 + (var27 - -var31) >> 12); int var32 = var24 * var23; int var34 = var9 - -(var32 + var28 - -var30 >> 12); - Class3_Sub13_Sub34.method330(var4, -88, var34, var10, var11, var33); + TextureOperation25.method330(var4, -88, var34, var10, var11, var33); var10 = var33; var11 = var34; } diff --git a/Client/src/main/java/org/runite/client/Class96.java b/Client/src/main/java/org/runite/client/Class96.java index 9fb8d849a..05a9b5a0d 100644 --- a/Client/src/main/java/org/runite/client/Class96.java +++ b/Client/src/main/java/org/runite/client/Class96.java @@ -1,17 +1,17 @@ package org.runite.client; -final class Class96 { +public final class Class96 { static int anInt1358 = 0; - int anInt1346; - int anInt1347; - int anInt1350; - int anInt1351; - int anInt1353; - int anInt1355 = -1; - int anInt1356; - int anInt1359; - int anInt1360; + public int anInt1346; + public int anInt1347; + public int anInt1350; + public int anInt1351; + public int anInt1353; + public int anInt1355 = -1; + public int anInt1356; + public int anInt1359; + public int anInt1360; static void method1587(DataBuffer var1) { try { @@ -29,7 +29,7 @@ final class Class96 { int var7 = var1.readUnsignedByte(); int var8 = var1.readUnsignedByte(); - int var9 = -Class3_Sub13_Sub21.anInt3256 + 64 * var7; + int var9 = -TextureOperation37.anInt3256 + 64 * var7; int var10 = -(var8 * 64) - (-Unsorted.anInt65 - -1) + Class108.anInt1460; int var11; int var12; diff --git a/Client/src/main/java/org/runite/client/Class97.java b/Client/src/main/java/org/runite/client/Class97.java index 73e6b8be0..25e91688c 100644 --- a/Client/src/main/java/org/runite/client/Class97.java +++ b/Client/src/main/java/org/runite/client/Class97.java @@ -18,7 +18,7 @@ public final class Class97 { for (int var1 = 0; var1 < 256; ++var1) { for (int var2 = 0; var2 <= var1; ++var2) { - aByteArray1364[var0++] = (byte) ((int) (255.0D / Math.sqrt((float) ('\uffff' + var2 * var2 + var1 * var1) / 65535.0F))); + aByteArray1364[var0++] = (byte) ((int) (255.0D / Math.sqrt((float) (65535 + var2 * var2 + var1 * var1) / 65535.0F))); } } diff --git a/Client/src/main/java/org/runite/client/Client.java b/Client/src/main/java/org/runite/client/Client.java index f8e1019fd..29075f61c 100644 --- a/Client/src/main/java/org/runite/client/Client.java +++ b/Client/src/main/java/org/runite/client/Client.java @@ -10,6 +10,7 @@ import org.rs09.client.data.HashTable; import org.rs09.client.filestore.resources.configs.enums.EnumDefinitionProvider; import org.rs09.client.filestore.resources.configs.structs.StructDefinitionProvider; import org.rs09.client.net.Connection; +import org.runite.client.drawcalls.LoadingBox; import java.awt.*; import java.io.IOException; @@ -65,8 +66,8 @@ public final class Client extends GameShell { static void method1175(int var0) { try { - Class3_Sub13_Sub30.anInt3362 = -1; - Class82.anInt1150 = -1; + TextureOperation13.anInt3362 = -1; + Texture.anInt1150 = -1; Class3_Sub28_Sub1.anInt3536 = var0; Class3_Sub5.method117(); @@ -137,13 +138,13 @@ public final class Client extends GameShell { switch (args[1]) { case "live": - Class3_Sub13_Sub13.paramModeWhat = 0; + TextureOperation20.paramModeWhat = 0; break; case "rc": - Class3_Sub13_Sub13.paramModeWhat = 1; + TextureOperation20.paramModeWhat = 1; break; case "wip": - Class3_Sub13_Sub13.paramModeWhat = 2; + TextureOperation20.paramModeWhat = 2; break; default: invalidArgument("modewhat"); @@ -157,7 +158,7 @@ public final class Client extends GameShell { /* Accepts en, de, fr, pt */ - language = Class3_Sub13_Sub16.compareEnteredLanguageArgument(Class3_Sub13_Sub3.bufferToString(languageSelection, languageSelection.length, 0)); + language = TextureOperation15.compareEnteredLanguageArgument(TextureOperation33.bufferToString(languageSelection, languageSelection.length, 0)); } catch (Exception ignored) { } @@ -283,7 +284,7 @@ public final class Client extends GameShell { var26 = Class126.anInt1676 >= var12 && Unsorted.anInt1709 >= var13 && Class126.anInt1676 < var14 && Unsorted.anInt1709 < var15; boolean var25 = false; - if (Class3_Sub13_Sub5.anInt3069 == 1 && var26) { + if (TextureOperation21.anInt3069 == 1 && var26) { var25 = true; } @@ -328,7 +329,7 @@ public final class Client extends GameShell { } if (inter == PacketParser.aClass11_88) { Class85.aBoolean1167 = true; - Class3_Sub13_Sub13.anInt3156 = var10; + TextureOperation20.anInt3156 = var10; Class134.anInt1761 = var11; } @@ -373,10 +374,10 @@ public final class Client extends GameShell { var29 = (int) ((double) (Class38_Sub1.anInt2614 - var11 - inter.height / 2) * 2.0D / (double) Class44.aFloat727); var21 = Class3_Sub28_Sub1.anInt3536 + var19; int var32 = Class3_Sub4.anInt2251 + var29; - int var23 = var21 + Class3_Sub13_Sub21.anInt3256; + int var23 = var21 + TextureOperation37.anInt3256; int var24 = Class108.anInt1460 - 1 - var32 + Unsorted.anInt65; Class30.method979(var23, var24, 0); - Class3_Sub13_Sub19.method264((byte) 126); + TextureOperation4.method264((byte) 126); continue; } @@ -395,7 +396,7 @@ public final class Client extends GameShell { if (Class3_Sub19.anInt2475 == 2) { method1175(Unsorted.anInt4073 + (int) ((double) (Unsorted.anInt1881 - Class126.anInt1676) * 2.0D / (double) NPC.aFloat3979)); - Class3_Sub13_Sub39.method354(Class38.anInt660 + (int) ((double) (Class95.anInt1336 - Unsorted.anInt1709) * 2.0D / (double) NPC.aFloat3979)); + TextureOperation8.method354(Class38.anInt660 + (int) ((double) (Class95.anInt1336 - Unsorted.anInt1709) * 2.0D / (double) NPC.aFloat3979)); } continue; } @@ -406,7 +407,7 @@ public final class Client extends GameShell { if (inter.anInt189 == 1401) { if (var25) { - Class3_Sub13_Sub17.method253(inter.width, Unsorted.anInt1709 - var11, Class126.anInt1676 - var10, inter.height); + TextureOperation23.method253(inter.width, Unsorted.anInt1709 - var11, Class126.anInt1676 - var10, inter.height); } continue; } @@ -719,7 +720,7 @@ public final class Client extends GameShell { handleItemSwitch(inter.aClass11Array262, inter.componentHash, var12, var13, var14, var15, var10 - inter.anInt247, var11 - inter.anInt208); } - Class3_Sub31 var28 = Class3_Sub13_Sub17.aHashTable_3208.get(inter.componentHash); + Class3_Sub31 var28 = TextureOperation23.aHashTable_3208.get(inter.componentHash); if (var28 != null) { GraphicDefinition.method967(var10, var13, var11, var14, var28.anInt2602, var12, var15); } @@ -758,7 +759,7 @@ public final class Client extends GameShell { int var4; int var5; - if (null == Class3_Sub13_Sub10.aFrame3121) { + if (null == TextureOperation30.aFrame3121) { Object var3; if (GameShell.frame == null) { var3 = Class38.signlink.gameApplet; @@ -786,14 +787,14 @@ public final class Client extends GameShell { } } - if (Class3_Sub13_Sub10.aFrame3121 != null && !Class3_Sub13_Sub6.aBoolean3078 && (30 == Class143.gameStage || 10 == Class143.gameStage)) { + if (TextureOperation30.aFrame3121 != null && !TextureOperation26.aBoolean3078 && (30 == Class143.gameStage || 10 == Class143.gameStage)) { GameObject.graphicsSettings(false, Unsorted.anInt2577, -1, -1); } boolean var10 = false; - if (Class3_Sub13_Sub10.aBoolean3116) { + if (TextureOperation30.aBoolean3116) { var10 = true; - Class3_Sub13_Sub10.aBoolean3116 = false; + TextureOperation30.aBoolean3116 = false; } if (var10) { @@ -812,14 +813,14 @@ public final class Client extends GameShell { } Class3_Sub28_Sub1.updateLoadingBar(null, var10, Class3_Sub17.aClass94_2464, LoadingStageNumber); } else if (5 == Class143.gameStage) { - Class3_Sub23.method406((byte) 117, false, Class168.bold); + Class3_Sub23.method406((byte) 117, false, FontType.bold); } else if (Class143.gameStage == 10) { Class3_Sub17.method381(true); } else if (25 != Class143.gameStage && Class143.gameStage != 28) { if (Class143.gameStage == 30) { Class49.method1127(0); } else if (40 == Class143.gameStage) { - TextureOperation.method164(false, RSString.stringCombiner(new RSString[]{TextCore.ConxLost, TextCore.aClass94_2598, TextCore.AttemptingReestablish})); + LoadingBox.draw(false, RSString.stringCombiner(new RSString[]{TextCore.ConxLost, TextCore.aClass94_2598, TextCore.AttemptingReestablish})); } } else if (Class163_Sub2_Sub1.anInt4019 == 1) { if (Class40.anInt3293 > LinkableRSString.anInt2579) { @@ -827,16 +828,16 @@ public final class Client extends GameShell { } var4 = 50 * (LinkableRSString.anInt2579 + -Class40.anInt3293) / LinkableRSString.anInt2579; - TextureOperation.method164(false, RSString.stringCombiner(new RSString[]{TextCore.LoadingPleaseWait2, TextCore.aClass94_3399, RSString.stringAnimator(var4), TextCore.aClass94_148})); + LoadingBox.draw(false, RSString.stringCombiner(new RSString[]{TextCore.LoadingPleaseWait2, TextCore.aClass94_3399, RSString.stringAnimator(var4), TextCore.aClass94_148})); } else if (Class163_Sub2_Sub1.anInt4019 == 2) { if (anInt2275 < Class162.anInt2038) { anInt2275 = Class162.anInt2038; } var4 = (-Class162.anInt2038 + anInt2275) * 50 / anInt2275 + 50; - TextureOperation.method164(false, RSString.stringCombiner(new RSString[]{TextCore.LoadingPleaseWait2, TextCore.aClass94_3399, RSString.stringAnimator(var4), TextCore.aClass94_148})); + LoadingBox.draw(false, RSString.stringCombiner(new RSString[]{TextCore.LoadingPleaseWait2, TextCore.aClass94_3399, RSString.stringAnimator(var4), TextCore.aClass94_148})); } else { - TextureOperation.method164(false, TextCore.LoadingPleaseWait2); + LoadingBox.draw(false, TextCore.LoadingPleaseWait2); } DeveloperConsole.INSTANCE.preDraw(); @@ -856,7 +857,7 @@ public final class Client extends GameShell { for (var5 = 0; Class3_Sub28_Sub3.anInt3557 > var5; ++var5) { if (Class163_Sub1_Sub1.aBooleanArray4008[var5]) { - Class164_Sub1.aClass158_3009.drawGraphics(Class3_Sub28_Sub18.anIntArray3768[var5], Class155.anIntArray1969[var5], Class140_Sub4.anIntArray2794[var5], var11, Player.anIntArray3954[var5]); + Unsorted.aClass158_3009.drawGraphics(Class3_Sub28_Sub18.anIntArray3768[var5], Class155.anIntArray1969[var5], Class140_Sub4.anIntArray2794[var5], var11, Player.anIntArray3954[var5]); Class163_Sub1_Sub1.aBooleanArray4008[var5] = false; } } @@ -866,7 +867,7 @@ public final class Client extends GameShell { } else if (0 != Class143.gameStage) { try { var11 = GameShell.canvas.getGraphics(); - Class164_Sub1.aClass158_3009.method2179(var11); + Unsorted.aClass158_3009.method2179(var11); for (var5 = 0; var5 < Class3_Sub28_Sub3.anInt3557; ++var5) { Class163_Sub1_Sub1.aBooleanArray4008[var5] = false; @@ -905,20 +906,20 @@ public final class Client extends GameShell { HDToolKit.method1842(); } - if (null != Class3_Sub13_Sub10.aFrame3121) { - Unsorted.method593(Class3_Sub13_Sub10.aFrame3121, Class38.signlink); - Class3_Sub13_Sub10.aFrame3121 = null; + if (null != TextureOperation30.aFrame3121) { + Unsorted.method593(TextureOperation30.aFrame3121, Class38.signlink); + TextureOperation30.aFrame3121 = null; } if (null != Class38.signlink) { Class38.signlink.method1442(this.getClass(), 0); } - if (null != Class3_Sub13_Sub13.aClass67_1443) { - Class3_Sub13_Sub13.aClass67_1443.aBoolean1015 = false; + if (null != TextureOperation20.aClass67_1443) { + TextureOperation20.aClass67_1443.aBoolean1015 = false; } - Class3_Sub13_Sub13.aClass67_1443 = null; + TextureOperation20.aClass67_1443 = null; if (Class3_Sub15.activeConnection != null) { Class3_Sub15.activeConnection.close(); Class3_Sub15.activeConnection = null; @@ -930,7 +931,7 @@ public final class Client extends GameShell { Class38.aClass146_668.method2082(GameShell.canvas); } - Class3_Sub13_Sub1.method167(0); + TextureOperation12.method167(0); MouseListeningClass.method2090(); Class38.aClass146_668 = null; if (null != WorldListEntry.aClass155_2627) { @@ -942,7 +943,7 @@ public final class Client extends GameShell { } Class58.aJs5Worker_917.close(); - Class3_Sub13_Sub14.aCacheResourceWorker_3159.stop(); + TextureOperation31.aCacheResourceWorker_3159.stop(); try { if (Class101.aClass30_1422 != null) { @@ -980,9 +981,9 @@ public final class Client extends GameShell { Class44.paramModeWhere = 0; } - Class3_Sub13_Sub13.paramModeWhat = Integer.parseInt(Objects.requireNonNull(this.getParameter("modewhat"))); - if (Class3_Sub13_Sub13.paramModeWhat < 0 || Class3_Sub13_Sub13.paramModeWhat > 2) { - Class3_Sub13_Sub13.paramModeWhat = 0; + TextureOperation20.paramModeWhat = Integer.parseInt(Objects.requireNonNull(this.getParameter("modewhat"))); + if (TextureOperation20.paramModeWhat < 0 || TextureOperation20.paramModeWhat > 2) { + TextureOperation20.paramModeWhat = 0; } String var1 = this.getParameter("advertsuppressed"); @@ -1032,7 +1033,7 @@ public final class Client extends GameShell { Class106.paramUserUsingInternetExplorer = null != var6 && var6.equals("1"); clientInstance = this; - this.method41(32 - -Class3_Sub13_Sub13.paramModeWhat); + this.method41(32 - -TextureOperation20.paramModeWhat); } catch (RuntimeException var11) { throw ClientErrorException.clientError(var11, "client.init()"); } @@ -1041,9 +1042,9 @@ public final class Client extends GameShell { final void method39() { try { Class119.method1729(); - Class3_Sub13_Sub14.aCacheResourceWorker_3159 = new CacheResourceWorker(); + TextureOperation31.aCacheResourceWorker_3159 = new CacheResourceWorker(); Class58.aJs5Worker_917 = new Js5Worker(); - if (Class3_Sub13_Sub13.paramModeWhat != 0) { + if (TextureOperation20.paramModeWhat != 0) { Class3_Sub6.aByteArrayArray2287 = new byte[50][]; } @@ -1085,7 +1086,7 @@ public final class Client extends GameShell { Class162.anInt2036 = anInt3773; Class38_Sub1.accRegistryIp = GameConfig.IP_MANAGEMENT; Class123.anInt1658 = anInt3773; - Class3_Sub13_Sub38.aShortArray3455 = Class3_Sub13_Sub9.aShortArray3110 = Class136.aShortArray1779 = Class3_Sub13_Sub38.aShortArray3453 = new short[256]; + TextureOperation38.aShortArray3455 = TextureOperation16.aShortArray3110 = Class136.aShortArray1779 = TextureOperation38.aShortArray3453 = new short[256]; Class140_Sub6.accRegistryPort = Class123.anInt1658; if (Signlink.anInt1214 == 3 && 2 != Class44.paramModeWhere) { @@ -1093,7 +1094,7 @@ public final class Client extends GameShell { } KeyboardListener.adjustKeyCodeMap(); - Class3_Sub13_Sub4.method193((byte) 115, GameShell.canvas); + TextureOperation34.method193((byte) 115, GameShell.canvas); ItemDefinition.method1119(GameShell.canvas, false); Class38.aClass146_668 = Class21.method916(); if (null != Class38.aClass146_668) { @@ -1154,7 +1155,7 @@ public final class Client extends GameShell { try { for (Class3_Sub23.anInt2537 = 0; Unsorted.method591(83) && Class3_Sub23.anInt2537 < 128; ++Class3_Sub23.anInt2537) { Class133.inputTextCodeArray[Class3_Sub23.anInt2537] = Class3_Sub28_Sub9.anInt3624; - Class120.anIntArray1638[Class3_Sub23.anInt2537] = Class3_Sub13_Sub27.anInt3342; + Class120.anIntArray1638[Class3_Sub23.anInt2537] = TextureOperation7.anInt3342; } ++Class106.anInt1446; @@ -1209,11 +1210,11 @@ public final class Client extends GameShell { if (Class133.anInt1753 == 2) { CS2Script.method379(); } else { - InterfaceWidget.d('\uffff'); + InterfaceWidget.d(65535); } if (14 > NPC.anInt3995 >> 7 || NPC.anInt3995 >> 7 >= 90 || 14 > Class77.anInt1111 >> 7 || Class77.anInt1111 >> 7 >= 90) { - Class3_Sub13_Sub6.method195(); + TextureOperation26.method195(); } } @@ -1234,11 +1235,11 @@ public final class Client extends GameShell { if (null != Class15.aClass64_351 && Class15.aClass64_351.anInt978 == 1) { if (null != Class15.aClass64_351.anObject974) { - Class99.method1596(Class3_Sub13_Sub24.aClass94_3295, (byte) 126, Unsorted.aBoolean2154); + Class99.method1596(TextureOperation5.aClass94_3295, (byte) 126, Unsorted.aBoolean2154); } Unsorted.aBoolean2154 = false; - Class3_Sub13_Sub24.aClass94_3295 = null; + TextureOperation5.aClass94_3295 = null; Class15.aClass64_351 = null; } @@ -1369,12 +1370,12 @@ public final class Client extends GameShell { var2.writeInt(GameConfig.CLIENT_VERSION); Unsorted.js5Connection.sendBytes(var2.buffer, 9); ++PacketParser.anInt80; - Class3_Sub13_Sub30.aLong3366 = TimeUtils.time(); + TextureOperation13.aLong3366 = TimeUtils.time(); } if (3 == PacketParser.anInt80) { if (Class143.gameStage != 0 && Class143.gameStage != 5 && 0 >= Unsorted.js5Connection.availableBytes()) { - if (TimeUtils.time() + -Class3_Sub13_Sub30.aLong3366 > 30000) { + if (TimeUtils.time() + -TextureOperation13.aLong3366 > 30000) { this.method46(1001); return; } @@ -1407,7 +1408,7 @@ public final class Client extends GameShell { try { if (!Unsorted.aBoolean2146) { while (Unsorted.method591(107)) { - if (Class3_Sub13_Sub27.anInt3342 == 115 || Class3_Sub13_Sub27.anInt3342 == 83) { + if (TextureOperation7.anInt3342 == 115 || TextureOperation7.anInt3342 == 83) { Unsorted.aBoolean2146 = true; } } @@ -1450,7 +1451,7 @@ public final class Client extends GameShell { Class3_Sub17.aClass94_2464 = TextCore.CreatedWorld; } else if (anInt1354 == 30) { if (Unsorted.aClass8_1936 == null) { - Unsorted.aClass8_1936 = new Class8(Class58.aJs5Worker_917, Class3_Sub13_Sub14.aCacheResourceWorker_3159); + Unsorted.aClass8_1936 = new Class8(Class58.aJs5Worker_917, TextureOperation31.aCacheResourceWorker_3159); } if (Unsorted.aClass8_1936.method837()) { @@ -1508,11 +1509,11 @@ public final class Client extends GameShell { Class3_Sub17.aClass94_2464 = TextCore.LoadedUpdateList; Sprites.getSpriteFromArchive(CacheIndex.spritesIndex); Class97.method1593(111, CacheIndex.spritesIndex); - Class3_Sub13_Sub13.method233(28280, CacheIndex.spritesIndex); + TextureOperation20.method233(28280, CacheIndex.spritesIndex); anInt1354 = 45; } } else if (anInt1354 == 45) { - Class140_Sub3.method1959(Class3_Sub13_Sub15.aBoolean3184); + Class140_Sub3.method1959(TextureOperation17.aBoolean3184); aClass3_Sub24_Sub4_1193 = new Class3_Sub24_Sub4(); aClass3_Sub24_Sub4_1193.method479(); WorldListEntry.aClass155_2627 = Class58.method1195(22050, Class38.signlink, GameShell.canvas, 0); @@ -1594,9 +1595,9 @@ public final class Client extends GameShell { Class107.method1648(CacheIndex.clientScriptConfigIndex); LinkableRSString.method731(CacheIndex.configurationsIndex); Unsorted.method89(CacheIndex.fontsIndex, CacheIndex.spritesIndex, CacheIndex.interfacesIndex, CacheIndex.modelsIndex); - Class3_Sub13_Sub17.method250(CacheIndex.configurationsIndex); + TextureOperation23.method250(CacheIndex.configurationsIndex); EnumDefinitionProvider.setIndex(CacheIndex.clientscriptMaskIndex); - Class3_Sub13_Sub8.method205(CacheIndex.quickchatMenusIndex, CacheIndex.quickchatMessagesIndex, new Class7()); + TextureOperation9.method205(CacheIndex.quickchatMenusIndex, CacheIndex.quickchatMessagesIndex, new Class7()); Class65.method1236(CacheIndex.quickchatMenusIndex, CacheIndex.quickchatMessagesIndex); Class58.method1197(CacheIndex.configurationsIndex); Unsorted.method2065(CacheIndex.configurationsIndex, CacheIndex.spritesIndex); @@ -1623,12 +1624,12 @@ public final class Client extends GameShell { } } else if (anInt1354 != 90) { if (anInt1354 == 100) { - if (Class3_Sub13_Sub34.method334(CacheIndex.spritesIndex)) { + if (TextureOperation25.method334(CacheIndex.spritesIndex)) { anInt1354 = 110; } } else if (anInt1354 == 110) { - Class3_Sub13_Sub13.aClass67_1443 = new Class67(); - Class38.signlink.method1451(10, Class3_Sub13_Sub13.aClass67_1443); + TextureOperation20.aClass67_1443 = new Class67(); + Class38.signlink.method1451(10, TextureOperation20.aClass67_1443); Class3_Sub17.aClass94_2464 = TextCore.LoadedInputHandler; LoadingStageNumber = 75; anInt1354 = 120; @@ -1702,7 +1703,7 @@ public final class Client extends GameShell { anInt1354 = 160; Class3_Sub17.aClass94_2464 = TextCore.Started3DLibrary; } else if (anInt1354 == 160) { - Class3_Sub13_Sub11.method219(true); + TextureOperation1.method219(true); } } else if (CacheIndex.huffmanEncodingIndex.method2125(TextCore.emptyJagexString, TextCore.HasHuffman)) { Class36 var9 = new Class36(CacheIndex.huffmanEncodingIndex.method2123(TextCore.emptyJagexString, TextCore.HasHuffman)); @@ -1788,11 +1789,11 @@ public final class Client extends GameShell { if (10 == Class143.gameStage) { this.method47(); - Class3_Sub13_Sub21.method267(); + TextureOperation37.method267(); Class163_Sub1_Sub1.method2216(); LoginHandler.handleLogin(); } else if (Class143.gameStage == 30) { - Class3_Sub13_Sub13.method235(); + TextureOperation20.method235(); } else if (Class143.gameStage == 40) { LoginHandler.handleLogin(); if (messageToDisplay != -3) { diff --git a/Client/src/main/java/org/runite/client/ClientCommands.java b/Client/src/main/java/org/runite/client/ClientCommands.java index 2f574775f..36f45454c 100644 --- a/Client/src/main/java/org/runite/client/ClientCommands.java +++ b/Client/src/main/java/org/runite/client/ClientCommands.java @@ -69,7 +69,7 @@ public class ClientCommands { } if (command.equalsStringIgnoreCase(TextCore.COMMAND_BREAK_CLIENT_CONNECTION)) { - Class3_Sub13_Sub13.breakClientConnection(); + TextureOperation20.breakClientConnection(); } if (command.equalsStringIgnoreCase(TextCore.COMMAND_BREAK_JS5_CLIENT_CONNECTION)) { @@ -192,9 +192,9 @@ public class ClientCommands { if (command.equalsStringIgnoreCase(TextCore.COMMAND_SHIFT_DROP_CLICK)) { shiftClickEnabled = !shiftClickEnabled; } - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(44); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(command.length() + -1); - Class3_Sub13_Sub1.outgoingBuffer.writeString(command.substring(2)); + TextureOperation12.outgoingBuffer.putOpcode(44); + TextureOperation12.outgoingBuffer.writeByte(command.length() + -1); + TextureOperation12.outgoingBuffer.writeString(command.substring(2)); } catch (RuntimeException var5) { throw ClientErrorException.clientError(var5, "k.H(" + (command != null ? "{...}" : "null") + ',' + false + ')'); @@ -216,15 +216,15 @@ public class ClientCommands { Class3_Sub28_Sub4.aReferenceCache_3572.clearSoftReferences();//Originally Class3_Sub30_Sub1.method813(); Class143.aReferenceCache_1874.clearSoftReferences();//Originally Class3_Sub30_Sub1.method813(); Class67.aReferenceCache_1013.clearSoftReferences();//Originally Class3_Sub30_Sub1.method813(); - Class82.aReferenceCache_1146.clearSoftReferences();//Originally Class133.method1803(); + Texture.aReferenceCache_1146.clearSoftReferences();//Originally Class133.method1803(); Class159.aReferenceCache_2016.clearSoftReferences();//Originally Class133.method1803(); Class3_Sub31.aReferenceCache_2604.clearSoftReferences();//Class38.method1025(); Class27.aReferenceCache_511.clearSoftReferences();//Class38.method1025(); CS2Script.aReferenceCache_2450.clearSoftReferences();//Class40.method1044(); Class136.aReferenceCache_1772.clearSoftReferences(); RenderAnimationDefinition.aReferenceCache_1955.clearSoftReferences();//Originally: Class158_Sub1.method2192(); - Class3_Sub13_Sub34.aReferenceCache_3412.clearSoftReferences();//Originally: Class159.method2196(); - Class3_Sub13_Sub31.aReferenceCache_3369.clearSoftReferences();//Originally: Class159.method2196(); + TextureOperation25.aReferenceCache_3412.clearSoftReferences();//Originally: Class159.method2196(); + TextureOperation2.aReferenceCache_3369.clearSoftReferences();//Originally: Class159.method2196(); Class128.aReferenceCache_1683.clearSoftReferences(); Unsorted.aReferenceCache_684.clearSoftReferences(); Class163_Sub1.aReferenceCache_2984.clearSoftReferences(); @@ -235,7 +235,7 @@ public class ClientCommands { Unsorted.aReferenceCache_743.clearSoftReferences();//Class3_Sub28_Sub6.h(); Class61.aReferenceCache_939.clearSoftReferences();//Class107.method1650(); Class158_Sub1.aReferenceCache_2982.clearSoftReferences();//MouseListeningClass.method2089(); - Class3_Sub13_Sub11.aReferenceCache_3130.clearSoftReferences(); + TextureOperation1.aReferenceCache_3130.clearSoftReferences(); Unsorted.aReferenceCache_1135.clearSoftReferences(); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "je.O(" + ')'); diff --git a/Client/src/main/java/org/runite/client/ClientErrorException.java b/Client/src/main/java/org/runite/client/ClientErrorException.java index 9b71e567d..426424577 100644 --- a/Client/src/main/java/org/runite/client/ClientErrorException.java +++ b/Client/src/main/java/org/runite/client/ClientErrorException.java @@ -1,9 +1,9 @@ package org.runite.client; -final class ClientErrorException extends RuntimeException { +public final class ClientErrorException extends RuntimeException { static int[] anIntArray2113 = new int[]{2, 2, 4, 0, 1, 8, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0}; - static Class96[] aClass96Array2114 = new Class96[4]; + public static Class96[] aClass96Array2114 = new Class96[4]; static int anInt2115 = -1; String aString2117; Throwable aThrowable2118; @@ -15,7 +15,7 @@ final class ClientErrorException extends RuntimeException { static void method2285(int var0, int var1, int var2, int var3, int var5) { try { LinkableRSString.anInt2587 = var1; - Class3_Sub13_Sub8.anInt3103 = var5; + TextureOperation9.anInt3103 = var5; Class140_Sub7.anInt2938 = var0; Unsorted.anInt144 = var3; Unsorted.anInt3695 = var2; @@ -37,7 +37,7 @@ final class ClientErrorException extends RuntimeException { } } - static ClientErrorException clientError(Throwable var0, String var1) { + public static ClientErrorException clientError(Throwable var0, String var1) { //var0.printStackTrace(); //var0.printStackTrace(); Uncomment to be spammed when clan chat is used cuz clanchat breaks the text script. ClientErrorException var2; diff --git a/Client/src/main/java/org/runite/client/DataBuffer.java b/Client/src/main/java/org/runite/client/DataBuffer.java index ab67787b1..7d791df36 100644 --- a/Client/src/main/java/org/runite/client/DataBuffer.java +++ b/Client/src/main/java/org/runite/client/DataBuffer.java @@ -25,7 +25,7 @@ public class DataBuffer extends Linkable { public final int readUnsignedShort() { this.index += 2; - return (this.buffer[-2 + this.index] << 8 & 0xff00) + (this.buffer[-1 + this.index] & 255); + return (this.buffer[-2 + this.index] << 8 & 0xff00) + (this.buffer[-1 + this.index] & 0xFF); } public final void writeInt(int value) { @@ -113,7 +113,7 @@ public class DataBuffer extends Linkable { return ((this.buffer[this.index - 4] & 0xff) << 24) + ((this.buffer[this.index - 3] & 0xff) << 16) + ((this.buffer[this.index - 2] & 0xff) << 8) + - (this.buffer[this.index - 1] & 255); + (this.buffer[this.index - 1] & 0xFF); } final byte readSigned128Byte() { @@ -147,14 +147,14 @@ public class DataBuffer extends Linkable { } final int readUnsigned128Byte() { - return 128 - this.buffer[this.index++] & 255; + return 128 - this.buffer[this.index++] & 0xFF; } // TODO final int getTriByte2() { try { this.index += 3; - return ((this.buffer[this.index + -2] & 255) << 8) + ((this.buffer[-1 + this.index] & 255) << 16) + (this.buffer[-3 + this.index] & 255); + return ((this.buffer[this.index + -2] & 0xFF) << 8) + ((this.buffer[-1 + this.index] & 0xFF) << 16) + (this.buffer[-3 + this.index] & 0xFF); } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "wa.BA(" + (byte) -118 + ')'); } @@ -176,7 +176,7 @@ public class DataBuffer extends Linkable { final int readUnsignedShort128() { this.index += 2; return (this.buffer[this.index - 1] - 128 & 0xff) - + ('\uff00' & this.buffer[this.index - 2] << 8); + + (65280 & this.buffer[this.index - 2] << 8); } final void writeIntV2(int value) { @@ -204,7 +204,7 @@ public class DataBuffer extends Linkable { while (Objects.requireNonNull(this.buffer)[this.index++] != 0) { } - return Class3_Sub13_Sub3.bufferToString(this.buffer, this.index - (var3 - -1), var3); + return TextureOperation33.bufferToString(this.buffer, this.index - (var3 - -1), var3); } else { throw new IllegalStateException("Bad version number in gjstr2"); } @@ -240,7 +240,7 @@ public class DataBuffer extends Linkable { final int readUnsignedShortLE() { this.index += 2; return (255 & this.buffer[this.index - 2]) - + ('\uff00' & this.buffer[this.index - 1] << 8); + + (65280 & this.buffer[this.index - 1] << 8); } // TODO Some smart @@ -248,7 +248,7 @@ public class DataBuffer extends Linkable { if (0 <= var2 && var2 < 128) { this.writeByte(var2); } else if (0 <= var2 && var2 < 32768) { - this.writeShort('\u8000' + var2); + this.writeShort(32768 + var2); } else { throw new IllegalArgumentException(); } @@ -357,11 +357,11 @@ public class DataBuffer extends Linkable { while (this.buffer[this.index++] != 0) ; - return Class3_Sub13_Sub3.bufferToString(this.buffer, (this.index - 1) - startIndex, startIndex); + return TextureOperation33.bufferToString(this.buffer, (this.index - 1) - startIndex, startIndex); } final int getSmart() { - int var2 = this.buffer[this.index] & 255; + int var2 = this.buffer[this.index] & 0xFF; return 128 <= var2 ? -32768 + this.readUnsignedShort() : this.readUnsignedByte(); } @@ -373,15 +373,15 @@ public class DataBuffer extends Linkable { final int readIntV1() { this.index += 4; - return ((this.buffer[this.index - 2] & 255) << 24) + - ((this.buffer[this.index - 1] & 255) << 16) + - ('\uff00' & this.buffer[this.index - 4] << 8) + - (this.buffer[this.index + -3] & 255); + return ((this.buffer[this.index - 2] & 0xFF) << 24) + + ((this.buffer[this.index - 1] & 0xFF) << 16) + + (65280 & this.buffer[this.index - 4] << 8) + + (this.buffer[this.index + -3] & 0xFF); } final int readUnsignedShortLE128() { this.index += 2; - return (this.buffer[this.index - 1] << 8 & '\uff00') + + return (this.buffer[this.index - 1] << 8 & 65280) + (255 & this.buffer[this.index - 2] - 128); } @@ -390,7 +390,7 @@ public class DataBuffer extends Linkable { return (255 & this.buffer[-4 + this.index]) + (16711680 & this.buffer[this.index - 2] << 16) + ((255 & this.buffer[this.index + -1]) << 24) + - ((this.buffer[-3 + this.index] & 255) << 8); + ((this.buffer[-3 + this.index] & 0xFF) << 8); } final void putShortA(int var1) { @@ -412,7 +412,7 @@ public class DataBuffer extends Linkable { final int readSignedShort() { this.index += 2; - int value = (this.buffer[-1 + this.index] & 255) + ((255 & this.buffer[this.index + -2]) << 8); + int value = (this.buffer[-1 + this.index] & 0xFF) + ((255 & this.buffer[this.index + -2]) << 8); if (value > 32767) { value -= 65536; } @@ -421,7 +421,7 @@ public class DataBuffer extends Linkable { final int readSignedShortLE128() { this.index += 2; - int var2 = ((this.buffer[this.index - 1] & 255) << 8) + (this.buffer[-2 + this.index] - 128 & 255); + int var2 = ((this.buffer[this.index - 1] & 0xFF) << 8) + (this.buffer[-2 + this.index] - 128 & 0xFF); if (32767 < var2) { var2 -= 65536; @@ -441,7 +441,7 @@ public class DataBuffer extends Linkable { final int readSignedShortLE() { this.index += 2; - int value = (this.buffer[-2 + this.index] & 255) + ('\uff00' & this.buffer[this.index + -1] << 8); + int value = (this.buffer[-2 + this.index] & 0xFF) + (65280 & this.buffer[this.index + -1] << 8); if (value > 32767) { value -= 65536; } @@ -457,8 +457,8 @@ public class DataBuffer extends Linkable { public final int readMedium() { this.index += 3; return (16711680 & this.buffer[this.index + -3] << 16) + - (('\uff00' & this.buffer[-2 + this.index] << 8) + - (this.buffer[this.index + -1] & 255)); + ((65280 & this.buffer[-2 + this.index] << 8) + + (this.buffer[this.index + -1] & 0xFF)); } final void writeShortLE(int value) { @@ -468,15 +468,15 @@ public class DataBuffer extends Linkable { // TODO final int getSmart(int var1) { - int var2 = this.buffer[this.index] & 255; + int var2 = this.buffer[this.index] & 0xFF; return var2 < 128 ? -64 + this.readUnsignedByte() : this.readUnsignedShort() - '\uc000'; } final int readIntV2() { this.index += 4; - return ((this.buffer[this.index + -3] & 255) << 24) + + return ((this.buffer[this.index + -3] & 0xFF) << 24) + (16711680 & this.buffer[this.index + -4] << 16) + - ((this.buffer[this.index + -1] & 255) << 8) + + ((this.buffer[this.index + -1] & 0xFF) << 8) + (255 & this.buffer[this.index + -2]); } @@ -507,7 +507,7 @@ public class DataBuffer extends Linkable { } public final int readUnsignedByte() { - return this.buffer[this.index++] & 255; + return this.buffer[this.index++] & 0xFF; } public final void writeShort(int value) { diff --git a/Client/src/main/java/org/runite/client/Font.java b/Client/src/main/java/org/runite/client/Font.java index a87b7de93..d434defb5 100644 --- a/Client/src/main/java/org/runite/client/Font.java +++ b/Client/src/main/java/org/runite/client/Font.java @@ -238,7 +238,7 @@ public abstract class Font extends Node { abstract void method679(int var1, int var2, int var3, int var4, int var5, int var6, int var7); - final int method680(RSString var1, int var2) { + public final int method680(RSString var1, int var2) { int var3 = this.method691(var1, new int[]{var2}, aClass94Array3753); int var4 = 0; @@ -344,7 +344,7 @@ public abstract class Font extends Node { } } - final int method684(RSString var1, int var2) { + public final int method684(RSString var1, int var2) { return this.method691(var1, new int[]{var2}, aClass94Array3753); } @@ -385,7 +385,7 @@ public abstract class Font extends Node { } private int method687(int var1) { - return this.anIntArray3736[var1 & 255]; + return this.anIntArray3736[var1 & 0xFF]; } final void drawStringRightAnchor(RSString var1, int var2, int var3, int var4, int var5) { @@ -599,7 +599,7 @@ public abstract class Font extends Node { } } - final int method693(RSString var1, int var2, int var3, int var4, int var5, int var6, int var7, int var9, int var10, int var11) { + public final int method693(RSString var1, int var2, int var3, int var4, int var5, int var6, int var7, int var9, int var10, int var11) { if (var1 == null) { return 0; } else { @@ -722,15 +722,15 @@ public abstract class Font extends Node { int var2; if (var1.length == 257) { for (var2 = 0; var2 < this.anIntArray3736.length; ++var2) { - this.anIntArray3736[var2] = var1[var2] & 255; + this.anIntArray3736[var2] = var1[var2] & 0xFF; } - this.anInt3727 = var1[256] & 255; + this.anInt3727 = var1[256] & 0xFF; } else { var2 = 0; for (int var3 = 0; var3 < 256; ++var3) { - this.anIntArray3736[var3] = var1[var2++] & 255; + this.anIntArray3736[var3] = var1[var2++] & 0xFF; } int[] var10 = new int[256]; @@ -738,11 +738,11 @@ public abstract class Font extends Node { int var5; for (var5 = 0; var5 < 256; ++var5) { - var10[var5] = var1[var2++] & 255; + var10[var5] = var1[var2++] & 0xFF; } for (var5 = 0; var5 < 256; ++var5) { - var4[var5] = var1[var2++] & 255; + var4[var5] = var1[var2++] & 0xFF; } byte[][] var12 = new byte[256][]; diff --git a/Client/src/main/java/org/runite/client/FontType.java b/Client/src/main/java/org/runite/client/FontType.java new file mode 100644 index 000000000..21f395e69 --- /dev/null +++ b/Client/src/main/java/org/runite/client/FontType.java @@ -0,0 +1,9 @@ +package org.runite.client; + +public final class FontType { + + public static Font plainFont; + public static Font bold; + public static Font smallFont; + +} diff --git a/Client/src/main/java/org/runite/client/GameObject.java b/Client/src/main/java/org/runite/client/GameObject.java index 4ae5c67e6..4230436fe 100644 --- a/Client/src/main/java/org/runite/client/GameObject.java +++ b/Client/src/main/java/org/runite/client/GameObject.java @@ -74,10 +74,10 @@ abstract class GameObject { LinkableRSString.aClass153_2581 = var4; Class97.aClass153_1370 = var2; int var5 = Class97.aClass153_1370.method2121() - 1; - Class3_Sub13_Sub23.itemDefinitionSize = Class97.aClass153_1370.getFileAmount(var5) + var5 * 256; + TextureOperation39.itemDefinitionSize = Class97.aClass153_1370.getFileAmount(var5) + var5 * 256; ClientErrorException.aClass94Array2119 = new RSString[]{null, null, null, null, TextCore.HasDrop}; Unsorted.aClass94Array2596 = new RSString[]{null, null, TextCore.HasTake, null, null}; - Class3_Sub13_Sub37.aClass3_Sub28_Sub17_Sub1_3440 = var3; + TextureOperation10.aClass3_Sub28_Sub17_Sub1_3440 = var3; } catch (RuntimeException var7) { throw ClientErrorException.clientError(var7, "th.FC(" + true + ',' + (byte) -126 + ',' + (var2 != null ? "{...}" : "null") + ',' + (var3 != null ? "{...}" : "null") + ',' + (var4 != null ? "{...}" : "null") + ')'); } @@ -89,11 +89,11 @@ abstract class GameObject { int var7 = var4 + -var5; if (var7 == 0) { if (var6 != 0) { - Class3_Sub13_Sub16.method244(var3, var5, var2, var1); + TextureOperation15.method244(var3, var5, var2, var1); } } else if (0 == var6) { - Class3_Sub13_Sub32.method320(var1, var3, var4, (byte) -107, var5); + TextureOperation14.method320(var1, var3, var4, (byte) -107, var5); } else { if (0 > var6) { var6 = -var6; diff --git a/Client/src/main/java/org/runite/client/GameShell.java b/Client/src/main/java/org/runite/client/GameShell.java index 45677015a..c1dd334bc 100644 --- a/Client/src/main/java/org/runite/client/GameShell.java +++ b/Client/src/main/java/org/runite/client/GameShell.java @@ -37,7 +37,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Class3_Sub21.aClass155_2491.method2163(); } - Class140_Sub3.method1959(Class3_Sub13_Sub15.aBoolean3184); + Class140_Sub3.method1959(TextureOperation17.aBoolean3184); WorldListEntry.aClass155_2627 = Class58.method1195(22050, Class38.signlink, canvas, 0); WorldListEntry.aClass155_2627.method2154(114, Client.aClass3_Sub24_Sub4_1193); Class3_Sub21.aClass155_2491 = Class58.method1195(2048, Class38.signlink, canvas, 1); @@ -50,8 +50,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public static void provideSignlink(Signlink var0) { try { Class38.signlink = var0; - Class3_Sub13_Sub10.aClass87_3125 = var0; - Class3_Sub13_Sub1.method445(); + TextureOperation30.aClass87_3125 = var0; + TextureOperation12.method445(); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "rc.providesignlink(" + (var0 != null ? "{...}" : "null") + ')'); } @@ -97,7 +97,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final void focusGained(FocusEvent var1) { try { hasWindowFocus = true; - Class3_Sub13_Sub10.aBoolean3116 = true; + TextureOperation30.aBoolean3116 = true; } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "rc.focusGained(" + (var1 != null ? "{...}" : "null") + ')'); } @@ -114,8 +114,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } Container var2; - if (Class3_Sub13_Sub10.aFrame3121 != null) { - var2 = Class3_Sub13_Sub10.aFrame3121; + if (TextureOperation30.aFrame3121 != null) { + var2 = TextureOperation30.aFrame3121; } else if (null == frame) { var2 = Class38.signlink.gameApplet; } else { @@ -137,8 +137,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene canvas.addFocusListener(this); canvas.requestFocus(); hasWindowFocus = true; - Class3_Sub13_Sub10.aBoolean3116 = true; - Class3_Sub13_Sub6.aBoolean3078 = true; + TextureOperation30.aBoolean3116 = true; + TextureOperation26.aBoolean3078 = true; Class3_Sub28_Sub5.forceReplaceCanvasEnable = false; SequenceDefinition.aLong1847 = TimeUtils.time(); ClientCommands.tweeningEnabled = true; @@ -152,7 +152,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene if (this == LinkableRSString.anApplet_Sub1_2588 && !Class29.aBoolean554) { aLong2313 = TimeUtils.time(); TimeUtils.sleep(5000L); - Class3_Sub13_Sub10.aClass87_3125 = null; + TextureOperation30.aClass87_3125 = null; this.method35(false); } } catch (RuntimeException var2) { @@ -195,7 +195,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final synchronized void paint(Graphics g) { if (LinkableRSString.anApplet_Sub1_2588 == this && !Class29.aBoolean554) { - Class3_Sub13_Sub10.aBoolean3116 = true; + TextureOperation30.aBoolean3116 = true; if (aBoolean1784 && !HDToolKit.highDetail && -SequenceDefinition.aLong1847 + TimeUtils.time() > 1000) { Rectangle var2 = g.getClipBounds(); @@ -269,7 +269,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Unsorted.anInt1953 = 31 & Unsorted.anInt1953 - -1; synchronized (this) { - Class3_Sub13_Sub6.aBoolean3078 = hasWindowFocus; + TextureOperation26.aBoolean3078 = hasWindowFocus; } this.method25(); @@ -291,12 +291,12 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene SequenceDefinition.anInt1862 = (32000 + (var6 >> 1)) / var6; } - if (50 < Class3_Sub13_Sub25.anInt3313++) { - Class3_Sub13_Sub10.aBoolean3116 = true; - Class3_Sub13_Sub25.anInt3313 -= 50; + if (50 < TextureOperation28.anInt3313++) { + TextureOperation30.aBoolean3116 = true; + TextureOperation28.anInt3313 -= 50; canvas.setSize(Class23.canvasWidth, Class140_Sub7.canvasHeight); canvas.setVisible(true); - if (frame != null && null == Class3_Sub13_Sub10.aFrame3121) { + if (frame != null && null == TextureOperation30.aFrame3121) { Insets var8 = frame.getInsets(); canvas.setLocation(var8.left + Class84.anInt1164, Class106.anInt1442 + var8.top); } else { @@ -370,7 +370,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene getMaxMemory(); this.addCanvas(); - Class164_Sub1.aClass158_3009 = Class3_Sub13_Sub23_Sub1.method285(Class140_Sub7.canvasHeight, Class23.canvasWidth, canvas); + Unsorted.aClass158_3009 = TextureOperation18.method285(Class140_Sub7.canvasHeight, Class23.canvasWidth, canvas); this.method39(); Class3_Sub25.aClass129_2552 = Class36.method1012(); @@ -436,7 +436,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene frame.toFront(); Insets var9 = frame.getInsets(); frame.setSize(var9.left + Unsorted.anInt2334 + var9.right, var9.top + Class70.anInt1047 + var9.bottom); - Class3_Sub13_Sub10.aClass87_3125 = Class38.signlink = new Signlink(null, 32 - -Class3_Sub13_Sub13.paramModeWhat, "runescape", 29); + TextureOperation30.aClass87_3125 = Class38.signlink = new Signlink(null, 32 - -TextureOperation20.paramModeWhat, "runescape", 29); Class64 var10 = Class38.signlink.method1451(1, this); while (0 == Objects.requireNonNull(var10).anInt978) { @@ -491,7 +491,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene InterfaceWidget.aBoolean3594 = var6 != null && var6.equals("1"); if (null == Class38.signlink) { - Class3_Sub13_Sub10.aClass87_3125 = Class38.signlink = new Signlink(this, var3, null, 0); + TextureOperation30.aClass87_3125 = Class38.signlink = new Signlink(this, var3, null, 0); } Class64 var7 = Class38.signlink.method1451(1, this); diff --git a/Client/src/main/java/org/runite/client/GraphicDefinition.java b/Client/src/main/java/org/runite/client/GraphicDefinition.java index 89474cb5b..56cb06b48 100644 --- a/Client/src/main/java/org/runite/client/GraphicDefinition.java +++ b/Client/src/main/java/org/runite/client/GraphicDefinition.java @@ -4,7 +4,7 @@ public final class GraphicDefinition { static int anInt529; private int anInt530 = 128; - static int CAMERA_DIRECTION = 0; + public static int CAMERA_DIRECTION = 0; public static Class3_Sub30_Sub1 incomingBuffer = new Class3_Sub30_Sub1(); private short[] aShortArray533; private short[] aShortArray534; @@ -26,7 +26,7 @@ public final class GraphicDefinition { try { GraphicDefinition def = (GraphicDefinition) Class3_Sub31.aReferenceCache_2604.get(graphicId); if (def == null) { - byte[] var3 = Class3_Sub13_Sub18.aClass153_3214.getFile(Unsorted.method64(graphicId), Class75.method1338(graphicId, var0 ^ 7)); + byte[] var3 = TextureOperation19.aClass153_3214.getFile(Unsorted.method64(graphicId), Class75.method1338(graphicId, var0 ^ 7)); def = new GraphicDefinition(); def.graphicId = graphicId; if (var0 != 42) { diff --git a/Client/src/main/java/org/runite/client/HDSprite.java b/Client/src/main/java/org/runite/client/HDSprite.java index a340f426a..d63a521fb 100644 --- a/Client/src/main/java/org/runite/client/HDSprite.java +++ b/Client/src/main/java/org/runite/client/HDSprite.java @@ -125,7 +125,7 @@ public class HDSprite extends AbstractSprite { var6.glEnd(); } - final void drawMinimapRegion(int x, int y, int width, int height, int playerRelativeX, int playerRelativeY, int regionRotation, int zoom, HDSprite var9) { + public final void drawMinimapRegion(int x, int y, int width, int height, int playerRelativeX, int playerRelativeY, int regionRotation, int zoom, HDSprite var9) { if (var9 != null) { HDToolKit.method1822(); HDToolKit.bindTexture2D(var9.anInt4077); diff --git a/Client/src/main/java/org/runite/client/HDToolKit.java b/Client/src/main/java/org/runite/client/HDToolKit.java index cd7ce2ebc..ac04ded86 100644 --- a/Client/src/main/java/org/runite/client/HDToolKit.java +++ b/Client/src/main/java/org/runite/client/HDToolKit.java @@ -51,7 +51,7 @@ public final class HDToolKit { private static RSString method1820(String var0) { byte[] var1; var1 = var0.getBytes(StandardCharsets.ISO_8859_1); - return Class3_Sub13_Sub3.bufferToString(var1, var1.length, 0); + return TextureOperation33.bufferToString(var1, var1.length, 0); } static void method1821(int offsetX, int offsetY, int ratioWidth, int ratioHeight) { @@ -113,12 +113,8 @@ public final class HDToolKit { } } - static void bufferSwap() { - try { - glDrawable.swapBuffers(); - } catch (Exception var1) { - } - + public static void bufferSwap() { + glDrawable.swapBuffers(); } static void method1827(boolean var0) { @@ -541,7 +537,7 @@ public final class HDToolKit { * @param color */ static void clearScreen(int color) { - gl.glClearColor((float) (color >> 16 & 255) / 255.0F, (float) (color >> 8 & 255) / 255.0F, (float) (color & 255) / 255.0F, 0.0F); + gl.glClearColor((float) (color >> 16 & 0xFF) / 255.0F, (float) (color >> 8 & 0xFF) / 255.0F, (float) (color & 0xFF) / 255.0F, 0.0F); gl.glClear(16640); gl.glClearColor(0.0F, 0.0F, 0.0F, 0.0F); } diff --git a/Client/src/main/java/org/runite/client/ISAACCipher.java b/Client/src/main/java/org/runite/client/ISAACCipher.java index 5845395d0..fc9ffdb37 100644 --- a/Client/src/main/java/org/runite/client/ISAACCipher.java +++ b/Client/src/main/java/org/runite/client/ISAACCipher.java @@ -177,7 +177,7 @@ final class ISAACCipher { this.anInt972 ^= this.anInt972 >>> 6; } - this.anInt972 += this.anIntArray971[128 + var2 & 255]; + this.anInt972 += this.anIntArray971[128 + var2 & 0xFF]; int var4; this.anIntArray971[var2] = var4 = this.anInt967 + this.anInt972 + this.anIntArray971[Unsorted.bitwiseAnd(var3, 1020) >> 2]; this.anIntArray970[var2] = this.anInt967 = var3 + this.anIntArray971[Unsorted.bitwiseAnd(261347, var4) >> 8 >> 2]; diff --git a/Client/src/main/java/org/runite/client/InterfaceWidget.java b/Client/src/main/java/org/runite/client/InterfaceWidget.java index acd91b403..c09e1059d 100644 --- a/Client/src/main/java/org/runite/client/InterfaceWidget.java +++ b/Client/src/main/java/org/runite/client/InterfaceWidget.java @@ -57,7 +57,7 @@ final class InterfaceWidget extends Node { float[] var3 = new float[3]; Class163_Sub2_Sub1.anInt4020 += var1; if(Class163_Sub2_Sub1.anInt4020 >= 65535) { - Class163_Sub2_Sub1.anInt4020 = '\uffff'; + Class163_Sub2_Sub1.anInt4020 = 65535; Class3_Sub28_Sub1.aBoolean3531 = !aBoolean3668; aBoolean3668 = true; @@ -66,7 +66,7 @@ final class InterfaceWidget extends Node { Class3_Sub28_Sub1.aBoolean3531 = false; } - if(var0 == '\uffff') { + if(var0 == 65535) { float var2 = (float)Class163_Sub2_Sub1.anInt4020 / 65535.0F; int var4 = Unsorted.anInt1081 * 2; @@ -90,7 +90,7 @@ final class InterfaceWidget extends Node { Class7.anInt2162 = -1 * (int)var3[1]; NPC.anInt3995 = (int)var3[0] + -(128 * Class131.anInt1716); - Class77.anInt1111 = (int)var3[2] + -(Class82.anInt1152 * 128); + Class77.anInt1111 = (int)var3[2] + -(Texture.anInt1152 * 128); float[] var16 = new float[3]; var6 = Class39.anInt670 * 2; @@ -112,7 +112,7 @@ final class InterfaceWidget extends Node { aFloat1169 = (float)Math.atan2(var18, var20); Class45.aFloat730 = -((float)Math.atan2(var17, var19)); Class139.anInt1823 = 2047 & (int)(325.949D * (double) aFloat1169); - Class3_Sub13_Sub25.anInt3315 = 2047 & (int)((double)Class45.aFloat730 * 325.949D); + TextureOperation28.anInt3315 = 2047 & (int)((double)Class45.aFloat730 * 325.949D); } } } catch (RuntimeException var15) { @@ -155,7 +155,7 @@ final class InterfaceWidget extends Node { static Class2 c(int var0) { try { - Class2 var2 = (Class2)Class3_Sub13_Sub34.aReferenceCache_3412.get(var0); + Class2 var2 = (Class2) TextureOperation25.aReferenceCache_3412.get(var0); if(var2 == null) { byte[] var3 = Class107.aClass153_878.getFile(34, var0); @@ -164,7 +164,7 @@ final class InterfaceWidget extends Node { var2.decode(new DataBuffer(var3)); } - Class3_Sub13_Sub34.aReferenceCache_3412.put(var2, var0); + TextureOperation25.aReferenceCache_3412.put(var2, var0); } return var2; } catch (RuntimeException var4) { @@ -219,11 +219,11 @@ final class InterfaceWidget extends Node { var8.writeShort(var7); var8.writeShort(var2); var8.writeInt((int)(9.9999999E7D * Math.random())); - var8.rsaEncrypt(Class3_Sub13_Sub37.EXPONENT,Class3_Sub13_Sub14.MODULUS); - Class3_Sub13_Sub1.outgoingBuffer.index = 0; - Class3_Sub13_Sub1.outgoingBuffer.writeByte(36); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(var8.index); - Class3_Sub13_Sub1.outgoingBuffer.putBytes(var8.buffer, var8.index); + var8.rsaEncrypt(TextureOperation10.EXPONENT, TextureOperation31.MODULUS); + TextureOperation12.outgoingBuffer.index = 0; + TextureOperation12.outgoingBuffer.writeByte(36); + TextureOperation12.outgoingBuffer.writeByte(var8.index); + TextureOperation12.outgoingBuffer.putBytes(var8.buffer, var8.index); Unsorted.anInt1711 = -3; Unsorted.registryStage = 1; Class132.anInt1734 = 0; diff --git a/Client/src/main/java/org/runite/client/InvalidateData.java b/Client/src/main/java/org/runite/client/InvalidateData.java new file mode 100644 index 000000000..680d9f908 --- /dev/null +++ b/Client/src/main/java/org/runite/client/InvalidateData.java @@ -0,0 +1,16 @@ +package org.runite.client; + +public class InvalidateData { + static void method165() { + try { + WorldListEntry.aAbstractSprite_1339 = null; + WorldListEntry.aAbstractSprite_3099 = null; + Class50.aAbstractSprite_824 = null; + + WorldListEntry.aAbstractSprite_1457 = null; + Class3_Sub26.aAbstractSprite_2560 = null; + } catch (RuntimeException var2) { + throw ClientErrorException.clientError(var2, "j.VA(" + -7878 + ')'); + } + } +} diff --git a/Client/src/main/java/org/runite/client/ItemDefinition.java b/Client/src/main/java/org/runite/client/ItemDefinition.java index 0a2144ac0..59a4f5203 100644 --- a/Client/src/main/java/org/runite/client/ItemDefinition.java +++ b/Client/src/main/java/org/runite/client/ItemDefinition.java @@ -410,7 +410,7 @@ final class ItemDefinition { if(null != this.aShortArray774) { for(var9 = 0; this.aShortArray774.length > var9; ++var9) { if(null != this.aByteArray785 && this.aByteArray785.length > var9) { - var12.method2016(this.aShortArray774[var9], Class3_Sub13_Sub38.aShortArray3453[this.aByteArray785[var9] & 255]); + var12.method2016(this.aShortArray774[var9], TextureOperation38.aShortArray3453[this.aByteArray785[var9] & 0xFF]); } else { var12.method2016(this.aShortArray774[var9], this.aShortArray772[var9]); } @@ -793,7 +793,7 @@ final class ItemDefinition { if(this.aShortArray774 != null) { for(var3 = 0; this.aShortArray774.length > var3; ++var3) { if(null != this.aByteArray785 && this.aByteArray785.length > var3) { - var2.method2016(this.aShortArray774[var3], Class3_Sub13_Sub38.aShortArray3453[this.aByteArray785[var3] & 255]); + var2.method2016(this.aShortArray774[var3], TextureOperation38.aShortArray3453[this.aByteArray785[var3] & 0xFF]); } else { var2.method2016(this.aShortArray774[var3], this.aShortArray772[var3]); } diff --git a/Client/src/main/java/org/runite/client/KeyboardListener.java b/Client/src/main/java/org/runite/client/KeyboardListener.java index e62c54b09..d121e8436 100644 --- a/Client/src/main/java/org/runite/client/KeyboardListener.java +++ b/Client/src/main/java/org/runite/client/KeyboardListener.java @@ -78,8 +78,8 @@ final class KeyboardListener implements KeyListener, FocusListener { return; } - if(null != Class3_Sub13_Sub3.aClass148_3049) { - Class3_Sub13_Sub33.anInt3398 = 0; + if(null != TextureOperation33.aClass148_3049) { + TextureOperation29.anInt3398 = 0; int var2 = var1.getKeyCode(); // switch(var2) { // case 112://f1 @@ -187,7 +187,7 @@ final class KeyboardListener implements KeyListener, FocusListener { } try { - if(Class3_Sub13_Sub3.aClass148_3049 != null) { + if(TextureOperation33.aClass148_3049 != null) { int var2 = Class79.method1386(var1); if(var2 >= 0) { int var3 = 1 + Class25.anInt491 & 127; @@ -206,7 +206,7 @@ final class KeyboardListener implements KeyListener, FocusListener { } public final synchronized void focusLost(FocusEvent var1) { - if(Class3_Sub13_Sub3.aClass148_3049 != null) { + if(TextureOperation33.aClass148_3049 != null) { anInt2384 = -1; } } @@ -226,8 +226,8 @@ final class KeyboardListener implements KeyListener, FocusListener { break; } try { - if(null != Class3_Sub13_Sub3.aClass148_3049) { - Class3_Sub13_Sub33.anInt3398 = 0; + if(null != TextureOperation33.aClass148_3049) { + TextureOperation29.anInt3398 = 0; int var2 = var1.getKeyCode(); if(var2 >= 0 && var2 < KEY_CODE_MAP.length) { var2 = KEY_CODE_MAP[var2] & -129; diff --git a/Client/src/main/java/org/runite/client/LDIndexedSprite.java b/Client/src/main/java/org/runite/client/LDIndexedSprite.java index 2b1309cb2..13bedb95e 100644 --- a/Client/src/main/java/org/runite/client/LDIndexedSprite.java +++ b/Client/src/main/java/org/runite/client/LDIndexedSprite.java @@ -10,7 +10,7 @@ final class LDIndexedSprite extends AbstractIndexedSprite { final void method1668(int var1, int var2, int var3) { for(int var4 = 0; var4 < this.anIntArray2673.length; ++var4) { - int var5 = this.anIntArray2673[var4] >> 16 & 255; + int var5 = this.anIntArray2673[var4] >> 16 & 0xFF; var5 += var1; if(var5 < 0) { var5 = 0; @@ -18,7 +18,7 @@ final class LDIndexedSprite extends AbstractIndexedSprite { var5 = 255; } - int var6 = this.anIntArray2673[var4] >> 8 & 255; + int var6 = this.anIntArray2673[var4] >> 8 & 0xFF; var6 += var2; if(var6 < 0) { var6 = 0; @@ -26,7 +26,7 @@ final class LDIndexedSprite extends AbstractIndexedSprite { var6 = 255; } - int var7 = this.anIntArray2673[var4] & 255; + int var7 = this.anIntArray2673[var4] & 0xFF; var7 += var3; if(var7 < 0) { var7 = 0; @@ -111,7 +111,7 @@ final class LDIndexedSprite extends AbstractIndexedSprite { if(var16 == 0) { ++var5; } else { - var0[var5++] = var2[var16 & 255]; + var0[var5++] = var2[var16 & 0xFF]; } var3 += var9; @@ -155,28 +155,28 @@ final class LDIndexedSprite extends AbstractIndexedSprite { if(var13 == 0) { ++var5; } else { - var0[var5++] = var2[var13 & 255]; + var0[var5++] = var2[var13 & 0xFF]; } var13 = var1[var4++]; if(var13 == 0) { ++var5; } else { - var0[var5++] = var2[var13 & 255]; + var0[var5++] = var2[var13 & 0xFF]; } var13 = var1[var4++]; if(var13 == 0) { ++var5; } else { - var0[var5++] = var2[var13 & 255]; + var0[var5++] = var2[var13 & 0xFF]; } var13 = var1[var4++]; if(var13 == 0) { ++var5; } else { - var0[var5++] = var2[var13 & 255]; + var0[var5++] = var2[var13 & 0xFF]; } } @@ -185,7 +185,7 @@ final class LDIndexedSprite extends AbstractIndexedSprite { if(var13 == 0) { ++var5; } else { - var0[var5++] = var2[var13 & 255]; + var0[var5++] = var2[var13 & 0xFF]; } } @@ -197,9 +197,9 @@ final class LDIndexedSprite extends AbstractIndexedSprite { private static void method1673(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { int var13 = var3; - int var14 = var12 >> 16 & 255; - int var15 = var12 >> 8 & 255; - int var16 = var12 & 255; + int var14 = var12 >> 16 & 0xFF; + int var15 = var12 >> 8 & 0xFF; + int var16 = var12 & 0xFF; for(int var17 = -var8; var17 < 0; ++var17) { int var18 = (var4 >> 16) * var11; @@ -209,10 +209,10 @@ final class LDIndexedSprite extends AbstractIndexedSprite { if(var20 == 0) { ++var5; } else { - int var24 = var2[var20 & 255]; - int var21 = var24 >> 16 & 255; - int var22 = var24 >> 8 & 255; - int var23 = var24 & 255; + int var24 = var2[var20 & 0xFF]; + int var21 = var24 >> 16 & 0xFF; + int var22 = var24 >> 8 & 0xFF; + int var23 = var24 & 0xFF; var0[var5++] = (var21 * var14 >> 8 << 16) + (var22 * var15 >> 8 << 8) + (var23 * var16 >> 8); } @@ -321,9 +321,9 @@ final class LDIndexedSprite extends AbstractIndexedSprite { if(var13 == 0) { ++var4; } else { - int var15 = var2[var13 & 255]; + int var15 = var2[var13 & 0xFF]; int var14 = var0[var4]; - var0[var4++] = ((var15 & 16711935) * var9 + (var14 & 16711935) * var10 & -16711936) + ((var15 & '\uff00') * var9 + (var14 & '\uff00') * var10 & 16711680) >> 8; + var0[var4++] = ((var15 & 16711935) * var9 + (var14 & 16711935) * var10 & -16711936) + ((var15 & 65280) * var9 + (var14 & 65280) * var10 & 16711680) >> 8; } } diff --git a/Client/src/main/java/org/runite/client/LinkableRSString.java b/Client/src/main/java/org/runite/client/LinkableRSString.java index 9883aa77f..3a2952967 100644 --- a/Client/src/main/java/org/runite/client/LinkableRSString.java +++ b/Client/src/main/java/org/runite/client/LinkableRSString.java @@ -110,8 +110,8 @@ public final class LinkableRSString extends Linkable { static void method731(CacheIndex var0) { try { - Class3_Sub13_Sub13.aClass153_3154 = var0; - Class95.anInt1344 = Class3_Sub13_Sub13.aClass153_3154.getFileAmount(16); + TextureOperation20.aClass153_3154 = var0; + Class95.anInt1344 = TextureOperation20.aClass153_3154.getFileAmount(16); } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "sj.B(" + (var0 != null ? "{...}" : "null") + ',' + (byte) -113 + ')'); } @@ -128,7 +128,7 @@ public final class LinkableRSString extends Linkable { if (var1 < 32768) { var3 = Class3_Sub24_Sub3.aClass153_3490.getFile(1, var1); } else { - var3 = Class3_Sub13_Sub8.aClass153_1967.getFile(1, 32767 & var1); + var3 = TextureOperation9.aClass153_1967.getFile(1, 32767 & var1); } var2 = new Class3_Sub28_Sub4(); @@ -137,7 +137,7 @@ public final class LinkableRSString extends Linkable { var2.method546(new DataBuffer(var3)); } - if (var1 >= '\u8000') { + if (var1 >= 32768) { var2.method548(); } @@ -182,7 +182,7 @@ public final class LinkableRSString extends Linkable { if (Class10.anInt154 == 0) { Class101.aClass3_Sub24_Sub4_1421.method506(var0); } else { - Class3_Sub13_Sub36.anInt3423 = var0; + TextureOperation36.anInt3423 = var0; } } catch (RuntimeException var3) { diff --git a/Client/src/main/java/org/runite/client/LoginHandler.java b/Client/src/main/java/org/runite/client/LoginHandler.java index 8c00382f7..396900e70 100644 --- a/Client/src/main/java/org/runite/client/LoginHandler.java +++ b/Client/src/main/java/org/runite/client/LoginHandler.java @@ -58,11 +58,11 @@ public class LoginHandler { Class3_Sub15.activeConnection = new Connection((Socket) Class3_Sub9.aClass64_2318.anObject974, Class38.signlink); Class3_Sub9.aClass64_2318 = null; long var1 = PacketParser.aLong3202 = Class131.username.toLong(); - Class3_Sub13_Sub1.outgoingBuffer.index = 0; - Class3_Sub13_Sub1.outgoingBuffer.writeByte(14); + TextureOperation12.outgoingBuffer.index = 0; + TextureOperation12.outgoingBuffer.writeByte(14); int nameHash = (int) (var1 >> 16 & 31L); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(nameHash); - Class3_Sub15.activeConnection.sendBytes(Class3_Sub13_Sub1.outgoingBuffer.buffer, 2); + TextureOperation12.outgoingBuffer.writeByte(nameHash); + Class3_Sub15.activeConnection.sendBytes(TextureOperation12.outgoingBuffer.buffer, 2); if (WorldListEntry.aClass155_2627 != null) { WorldListEntry.aClass155_2627.method2159(106); } @@ -100,20 +100,20 @@ public class LoginHandler { GraphicDefinition.incomingBuffer.index = 0; isaacServerKey = GraphicDefinition.incomingBuffer.readLong(); int[] var9 = new int[4]; - Class3_Sub13_Sub1.outgoingBuffer.index = 0; + TextureOperation12.outgoingBuffer.index = 0; var9[2] = (int) (isaacServerKey >> 32); var9[3] = (int) isaacServerKey; var9[1] = (int) (Math.random() * 9.9999999E7D); var9[0] = (int) (Math.random() * 9.9999999E7D); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(10); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var9[0]); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var9[1]); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var9[2]); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var9[3]); - Class3_Sub13_Sub1.outgoingBuffer.writeLong(Class131.username.toLong()); - Class3_Sub13_Sub1.outgoingBuffer.writeString(Class131.password); - Class3_Sub13_Sub1.method229(); - Class3_Sub13_Sub1.outgoingBuffer.rsaEncrypt(Class3_Sub13_Sub37.EXPONENT, Class3_Sub13_Sub14.MODULUS); + TextureOperation12.outgoingBuffer.writeByte(10); + TextureOperation12.outgoingBuffer.writeInt(var9[0]); + TextureOperation12.outgoingBuffer.writeInt(var9[1]); + TextureOperation12.outgoingBuffer.writeInt(var9[2]); + TextureOperation12.outgoingBuffer.writeInt(var9[3]); + TextureOperation12.outgoingBuffer.writeLong(Class131.username.toLong()); + TextureOperation12.outgoingBuffer.writeString(Class131.password); + TextureOperation12.method229(); + TextureOperation12.outgoingBuffer.rsaEncrypt(TextureOperation10.EXPONENT, TextureOperation31.MODULUS); Unsorted.aClass3_Sub30_Sub1_2942.index = 0; if (40 == Class143.gameStage) { Unsorted.aClass3_Sub30_Sub1_2942.writeByte(18); @@ -121,7 +121,7 @@ public class LoginHandler { Unsorted.aClass3_Sub30_Sub1_2942.writeByte(16); } - Unsorted.aClass3_Sub30_Sub1_2942.writeShort(Class3_Sub13_Sub1.outgoingBuffer.index + 163 - -Class3_Sub13_Sub33.method326((byte) 111, Class163_Sub2.paramSettings)); + Unsorted.aClass3_Sub30_Sub1_2942.writeShort(TextureOperation12.outgoingBuffer.index + 163 - -TextureOperation29.method326((byte) 111, Class163_Sub2.paramSettings)); Unsorted.aClass3_Sub30_Sub1_2942.writeInt(GameConfig.CLIENT_BUILD); Unsorted.aClass3_Sub30_Sub1_2942.writeByte(Class7.anInt2161); Unsorted.aClass3_Sub30_Sub1_2942.writeByte(!Client.paramAdvertisementSuppressed ? 0 : 1); @@ -165,9 +165,9 @@ public class LoginHandler { Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.materialsIndex.getReferenceTableCrc()); Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.particlesConfigIndex.getReferenceTableCrc()); Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.libIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.putBytes(Class3_Sub13_Sub1.outgoingBuffer.buffer, Class3_Sub13_Sub1.outgoingBuffer.index); + Unsorted.aClass3_Sub30_Sub1_2942.putBytes(TextureOperation12.outgoingBuffer.buffer, TextureOperation12.outgoingBuffer.index); Class3_Sub15.activeConnection.sendBytes(Unsorted.aClass3_Sub30_Sub1_2942.buffer, Unsorted.aClass3_Sub30_Sub1_2942.index); - Class3_Sub13_Sub1.outgoingBuffer.method814(var9); + TextureOperation12.outgoingBuffer.method814(var9); for (int var2 = 0; var2 < 4; ++var2) { var9[var2] += 50; @@ -222,16 +222,16 @@ public class LoginHandler { } if (6 == loginStage) { - Class3_Sub13_Sub1.outgoingBuffer.index = 0; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(17); - Class3_Sub15.activeConnection.sendBytes(Class3_Sub13_Sub1.outgoingBuffer.buffer, Class3_Sub13_Sub1.outgoingBuffer.index); + TextureOperation12.outgoingBuffer.index = 0; + TextureOperation12.outgoingBuffer.putOpcode(17); + Class3_Sub15.activeConnection.sendBytes(TextureOperation12.outgoingBuffer.buffer, TextureOperation12.outgoingBuffer.index); loginStage = 4; return; } if (loginStage == 7) { if (Class3_Sub15.activeConnection.availableBytes() >= 1) { - Class3_Sub13_Sub34.anInt3413 = 60 * (3 + Class3_Sub15.activeConnection.readByte()); + TextureOperation25.anInt3413 = 60 * (3 + Class3_Sub15.activeConnection.readByte()); loginStage = 0; Client.messageToDisplay = 21; Class3_Sub15.activeConnection.close(); @@ -268,15 +268,15 @@ public class LoginHandler { Class3_Sub15.aBoolean2433 = GraphicDefinition.incomingBuffer.readUnsignedByte() == 1; Class121.aBoolean1641 = 1 == GraphicDefinition.incomingBuffer.readUnsignedByte(); Unsorted.aBoolean4063 = GraphicDefinition.incomingBuffer.readUnsignedByte() == 1; - Class3_Sub13_Sub14.aBoolean3166 = 1 == GraphicDefinition.incomingBuffer.readUnsignedByte(); + TextureOperation31.aBoolean3166 = 1 == GraphicDefinition.incomingBuffer.readUnsignedByte(); Unsorted.aBoolean29 = GraphicDefinition.incomingBuffer.readUnsignedByte() == 1; Class3_Sub1.localIndex = GraphicDefinition.incomingBuffer.readUnsignedShort(); - Class3_Sub13_Sub29.disableGEBoxes = GraphicDefinition.incomingBuffer.readUnsignedByte() == 1; + TextureOperation3.disableGEBoxes = GraphicDefinition.incomingBuffer.readUnsignedByte() == 1; Unsorted.isMember = GraphicDefinition.incomingBuffer.readUnsignedByte() == 1; Class113.method1702(Unsorted.isMember); Class8.method845(Unsorted.isMember); if (!Client.paramAdvertisementSuppressed) { - if ((!Class3_Sub15.aBoolean2433 || Unsorted.aBoolean4063) && !Class3_Sub13_Sub29.disableGEBoxes) { + if ((!Class3_Sub15.aBoolean2433 || Unsorted.aBoolean4063) && !TextureOperation3.disableGEBoxes) { try { TextCore.aClass94_516.method1577(Class38.signlink.gameApplet); } catch (Throwable var5) { diff --git a/Client/src/main/java/org/runite/client/MapUnderlayColorDefinition.java b/Client/src/main/java/org/runite/client/MapUnderlayColorDefinition.java index d0caa7919..51c89d8f3 100644 --- a/Client/src/main/java/org/runite/client/MapUnderlayColorDefinition.java +++ b/Client/src/main/java/org/runite/client/MapUnderlayColorDefinition.java @@ -54,7 +54,7 @@ final class MapUnderlayColorDefinition { double red = (double) (255 & rgbAsInt >> 16) / 256.0D; double green = (double) (255 & rgbAsInt >> 8) / 256.0D; double var9 = red; - double blue = (double) (rgbAsInt & 255) / 256.0D; + double blue = (double) (rgbAsInt & 0xFF) / 256.0D; if (green < red) { var9 = green; } diff --git a/Client/src/main/java/org/runite/client/ModPanel.java b/Client/src/main/java/org/runite/client/ModPanel.java index 6b87eb3c6..b34872e48 100644 --- a/Client/src/main/java/org/runite/client/ModPanel.java +++ b/Client/src/main/java/org/runite/client/ModPanel.java @@ -53,9 +53,9 @@ public class ModPanel extends JPanel { } private void sendCommand(String command) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(44); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(command.length() + -1); - Class3_Sub13_Sub1.outgoingBuffer.writeString(command.substring(2)); + TextureOperation12.outgoingBuffer.putOpcode(44); + TextureOperation12.outgoingBuffer.writeByte(command.length() + -1); + TextureOperation12.outgoingBuffer.writeString(command.substring(2)); } class ButtonListener implements ActionListener { diff --git a/Client/src/main/java/org/runite/client/Model.java b/Client/src/main/java/org/runite/client/Model.java index ff3f065db..889ba4af6 100644 --- a/Client/src/main/java/org/runite/client/Model.java +++ b/Client/src/main/java/org/runite/client/Model.java @@ -36,7 +36,7 @@ abstract class Model extends GameObject { int var14; if (var13 != -1) { var14 = var9 & var1.anIntArray2455[var13]; - if (var14 == '\uffff') { + if (var14 == 65535) { this.method1891(0, var1.anIntArrayArray2460[var13], 0, 0, 0, var8); } else { this.method1899(0, var1.anIntArrayArray2460[var13], 0, 0, 0, var8, var14, var10); @@ -44,7 +44,7 @@ abstract class Model extends GameObject { } var14 = var9 & var1.anIntArray2455[var12]; - if (var14 == '\uffff') { + if (var14 == 65535) { this.method1891(var1.anIntArray2466[var12], var1.anIntArrayArray2460[var12], var2.aShortArray1388[var11], var2.aShortArray1396[var11], var2.aShortArray1395[var11], var8); } else { this.method1899(var1.anIntArray2466[var12], var1.anIntArrayArray2460[var12], var2.aShortArray1388[var11], var2.aShortArray1396[var11], var2.aShortArray1395[var11], var8, var14, var10); @@ -129,9 +129,9 @@ abstract class Model extends GameObject { int var30; if ((var22 & 2) == 0 && (var27 & 1) == 0) { if (var17 == 2) { - var31 = var23 - var18 & 2047; - int var32 = var24 - var19 & 2047; - int var33 = var25 - var20 & 2047; + var31 = var23 - var18 & 0x7FF; + int var32 = var24 - var19 & 0x7FF; + int var33 = var25 - var20 & 0x7FF; if (var31 >= 1024) { var31 -= 2048; } @@ -144,9 +144,9 @@ abstract class Model extends GameObject { var33 -= 2048; } - var28 = var18 + var31 * var4 / var5 & 2047; - var29 = var19 + var32 * var4 / var5 & 2047; - var30 = var20 + var33 * var4 / var5 & 2047; + var28 = var18 + var31 * var4 / var5 & 0x7FF; + var29 = var19 + var32 * var4 / var5 & 0x7FF; + var30 = var20 + var33 * var4 / var5 & 0x7FF; } else if (var17 == 7) { var31 = var23 - var18 & 63; if (var31 >= 32) { @@ -169,14 +169,14 @@ abstract class Model extends GameObject { if (var21 != -1) { var31 = var9 & var1.anIntArray2455[var21]; - if (var31 == '\uffff') { + if (var31 == 65535) { this.method1891(0, var1.anIntArrayArray2460[var21], 0, 0, 0, var8); } else { this.method1899(0, var1.anIntArrayArray2460[var21], 0, 0, 0, var8, var31, var10); } } else if (var26 != -1) { var31 = var9 & var1.anIntArray2455[var26]; - if (var31 == '\uffff') { + if (var31 == 65535) { this.method1891(0, var1.anIntArrayArray2460[var26], 0, 0, 0, var8); } else { this.method1899(0, var1.anIntArrayArray2460[var26], 0, 0, 0, var8, var31, var10); @@ -184,7 +184,7 @@ abstract class Model extends GameObject { } var31 = var9 & var1.anIntArray2455[var35]; - if (var31 == '\uffff') { + if (var31 == 65535) { this.method1891(var17, var1.anIntArrayArray2460[var35], var28, var29, var30, var8); } else { this.method1899(var17, var1.anIntArrayArray2460[var35], var28, var29, var30, var8, var31, var10); @@ -235,7 +235,7 @@ abstract class Model extends GameObject { } } - this.method1875(var9, var8, var10, var5, var6, null, false, var7, '\uffff', null); + this.method1875(var9, var8, var10, var5, var6, null, false, var7, 65535, null); this.method1879(); } } @@ -304,9 +304,9 @@ abstract class Model extends GameObject { } } - this.method1875(var16, var15, var17, var5, var6, debugArray530, false, var14, '\uffff', null); + this.method1875(var16, var15, var17, var5, var6, debugArray530, false, var14, 65535, null); this.method1891(0, new int[0], 0, 0, 0, var14); - this.method1875(var16, var18, var19, var11, var12, debugArray530, true, var14, '\uffff', null); + this.method1875(var16, var18, var19, var11, var12, debugArray530, true, var14, 65535, null); this.method1879(); } } @@ -334,14 +334,14 @@ abstract class Model extends GameObject { int var24 = var15 < var21 ? var15 : var21; int var25 = var12 < var18 ? var12 : var18; if (var6 != 0) { - int var26 = (int) (Math.atan2(var22 - var23, var6) * 325.95D) & 2047; + int var26 = (int) (Math.atan2(var22 - var23, var6) * 325.95D) & 0x7FF; if (var26 != 0) { this.method1896(var26); } } if (var5 != 0) { - int var27 = (int) (Math.atan2(var25 - var24, var5) * 325.95D) & 2047; + int var27 = (int) (Math.atan2(var25 - var24, var5) * 325.95D) & 0x7FF; if (var27 != 0) { this.method1886(var27); } diff --git a/Client/src/main/java/org/runite/client/Model_Sub1.java b/Client/src/main/java/org/runite/client/Model_Sub1.java index 1962c1b2d..7a9c3632c 100644 --- a/Client/src/main/java/org/runite/client/Model_Sub1.java +++ b/Client/src/main/java/org/runite/client/Model_Sub1.java @@ -486,14 +486,14 @@ final class Model_Sub1 extends GameObject { int var24 = var15 < var21 ? var15 : var21; int var25 = var12 < var18 ? var12 : var18; if (var6 != 0) { - int var26 = (int) (Math.atan2(var22 - var23, var6) * 325.95D) & 2047; + int var26 = (int) (Math.atan2(var22 - var23, var6) * 325.95D) & 0x7FF; if (var26 != 0) { this.method2006(var26); } } if (var5 != 0) { - int var27 = (int) (Math.atan2(var25 - var24, var5) * 325.95D) & 2047; + int var27 = (int) (Math.atan2(var25 - var24, var5) * 325.95D) & 0x7FF; if (var27 != 0) { this.method1992(var27); } @@ -716,8 +716,8 @@ final class Model_Sub1 extends GameObject { } } } else if (var1 == 3) { - var15 = (var2 & 255) * 4; - var16 = (var2 >> 8 & 255) * 4; + var15 = (var2 & 0xFF) * 4; + var16 = (var2 >> 8 & 0xFF) * 4; this.method1996(var3, var5, var6, var7, var15, var16); } else if (var1 == 4) { var15 = this.aShort2844 - this.aShort2854; @@ -1102,7 +1102,7 @@ final class Model_Sub1 extends GameObject { var7.index = var48; for (var57 = 0; var57 < var11; ++var57) { - var58 = this.aByteArray2857[var57] & 255; + var58 = this.aByteArray2857[var57] & 0xFF; if (var58 == 0) { this.aShortArray2884[var57] = (short) var2.readUnsignedShort(); this.aShortArray2846[var57] = (short) var2.readUnsignedShort(); @@ -1733,9 +1733,9 @@ final class Model_Sub1 extends GameObject { boolean var46 = false; for (var43 = 0; var43 < var10; ++var43) { - var44 = this.aByteArray2866[var43] & 255; + var44 = this.aByteArray2866[var43] & 0xFF; if (var44 != 255) { - if ((this.aShortArray2884[var44] & '\uffff') == this.anIntArray2865[var43] && (this.aShortArray2846[var44] & '\uffff') == this.anIntArray2878[var43] && (this.aShortArray2891[var44] & '\uffff') == this.anIntArray2864[var43]) { + if ((this.aShortArray2884[var44] & 65535) == this.anIntArray2865[var43] && (this.aShortArray2846[var44] & 65535) == this.anIntArray2878[var43] && (this.aShortArray2891[var44] & 65535) == this.anIntArray2864[var43]) { this.aByteArray2866[var43] = -1; } else { var46 = true; diff --git a/Client/src/main/java/org/runite/client/MouseListeningClass.java b/Client/src/main/java/org/runite/client/MouseListeningClass.java index 492d5b7ea..6cc46d1ac 100644 --- a/Client/src/main/java/org/runite/client/MouseListeningClass.java +++ b/Client/src/main/java/org/runite/client/MouseListeningClass.java @@ -3,89 +3,70 @@ package org.runite.client; import javax.swing.*; import java.awt.event.*; -final class MouseListeningClass implements MouseListener, MouseMotionListener, FocusListener -{ +public final class MouseListeningClass implements MouseListener, MouseMotionListener, FocusListener { static volatile int anInt1340 = -1; public int mouseWheelX; - public int mouseWheelY; - static float[] aFloatArray1919 = new float[4]; - static int[] anIntArray1920; - static int anInt1921 = 0; - static int anInt1923; - static int anInt1924 = 0; - static int anInt1925 = 0; - static int anInt1926; + public int mouseWheelY; + static float[] aFloatArray1919 = new float[4]; + static int[] anIntArray1920; + static int anInt1921 = 0; + static int anInt1923; + public static int anInt1924 = 0; + static int anInt1925 = 0; + static int anInt1926; - public final synchronized void mouseMoved(MouseEvent var1) - { - try - { - if (Unsorted.aClass149_4047 != null) - { - Unsorted.anInt4045 = 0; - Class3_Sub21.anInt2493 = var1.getX(); - anInt1340 = var1.getY(); - } - } - catch (RuntimeException var3) - { - throw ClientErrorException.clientError(var3, "ug.mouseMoved(" + (var1 != null ? "{...}" : "null") + ')'); - } - } - - static void method2087() - { - try - { - Class3_Sub4 var1 = (Class3_Sub4)Class3_Sub13_Sub6.aClass61_3075.method1222(); - for (; var1 != null; var1 = (Class3_Sub4)Class3_Sub13_Sub6.aClass61_3075.method1221()) - { - if (var1.anInt2259 > 0) { - var1.anInt2259 -= 1; - } - if (var1.anInt2259 != 0) - { - if (var1.anInt2261 > 0) { - var1.anInt2261 -= 1; - } - if ((var1.anInt2261 == 0) && (1 <= var1.anInt2264) && (1 <= var1.anInt2248) && (102 >= var1.anInt2264) && (var1.anInt2248 <= 102) && ((var1.anInt2265 < 0) || (Unsorted.method590((byte)-34, var1.anInt2265, var1.anInt2262)))) - { - Unsorted.method1048(var1.anInt2265, var1.anInt2264, var1.anInt2250, var1.anInt2256, var1.anInt2248, -65, var1.anInt2262, var1.anInt2263); - var1.anInt2261 = -1; - if ((var1.anInt2265 == var1.anInt2254) && (var1.anInt2254 == -1)) { - var1.unlink(); - } else if ((var1.anInt2254 == var1.anInt2265) && (var1.anInt2256 == var1.anInt2257) && (var1.anInt2262 == var1.anInt2253)) { - var1.unlink(); - } - } - } - else if ((var1.anInt2254 < 0) || (Unsorted.method590((byte)-66, var1.anInt2254, var1.anInt2253))) - { - Unsorted.method1048(var1.anInt2254, var1.anInt2264, var1.anInt2250, var1.anInt2257, var1.anInt2248, -71, var1.anInt2253, var1.anInt2263); - var1.unlink(); - } - } - } - catch (RuntimeException var3) - { - throw ClientErrorException.clientError(var3, "ug.A(" + (byte) -82 + ')'); - } - } + public final synchronized void mouseMoved(MouseEvent var1) { + try { + if (Unsorted.aClass149_4047 != null) { + Unsorted.anInt4045 = 0; + Class3_Sub21.anInt2493 = var1.getX(); + anInt1340 = var1.getY(); + } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "ug.mouseMoved(" + (var1 != null ? "{...}" : "null") + ')'); + } + } + + static void method2087() { + try { + Class3_Sub4 var1 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1222(); + for (; var1 != null; var1 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1221()) { + if (var1.anInt2259 > 0) { + var1.anInt2259 -= 1; + } + if (var1.anInt2259 != 0) { + if (var1.anInt2261 > 0) { + var1.anInt2261 -= 1; + } + if ((var1.anInt2261 == 0) && (1 <= var1.anInt2264) && (1 <= var1.anInt2248) && (102 >= var1.anInt2264) && (var1.anInt2248 <= 102) && ((var1.anInt2265 < 0) || (Unsorted.method590((byte) -34, var1.anInt2265, var1.anInt2262)))) { + Unsorted.method1048(var1.anInt2265, var1.anInt2264, var1.anInt2250, var1.anInt2256, var1.anInt2248, -65, var1.anInt2262, var1.anInt2263); + var1.anInt2261 = -1; + if ((var1.anInt2265 == var1.anInt2254) && (var1.anInt2254 == -1)) { + var1.unlink(); + } else if ((var1.anInt2254 == var1.anInt2265) && (var1.anInt2256 == var1.anInt2257) && (var1.anInt2262 == var1.anInt2253)) { + var1.unlink(); + } + } + } else if ((var1.anInt2254 < 0) || (Unsorted.method590((byte) -66, var1.anInt2254, var1.anInt2253))) { + Unsorted.method1048(var1.anInt2254, var1.anInt2264, var1.anInt2250, var1.anInt2257, var1.anInt2248, -71, var1.anInt2253, var1.anInt2263); + var1.unlink(); + } + } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "ug.A(" + (byte) -82 + ')'); + } + } + + public final synchronized void focusLost(FocusEvent var1) { + try { + if (Unsorted.aClass149_4047 != null) { + GraphicDefinition.anInt549 = 0; + } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "ug.focusLost(" + (var1 != null ? "{...}" : "null") + ')'); + } + } - public final synchronized void focusLost(FocusEvent var1) - { - try - { - if (Unsorted.aClass149_4047 != null) { - GraphicDefinition.anInt549 = 0; - } - } - catch (RuntimeException var3) - { - throw ClientErrorException.clientError(var3, "ug.focusLost(" + (var1 != null ? "{...}" : "null") + ')'); - } - } - // static void method2089() // { // try @@ -97,185 +78,139 @@ final class MouseListeningClass implements MouseListener, MouseMotionListener, F // throw ClientErrorException.clientError(var2, "ug.D(" + (byte) 115 + ')'); // } // } - - public final synchronized void mouseDragged(MouseEvent var1) - { - try - { - int x = var1.getX(); - int y = var1.getY(); - if (SwingUtilities.isMiddleMouseButton(var1)) - { - int accelX = this.mouseWheelX - x; - int accelY = this.mouseWheelY - y; - this.mouseWheelX = var1.getX(); - this.mouseWheelY = var1.getY(); - GraphicDefinition.CAMERA_DIRECTION += accelX * 2; - Unsorted.anInt2309 -= (accelY << 1); - return; - } - if (Unsorted.aClass149_4047 != null) - { - Unsorted.anInt4045 = 0; - Class3_Sub21.anInt2493 = var1.getX(); - anInt1340 = var1.getY(); - } - } - catch (RuntimeException var3) - { - throw ClientErrorException.clientError(var3, "ug.mouseDragged(" + (var1 != null ? "{...}" : "null") + ')'); - } - } - - public final synchronized void mouseReleased(MouseEvent var1) - { - try - { - if (Unsorted.aClass149_4047 != null) - { - Unsorted.anInt4045 = 0; - GraphicDefinition.anInt549 = 0; - } - if (var1.isPopupTrigger()) { - var1.consume(); - } - } - catch (RuntimeException var3) - { - throw ClientErrorException.clientError(var3, "ug.mouseReleased(" + (var1 != null ? "{...}" : "null") + ')'); - } - } - - public final void mouseClicked(MouseEvent var1) - { - try - { - if (var1.isPopupTrigger()) { - var1.consume(); - } - } - catch (RuntimeException var3) - { - throw ClientErrorException.clientError(var3, "ug.mouseClicked(" + (var1 != null ? "{...}" : "null") + ')'); - } - } - - public final void focusGained(FocusEvent var1) {} - - static void method2090() - { - try - { - if (Unsorted.aClass149_4047 != null) - { - MouseListeningClass var1 = Unsorted.aClass149_4047; - synchronized (var1) - { - Unsorted.aClass149_4047 = null; - } - } - } - catch (RuntimeException var4) - { - throw ClientErrorException.clientError(var4, "ug.F(" + 8 + ')'); - } - } - - public final synchronized void mousePressed(MouseEvent var1) - { - try - { - if (SwingUtilities.isMiddleMouseButton(var1)) - { - this.mouseWheelX = var1.getX(); - this.mouseWheelY = var1.getY(); - return; - } - if (Unsorted.aClass149_4047 != null) - { - Unsorted.anInt4045 = 0; - RenderAnimationDefinition.anInt362 = var1.getX(); - Class3_Sub13_Sub32.anInt3389 = var1.getY(); - Class140_Sub6.aLong2926 = TimeUtils.time(); - if (var1.getButton() == MouseEvent.BUTTON3) // SwingUtilities.isRightMouseButton(var1) - { - Class140_Sub3.anInt2743 = 2; - GraphicDefinition.anInt549 = 2; - } - else if (SwingUtilities.isLeftMouseButton(var1)) - { - Class140_Sub3.anInt2743 = 1; - GraphicDefinition.anInt549 = 1; - } - } - if (var1.isPopupTrigger()) { - var1.consume(); - } - } - catch (RuntimeException var3) - { - throw ClientErrorException.clientError(var3, "ug.mousePressed(" + (var1 != null ? "{...}" : "null") + ')'); - } - } - - public final synchronized void mouseExited(MouseEvent var1) - { - try - { - if (Unsorted.aClass149_4047 != null) - { - Unsorted.anInt4045 = 0; - Class3_Sub21.anInt2493 = -1; - anInt1340 = -1; - } - } - catch (RuntimeException var3) - { - throw ClientErrorException.clientError(var3, "ug.mouseExited(" + (var1 != null ? "{...}" : "null") + ')'); - } - } - - static void method2091(int var0) - { - try - { - if ((GameObject.anIntArray1838 == null) || (GameObject.anIntArray1838.length < var0)) { - GameObject.anIntArray1838 = new int[var0]; - } - } - catch (RuntimeException var3) - { - throw ClientErrorException.clientError(var3, "ug.E(" + var0 + ',' + 4 + ')'); - } - } - - public final synchronized void mouseEntered(MouseEvent var1) - { - try - { - if (Unsorted.aClass149_4047 != null) - { - Unsorted.anInt4045 = 0; - Class3_Sub21.anInt2493 = var1.getX(); - anInt1340 = var1.getY(); - } - } - catch (RuntimeException var3) - { - throw ClientErrorException.clientError(var3, "ug.mouseEntered(" + (var1 != null ? "{...}" : "null") + ')'); - } - } - - static void method2092(int var0) - { - try - { - InterfaceWidget var2 = InterfaceWidget.getWidget(9, var0); - var2.a(); - } - catch (RuntimeException var3) - { - throw ClientErrorException.clientError(var3, "ug.B(" + var0 + ',' + (byte) -47 + ')'); - } - } - } + + public final synchronized void mouseDragged(MouseEvent var1) { + try { + int x = var1.getX(); + int y = var1.getY(); + if (SwingUtilities.isMiddleMouseButton(var1)) { + int accelX = this.mouseWheelX - x; + int accelY = this.mouseWheelY - y; + this.mouseWheelX = var1.getX(); + this.mouseWheelY = var1.getY(); + GraphicDefinition.CAMERA_DIRECTION += accelX * 2; + Unsorted.anInt2309 -= (accelY << 1); + return; + } + if (Unsorted.aClass149_4047 != null) { + Unsorted.anInt4045 = 0; + Class3_Sub21.anInt2493 = var1.getX(); + anInt1340 = var1.getY(); + } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "ug.mouseDragged(" + (var1 != null ? "{...}" : "null") + ')'); + } + } + + public final synchronized void mouseReleased(MouseEvent var1) { + try { + if (Unsorted.aClass149_4047 != null) { + Unsorted.anInt4045 = 0; + GraphicDefinition.anInt549 = 0; + } + if (var1.isPopupTrigger()) { + var1.consume(); + } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "ug.mouseReleased(" + (var1 != null ? "{...}" : "null") + ')'); + } + } + + public final void mouseClicked(MouseEvent var1) { + try { + if (var1.isPopupTrigger()) { + var1.consume(); + } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "ug.mouseClicked(" + (var1 != null ? "{...}" : "null") + ')'); + } + } + + public final void focusGained(FocusEvent var1) { + } + + static void method2090() { + try { + if (Unsorted.aClass149_4047 != null) { + MouseListeningClass var1 = Unsorted.aClass149_4047; + synchronized (var1) { + Unsorted.aClass149_4047 = null; + } + } + } catch (RuntimeException var4) { + throw ClientErrorException.clientError(var4, "ug.F(" + 8 + ')'); + } + } + + public final synchronized void mousePressed(MouseEvent var1) { + try { + if (SwingUtilities.isMiddleMouseButton(var1)) { + this.mouseWheelX = var1.getX(); + this.mouseWheelY = var1.getY(); + return; + } + if (Unsorted.aClass149_4047 != null) { + Unsorted.anInt4045 = 0; + RenderAnimationDefinition.anInt362 = var1.getX(); + TextureOperation14.anInt3389 = var1.getY(); + Class140_Sub6.aLong2926 = TimeUtils.time(); + if (var1.getButton() == MouseEvent.BUTTON3) // SwingUtilities.isRightMouseButton(var1) + { + Class140_Sub3.anInt2743 = 2; + GraphicDefinition.anInt549 = 2; + } else if (SwingUtilities.isLeftMouseButton(var1)) { + Class140_Sub3.anInt2743 = 1; + GraphicDefinition.anInt549 = 1; + } + } + if (var1.isPopupTrigger()) { + var1.consume(); + } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "ug.mousePressed(" + (var1 != null ? "{...}" : "null") + ')'); + } + } + + public final synchronized void mouseExited(MouseEvent var1) { + try { + if (Unsorted.aClass149_4047 != null) { + Unsorted.anInt4045 = 0; + Class3_Sub21.anInt2493 = -1; + anInt1340 = -1; + } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "ug.mouseExited(" + (var1 != null ? "{...}" : "null") + ')'); + } + } + + static void method2091(int var0) { + try { + if ((GameObject.anIntArray1838 == null) || (GameObject.anIntArray1838.length < var0)) { + GameObject.anIntArray1838 = new int[var0]; + } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "ug.E(" + var0 + ',' + 4 + ')'); + } + } + + public final synchronized void mouseEntered(MouseEvent var1) { + try { + if (Unsorted.aClass149_4047 != null) { + Unsorted.anInt4045 = 0; + Class3_Sub21.anInt2493 = var1.getX(); + anInt1340 = var1.getY(); + } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "ug.mouseEntered(" + (var1 != null ? "{...}" : "null") + ')'); + } + } + + static void method2092(int var0) { + try { + InterfaceWidget var2 = InterfaceWidget.getWidget(9, var0); + var2.a(); + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "ug.B(" + var0 + ',' + (byte) -47 + ')'); + } + } +} diff --git a/Client/src/main/java/org/runite/client/NPC.java b/Client/src/main/java/org/runite/client/NPC.java index 25febe3ce..6dbdd30dc 100644 --- a/Client/src/main/java/org/runite/client/NPC.java +++ b/Client/src/main/java/org/runite/client/NPC.java @@ -2,11 +2,11 @@ package org.runite.client; import java.util.Objects; -final class NPC extends Class140_Sub4 { +public final class NPC extends Class140_Sub4 { static boolean aBoolean3975 = false; static int[] npcSpawnCacheIndices; - static NPC[] npcs = new NPC['\u8000']; + public static NPC[] npcs = new NPC[32768]; static Class3_Sub27 aClass3_Sub27_1154; static AbstractSprite[] aAbstractSpriteArray3977; static float aFloat3979; @@ -14,7 +14,7 @@ final class NPC extends Class140_Sub4 { static int anInt3995; static int[] anIntArray3997 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; static int anInt4001; - NPCDefinition definition; + public NPCDefinition definition; static int method1984(int var0, int var1, int var2) { try { @@ -64,7 +64,7 @@ final class NPC extends Class140_Sub4 { if ((var4 & 16) != 0) { var5 = GraphicDefinition.incomingBuffer.readUnsignedShort(); var6 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - if ('\uffff' == var5) { + if (65535 == var5) { var5 = -1; } @@ -82,7 +82,7 @@ final class NPC extends Class140_Sub4 { //Ordinal: 4 Graphic if (0 != (var4 & 128)) { var5 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - if (var5 == '\uffff') { + if (var5 == 65535) { var5 = -1; } @@ -94,7 +94,7 @@ final class NPC extends Class140_Sub4 { if (var7) { npc.anInt2842 = var5; - npc.anInt2759 = ('\uffff' & var6) + Class44.anInt719; + npc.anInt2759 = (65535 & var6) + Class44.anInt719; npc.anInt2761 = 0; npc.anInt2805 = 0; npc.anInt2799 = var6 >> 16; @@ -144,7 +144,7 @@ final class NPC extends Class140_Sub4 { for (int var15 = 0; var5 > var15; ++var15) { int var10 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - if (var10 == '\uffff') { + if (var10 == 65535) { var10 = -1; } @@ -153,7 +153,7 @@ final class NPC extends Class140_Sub4 { var14[var15] = GraphicDefinition.incomingBuffer.readUnsignedShort(); } - Class3_Sub13_Sub22.method273(var14, npc, var13, var12); + TextureOperation0.method273(var14, npc, var13, var12); } //Ordinal: 8 Face location @@ -205,7 +205,7 @@ final class NPC extends Class140_Sub4 { try { if (Class10.anInt154 == 2) { if (aClass3_Sub27_1154 == null) { - aClass3_Sub27_1154 = Class3_Sub27.method517(Class101.aClass153_1423, Class3_Sub13_Sub39.anInt3463, Class132.anInt1741); + aClass3_Sub27_1154 = Class3_Sub27.method517(Class101.aClass153_1423, TextureOperation8.anInt3463, Class132.anInt1741); if (null == aClass3_Sub27_1154) { return false; } @@ -217,7 +217,7 @@ final class NPC extends Class140_Sub4 { if (Class101.aClass3_Sub24_Sub4_1421.method470(aClass3_Sub27_1154, Class124.aClass153_1661, Class3_Sub28_Sub4.aClass83_3579)) { Class101.aClass3_Sub24_Sub4_1421.method471(); - Class101.aClass3_Sub24_Sub4_1421.method506(Class3_Sub13_Sub36.anInt3423); + Class101.aClass3_Sub24_Sub4_1421.method506(TextureOperation36.anInt3423); Class101.aClass3_Sub24_Sub4_1421.method490(Unsorted.aBoolean2311, aClass3_Sub27_1154); Class10.anInt154 = 0; aClass3_Sub27_1154 = null; @@ -290,16 +290,16 @@ final class NPC extends Class140_Sub4 { if (var17 != null) { var17.method1897(0, -this.anInt2799, 0); if (var21.aBoolean536) { - if (Class3_Sub13_Sub16.anInt3198 != 0) { - var17.method1896(Class3_Sub13_Sub16.anInt3198); + if (TextureOperation15.anInt3198 != 0) { + var17.method1896(TextureOperation15.anInt3198); } if (Class3_Sub28_Sub9.anInt3623 != 0) { var17.method1886(Class3_Sub28_Sub9.anInt3623); } - if (0 != Class3_Sub13_Sub9.anInt3111) { - var17.method1897(0, Class3_Sub13_Sub9.anInt3111, 0); + if (0 != TextureOperation16.anInt3111) { + var17.method1897(0, TextureOperation16.anInt3111, 0); } } } @@ -359,7 +359,7 @@ final class NPC extends Class140_Sub4 { } } - final boolean hasDefinitions() { + public final boolean hasDefinitions() { try { return null != this.definition; diff --git a/Client/src/main/java/org/runite/client/NPCDefinition.java b/Client/src/main/java/org/runite/client/NPCDefinition.java index 10f442cd7..dd6356ead 100644 --- a/Client/src/main/java/org/runite/client/NPCDefinition.java +++ b/Client/src/main/java/org/runite/client/NPCDefinition.java @@ -41,7 +41,7 @@ public final class NPCDefinition { byte aByte1267; byte aByte1268; int anInt1269; - boolean aBoolean1270 = true; + public boolean aBoolean1270 = true; private short[] aShortArray1271; private HashTable aHashTable_1272; RSString NPCName; @@ -53,16 +53,16 @@ public final class NPCDefinition { int anInt1279; int renderAnimationId; private int anInt1282; - int anInt1283; + public int anInt1283; public int npcId; - boolean aBoolean1285; + public boolean aBoolean1285; short aShort1286; byte aByte1287; private int[] models; int anInt1289; int anInt1290; int anInt1291; - int[] childNPCs; + public int[] childNPCs; int anInt1293; private int configFileId; int anInt1296; @@ -89,7 +89,7 @@ public final class NPCDefinition { return null; } - final NPCDefinition method1471(byte var1) { + public final NPCDefinition method1471(byte var1) { try { int var2 = -1; if(this.configId == -1) { @@ -236,7 +236,7 @@ public final class NPCDefinition { if(var20 == 0 && var21 == 0 && var22 == 0) { var23[13] = -var18; var23[14] = -var19; - var23[0] = var23[4] = var23[8] = '\u8000'; + var23[0] = var23[4] = var23[8] = 32768; var23[12] = -var17; } else { var24 = Class51.anIntArray851[var20] >> 1; @@ -287,7 +287,7 @@ public final class NPCDefinition { if(this.aShortArray1248 != null) { for(var16 = 0; var16 < this.aShortArray1248.length; ++var16) { if(null != this.aByteArray1247 && var16 < this.aByteArray1247.length) { - Objects.requireNonNull(var34).method2016(this.aShortArray1248[var16], Class136.aShortArray1779[this.aByteArray1247[var16] & 255]); + Objects.requireNonNull(var34).method2016(this.aShortArray1248[var16], Class136.aShortArray1779[this.aByteArray1247[var16] & 0xFF]); } else { Objects.requireNonNull(var34).method2016(this.aShortArray1248[var16], this.aShortArray1254[var16]); } @@ -323,7 +323,7 @@ public final class NPCDefinition { var19 = var1[var17].anInt1893; var21 = def.frames[var19]; aClass3_Sub28_Sub5Array3041[var17] = Class3_Sub9.method133(var21 >>> 16); - var21 &= '\uffff'; + var21 &= 65535; anIntArray912[var17] = var21; if(aClass3_Sub28_Sub5Array3041[var17] != null) { var35 |= aClass3_Sub28_Sub5Array3041[var17].method561(var21, (byte)124); @@ -336,7 +336,7 @@ public final class NPCDefinition { Unsorted.anIntArray2574[var17] = var1[var17].anInt1897; var22 = def.frames[var20]; aClass3_Sub28_Sub5Array4031[var17] = Class3_Sub9.method133(var22 >>> 16); - var22 &= '\uffff'; + var22 &= 65535; Class30.anIntArray574[var17] = var22; if(null != aClass3_Sub28_Sub5Array4031[var17]) { var35 |= aClass3_Sub28_Sub5Array4031[var17].method561(var22, (byte)124); @@ -368,7 +368,7 @@ public final class NPCDefinition { if(var10 != null) { var17 = var10.frames[var7]; var22 = var17 >>> 16; - var17 &= '\uffff'; + var17 &= 65535; var40 = Class3_Sub9.method133(var22); if(null != var40) { var35 |= var40.method561(var17, (byte)126); @@ -380,7 +380,7 @@ public final class NPCDefinition { var19 = var10.duration[var7]; var18 = var10.frames[var5]; var42 = var18 >>> 16; - var18 &= '\uffff'; + var18 &= 65535; if(var22 == var42) { var43 = var40; } else { @@ -406,7 +406,7 @@ public final class NPCDefinition { if(var8 != null) { var22 = var8.frames[var4]; var27 = var22 >>> 16; - var22 &= '\uffff'; + var22 &= 65535; var44 = Class3_Sub9.method133(var27); if(var44 != null) { var35 |= var44.method561(var22, (byte)124); @@ -418,7 +418,7 @@ public final class NPCDefinition { var24 = var8.duration[var4]; var42 = var8.frames[var2]; var28 = var42 >>> 16; - var42 &= '\uffff'; + var42 &= 65535; if(var27 == var28) { var46 = var44; } else { @@ -504,7 +504,7 @@ public final class NPCDefinition { static void method1479(int var0) { try { - Class3_Sub13_Sub30.anInt3362 = -1; + TextureOperation13.anInt3362 = -1; if(var0 == 37) { NPC.aFloat3979 = 3.0F; @@ -529,7 +529,7 @@ public final class NPCDefinition { var1 = var1.toLowercase(); int var4 = 0; - for(int var5 = 0; Class3_Sub13_Sub23.itemDefinitionSize > var5; ++var5) { + for(int var5 = 0; TextureOperation39.itemDefinitionSize > var5; ++var5) { ItemDefinition var6 = ItemDefinition.getItemDefinition(var5); if((!var0 || var6.aBoolean807) && var6.anInt791 == -1 && -1 == var6.anInt762 && var6.anInt800 == 0 && var6.name.toLowercase().indexOf(var1, 116) != -1) { if(var4 >= 250) { @@ -559,7 +559,7 @@ public final class NPCDefinition { var10[var11] = ItemDefinition.getItemDefinition(var3[var11]).name; } - Class3_Sub13_Sub29.method307(var10, Class99.aShortArray1398, 77); + TextureOperation3.method307(var10, Class99.aShortArray1398, 77); } catch (RuntimeException var9) { throw ClientErrorException.clientError(var9, "me.J(" + var0 + ',' + (var1 != null?"{...}":"null") + ',' + 102 + ')'); } @@ -644,7 +644,7 @@ public final class NPCDefinition { for(var5 = 0; var4 > var5; ++var5) { this.models[var5] = buffer.readUnsignedShort(); - if(this.models[var5] == '\uffff') { + if(this.models[var5] == 65535) { this.models[var5] = -1; } } @@ -781,7 +781,7 @@ public final class NPCDefinition { buffer.readUnsignedByte(); } else if (opcode == 134) { this.anInt1262 = buffer.readUnsignedShort(); - if (this.anInt1262 == '\uffff') { + if (this.anInt1262 == 65535) { this.anInt1262 = -1; } diff --git a/Client/src/main/java/org/runite/client/ObjectDefinition.java b/Client/src/main/java/org/runite/client/ObjectDefinition.java index 13e9ced50..349de1b7a 100644 --- a/Client/src/main/java/org/runite/client/ObjectDefinition.java +++ b/Client/src/main/java/org/runite/client/ObjectDefinition.java @@ -1,1091 +1,1091 @@ package org.runite.client; import org.rs09.client.Linkable; +import org.rs09.client.LinkableInt; import org.rs09.client.config.GameConfig; import org.rs09.client.data.HashTable; -import org.rs09.client.LinkableInt; import org.rs09.client.data.ReferenceCache; import java.util.Objects; -final class ObjectDefinition { +public final class ObjectDefinition { static ReferenceCache aReferenceCache_1401 = new ReferenceCache(500); static Class136 aClass136_1413 = new Class136(); static ReferenceCache aReferenceCache_1965 = new ReferenceCache(50); private short[] aShortArray1476; - private short[] OriginalColors; - int anInt1478; - private int anInt1479; - int SizeX = 1; - private int anInt1481; - int MapIcon; - boolean aBoolean1483 = false; - int anInt1484; - int SizeY = 1; - boolean ProjectileClipped; - private int[] configuration; - private int anInt1488; - private int anInt1489; - static boolean[] aBooleanArray1490 = new boolean[112]; - boolean aBoolean1491; - boolean aBoolean1492; - int anInt1493; - private int anInt1494 = 0; - private short[] aShortArray1495; - private int anInt1496; - static int[][][] anIntArrayArrayArray1497 = new int[4][13][13]; - boolean NotClipped; - RSString[] options; - private short aShort1500; - private HashTable aHashTable_1501; - boolean aBoolean1502 = false; - boolean aBoolean1503; - RSString name; - private byte aByte1505; - private short[] ModifiedColors; - boolean aBoolean1507; - boolean aBoolean1510; - private int anInt1511; - int anInt1512; - private byte[] aByteArray1513; - static int paramWorldID = 1; - int anInt1515; - int anInt1516; - int anInt1517; - int anInt1518; - private int[] models; - int anInt1520; - static int anInt1521 = 0; - int anInt1522; - int[] ChildrenIds; - boolean aBoolean1525; - private int ConfigFileId; - int objectId; - int anInt1528; - int SecondInt; - boolean aBoolean1530; - int animationId; - private int ConfigId; - int WalkingFlag; - private int SecondBool; - static short aShort1535 = 320; - private boolean aBoolean1536; - boolean aBoolean1537; - int ClipType; - int[] anIntArray1539; - int anInt1540; - private boolean aBoolean1541; - boolean aBoolean1542; + private short[] OriginalColors; + int anInt1478; + private int anInt1479; + int SizeX = 1; + private int anInt1481; + public int MapIcon; + boolean aBoolean1483 = false; + int anInt1484; + int SizeY = 1; + boolean ProjectileClipped; + private int[] configuration; + private int anInt1488; + private int anInt1489; + static boolean[] aBooleanArray1490 = new boolean[112]; + boolean aBoolean1491; + boolean aBoolean1492; + int anInt1493; + private int anInt1494 = 0; + private short[] aShortArray1495; + private int anInt1496; + static int[][][] anIntArrayArrayArray1497 = new int[4][13][13]; + boolean NotClipped; + RSString[] options; + private short aShort1500; + private HashTable aHashTable_1501; + boolean aBoolean1502 = false; + boolean aBoolean1503; + RSString name; + private byte aByte1505; + private short[] ModifiedColors; + boolean aBoolean1507; + boolean aBoolean1510; + private int anInt1511; + int anInt1512; + private byte[] aByteArray1513; + static int paramWorldID = 1; + int anInt1515; + int anInt1516; + int anInt1517; + int anInt1518; + private int[] models; + int anInt1520; + static int anInt1521 = 0; + int anInt1522; + public int[] ChildrenIds; + boolean aBoolean1525; + private int ConfigFileId; + int objectId; + int anInt1528; + int SecondInt; + boolean aBoolean1530; + int animationId; + private int ConfigId; + int WalkingFlag; + private int SecondBool; + static short aShort1535 = 320; + private boolean aBoolean1536; + boolean aBoolean1537; + int ClipType; + int[] anIntArray1539; + int anInt1540; + private boolean aBoolean1541; + boolean aBoolean1542; - static ObjectDefinition getObjectDefinition(int objectId) { - try { - //36873, 24065, 22418 - ObjectDefinition objdef = (ObjectDefinition) Unsorted.aReferenceCache_21.get(objectId); - if(objdef == null) { - byte[] var3 = Class85.aClass153_1171.getFile(Class3_Sub13_Sub36.method340(objectId), objectId & 255); - objdef = new ObjectDefinition(); - objdef.objectId = objectId; - if(null != var3) { - objdef.method1692(6219, new DataBuffer(var3)); - } + public static ObjectDefinition getObjectDefinition(int objectId) { + try { + //36873, 24065, 22418 + ObjectDefinition objdef = (ObjectDefinition) Unsorted.aReferenceCache_21.get(objectId); + if (objdef == null) { + byte[] var3 = Class85.aClass153_1171.getFile(TextureOperation36.method340(objectId), objectId & 0xFF); + objdef = new ObjectDefinition(); + objdef.objectId = objectId; + if (null != var3) { + objdef.method1692(6219, new DataBuffer(var3)); + } - objdef.method1689(4 + -2120); - if(!Sprites.aBoolean337 && objdef.aBoolean1491) { - objdef.options = null; - } + objdef.method1689(4 + -2120); + if (!Sprites.aBoolean337 && objdef.aBoolean1491) { + objdef.options = null; + } - if(objdef.NotClipped) { - objdef.ClipType = 0; - objdef.ProjectileClipped = false; - } + if (objdef.NotClipped) { + objdef.ClipType = 0; + objdef.ProjectileClipped = false; + } - Unsorted.aReferenceCache_21.put(objdef, objectId); - } - return objdef; - } catch (RuntimeException var4) { - throw ClientErrorException.clientError(var4, "wc.D(" + 4 + ',' + objectId + ')'); - } + Unsorted.aReferenceCache_21.put(objdef, objectId); + } + return objdef; + } catch (RuntimeException var4) { + throw ClientErrorException.clientError(var4, "wc.D(" + 4 + ',' + objectId + ')'); + } } final boolean method1684(int var2) { - try { - if(this.configuration != null) { - for(int var7 = 0; var7 < this.configuration.length; ++var7) { - if(this.configuration[var7] == var2) { - return Unsorted.aClass153_1043.method2129((byte)72, 0, this.models[var7] & '\uffff'); - } + try { + if (this.configuration != null) { + for (int var7 = 0; var7 < this.configuration.length; ++var7) { + if (this.configuration[var7] == var2) { + return Unsorted.aClass153_1043.method2129((byte) 72, 0, this.models[var7] & 65535); + } + } + + return true; + } else if (null == this.models) { + return true; + } else if (var2 == 10) { + boolean var4 = true; + + for (int var5 = 0; this.models.length > var5; ++var5) { + var4 &= Unsorted.aClass153_1043.method2129((byte) 71, 0, 65535 & this.models[var5]); + } + + return var4; + } else { + return true; + } + } catch (RuntimeException var6) { + throw ClientErrorException.clientError(var6, "pb.H(" + 115 + ',' + var2 + ')'); + } + } + + public final ObjectDefinition method1685(int var1) { + try { + if (var1 != 0) { + this.method1697(-92, 83, null, -13, null, 18, null, true, 114, 123, null, 118, 85, -116); } - return true; - } else if(null == this.models) { - return true; - } else if(var2 == 10) { - boolean var4 = true; - - for(int var5 = 0; this.models.length > var5; ++var5) { - var4 &= Unsorted.aClass153_1043.method2129((byte)71, 0, '\uffff' & this.models[var5]); + int var2 = -1; + if (this.ConfigFileId != -1) { + var2 = NPCDefinition.method1484(this.ConfigFileId); + } else if (this.ConfigId != -1) { + var2 = ItemDefinition.ram[this.ConfigId]; } - return var4; - } else { - return true; - } - } catch (RuntimeException var6) { - throw ClientErrorException.clientError(var6, "pb.H(" + 115 + ',' + var2 + ')'); - } - } + if (var2 >= 0 && this.ChildrenIds.length - 1 > var2 && this.ChildrenIds[var2] != -1) { + return getObjectDefinition(this.ChildrenIds[var2]); + } else { + int var3 = this.ChildrenIds[-1 + this.ChildrenIds.length]; + return var3 == -1 ? null : getObjectDefinition(var3); + } + } catch (RuntimeException var4) { + throw ClientErrorException.clientError(var4, "pb.C(" + var1 + ')'); + } + } - final ObjectDefinition method1685(int var1) { - try { - if(var1 != 0) { - this.method1697(-92, 83, null, -13, null, 18, null, true, 114, 123, null, 118, 85, -116); - } - - int var2 = -1; - if(this.ConfigFileId != -1) { - var2 = NPCDefinition.method1484(this.ConfigFileId); - } else if(this.ConfigId != -1) { - var2 = ItemDefinition.ram[this.ConfigId]; - } - - if(var2 >= 0 && this.ChildrenIds.length - 1 > var2 && this.ChildrenIds[var2] != -1) { - return getObjectDefinition(this.ChildrenIds[var2]); - } else { - int var3 = this.ChildrenIds[-1 + this.ChildrenIds.length]; - return var3 == -1 ?null: getObjectDefinition(var3); - } - } catch (RuntimeException var4) { - throw ClientErrorException.clientError(var4, "pb.C(" + var1 + ')'); - } - } - - private Model_Sub1 method1686(int var1, int var2) { - try { - Model_Sub1 var4 = null; - boolean var5 = this.aBoolean1536; - if(var2 == 2 && 3 < var1) { - var5 = !var5; - } - - int var6; - int var7; - if(null == this.configuration) { - if(var2 != 10) { - return null; + private Model_Sub1 method1686(int var1, int var2) { + try { + Model_Sub1 var4 = null; + boolean var5 = this.aBoolean1536; + if (var2 == 2 && 3 < var1) { + var5 = !var5; } - if(this.models == null) { - return null; + int var6; + int var7; + if (null == this.configuration) { + if (var2 != 10) { + return null; + } + + if (this.models == null) { + return null; + } + + var6 = this.models.length; + + for (var7 = 0; var6 > var7; ++var7) { + int var8 = this.models[var7]; + if (var5) { + var8 += 65536; + } + + var4 = (Model_Sub1) aReferenceCache_1401.get(var8); + if (var4 == null) { + var4 = Model_Sub1.method2015(Unsorted.aClass153_1043, var8 & 65535); + if (var4 == null) { + return null; + } + + if (var5) { + var4.method2002(); + } + + aReferenceCache_1401.put(var4, var8); + } + + if (1 < var6) { + Class164.aClass140_Sub5Array2058[var7] = var4; + } + } + + if (var6 > 1) { + var4 = new Model_Sub1(Class164.aClass140_Sub5Array2058, var6); + } + } else { + var6 = -1; + + for (var7 = 0; this.configuration.length > var7; ++var7) { + if (var2 == this.configuration[var7]) { + var6 = var7; + break; + } + } + + if (var6 == -1) { + return null; + } + + var7 = this.models[var6]; + if (var5) { + var7 += 65536; + } + + var4 = (Model_Sub1) aReferenceCache_1401.get(var7); + if (null == var4) { + var4 = Model_Sub1.method2015(Unsorted.aClass153_1043, var7 & 65535); + if (null == var4) { + return null; + } + + if (var5) { + var4.method2002(); + } + + aReferenceCache_1401.put(var4, var7); + } } - var6 = this.models.length; + boolean var11; + var11 = 128 != this.anInt1479 || this.anInt1488 != 128 || 128 != this.anInt1481; - for(var7 = 0; var6 > var7; ++var7) { - int var8 = this.models[var7]; - if(var5) { - var8 += 65536; - } + boolean var12; + var12 = this.anInt1496 != 0 || this.anInt1511 != 0 || 0 != this.SecondBool; - var4 = (Model_Sub1) aReferenceCache_1401.get(var8); - if(var4 == null) { - var4 = Model_Sub1.method2015(Unsorted.aClass153_1043, var8 & '\uffff'); - if(var4 == null) { - return null; - } - - if(var5) { - var4.method2002(); - } - - aReferenceCache_1401.put(var4, var8); - } - - if(1 < var6) { - Class164.aClass140_Sub5Array2058[var7] = var4; - } + Model_Sub1 var13 = new Model_Sub1(Objects.requireNonNull(var4), var1 == 0 && !var11 && !var12, this.OriginalColors == null, null == this.aShortArray1476); + if (var2 == 4 && var1 > 3) { + var13.method2011(); + var13.method2001(45, 0, -45); } - if(var6 > 1) { - var4 = new Model_Sub1(Class164.aClass140_Sub5Array2058, var6); + var1 &= 3; + if (var1 == 1) { + var13.method1991(); + } else if (var1 == 2) { + var13.method1989(); + } else if (3 == var1) { + var13.method2018(); } - } else { - var6 = -1; - - for(var7 = 0; this.configuration.length > var7; ++var7) { - if(var2 == this.configuration[var7]) { - var6 = var7; - break; - } - } - - if(var6 == -1) { - return null; - } - - var7 = this.models[var6]; - if(var5) { - var7 += 65536; - } - - var4 = (Model_Sub1) aReferenceCache_1401.get(var7); - if(null == var4) { - var4 = Model_Sub1.method2015(Unsorted.aClass153_1043, var7 & '\uffff'); - if(null == var4) { - return null; - } - - if(var5) { - var4.method2002(); - } - - aReferenceCache_1401.put(var4, var7); - } - } - - boolean var11; - var11 = 128 != this.anInt1479 || this.anInt1488 != 128 || 128 != this.anInt1481; - - boolean var12; - var12 = this.anInt1496 != 0 || this.anInt1511 != 0 || 0 != this.SecondBool; - - Model_Sub1 var13 = new Model_Sub1(Objects.requireNonNull(var4), var1 == 0 && !var11 && !var12, this.OriginalColors == null, null == this.aShortArray1476); - if(var2 == 4 && var1 > 3) { - var13.method2011(); - var13.method2001(45, 0, -45); - } - - var1 &= 3; - if(var1 == 1) { - var13.method1991(); - } else if (var1 == 2) { - var13.method1989(); - } else if (3 == var1) { - var13.method2018(); - } - - int var9; - if(null != this.OriginalColors) { - for(var9 = 0; this.OriginalColors.length > var9; ++var9) { - if(null != this.aByteArray1513 && this.aByteArray1513.length > var9) { - var13.method2016(this.OriginalColors[var9], Class3_Sub13_Sub9.aShortArray3110[255 & this.aByteArray1513[var9]]); - } else { - var13.method2016(this.OriginalColors[var9], this.ModifiedColors[var9]); - } - } - } - - if(this.aShortArray1476 != null) { - for(var9 = 0; this.aShortArray1476.length > var9; ++var9) { - var13.method1998(this.aShortArray1476[var9], this.aShortArray1495[var9]); - } - } - - if(var11) { - var13.method1994(this.anInt1479, this.anInt1488, this.anInt1481); - } - - if(var12) { - var13.method2001(this.anInt1496, this.anInt1511, this.SecondBool); - } - - return var13; - } catch (RuntimeException var10) { - throw ClientErrorException.clientError(var10, "pb.O(" + var1 + ',' + var2 + ',' + -1 + ')'); - } - } - - static void method1688(int var0, int var1, int var2) { - Class3_Sub2 var3 = Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var0][var1][var2]; - if(var3 == null) { - } else { - var3.aClass72_2245 = null; - } - } - - final void method1689(int var1) { - try { - if(this.SecondInt == -1) { - this.SecondInt = 0; - if(null != this.models && (null == this.configuration || this.configuration[0] == 10)) { - this.SecondInt = 1; - } - - for(int var2 = 0; var2 < 5; ++var2) { - if(this.options[var2] != null) { - this.SecondInt = 1; - break; - } - } - } - - if(var1 != -2116) { - this.method1692(67, null); - } - - if(-1 == this.anInt1540) { - this.anInt1540 = this.ClipType != 0 ?1:0; - } - - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "pb.D(" + var1 + ')'); - } - } - - final boolean method1690() { - try { - if(this.ChildrenIds == null) { - return this.anInt1512 != -1 || this.anIntArray1539 != null; - } else { - - for(int var2 = 0; this.ChildrenIds.length > var2; ++var2) { - if(this.ChildrenIds[var2] != -1) { - ObjectDefinition var3 = getObjectDefinition(this.ChildrenIds[var2]); - if(var3.anInt1512 != -1 || var3.anIntArray1539 != null) { - return true; - } - } - } - - return false; - } - } catch (RuntimeException var4) { - throw ClientErrorException.clientError(var4, "pb.F(" + 28933 + ')'); - } - } - - final int method1691(int var1, int var2, byte var3) { - try { - if(var3 <= 76) { - return -40; - } else if(this.aHashTable_1501 == null) { - return var1; - } else { - LinkableInt var4 = (LinkableInt)this.aHashTable_1501.get(var2); - return var4 != null?var4.value :var1; - } - } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "pb.N(" + var1 + ',' + var2 + ',' + var3 + ')'); - } - } - - final void method1692(int var1, DataBuffer var2) { - try { - while(true) { - int var3 = var2.readUnsignedByte(); - if(var3 == 0) { - if(var1 != 6219) { - this.method1696(105, -55, null, -39, 71, null, true, null, (byte)-117, false, -25); - } - - return; - } - - this.parseOpcode(var2, var3); - } - } catch (RuntimeException var4) { - throw ClientErrorException.clientError(var4, "pb.G(" + var1 + ',' + (var2 != null?"{...}":"null") + ')'); - } - } - - private void parseOpcode(DataBuffer buffer, int opcode) { - try { - - int var4; - int var5; - if(1 == opcode) { - var4 = buffer.readUnsignedByte(); - if(var4 > 0) { - if(this.models == null || Unsorted.aBoolean742) { - this.configuration = new int[var4]; - this.models = new int[var4]; - - for(var5 = 0; var4 > var5; ++var5) { - this.models[var5] = buffer.readUnsignedShort(); - this.configuration[var5] = buffer.readUnsignedByte(); - } - } else { - buffer.index += var4 * 3; - } - } - } else if(opcode == 2) { - this.name = buffer.readString(); - } else if(opcode == 5) { - var4 = buffer.readUnsignedByte(); - if(var4 > 0) { - if(null == this.models || Unsorted.aBoolean742) { - this.models = new int[var4]; - this.configuration = null; - - for(var5 = 0; var4 > var5; ++var5) { - this.models[var5] = buffer.readUnsignedShort(); - } - } else { - buffer.index += var4 * 2; - } - } - } else if (opcode == 14) { - this.SizeX = buffer.readUnsignedByte(); - } else if (opcode == 15) { - this.SizeY = buffer.readUnsignedByte(); - } else if (opcode == 17) { - this.ClipType = 0; - this.ProjectileClipped = false; - } else if (18 == opcode) { - this.ProjectileClipped = false; - } else if (opcode == 19) { - this.SecondInt = buffer.readUnsignedByte(); - } else if (opcode == 21) { - this.aByte1505 = 1; - } else if (opcode == 22) { - this.aBoolean1541 = true; - } else if (opcode == 23) { - this.aBoolean1542 = true; - } else if (opcode == 24) { - this.animationId = buffer.readUnsignedShort(); - if (this.animationId == 65535) { - this.animationId = -1; - } - } else if (opcode == 27) { - this.ClipType = 1; - } else if (28 == opcode) { - this.anInt1528 = buffer.readUnsignedByte(); - } else if (opcode == 29) { - this.anInt1494 = buffer.readSignedByte(); - } else if (39 == opcode) { - this.anInt1489 = buffer.readSignedByte() * 5; - } else if (opcode >= 30 && opcode < 35) { - this.options[opcode - 30] = buffer.readString(); - if (this.options[-30 + opcode].equalsStringIgnoreCase(TextCore.HasHidden)) { - this.options[-30 + opcode] = null; - } - } else if (opcode == 40) { - var4 = buffer.readUnsignedByte(); - this.OriginalColors = new short[var4]; - this.ModifiedColors = new short[var4]; - - for (var5 = 0; var5 < var4; ++var5) { - this.OriginalColors[var5] = (short) buffer.readUnsignedShort(); - this.ModifiedColors[var5] = (short) buffer.readUnsignedShort(); - } - } else if (opcode == 41) { - var4 = buffer.readUnsignedByte(); - this.aShortArray1495 = new short[var4]; - this.aShortArray1476 = new short[var4]; - - for (var5 = 0; var4 > var5; ++var5) { - this.aShortArray1476[var5] = (short) buffer.readUnsignedShort(); - this.aShortArray1495[var5] = (short) buffer.readUnsignedShort(); - } - } else if (opcode == 42) { - var4 = buffer.readUnsignedByte(); - this.aByteArray1513 = new byte[var4]; - - for (var5 = 0; var4 > var5; ++var5) { - this.aByteArray1513[var5] = buffer.readSignedByte(); - } - } else if (opcode == 60) { - this.MapIcon = buffer.readUnsignedShort(); - } else if (opcode == 62) { - this.aBoolean1536 = true; - } else if (opcode == 64) { - this.aBoolean1525 = false; - } else if (opcode == 65) { - this.anInt1479 = buffer.readUnsignedShort(); - } else if (opcode == 66) { - this.anInt1488 = buffer.readUnsignedShort(); - } else if (opcode == 67) { - this.anInt1481 = buffer.readUnsignedShort(); - } else if (opcode == 69) { - this.WalkingFlag = buffer.readUnsignedByte(); - } else if (70 == opcode) { - this.anInt1496 = buffer.readSignedShort(); - } else if (71 == opcode) { - this.anInt1511 = buffer.readSignedShort(); - } else if (72 == opcode) { - this.SecondBool = buffer.readSignedShort(); - } else if (opcode == 73) { - this.aBoolean1483 = true; - } else if (opcode == 74) { - this.NotClipped = true; - } else if (75 == opcode) { - this.anInt1540 = buffer.readUnsignedByte(); - } else if (opcode == 77 || opcode == 92) { - var4 = -1; - this.ConfigFileId = buffer.readUnsignedShort(); - if ('\uffff' == this.ConfigFileId) { - this.ConfigFileId = -1; - } - - this.ConfigId = buffer.readUnsignedShort(); - if ('\uffff' == this.ConfigId) { - this.ConfigId = -1; - } - - if (92 == opcode) { - var4 = buffer.readUnsignedShort(); - if (var4 == '\uffff') { - var4 = -1; - } - } - - var5 = buffer.readUnsignedByte(); - this.ChildrenIds = new int[var5 - -2]; - - for (int var6 = 0; var5 >= var6; ++var6) { - this.ChildrenIds[var6] = buffer.readUnsignedShort(); - if ('\uffff' == this.ChildrenIds[var6]) { - this.ChildrenIds[var6] = -1; - } - } - - this.ChildrenIds[1 + var5] = var4; - } else if (78 == opcode) { - this.anInt1512 = buffer.readUnsignedShort(); - this.anInt1484 = buffer.readUnsignedByte(); - } else if (opcode == 79) { - this.anInt1518 = buffer.readUnsignedShort(); - this.anInt1515 = buffer.readUnsignedShort(); - this.anInt1484 = buffer.readUnsignedByte(); - var4 = buffer.readUnsignedByte(); - this.anIntArray1539 = new int[var4]; - - for (var5 = 0; var5 < var4; ++var5) { - this.anIntArray1539[var5] = buffer.readUnsignedShort(); - } - } else if (81 == opcode) { - this.aByte1505 = 2; - this.aShort1500 = (short) (256 * buffer.readUnsignedByte()); - } else if (opcode == 82) { - this.aBoolean1530 = true; - } else if (opcode == 88) { - this.aBoolean1503 = false; - } else if (opcode == 89) { - this.aBoolean1492 = false; - } else if (90 == opcode) { - this.aBoolean1502 = true; - } else if (opcode == 91) { - this.aBoolean1491 = true; - } else if (opcode == 93) { - this.aByte1505 = 3; - this.aShort1500 = (short) buffer.readUnsignedShort(); - } else if (opcode == 94) { - this.aByte1505 = 4; - } else if (opcode == 95) { - this.aByte1505 = 5; - } else if (opcode == 96) { - this.aBoolean1507 = true; - } else if (opcode == 97) { - this.aBoolean1537 = true; - } else if (opcode == 98) { - this.aBoolean1510 = true; - } else if (opcode == 99) { - this.anInt1493 = buffer.readUnsignedByte(); - this.anInt1517 = buffer.readUnsignedShort(); - } else if (opcode == 100) { - this.anInt1520 = buffer.readUnsignedByte(); - this.anInt1522 = buffer.readUnsignedShort(); - } else if (opcode == 101) { - this.anInt1478 = buffer.readUnsignedByte(); - } else if (opcode == 102) { - this.anInt1516 = buffer.readUnsignedShort(); - } else if (249 == opcode) { - var4 = buffer.readUnsignedByte(); - if (null == this.aHashTable_1501) { - var5 = Class95.method1585((byte) 83, var4); - this.aHashTable_1501 = new HashTable(var5); - } - - for (var5 = 0; var4 > var5; ++var5) { - boolean var10 = buffer.readUnsignedByte() == 1; - int var7 = buffer.readMedium(); - Object var8; - if (var10) { - var8 = new LinkableRSString(buffer.readString()); - } else { - var8 = new LinkableInt(buffer.readInt()); - } - - this.aHashTable_1501.put(var7, (Linkable) var8); - } - } - } catch (RuntimeException var9) { - throw ClientErrorException.clientError(var9, "pb.K(" + (buffer != null?"{...}":"null") + ',' + opcode + ',' + -80 + ')'); - } - - /** - * Will find a better way to incorporate this without tacking it onto the end of ObjectDefinitions at some point. - * Will *Actually* worry about it and make it 100x better when working on the new client. ~ Woah - * - * Checks to see if the Halloween Event is enabled, and then applies the "Gaze-into" option to the cauldron that - * had it during the 2008 Halloween Event - */ - if (GameConfig.HALLOWEEN_EVENT_ENABLED) { - if (objectId == 39233) { - options[0] = TextCore.GazeInto; - } - } - - if (GameConfig.CHRISTMAS_EVENT_ENABLED) { - //TODO: Add more christmas trees - if (objectId == 1278) { - this.models = new int[0]; - this.models = new int[]{1681}; - } - if (objectId == 1276) { - this.models = new int[0]; - this.models = new int[]{1682}; - } - } - - if (GameConfig.OBJECT_DEBUG_ENABLED) { - if (options[0] == null && options[1] == null && options[2] == null && options[3] == null && options[4] == null) { - options[0] = RSString.parse("Viewing object"); - } - } - } - - final boolean hasModels() { - try { - if(null == this.models) { - return true; - } else { - boolean var2 = true; - - for(int var3 = 0; var3 < this.models.length; ++var3) { - var2 &= Unsorted.aClass153_1043.method2129((byte)64, 0, '\uffff' & this.models[var3]); - } - - return var2; - } - } catch (RuntimeException var4) { - throw ClientErrorException.clientError(var4, "pb.I(" + false + ')'); - } - } - - private Class140_Sub1_Sub1 method1695(int var1, boolean var2, int var4) { - try { - int var6 = this.anInt1494 + 64; - int var7 = 5 * this.anInt1489 + 768; - Class140_Sub1_Sub1 var5; - int var8; - int var12; - if(this.configuration == null) { - if(var4 != 10) { - return null; - } - - if(this.models == null) { - return null; - } - - var8 = this.models.length; - if(var8 == 0) { - return null; - } - - long var16 = 0L; - - for(int var11 = 0; var11 < var8; ++var11) { - var16 = (long)this.models[var11] + var16 * 67783L; - } - - if(var2) { - var16 = ~var16; - } - - var5 = (Class140_Sub1_Sub1) aReferenceCache_1401.get(var16); - if(null == var5) { - Model_Sub1 var17 = null; - - for(var12 = 0; var12 < var8; ++var12) { - var17 = Model_Sub1.method2015(Unsorted.aClass153_1043, this.models[var12] & '\uffff'); - if(null == var17) { - return null; - } - - if(var8 > 1) { - Class164.aClass140_Sub5Array2058[var12] = var17; - } - } - - if(1 < var8) { - var17 = new Model_Sub1(Class164.aClass140_Sub5Array2058, var8); - } - - var5 = new Class140_Sub1_Sub1(var17, var6, var7, var2); - aReferenceCache_1401.put(var5, var16); - } - } else { - var8 = -1; int var9; - for(var9 = 0; this.configuration.length > var9; ++var9) { - if(var4 == this.configuration[var9]) { - var8 = var9; - break; - } + if (null != this.OriginalColors) { + for (var9 = 0; this.OriginalColors.length > var9; ++var9) { + if (null != this.aByteArray1513 && this.aByteArray1513.length > var9) { + var13.method2016(this.OriginalColors[var9], TextureOperation16.aShortArray3110[255 & this.aByteArray1513[var9]]); + } else { + var13.method2016(this.OriginalColors[var9], this.ModifiedColors[var9]); + } + } } - if(var8 == -1) { - return null; + if (this.aShortArray1476 != null) { + for (var9 = 0; this.aShortArray1476.length > var9; ++var9) { + var13.method1998(this.aShortArray1476[var9], this.aShortArray1495[var9]); + } } - var9 = this.models[var8]; - if(var2) { - var9 += 65536; + if (var11) { + var13.method1994(this.anInt1479, this.anInt1488, this.anInt1481); } - var5 = (Class140_Sub1_Sub1) aReferenceCache_1401.get(var9); - if(null == var5) { - Model_Sub1 var10 = Model_Sub1.method2015(Unsorted.aClass153_1043, '\uffff' & var9); - if(null == var10) { - return null; - } - - var5 = new Class140_Sub1_Sub1(var10, var6, var7, var2); - aReferenceCache_1401.put(var5, var9); + if (var12) { + var13.method2001(this.anInt1496, this.anInt1511, this.SecondBool); } - } - boolean var14 = this.aBoolean1536; - if(var4 == 2 && var1 > 3) { - var14 = !var14; - } + return var13; + } catch (RuntimeException var10) { + throw ClientErrorException.clientError(var10, "pb.O(" + var1 + ',' + var2 + ',' + -1 + ')'); + } + } - boolean var15 = 128 == this.anInt1488 && this.anInt1511 == 0; - boolean var18 = var1 == 0 && 128 == this.anInt1479 && this.anInt1481 == 128 && this.anInt1496 == 0 && this.SecondBool == 0 && !var14; - Class140_Sub1_Sub1 var19 = var5.method1926(var18, var15, this.OriginalColors == null, var6 == var5.method1903(), var1 == 0 && !var14, true, var5.method1924() == var7, !var14, this.aShortArray1476 == null); - if(var14) { - var19.method1931(); - } + static void method1688(int var0, int var1, int var2) { + Class3_Sub2 var3 = Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var0][var1][var2]; + if (var3 == null) { + } else { + var3.aClass72_2245 = null; + } + } - if(var4 == 4 && 3 < var1) { - var19.method1932(); - var19.method1897(45, 0, -45); - } + final void method1689(int var1) { + try { + if (this.SecondInt == -1) { + this.SecondInt = 0; + if (null != this.models && (null == this.configuration || this.configuration[0] == 10)) { + this.SecondInt = 1; + } - var1 &= 3; - if(1 == var1) { - var19.method1925(); - } else if(var1 == 2) { - var19.method1911(); - } else if (var1 == 3) { - var19.method1902(); - } - - if(null != this.OriginalColors) { - for(var12 = 0; var12 < this.OriginalColors.length; ++var12) { - var19.method1918(this.OriginalColors[var12], this.ModifiedColors[var12]); + for (int var2 = 0; var2 < 5; ++var2) { + if (this.options[var2] != null) { + this.SecondInt = 1; + break; + } + } } - } - if(null != this.aShortArray1476) { - for(var12 = 0; var12 < this.aShortArray1476.length; ++var12) { - var19.method1916(this.aShortArray1476[var12], this.aShortArray1495[var12]); + if (var1 != -2116) { + this.method1692(67, null); } - } - if(this.anInt1479 != 128 || this.anInt1488 != 128 || this.anInt1481 != 128) { - var19.resize(this.anInt1479, this.anInt1488, this.anInt1481); - } + if (-1 == this.anInt1540) { + this.anInt1540 = this.ClipType != 0 ? 1 : 0; + } - if(this.anInt1496 != 0 || this.anInt1511 != 0 || 0 != this.SecondBool) { - var19.method1897(this.anInt1496, this.anInt1511, this.SecondBool); - } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "pb.D(" + var1 + ')'); + } + } - if(var6 != var19.method1903()) { - var19.method1914(var6); - } - - if(var19.method1924() != var7) { - var19.method1909(var7); - } - - return var19; - } catch (RuntimeException var13) { - throw ClientErrorException.clientError(var13, "pb.L(" + var1 + ',' + var2 + ',' + true + ',' + var4 + ')'); - } - } - - final Class136 method1696(int var1, int var2, int[][] var3, int var4, int var5, int[][] var6, boolean var7, LDIndexedSprite var8, byte var9, boolean var10, int var11) { - try { - if(var9 >= -5) { - return null; - } else { - long var12; - if(HDToolKit.highDetail) { - if(null == this.configuration) { - var12 = (this.objectId << 10) + var1; - } else { - var12 = var1 + (this.objectId << 10) - -(var4 << 3); - } - - Class136 var16 = (Class136) Unsorted.aReferenceCache_4051.get(var12); - Class140_Sub1_Sub1 var14; - LDIndexedSprite var15; - if(null == var16) { - var14 = this.method1695(var1, false, var4); - if(null == var14) { - aClass136_1413.aClass140_1777 = null; - aClass136_1413.aClass109_Sub1_1770 = null; - return aClass136_1413; - } - - if(var4 == 10 && var1 > 3) { - var14.method1876(256); - } - - if(var10) { - var15 = var14.method1933(var8); - } else { - var15 = null; - } - - var16 = new Class136(); - var16.aClass140_1777 = var14; - var16.aClass109_Sub1_1770 = var15; - Unsorted.aReferenceCache_4051.put(var16, var12); - } else { - var14 = (Class140_Sub1_Sub1)var16.aClass140_1777; - var15 = var16.aClass109_Sub1_1770; - } - - boolean var17 = this.aBoolean1541 & var7; - Class140_Sub1_Sub1 var18 = var14.method1926(3 != this.aByte1505, this.aByte1505 == 0, true, true, true, !var17, true, true, true); - if(this.aByte1505 != 0) { - var18.method1919(this.aByte1505, this.aShort1500, var14, var3, var6, var2, var5, var11); - } - - var18.method1920(this.SecondInt == 0 && !this.aBoolean1510, true, true, this.SecondInt == 0, true, false); - aClass136_1413.aClass140_1777 = var18; - var18.aBoolean3809 = var17; - aClass136_1413.aClass109_Sub1_1770 = var15; + final boolean method1690() { + try { + if (this.ChildrenIds == null) { + return this.anInt1512 != -1 || this.anIntArray1539 != null; } else { - if(this.configuration == null) { - var12 = (this.objectId << 10) + var1; - } else { - var12 = (var4 << 3) + ((this.objectId << 10) - -var1); - } - boolean var20; - if(var7 && this.aBoolean1541) { - var12 |= Long.MIN_VALUE; - var20 = true; - } else { - var20 = false; - } + for (int var2 = 0; this.ChildrenIds.length > var2; ++var2) { + if (this.ChildrenIds[var2] != -1) { + ObjectDefinition var3 = getObjectDefinition(this.ChildrenIds[var2]); + if (var3.anInt1512 != -1 || var3.anIntArray1539 != null) { + return true; + } + } + } - Object var22 = Unsorted.aReferenceCache_4051.get(var12); - if(null == var22) { - Model_Sub1 var21 = this.method1686(var1, var4); - if(var21 == null) { - aClass136_1413.aClass140_1777 = null; - return aClass136_1413; - } + return false; + } + } catch (RuntimeException var4) { + throw ClientErrorException.clientError(var4, "pb.F(" + 28933 + ')'); + } + } - var21.method2010(); - if(var4 == 10 && var1 > 3) { - var21.method2011(); - } + final int method1691(int var1, int var2, byte var3) { + try { + if (var3 <= 76) { + return -40; + } else if (this.aHashTable_1501 == null) { + return var1; + } else { + LinkableInt var4 = (LinkableInt) this.aHashTable_1501.get(var2); + return var4 != null ? var4.value : var1; + } + } catch (RuntimeException var5) { + throw ClientErrorException.clientError(var5, "pb.N(" + var1 + ',' + var2 + ',' + var3 + ')'); + } + } - if(var20) { - var21.aShort2879 = (short)(64 + this.anInt1494); - var22 = var21; - var21.aShort2876 = (short)(768 + 5 * this.anInt1489); - var21.method1997(); - } else { - var22 = new Class140_Sub1_Sub2(var21, 64 - -this.anInt1494, 5 * this.anInt1489 + 768, -50, -10, -50); - } + final void method1692(int var1, DataBuffer var2) { + try { + while (true) { + int var3 = var2.readUnsignedByte(); + if (var3 == 0) { + if (var1 != 6219) { + this.method1696(105, -55, null, -39, 71, null, true, null, (byte) -117, false, -25); + } - Unsorted.aReferenceCache_4051.put(var22, var12); - } + return; + } - if(var20) { - var22 = ((Model_Sub1)var22).method2004(); - } + this.parseOpcode(var2, var3); + } + } catch (RuntimeException var4) { + throw ClientErrorException.clientError(var4, "pb.G(" + var1 + ',' + (var2 != null ? "{...}" : "null") + ')'); + } + } - if(0 != this.aByte1505) { - if(var22 instanceof Class140_Sub1_Sub2) { - var22 = ((Class140_Sub1_Sub2)var22).method1941(this.aByte1505, this.aShort1500, var3, var6, var2, var5, var11, true); - } else if (var22 instanceof Model_Sub1) { - var22 = ((Model_Sub1) var22).method1999(this.aByte1505, this.aShort1500, var3, var6, var2, var5, var11); - } - } + private void parseOpcode(DataBuffer buffer, int opcode) { + try { - aClass136_1413.aClass140_1777 = (GameObject)var22; + int var4; + int var5; + if (1 == opcode) { + var4 = buffer.readUnsignedByte(); + if (var4 > 0) { + if (this.models == null || Unsorted.aBoolean742) { + this.configuration = new int[var4]; + this.models = new int[var4]; + + for (var5 = 0; var4 > var5; ++var5) { + this.models[var5] = buffer.readUnsignedShort(); + this.configuration[var5] = buffer.readUnsignedByte(); + } + } else { + buffer.index += var4 * 3; + } + } + } else if (opcode == 2) { + this.name = buffer.readString(); + } else if (opcode == 5) { + var4 = buffer.readUnsignedByte(); + if (var4 > 0) { + if (null == this.models || Unsorted.aBoolean742) { + this.models = new int[var4]; + this.configuration = null; + + for (var5 = 0; var4 > var5; ++var5) { + this.models[var5] = buffer.readUnsignedShort(); + } + } else { + buffer.index += var4 * 2; + } + } + } else if (opcode == 14) { + this.SizeX = buffer.readUnsignedByte(); + } else if (opcode == 15) { + this.SizeY = buffer.readUnsignedByte(); + } else if (opcode == 17) { + this.ClipType = 0; + this.ProjectileClipped = false; + } else if (18 == opcode) { + this.ProjectileClipped = false; + } else if (opcode == 19) { + this.SecondInt = buffer.readUnsignedByte(); + } else if (opcode == 21) { + this.aByte1505 = 1; + } else if (opcode == 22) { + this.aBoolean1541 = true; + } else if (opcode == 23) { + this.aBoolean1542 = true; + } else if (opcode == 24) { + this.animationId = buffer.readUnsignedShort(); + if (this.animationId == 65535) { + this.animationId = -1; + } + } else if (opcode == 27) { + this.ClipType = 1; + } else if (28 == opcode) { + this.anInt1528 = buffer.readUnsignedByte(); + } else if (opcode == 29) { + this.anInt1494 = buffer.readSignedByte(); + } else if (39 == opcode) { + this.anInt1489 = buffer.readSignedByte() * 5; + } else if (opcode >= 30 && opcode < 35) { + this.options[opcode - 30] = buffer.readString(); + if (this.options[-30 + opcode].equalsStringIgnoreCase(TextCore.HasHidden)) { + this.options[-30 + opcode] = null; + } + } else if (opcode == 40) { + var4 = buffer.readUnsignedByte(); + this.OriginalColors = new short[var4]; + this.ModifiedColors = new short[var4]; + + for (var5 = 0; var5 < var4; ++var5) { + this.OriginalColors[var5] = (short) buffer.readUnsignedShort(); + this.ModifiedColors[var5] = (short) buffer.readUnsignedShort(); + } + } else if (opcode == 41) { + var4 = buffer.readUnsignedByte(); + this.aShortArray1495 = new short[var4]; + this.aShortArray1476 = new short[var4]; + + for (var5 = 0; var4 > var5; ++var5) { + this.aShortArray1476[var5] = (short) buffer.readUnsignedShort(); + this.aShortArray1495[var5] = (short) buffer.readUnsignedShort(); + } + } else if (opcode == 42) { + var4 = buffer.readUnsignedByte(); + this.aByteArray1513 = new byte[var4]; + + for (var5 = 0; var4 > var5; ++var5) { + this.aByteArray1513[var5] = buffer.readSignedByte(); + } + } else if (opcode == 60) { + this.MapIcon = buffer.readUnsignedShort(); + } else if (opcode == 62) { + this.aBoolean1536 = true; + } else if (opcode == 64) { + this.aBoolean1525 = false; + } else if (opcode == 65) { + this.anInt1479 = buffer.readUnsignedShort(); + } else if (opcode == 66) { + this.anInt1488 = buffer.readUnsignedShort(); + } else if (opcode == 67) { + this.anInt1481 = buffer.readUnsignedShort(); + } else if (opcode == 69) { + this.WalkingFlag = buffer.readUnsignedByte(); + } else if (70 == opcode) { + this.anInt1496 = buffer.readSignedShort(); + } else if (71 == opcode) { + this.anInt1511 = buffer.readSignedShort(); + } else if (72 == opcode) { + this.SecondBool = buffer.readSignedShort(); + } else if (opcode == 73) { + this.aBoolean1483 = true; + } else if (opcode == 74) { + this.NotClipped = true; + } else if (75 == opcode) { + this.anInt1540 = buffer.readUnsignedByte(); + } else if (opcode == 77 || opcode == 92) { + var4 = -1; + this.ConfigFileId = buffer.readUnsignedShort(); + if (65535 == this.ConfigFileId) { + this.ConfigFileId = -1; + } + + this.ConfigId = buffer.readUnsignedShort(); + if (65535 == this.ConfigId) { + this.ConfigId = -1; + } + + if (92 == opcode) { + var4 = buffer.readUnsignedShort(); + if (var4 == 65535) { + var4 = -1; + } + } + + var5 = buffer.readUnsignedByte(); + this.ChildrenIds = new int[var5 - -2]; + + for (int var6 = 0; var5 >= var6; ++var6) { + this.ChildrenIds[var6] = buffer.readUnsignedShort(); + if (65535 == this.ChildrenIds[var6]) { + this.ChildrenIds[var6] = -1; + } + } + + this.ChildrenIds[1 + var5] = var4; + } else if (78 == opcode) { + this.anInt1512 = buffer.readUnsignedShort(); + this.anInt1484 = buffer.readUnsignedByte(); + } else if (opcode == 79) { + this.anInt1518 = buffer.readUnsignedShort(); + this.anInt1515 = buffer.readUnsignedShort(); + this.anInt1484 = buffer.readUnsignedByte(); + var4 = buffer.readUnsignedByte(); + this.anIntArray1539 = new int[var4]; + + for (var5 = 0; var5 < var4; ++var5) { + this.anIntArray1539[var5] = buffer.readUnsignedShort(); + } + } else if (81 == opcode) { + this.aByte1505 = 2; + this.aShort1500 = (short) (256 * buffer.readUnsignedByte()); + } else if (opcode == 82) { + this.aBoolean1530 = true; + } else if (opcode == 88) { + this.aBoolean1503 = false; + } else if (opcode == 89) { + this.aBoolean1492 = false; + } else if (90 == opcode) { + this.aBoolean1502 = true; + } else if (opcode == 91) { + this.aBoolean1491 = true; + } else if (opcode == 93) { + this.aByte1505 = 3; + this.aShort1500 = (short) buffer.readUnsignedShort(); + } else if (opcode == 94) { + this.aByte1505 = 4; + } else if (opcode == 95) { + this.aByte1505 = 5; + } else if (opcode == 96) { + this.aBoolean1507 = true; + } else if (opcode == 97) { + this.aBoolean1537 = true; + } else if (opcode == 98) { + this.aBoolean1510 = true; + } else if (opcode == 99) { + this.anInt1493 = buffer.readUnsignedByte(); + this.anInt1517 = buffer.readUnsignedShort(); + } else if (opcode == 100) { + this.anInt1520 = buffer.readUnsignedByte(); + this.anInt1522 = buffer.readUnsignedShort(); + } else if (opcode == 101) { + this.anInt1478 = buffer.readUnsignedByte(); + } else if (opcode == 102) { + this.anInt1516 = buffer.readUnsignedShort(); + } else if (249 == opcode) { + var4 = buffer.readUnsignedByte(); + if (null == this.aHashTable_1501) { + var5 = Class95.method1585((byte) 83, var4); + this.aHashTable_1501 = new HashTable(var5); + } + + for (var5 = 0; var4 > var5; ++var5) { + boolean var10 = buffer.readUnsignedByte() == 1; + int var7 = buffer.readMedium(); + Object var8; + if (var10) { + var8 = new LinkableRSString(buffer.readString()); + } else { + var8 = new LinkableInt(buffer.readInt()); + } + + this.aHashTable_1501.put(var7, (Linkable) var8); + } + } + } catch (RuntimeException var9) { + throw ClientErrorException.clientError(var9, "pb.K(" + (buffer != null ? "{...}" : "null") + ',' + opcode + ',' + -80 + ')'); + } + + /** + * Will find a better way to incorporate this without tacking it onto the end of ObjectDefinitions at some point. + * Will *Actually* worry about it and make it 100x better when working on the new client. ~ Woah + * + * Checks to see if the Halloween Event is enabled, and then applies the "Gaze-into" option to the cauldron that + * had it during the 2008 Halloween Event + */ + if (GameConfig.HALLOWEEN_EVENT_ENABLED) { + if (objectId == 39233) { + options[0] = TextCore.GazeInto; + } + } + + if (GameConfig.CHRISTMAS_EVENT_ENABLED) { + //TODO: Add more christmas trees + if (objectId == 1278) { + this.models = new int[0]; + this.models = new int[]{1681}; + } + if (objectId == 1276) { + this.models = new int[0]; + this.models = new int[]{1682}; + } + } + + if (GameConfig.OBJECT_DEBUG_ENABLED) { + if (options[0] == null && options[1] == null && options[2] == null && options[3] == null && options[4] == null) { + options[0] = RSString.parse("Viewing object"); + } + } + } + + final boolean hasModels() { + try { + if (null == this.models) { + return true; + } else { + boolean var2 = true; + + for (int var3 = 0; var3 < this.models.length; ++var3) { + var2 &= Unsorted.aClass153_1043.method2129((byte) 64, 0, 65535 & this.models[var3]); + } + + return var2; + } + } catch (RuntimeException var4) { + throw ClientErrorException.clientError(var4, "pb.I(" + false + ')'); + } + } + + private Class140_Sub1_Sub1 method1695(int var1, boolean var2, int var4) { + try { + int var6 = this.anInt1494 + 64; + int var7 = 5 * this.anInt1489 + 768; + Class140_Sub1_Sub1 var5; + int var8; + int var12; + if (this.configuration == null) { + if (var4 != 10) { + return null; + } + + if (this.models == null) { + return null; + } + + var8 = this.models.length; + if (var8 == 0) { + return null; + } + + long var16 = 0L; + + for (int var11 = 0; var11 < var8; ++var11) { + var16 = (long) this.models[var11] + var16 * 67783L; + } + + if (var2) { + var16 = ~var16; + } + + var5 = (Class140_Sub1_Sub1) aReferenceCache_1401.get(var16); + if (null == var5) { + Model_Sub1 var17 = null; + + for (var12 = 0; var12 < var8; ++var12) { + var17 = Model_Sub1.method2015(Unsorted.aClass153_1043, this.models[var12] & 65535); + if (null == var17) { + return null; + } + + if (var8 > 1) { + Class164.aClass140_Sub5Array2058[var12] = var17; + } + } + + if (1 < var8) { + var17 = new Model_Sub1(Class164.aClass140_Sub5Array2058, var8); + } + + var5 = new Class140_Sub1_Sub1(var17, var6, var7, var2); + aReferenceCache_1401.put(var5, var16); + } + } else { + var8 = -1; + + int var9; + for (var9 = 0; this.configuration.length > var9; ++var9) { + if (var4 == this.configuration[var9]) { + var8 = var9; + break; + } + } + + if (var8 == -1) { + return null; + } + + var9 = this.models[var8]; + if (var2) { + var9 += 65536; + } + + var5 = (Class140_Sub1_Sub1) aReferenceCache_1401.get(var9); + if (null == var5) { + Model_Sub1 var10 = Model_Sub1.method2015(Unsorted.aClass153_1043, 65535 & var9); + if (null == var10) { + return null; + } + + var5 = new Class140_Sub1_Sub1(var10, var6, var7, var2); + aReferenceCache_1401.put(var5, var9); + } + } + + boolean var14 = this.aBoolean1536; + if (var4 == 2 && var1 > 3) { + var14 = !var14; + } + + boolean var15 = 128 == this.anInt1488 && this.anInt1511 == 0; + boolean var18 = var1 == 0 && 128 == this.anInt1479 && this.anInt1481 == 128 && this.anInt1496 == 0 && this.SecondBool == 0 && !var14; + Class140_Sub1_Sub1 var19 = var5.method1926(var18, var15, this.OriginalColors == null, var6 == var5.method1903(), var1 == 0 && !var14, true, var5.method1924() == var7, !var14, this.aShortArray1476 == null); + if (var14) { + var19.method1931(); + } + + if (var4 == 4 && 3 < var1) { + var19.method1932(); + var19.method1897(45, 0, -45); + } + + var1 &= 3; + if (1 == var1) { + var19.method1925(); + } else if (var1 == 2) { + var19.method1911(); + } else if (var1 == 3) { + var19.method1902(); + } + + if (null != this.OriginalColors) { + for (var12 = 0; var12 < this.OriginalColors.length; ++var12) { + var19.method1918(this.OriginalColors[var12], this.ModifiedColors[var12]); + } + } + + if (null != this.aShortArray1476) { + for (var12 = 0; var12 < this.aShortArray1476.length; ++var12) { + var19.method1916(this.aShortArray1476[var12], this.aShortArray1495[var12]); + } + } + + if (this.anInt1479 != 128 || this.anInt1488 != 128 || this.anInt1481 != 128) { + var19.resize(this.anInt1479, this.anInt1488, this.anInt1481); + } + + if (this.anInt1496 != 0 || this.anInt1511 != 0 || 0 != this.SecondBool) { + var19.method1897(this.anInt1496, this.anInt1511, this.SecondBool); + } + + if (var6 != var19.method1903()) { + var19.method1914(var6); + } + + if (var19.method1924() != var7) { + var19.method1909(var7); + } + + return var19; + } catch (RuntimeException var13) { + throw ClientErrorException.clientError(var13, "pb.L(" + var1 + ',' + var2 + ',' + true + ',' + var4 + ')'); + } + } + + final Class136 method1696(int var1, int var2, int[][] var3, int var4, int var5, int[][] var6, boolean var7, LDIndexedSprite var8, byte var9, boolean var10, int var11) { + try { + if (var9 >= -5) { + return null; + } else { + long var12; + if (HDToolKit.highDetail) { + if (null == this.configuration) { + var12 = (this.objectId << 10) + var1; + } else { + var12 = var1 + (this.objectId << 10) - -(var4 << 3); + } + + Class136 var16 = (Class136) Unsorted.aReferenceCache_4051.get(var12); + Class140_Sub1_Sub1 var14; + LDIndexedSprite var15; + if (null == var16) { + var14 = this.method1695(var1, false, var4); + if (null == var14) { + aClass136_1413.aClass140_1777 = null; + aClass136_1413.aClass109_Sub1_1770 = null; + return aClass136_1413; + } + + if (var4 == 10 && var1 > 3) { + var14.method1876(256); + } + + if (var10) { + var15 = var14.method1933(var8); + } else { + var15 = null; + } + + var16 = new Class136(); + var16.aClass140_1777 = var14; + var16.aClass109_Sub1_1770 = var15; + Unsorted.aReferenceCache_4051.put(var16, var12); + } else { + var14 = (Class140_Sub1_Sub1) var16.aClass140_1777; + var15 = var16.aClass109_Sub1_1770; + } + + boolean var17 = this.aBoolean1541 & var7; + Class140_Sub1_Sub1 var18 = var14.method1926(3 != this.aByte1505, this.aByte1505 == 0, true, true, true, !var17, true, true, true); + if (this.aByte1505 != 0) { + var18.method1919(this.aByte1505, this.aShort1500, var14, var3, var6, var2, var5, var11); + } + + var18.method1920(this.SecondInt == 0 && !this.aBoolean1510, true, true, this.SecondInt == 0, true, false); + aClass136_1413.aClass140_1777 = var18; + var18.aBoolean3809 = var17; + aClass136_1413.aClass109_Sub1_1770 = var15; + } else { + if (this.configuration == null) { + var12 = (this.objectId << 10) + var1; + } else { + var12 = (var4 << 3) + ((this.objectId << 10) - -var1); + } + + boolean var20; + if (var7 && this.aBoolean1541) { + var12 |= Long.MIN_VALUE; + var20 = true; + } else { + var20 = false; + } + + Object var22 = Unsorted.aReferenceCache_4051.get(var12); + if (null == var22) { + Model_Sub1 var21 = this.method1686(var1, var4); + if (var21 == null) { + aClass136_1413.aClass140_1777 = null; + return aClass136_1413; + } + + var21.method2010(); + if (var4 == 10 && var1 > 3) { + var21.method2011(); + } + + if (var20) { + var21.aShort2879 = (short) (64 + this.anInt1494); + var22 = var21; + var21.aShort2876 = (short) (768 + 5 * this.anInt1489); + var21.method1997(); + } else { + var22 = new Class140_Sub1_Sub2(var21, 64 - -this.anInt1494, 5 * this.anInt1489 + 768, -50, -10, -50); + } + + Unsorted.aReferenceCache_4051.put(var22, var12); + } + + if (var20) { + var22 = ((Model_Sub1) var22).method2004(); + } + + if (0 != this.aByte1505) { + if (var22 instanceof Class140_Sub1_Sub2) { + var22 = ((Class140_Sub1_Sub2) var22).method1941(this.aByte1505, this.aShort1500, var3, var6, var2, var5, var11, true); + } else if (var22 instanceof Model_Sub1) { + var22 = ((Model_Sub1) var22).method1999(this.aByte1505, this.aShort1500, var3, var6, var2, var5, var11); + } + } + + aClass136_1413.aClass140_1777 = (GameObject) var22; + } + return aClass136_1413; + } + } catch (RuntimeException var19) { + throw ClientErrorException.clientError(var19, "pb.A(" + var1 + ',' + var2 + ',' + (var3 != null ? "{...}" : "null") + ',' + var4 + ',' + var5 + ',' + (var6 != null ? "{...}" : "null") + ',' + var7 + ',' + (var8 != null ? "{...}" : "null") + ',' + var9 + ',' + var10 + ',' + var11 + ')'); + } + } + + final Class136 method1697(int var1, int var2, LDIndexedSprite var3, int var4, SequenceDefinition var5, int var6, int[][] var7, boolean var8, int var9, int var10, int[][] var11, int var12, int var13, int var14) { + try { + if (var10 != 8308) { + this.hasModels(); + } + + long var15; + if (HDToolKit.highDetail) { + if (this.configuration == null) { + var15 = var6 + (this.objectId << 10); + } else { + var15 = (var13 << 3) + ((this.objectId << 10) - -var6); + } + + Class140_Sub1_Sub1 var23 = (Class140_Sub1_Sub1) aReferenceCache_1965.get(var15); + if (var23 == null) { + var23 = this.method1695(var6, true, var13); + if (null == var23) { + return null; + } + + var23.method1908(); + var23.method1920(false, false, false, false, false, true); + aReferenceCache_1965.put(var23, var15); + } + + boolean var19 = false; + Class140_Sub1_Sub1 var22 = var23; + if (null != var5) { + var22 = (Class140_Sub1_Sub1) var5.method2056(var12, var9, var14, var6, var23); + var19 = true; + } + + if (var13 == 10 && 3 < var6) { + if (!var19) { + var22 = (Class140_Sub1_Sub1) var22.method1890(true, true, true); + var19 = true; + } + + var22.method1876(256); + } + + if (var8) { + aClass136_1413.aClass109_Sub1_1770 = var22.method1933(var3); + } else { + aClass136_1413.aClass109_Sub1_1770 = null; + } + + if (this.aByte1505 != 0) { + if (!var19) { + var22 = (Class140_Sub1_Sub1) var22.method1890(true, true, true); + } + + var22.method1919(this.aByte1505, this.aShort1500, var23, var7, var11, var2, var4, var1); + } + + aClass136_1413.aClass140_1777 = var22; + } else { + if (this.configuration == null) { + var15 = (this.objectId << 10) + var6; + } else { + var15 = var6 + (this.objectId << 10) + (var13 << 3); + } + + Class140_Sub1_Sub2 var17 = (Class140_Sub1_Sub2) aReferenceCache_1965.get(var15); + if (var17 == null) { + Model_Sub1 var18 = this.method1686(var6, var13); + if (var18 == null) { + return null; + } + + var17 = new Class140_Sub1_Sub2(var18, 64 + this.anInt1494, this.anInt1489 * 5 + 768, -50, -10, -50); + aReferenceCache_1965.put(var17, var15); + } + + boolean var21 = false; + if (var5 != null) { + var21 = true; + var17 = (Class140_Sub1_Sub2) var5.method2054(var9, var12, var17, var6, var14); + } + + if (var13 == 10 && var6 > 3) { + if (!var21) { + var21 = true; + var17 = (Class140_Sub1_Sub2) var17.method1890(true, true, true); + } + + var17.method1876(256); + } + + if (this.aByte1505 != 0) { + if (!var21) { + var17 = (Class140_Sub1_Sub2) var17.method1890(true, true, true); + } + + var17 = var17.method1941(this.aByte1505, this.aShort1500, var7, var11, var2, var4, var1, false); + } + + aClass136_1413.aClass140_1777 = var17; } return aClass136_1413; - } - } catch (RuntimeException var19) { - throw ClientErrorException.clientError(var19, "pb.A(" + var1 + ',' + var2 + ',' + (var3 != null?"{...}":"null") + ',' + var4 + ',' + var5 + ',' + (var6 != null?"{...}":"null") + ',' + var7 + ',' + (var8 != null?"{...}":"null") + ',' + var9 + ',' + var10 + ',' + var11 + ')'); - } - } + } catch (RuntimeException var20) { + throw ClientErrorException.clientError(var20, "pb.M(" + var1 + ',' + var2 + ',' + (var3 != null ? "{...}" : "null") + ',' + var4 + ',' + (var5 != null ? "{...}" : "null") + ',' + var6 + ',' + (var7 != null ? "{...}" : "null") + ',' + var8 + ',' + var9 + ',' + var10 + ',' + (var11 != null ? "{...}" : "null") + ',' + var12 + ',' + var13 + ',' + var14 + ')'); + } + } - final Class136 method1697(int var1, int var2, LDIndexedSprite var3, int var4, SequenceDefinition var5, int var6, int[][] var7, boolean var8, int var9, int var10, int[][] var11, int var12, int var13, int var14) { - try { - if(var10 != 8308) { - this.hasModels(); - } + final RSString method1698(RSString var1, int var3) { + try { - long var15; - if(HDToolKit.highDetail) { - if(this.configuration == null) { - var15 = var6 + (this.objectId << 10); + if (null == this.aHashTable_1501) { + return var1; } else { - var15 = (var13 << 3) + ((this.objectId << 10) - -var6); + LinkableRSString var4 = (LinkableRSString) this.aHashTable_1501.get(var3); + return var4 == null ? var1 : var4.value; } + } catch (RuntimeException var5) { + throw ClientErrorException.clientError(var5, "pb.E(" + (var1 != null ? "{...}" : "null") + ',' + -23085 + ',' + var3 + ')'); + } + } - Class140_Sub1_Sub1 var23 = (Class140_Sub1_Sub1) aReferenceCache_1965.get(var15); - if(var23 == null) { - var23 = this.method1695(var6, true, var13); - if(null == var23) { - return null; - } - - var23.method1908(); - var23.method1920(false, false, false, false, false, true); - aReferenceCache_1965.put(var23, var15); - } - - boolean var19 = false; - Class140_Sub1_Sub1 var22 = var23; - if(null != var5) { - var22 = (Class140_Sub1_Sub1)var5.method2056(var12, var9, var14, var6, var23); - var19 = true; - } - - if(var13 == 10 && 3 < var6) { - if(!var19) { - var22 = (Class140_Sub1_Sub1)var22.method1890(true, true, true); - var19 = true; - } - - var22.method1876(256); - } - - if(var8) { - aClass136_1413.aClass109_Sub1_1770 = var22.method1933(var3); - } else { - aClass136_1413.aClass109_Sub1_1770 = null; - } - - if(this.aByte1505 != 0) { - if(!var19) { - var22 = (Class140_Sub1_Sub1)var22.method1890(true, true, true); - } - - var22.method1919(this.aByte1505, this.aShort1500, var23, var7, var11, var2, var4, var1); - } - - aClass136_1413.aClass140_1777 = var22; - } else { - if(this.configuration == null) { - var15 = (this.objectId << 10) + var6; - } else { - var15 = var6 + (this.objectId << 10) + (var13 << 3); - } - - Class140_Sub1_Sub2 var17 = (Class140_Sub1_Sub2) aReferenceCache_1965.get(var15); - if(var17 == null) { - Model_Sub1 var18 = this.method1686(var6, var13); - if(var18 == null) { - return null; - } - - var17 = new Class140_Sub1_Sub2(var18, 64 + this.anInt1494, this.anInt1489 * 5 + 768, -50, -10, -50); - aReferenceCache_1965.put(var17, var15); - } - - boolean var21 = false; - if(var5 != null) { - var21 = true; - var17 = (Class140_Sub1_Sub2)var5.method2054(var9, var12, var17, var6, var14); - } - - if(var13 == 10 && var6 > 3) { - if(!var21) { - var21 = true; - var17 = (Class140_Sub1_Sub2)var17.method1890(true, true, true); - } - - var17.method1876(256); - } - - if(this.aByte1505 != 0) { - if(!var21) { - var17 = (Class140_Sub1_Sub2)var17.method1890(true, true, true); - } - - var17 = var17.method1941(this.aByte1505, this.aShort1500, var7, var11, var2, var4, var1, false); - } - - aClass136_1413.aClass140_1777 = var17; - } - return aClass136_1413; - } catch (RuntimeException var20) { - throw ClientErrorException.clientError(var20, "pb.M(" + var1 + ',' + var2 + ',' + (var3 != null?"{...}":"null") + ',' + var4 + ',' + (var5 != null?"{...}":"null") + ',' + var6 + ',' + (var7 != null?"{...}":"null") + ',' + var8 + ',' + var9 + ',' + var10 + ',' + (var11 != null?"{...}":"null") + ',' + var12 + ',' + var13 + ',' + var14 + ')'); - } - } - - final RSString method1698(RSString var1, int var3) { - try { - - if(null == this.aHashTable_1501) { - return var1; - } else { - LinkableRSString var4 = (LinkableRSString)this.aHashTable_1501.get(var3); - return var4 == null?var1:var4.value; - } - } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "pb.E(" + (var1 != null?"{...}":"null") + ',' + -23085 + ',' + var3 + ')'); - } - } - - public ObjectDefinition() { - this.name = RSString.parse("null"); - this.aBoolean1503 = true; - this.anInt1493 = -1; - this.anInt1515 = 0; - this.anInt1516 = -1; - this.aByte1505 = 0; - this.aBoolean1491 = false; - this.anInt1517 = -1; - this.anInt1496 = 0; - this.anInt1518 = 0; - this.MapIcon = -1; - this.aBoolean1510 = false; - this.anInt1520 = -1; - this.aShort1500 = -1; - this.anInt1481 = 128; - this.options = new RSString[5]; - this.anInt1479 = 128; - this.aBoolean1492 = true; - this.anInt1488 = 128; - this.NotClipped = false; - this.SecondInt = -1; - this.aBoolean1530 = false; - this.aBoolean1525 = true; - this.ConfigId = -1; - this.anInt1522 = -1; - this.WalkingFlag = 0; - this.ProjectileClipped = true; - this.SecondBool = 0; - this.anInt1478 = 0; - this.anInt1528 = 16; - this.aBoolean1537 = false; - this.anInt1511 = 0; - this.anInt1484 = 0; - this.anInt1489 = 0; - this.animationId = -1; - this.aBoolean1507 = false; - this.anInt1512 = -1; - this.ClipType = 2; - this.aBoolean1536 = false; - this.ConfigFileId = -1; - this.anInt1540 = -1; - this.aBoolean1541 = false; - this.aBoolean1542 = false; - } + public ObjectDefinition() { + this.name = RSString.parse("null"); + this.aBoolean1503 = true; + this.anInt1493 = -1; + this.anInt1515 = 0; + this.anInt1516 = -1; + this.aByte1505 = 0; + this.aBoolean1491 = false; + this.anInt1517 = -1; + this.anInt1496 = 0; + this.anInt1518 = 0; + this.MapIcon = -1; + this.aBoolean1510 = false; + this.anInt1520 = -1; + this.aShort1500 = -1; + this.anInt1481 = 128; + this.options = new RSString[5]; + this.anInt1479 = 128; + this.aBoolean1492 = true; + this.anInt1488 = 128; + this.NotClipped = false; + this.SecondInt = -1; + this.aBoolean1530 = false; + this.aBoolean1525 = true; + this.ConfigId = -1; + this.anInt1522 = -1; + this.WalkingFlag = 0; + this.ProjectileClipped = true; + this.SecondBool = 0; + this.anInt1478 = 0; + this.anInt1528 = 16; + this.aBoolean1537 = false; + this.anInt1511 = 0; + this.anInt1484 = 0; + this.anInt1489 = 0; + this.animationId = -1; + this.aBoolean1507 = false; + this.anInt1512 = -1; + this.ClipType = 2; + this.aBoolean1536 = false; + this.ConfigFileId = -1; + this.anInt1540 = -1; + this.aBoolean1541 = false; + this.aBoolean1542 = false; + } } diff --git a/Client/src/main/java/org/runite/client/PacketParser.java b/Client/src/main/java/org/runite/client/PacketParser.java index 1291c6cc1..c700b9154 100644 --- a/Client/src/main/java/org/runite/client/PacketParser.java +++ b/Client/src/main/java/org/runite/client/PacketParser.java @@ -18,7 +18,7 @@ public final class PacketParser { static int anInt87 = 0; static RSInterface aClass11_88 = null; static int inTutorialIsland = 0; // could be boolean - static Class3_Sub19[] aClass3_Sub19Array3694; + public static Class3_Sub19[] aClass3_Sub19Array3694; static long aLong3202; static int anInt3213 = 1; @@ -77,7 +77,7 @@ public final class PacketParser { if (60 == Unsorted.incomingOpcode) { nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShort128(); byte var69 = GraphicDefinition.incomingBuffer.readSignedNegativeByte(); - Class3_Sub13_Sub23.method281(var69, nodeModelId); + TextureOperation39.method281(var69, nodeModelId); Unsorted.incomingOpcode = -1; return true; } else { @@ -271,7 +271,7 @@ public final class PacketParser { var19 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); modelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); Class146.updateInterfacePacketCounter(modelId); - Class3_Sub13_Sub33.method327(var19, nodeModelId); + TextureOperation29.method327(var19, nodeModelId); Unsorted.incomingOpcode = -1; return true; @@ -420,7 +420,7 @@ public final class PacketParser { RSString var56; if (Unsorted.incomingOpcode == 44) { nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); - if (nodeModelId == '\uffff') { + if (nodeModelId == 65535) { nodeModelId = -1; } @@ -433,7 +433,7 @@ public final class PacketParser { } Class91.aClass94Array1299[-1 + modelId] = var56; - Class3_Sub13_Sub26.anIntArray3328[modelId + -1] = nodeModelId; + TextureOperation35.anIntArray3328[modelId + -1] = nodeModelId; Class1.aBooleanArray54[modelId + -1] = var19 == 0; } @@ -442,7 +442,7 @@ public final class PacketParser { } else if (Unsorted.incomingOpcode == 226) { nodeModelId = GraphicDefinition.incomingBuffer.readInt(); var19 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - Class3_Sub13_Sub23.method281(nodeModelId, var19); + TextureOperation39.method281(nodeModelId, var19); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 21) { @@ -450,7 +450,7 @@ public final class PacketParser { var19 = GraphicDefinition.incomingBuffer.readUnsignedShort(); modelId = GraphicDefinition.incomingBuffer.readIntLE(); Class146.updateInterfacePacketCounter(var19); - Class3_Sub13_Sub19.method260(modelId, nodeModelId); + TextureOperation4.method260(modelId, nodeModelId); Unsorted.incomingOpcode = -1; return true; @@ -463,9 +463,9 @@ public final class PacketParser { Class7.method834(); } Class3_Sub28_Sub12.anInt3655 = nodeModelId; - Class3_Sub13_Sub13.method232(nodeModelId); + TextureOperation20.method232(nodeModelId); Class124.method1746(false, (byte) -64); - Class3_Sub13_Sub12.method226(Class3_Sub28_Sub12.anInt3655); + TextureOperation24.method226(Class3_Sub28_Sub12.anInt3655); for (counter = 0; counter < 100; ++counter) { Unsorted.aBooleanArray3674[counter] = true; @@ -478,7 +478,7 @@ public final class PacketParser { var19 = GraphicDefinition.incomingBuffer.readInt(); modelId = GraphicDefinition.incomingBuffer.readUnsignedShort128(); Class146.updateInterfacePacketCounter(nodeModelId); - Class3_Sub13_Sub18.method255(modelId, var19, 1); + TextureOperation19.method255(modelId, var19, 1); Unsorted.incomingOpcode = -1; return true; @@ -494,7 +494,7 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (89 == Unsorted.incomingOpcode) { //UNUSED BY SERVER - Class3_Sub13_Sub2.method176(-117); + TextureOperation6.method176(-117); Class3_Sub30_Sub1.method819(); Class36.anInt641 += 32; Unsorted.incomingOpcode = -1; @@ -565,7 +565,7 @@ public final class PacketParser { if (modelId >> 30 == 0) { SequenceDefinition var53; if (modelId >> 29 != 0) { - var6 = '\uffff' & modelId; + var6 = 65535 & modelId; NPC var62 = NPC.npcs[var6]; if (null != var62) { if (counter == 65535) { @@ -596,16 +596,16 @@ public final class PacketParser { } } } else if (modelId >> 28 != 0) { - var6 = modelId & '\uffff'; + var6 = modelId & 65535; Player var60; if (var6 == Class3_Sub1.localIndex) { var60 = Class102.player; } else { - var60 = Class3_Sub13_Sub22.players[var6]; + var60 = TextureOperation0.players[var6]; } if (null != var60) { - if (counter == '\uffff') { + if (counter == 65535) { counter = -1; } var32 = counter == -1 || var60.anInt2842 == -1 || SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, var60.anInt2842).anInt542).forcedPriority <= SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, counter).anInt542).forcedPriority; @@ -637,12 +637,12 @@ public final class PacketParser { } else { var6 = 3 & modelId >> 28; var30 = ((modelId & 268434277) >> 14) + -Class131.anInt1716; - chatIcon = (modelId & 16383) + -Class82.anInt1152; + chatIcon = (modelId & 16383) + -Texture.anInt1152; if (var30 >= 0 && chatIcon >= 0 && 104 > var30 && chatIcon < 104) { chatIcon = chatIcon * 128 - -64; var30 = 128 * var30 + 64; Class140_Sub2 var50 = new Class140_Sub2(counter, var6, var30, chatIcon, -var19 + Class121.method1736(var6, 1, var30, chatIcon), nodeModelId, Class44.anInt719); - Class3_Sub13_Sub15.aClass61_3177.method1215(new Class3_Sub28_Sub2(var50)); + TextureOperation17.aClass61_3177.method1215(new Class3_Sub28_Sub2(var50)); } } @@ -667,7 +667,7 @@ public final class PacketParser { XPGainDraw.addGain(gain,modelId); XPGainDraw.getLastXp()[modelId] = var19; Class133.anIntArray1743[modelId] = var19;//XP for Skill ID - Class3_Sub13_Sub15.anIntArray3185[modelId] = nodeModelId;//Level for Skill ID + TextureOperation17.anIntArray3185[modelId] = nodeModelId;//Level for Skill ID Class3_Sub20.anIntArray2480[modelId] = 1; for (counter = 0; 98 > counter; ++counter) { @@ -702,14 +702,14 @@ public final class PacketParser { nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); var19 = GraphicDefinition.incomingBuffer.readInt(); Class146.updateInterfacePacketCounter(nodeModelId); - Class3_Sub31 var67 = Class3_Sub13_Sub17.aHashTable_3208.get(var19); + Class3_Sub31 var67 = TextureOperation23.aHashTable_3208.get(var19); if (null != var67) { - Class3_Sub13_Sub18.method254(true, var67); + TextureOperation19.method254(true, var67); } - if (null != Class3_Sub13_Sub7.aClass11_3087) { - Class20.method909(Class3_Sub13_Sub7.aClass11_3087); - Class3_Sub13_Sub7.aClass11_3087 = null; + if (null != TextureOperation27.aClass11_3087) { + Class20.method909(TextureOperation27.aClass11_3087); + TextureOperation27.aClass11_3087 = null; } Unsorted.incomingOpcode = -1; @@ -724,7 +724,7 @@ public final class PacketParser { Unsorted.anInt2309 = modelId; if (Class133.anInt1753 == 2) { Class139.anInt1823 = Unsorted.anInt2309; - Class3_Sub13_Sub25.anInt3315 = GraphicDefinition.CAMERA_DIRECTION; + TextureOperation28.anInt3315 = GraphicDefinition.CAMERA_DIRECTION; } Unsorted.method1098((byte) -117); @@ -748,14 +748,14 @@ public final class PacketParser { for (nodeModelId = Class65.currentChunkX; nodeModelId < 8 + Class65.currentChunkX; ++nodeModelId) { for (var19 = Class39.currentChunkY; 8 + Class39.currentChunkY > var19; ++var19) { - if (null != Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][nodeModelId][var19]) { - Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][nodeModelId][var19] = null; + if (null != TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][nodeModelId][var19]) { + TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][nodeModelId][var19] = null; Class128.method1760(var19, nodeModelId); } } } - for (Class3_Sub4 var68 = (Class3_Sub4) Class3_Sub13_Sub6.aClass61_3075.method1222(); null != var68; var68 = (Class3_Sub4) Class3_Sub13_Sub6.aClass61_3075.method1221()) { + for (Class3_Sub4 var68 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1222(); null != var68; var68 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1221()) { if (Class65.currentChunkX <= var68.anInt2264 && 8 + Class65.currentChunkX > var68.anInt2264 && var68.anInt2248 >= Class39.currentChunkY && 8 + Class39.currentChunkY > var68.anInt2248 && var68.anInt2250 == WorldListCountry.localPlane) { var68.anInt2259 = 0; } @@ -779,7 +779,7 @@ public final class PacketParser { nodeModelId = GraphicDefinition.incomingBuffer.readIntLE(); var19 = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); modelId = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - if (modelId == '\uffff') { + if (modelId == 65535) { modelId = -1; } @@ -893,9 +893,9 @@ public final class PacketParser { return true; } else if (Unsorted.incomingOpcode == 160) { if (0 == Unsorted.incomingPacketLength) { - Class3_Sub13_Sub28.aClass94_3353 = TextCore.HasWalkHere; + TextureOperation32.aClass94_3353 = TextCore.HasWalkHere; } else { - Class3_Sub13_Sub28.aClass94_3353 = GraphicDefinition.incomingBuffer.readString(); + TextureOperation32.aClass94_3353 = GraphicDefinition.incomingBuffer.readString(); } Unsorted.incomingOpcode = -1; @@ -978,15 +978,15 @@ public final class PacketParser { var19 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); modelId = GraphicDefinition.incomingBuffer.readIntV1(); Class146.updateInterfacePacketCounter(var19); - Class3_Sub31 var23 = Class3_Sub13_Sub17.aHashTable_3208.get(nodeModelId); - var26 = Class3_Sub13_Sub17.aHashTable_3208.get(modelId); + Class3_Sub31 var23 = TextureOperation23.aHashTable_3208.get(nodeModelId); + var26 = TextureOperation23.aHashTable_3208.get(modelId); if (null != var26) { - Class3_Sub13_Sub18.method254(null == var23 || var26.anInt2602 != var23.anInt2602, var26); + TextureOperation19.method254(null == var23 || var26.anInt2602 != var23.anInt2602, var26); } if (null != var23) { var23.unlink(); - Class3_Sub13_Sub17.aHashTable_3208.put(modelId, var23); + TextureOperation23.aHashTable_3208.put(modelId, var23); } RSInterface var27 = Class7.getRSInterface(nodeModelId); @@ -1015,9 +1015,9 @@ public final class PacketParser { var30 = GraphicDefinition.incomingBuffer.readUnsignedShort(); Class146.updateInterfacePacketCounter(nodeModelId); WaterfallShader.aBooleanArray2169[var19] = true; - Class3_Sub13_Sub32.anIntArray3383[var19] = modelId; + TextureOperation14.anIntArray3383[var19] = modelId; Class166.anIntArray2073[var19] = counter; - Class3_Sub13_Sub29.anIntArray3359[var19] = var6; + TextureOperation3.anIntArray3359[var19] = var6; Class163_Sub1_Sub1.anIntArray4009[var19] = var30; Unsorted.incomingOpcode = -1; @@ -1037,7 +1037,7 @@ public final class PacketParser { Class140_Sub6.anInt2905 = anInt3213; return true; } else if (Unsorted.incomingOpcode == 114) { - Class3_Sub13_Sub29.method305(Class38.signlink, GraphicDefinition.incomingBuffer, Unsorted.incomingPacketLength); + TextureOperation3.method305(Class38.signlink, GraphicDefinition.incomingBuffer, Unsorted.incomingPacketLength); Unsorted.incomingOpcode = -1; return true; } else if (65 == Unsorted.incomingOpcode) { @@ -1045,7 +1045,7 @@ public final class PacketParser { var19 = GraphicDefinition.incomingBuffer.readUnsignedNegativeByte(); modelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); Class146.updateInterfacePacketCounter(nodeModelId); - Class3_Sub13_Sub18.method255(modelId, var19, (byte) -83 ^ -84); + TextureOperation19.method255(modelId, var19, (byte) -83 ^ -84); Unsorted.incomingOpcode = -1; return true; @@ -1092,17 +1092,17 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 42) { - if (null != Class3_Sub13_Sub10.aFrame3121) { + if (null != TextureOperation30.aFrame3121) { GameObject.graphicsSettings(false, Unsorted.anInt2577, -1, -1); } byte[] var22 = new byte[Unsorted.incomingPacketLength]; GraphicDefinition.incomingBuffer.method811((byte) 30, 0, var22, Unsorted.incomingPacketLength); - playerName = Class3_Sub13_Sub3.bufferToString(var22, Unsorted.incomingPacketLength, 0); + playerName = TextureOperation33.bufferToString(var22, Unsorted.incomingPacketLength, 0); if (null == GameShell.frame && (3 == Signlink.anInt1214 || !Signlink.osName.startsWith("win") || Class106.paramUserUsingInternetExplorer)) { Class99.method1596(playerName, (byte) 127, true); } else { - Class3_Sub13_Sub24.aClass94_3295 = playerName; + TextureOperation5.aClass94_3295 = playerName; Unsorted.aBoolean2154 = true; Class15.aClass64_351 = Class38.signlink.method1452(new String(playerName.method1568(), StandardCharsets.ISO_8859_1), true); } @@ -1132,9 +1132,9 @@ public final class PacketParser { modelId = GraphicDefinition.incomingBuffer.readUnsignedShort128(); counter = GraphicDefinition.incomingBuffer.readUnsignedShort(); Class146.updateInterfacePacketCounter(modelId); - var26 = Class3_Sub13_Sub17.aHashTable_3208.get(var19); + var26 = TextureOperation23.aHashTable_3208.get(var19); if (null != var26) { - Class3_Sub13_Sub18.method254(var26.anInt2602 != counter, var26); + TextureOperation19.method254(var26.anInt2602 != counter, var26); } Class21.method914(counter, var19, nodeModelId); @@ -1142,9 +1142,9 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 131) { - for (nodeModelId = 0; nodeModelId < Class3_Sub13_Sub22.players.length; ++nodeModelId) { - if (Class3_Sub13_Sub22.players[nodeModelId] != null) { - Class3_Sub13_Sub22.players[nodeModelId].anInt2771 = -1; + for (nodeModelId = 0; nodeModelId < TextureOperation0.players.length; ++nodeModelId) { + if (TextureOperation0.players[nodeModelId] != null) { + TextureOperation0.players[nodeModelId].anInt2771 = -1; } } @@ -1199,7 +1199,7 @@ public final class PacketParser { } var48.anInt1355 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - if (var48.anInt1355 == '\uffff') { + if (var48.anInt1355 == 65535) { var48.anInt1355 = -1; } @@ -1213,14 +1213,14 @@ public final class PacketParser { for (nodeModelId = 0; Class3_Sub28_Sub5.anInt3591 > nodeModelId; ++nodeModelId) { Class114.ignores[nodeModelId] = GraphicDefinition.incomingBuffer.readLong(); - Class3_Sub13_Sub27.aClass94Array3341[nodeModelId] = Unsorted.method1052(Class114.ignores[nodeModelId]); + TextureOperation7.aClass94Array3341[nodeModelId] = Unsorted.method1052(Class114.ignores[nodeModelId]); } Class110.anInt1472 = anInt3213; Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 32) { - Class3_Sub13_Sub14.renderNPCs(8169); + TextureOperation31.renderNPCs(8169); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 119) { @@ -1241,14 +1241,14 @@ public final class PacketParser { counter = Class75.anIntArray1107[var19]; var6 = GraphicDefinition.incomingBuffer.readUnsignedShort(); var30 = GraphicDefinition.incomingBuffer.readInt(); - if ('\uffff' == var6) { + if (65535 == var6) { var6 = -1; } clanChatIcon = 16383 & var30; var33 = 16383 & var30 >> 14; var33 -= Class131.anInt1716; - clanChatIcon -= Class82.anInt1152; + clanChatIcon -= Texture.anInt1152; chatIcon = 3 & var30 >> 28; Class50.method1131(chatIcon, 110, modelId, var19, clanChatIcon, counter, var33, var6); Unsorted.incomingOpcode = -1; @@ -1265,7 +1265,7 @@ public final class PacketParser { while (true) { if (var12 >= 100) { if (chatIcon <= 1) { - if ((!Class3_Sub15.aBoolean2433 || Class121.aBoolean1641) && !Class3_Sub13_Sub14.aBoolean3166) { + if ((!Class3_Sub15.aBoolean2433 || Class121.aBoolean1641) && !TextureOperation31.aBoolean3166) { for (var12 = 0; var12 < Class3_Sub28_Sub5.anInt3591; ++var12) { if (Class114.ignores[var12] == var2) { var42 = true; @@ -1317,7 +1317,7 @@ public final class PacketParser { while (true) { if (var14 >= 100) { if (1 >= clanChatIcon) { - if ((!Class3_Sub15.aBoolean2433 || Class121.aBoolean1641) && !Class3_Sub13_Sub14.aBoolean3166) { + if ((!Class3_Sub15.aBoolean2433 || Class121.aBoolean1641) && !TextureOperation31.aBoolean3166) { for (var14 = 0; Class3_Sub28_Sub5.anInt3591 > var14; ++var14) { if (Class114.ignores[var14] == var2) { var13 = true; @@ -1344,14 +1344,14 @@ public final class PacketParser { MouseListeningClass.anInt1921 = (MouseListeningClass.anInt1921 + 1) % 100; var57 = Font.method686(Objects.requireNonNull(Class32.method992(GraphicDefinition.incomingBuffer).properlyCapitalize())); if (clanChatIcon == 2 || clanChatIcon == 3) { - Class3_Sub13_Sub11.method221(-1, var57, RSString.stringCombiner(new RSString[]{TextCore.aClass94_444, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), 9); + TextureOperation1.method221(-1, var57, RSString.stringCombiner(new RSString[]{TextCore.aClass94_444, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), 9); } else if (clanChatIcon == 1) { - Class3_Sub13_Sub11.method221(-1, var57, RSString.stringCombiner(new RSString[]{TextCore.aClass94_592, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), 9); + TextureOperation1.method221(-1, var57, RSString.stringCombiner(new RSString[]{TextCore.aClass94_592, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), 9); } else { if (clanChatIcon == 0) - Class3_Sub13_Sub11.method221(-1, var57, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString(), Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), 9); + TextureOperation1.method221(-1, var57, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString(), Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), 9); else - Class3_Sub13_Sub11.method221(-1, var57, RSString.stringCombiner(new RSString[]{RSString.parse(""), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), 9); + TextureOperation1.method221(-1, var57, RSString.stringCombiner(new RSString[]{RSString.parse(""), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), 9); } } @@ -1369,7 +1369,7 @@ public final class PacketParser { } modelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); - Class3_Sub13_Sub6.method199(var19, nodeModelId, modelId); + TextureOperation26.method199(var19, nodeModelId, modelId); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 66) { @@ -1406,7 +1406,7 @@ public final class PacketParser { nodeModelId = GraphicDefinition.incomingBuffer.readInt(); var19 = GraphicDefinition.incomingBuffer.readUnsignedShort(); if (nodeModelId < -70000) { - var19 += '\u8000'; + var19 += 32768; } if (nodeModelId < 0) { @@ -1457,10 +1457,10 @@ public final class PacketParser { } else if (116 == Unsorted.incomingOpcode) { nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedByte(); if (GraphicDefinition.incomingBuffer.readUnsignedByte() == 0) { - Class3_Sub13_Sub33.aClass133Array3393[nodeModelId] = new Class133(); + TextureOperation29.aClass133Array3393[nodeModelId] = new Class133(); } else { --GraphicDefinition.incomingBuffer.index; - Class3_Sub13_Sub33.aClass133Array3393[nodeModelId] = new Class133(GraphicDefinition.incomingBuffer); + TextureOperation29.aClass133Array3393[nodeModelId] = new Class133(GraphicDefinition.incomingBuffer); } Unsorted.incomingOpcode = -1; @@ -1486,7 +1486,7 @@ public final class PacketParser { } else if (165 == Unsorted.incomingOpcode) { nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); var19 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - if (var19 == '\uffff') { + if (var19 == 65535) { var19 = -1; } @@ -1605,7 +1605,7 @@ public final class PacketParser { nodeModelId = GraphicDefinition.incomingBuffer.readInt(); var19 = GraphicDefinition.incomingBuffer.readIntV2(); modelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); - if ('\uffff' == modelId) { + if (65535 == modelId) { modelId = -1; } @@ -1617,7 +1617,7 @@ public final class PacketParser { Class140_Sub6.method2026(var19, nodeModelId, modelId); var43 = ItemDefinition.getItemDefinition(modelId); Unsorted.method2143((byte) -128, var43.anInt810, var19, var43.anInt799, var43.anInt786); - Class84.method1420(var19, var43.anInt768, var43.anInt754, var43.anInt792, (byte) -85); + Class84.method1420(var19, var43.anInt768, var43.anInt754, var43.anInt792); } else { if (-1 == modelId) { var34.modelType = 0; @@ -1640,7 +1640,7 @@ public final class PacketParser { nodeModelId = GraphicDefinition.incomingBuffer.readInt(); var19 = GraphicDefinition.incomingBuffer.readUnsignedShort(); if (nodeModelId < -70000) { - var19 += '\u8000'; + var19 += 32768; } if (0 <= nodeModelId) { @@ -1693,7 +1693,7 @@ public final class PacketParser { return true; } else if (4 == Unsorted.incomingOpcode) { nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); - if (nodeModelId == '\uffff') { + if (nodeModelId == 65535) { nodeModelId = -1; } @@ -1703,7 +1703,7 @@ public final class PacketParser { } else if (Unsorted.incomingOpcode == 208) { nodeModelId = GraphicDefinition.incomingBuffer.getTriByte2(); var19 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - if (var19 == '\uffff') { + if (var19 == 65535) { var19 = -1; } @@ -1736,13 +1736,13 @@ public final class PacketParser { if (Class21.aBoolean440 && Class85.aBoolean1167) { int var1 = Class126.anInt1676; var1 -= Unsorted.anInt1881; - if (Class3_Sub13_Sub13.anInt3156 > var1) { - var1 = Class3_Sub13_Sub13.anInt3156; + if (TextureOperation20.anInt3156 > var1) { + var1 = TextureOperation20.anInt3156; } int var2 = Unsorted.anInt1709; - if (var1 - -Class56.aClass11_886.width > Class3_Sub13_Sub13.anInt3156 + aClass11_88.width) { - var1 = -Class56.aClass11_886.width + Class3_Sub13_Sub13.anInt3156 + aClass11_88.width; + if (var1 - -Class56.aClass11_886.width > TextureOperation20.anInt3156 + aClass11_88.width) { + var1 = -Class56.aClass11_886.width + TextureOperation20.anInt3156 + aClass11_88.width; } var2 -= Class95.anInt1336; @@ -1756,7 +1756,7 @@ public final class PacketParser { int var4 = var2 - Class3_Sub2.anInt2218; int var3 = var1 + -Class3_Sub15.anInt2421; - int var6 = var1 + -Class3_Sub13_Sub13.anInt3156 + aClass11_88.anInt247; + int var6 = var1 + -TextureOperation20.anInt3156 + aClass11_88.anInt247; int var7 = aClass11_88.anInt208 + -Class134.anInt1761 + var2; int var5 = Class56.aClass11_886.anInt214; if (Class56.aClass11_886.anInt179 < Class75_Sub3.anInt2658 && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { @@ -1773,7 +1773,7 @@ public final class PacketParser { Class43.method1065(var8); } - if (0 == Class3_Sub13_Sub5.anInt3069) { + if (0 == TextureOperation21.anInt3069) { if (NPC.aBoolean3975) { if (Class56.aClass11_886.anObjectArray229 != null) { var8 = new CS2Script(); @@ -1788,11 +1788,11 @@ public final class PacketParser { if (withInter == null) { withInter = Class56.aClass11_886; } - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(79); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV2(Class56.aClass11_886.componentHash); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(withInter.anInt191); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(withInter.componentHash); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(Class56.aClass11_886.anInt191); + TextureOperation12.outgoingBuffer.putOpcode(79); + TextureOperation12.outgoingBuffer.writeIntV2(Class56.aClass11_886.componentHash); + TextureOperation12.outgoingBuffer.writeShortLE(withInter.anInt191); + TextureOperation12.outgoingBuffer.writeInt(withInter.componentHash); + TextureOperation12.outgoingBuffer.writeShortLE(Class56.aClass11_886.anInt191); // && client.method42(Class56.aClass11_886) != null) { if (Class27.aClass11_526 == null) { @@ -1800,10 +1800,10 @@ public final class PacketParser { } else if (Client.method42(Class56.aClass11_886) != null) { System.out.println("Shouldn't be sending packet, enabled to fix banking tabs though."); } - } else if ((Unsorted.anInt998 == 1 || Class3_Sub13_Sub39.method353(-1 + Unsorted.menuOptionCount, ~-1)) && Unsorted.menuOptionCount > 2) { + } else if ((Unsorted.anInt998 == 1 || TextureOperation8.method353(-1 + Unsorted.menuOptionCount, ~-1)) && Unsorted.menuOptionCount > 2) { Class132.method1801(); } else if (Unsorted.menuOptionCount > 0) { - Class3_Sub13_Sub8.method203(96); + TextureOperation9.method203(96); } Class56.aClass11_886 = null; @@ -1831,9 +1831,9 @@ public final class PacketParser { static void method1605(RSString var1, int var2) { try { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(188); - Class3_Sub13_Sub1.outgoingBuffer.writeByte128(var2); - Class3_Sub13_Sub1.outgoingBuffer.writeLong(var1.toLong()); + TextureOperation12.outgoingBuffer.putOpcode(188); + TextureOperation12.outgoingBuffer.writeByte128(var2); + TextureOperation12.outgoingBuffer.writeLong(var1.toLong()); } catch (RuntimeException var4) { throw ClientErrorException.clientError(var4, "ni.B(" + 255 + ',' + (var1 != null ? "{...}" : "null") + ',' + var2 + ')'); } diff --git a/Client/src/main/java/org/runite/client/Player.java b/Client/src/main/java/org/runite/client/Player.java index e78004f75..99656489a 100644 --- a/Client/src/main/java/org/runite/client/Player.java +++ b/Client/src/main/java/org/runite/client/Player.java @@ -2,7 +2,7 @@ package org.runite.client; import java.util.Objects; -final class Player extends Class140_Sub4 { +public final class Player extends Class140_Sub4 { static int[] anIntArray3951 = new int[4]; static int rights = 0; @@ -11,13 +11,13 @@ final class Player extends Class140_Sub4 { static int[] anIntArray3959 = new int[2]; int anInt3952 = -1; int headIcon = -1; - int teamId = 0; + public int teamId = 0; int COMBAT_LEVEL = 0; Class52 class52; int anInt3963 = -1; int combatLevel = 0; int anInt3966 = -1; - RSString displayName; + public RSString displayName; boolean aBoolean3968 = false; int anInt3969 = 0; int anInt3970 = -1; @@ -141,20 +141,20 @@ final class Player extends Class140_Sub4 { break; } - if ('\u8000' <= outfit) { - int equipId = outfit - '\u8000'; + if (32768 <= outfit) { + int equipId = outfit - 32768; if (equipId > Class75_Sub4.anIntArray2664.length) { - System.err.println("Player->parseAppearance()-> Array length = " + Class75_Sub4.anIntArray2664.length + ", equipId=" + equipId + ", item def size=" + Class3_Sub13_Sub23.itemDefinitionSize); + System.err.println("Player->parseAppearance()-> Array length = " + Class75_Sub4.anIntArray2664.length + ", equipId=" + equipId + ", item def size=" + TextureOperation39.itemDefinitionSize); continue; } outfit = Class75_Sub4.anIntArray2664[equipId]; - look[var10] = Class3_Sub13_Sub29.bitwiseOr(1073741824, outfit); + look[var10] = TextureOperation3.bitwiseOr(1073741824, outfit); var14 = ItemDefinition.getItemDefinition(outfit).teamId; if (var14 != 0) { this.teamId = var14; } } else { - look[var10] = Class3_Sub13_Sub29.bitwiseOr(-256 + outfit, Integer.MIN_VALUE); + look[var10] = TextureOperation3.bitwiseOr(-256 + outfit, Integer.MIN_VALUE); } } } @@ -232,7 +232,7 @@ final class Player extends Class140_Sub4 { } int var17; - if (0 != Class3_Sub13_Sub13.paramModeWhat && var16 < 50) { + if (0 != TextureOperation20.paramModeWhat && var16 < 50) { for (var17 = 50 - var16; Class56.anInt893 < var17; ++Class56.anInt893) { Class3_Sub6.aByteArrayArray2287[Class56.anInt893] = new byte[102400]; } @@ -278,12 +278,12 @@ final class Player extends Class140_Sub4 { if (var27.anInt1360 == 2) { int var29 = 4 * (-Class131.anInt1716 + var27.anInt1356) + 2 + -(Class102.player.anInt2819 / 32); - var20 = 2 + (4 * (var27.anInt1347 - Class82.anInt1152) - Class102.player.anInt2829 / 32); + var20 = 2 + (4 * (var27.anInt1347 - Texture.anInt1152) - Class102.player.anInt2829 / 32); this.method1979(null, var20, var15, var29, var6, var11, var1, var8, var5, var4, var2, var27.anInt1355, var3, var7); } - if (var27.anInt1360 == 10 && var27.anInt1359 >= 0 && var27.anInt1359 < Class3_Sub13_Sub22.players.length) { - Player var28 = Class3_Sub13_Sub22.players[var27.anInt1359]; + if (var27.anInt1360 == 10 && var27.anInt1359 >= 0 && var27.anInt1359 < TextureOperation0.players.length) { + Player var28 = TextureOperation0.players[var27.anInt1359]; if (null != var28) { var20 = -(Class102.player.anInt2819 / 32) + var28.anInt2819 / 32; var21 = var28.anInt2829 / 32 + -(Class102.player.anInt2829 / 32); @@ -303,16 +303,16 @@ final class Player extends Class140_Sub4 { if (var23 != null) { var23.method1897(0, -this.anInt2799, 0); if (var26.aBoolean536) { - if (Class3_Sub13_Sub16.anInt3198 != 0) { - var23.method1896(Class3_Sub13_Sub16.anInt3198); + if (TextureOperation15.anInt3198 != 0) { + var23.method1896(TextureOperation15.anInt3198); } if (0 != Class3_Sub28_Sub9.anInt3623) { var23.method1886(Class3_Sub28_Sub9.anInt3623); } - if (Class3_Sub13_Sub9.anInt3111 != 0) { - var23.method1897(0, Class3_Sub13_Sub9.anInt3111, 0); + if (TextureOperation16.anInt3111 != 0) { + var23.method1897(0, TextureOperation16.anInt3111, 0); } } } @@ -385,7 +385,7 @@ final class Player extends Class140_Sub4 { try { int var16 = var4 * var4 - -(var2 * var2); if (var16 >= 16 && var16 <= 360000) { - int var17 = (int) (325.949D * Math.atan2(var4, var2)) & 2047; + int var17 = (int) (325.949D * Math.atan2(var4, var2)) & 0x7FF; Model var18 = Class128.method1763(var17, this.anInt2829, var13, this.anInt2819, var3, this.anInt2831); if (var18 != null) { if (HDToolKit.highDetail) { @@ -407,7 +407,7 @@ final class Player extends Class140_Sub4 { } } - final boolean hasDefinitions() { + public final boolean hasDefinitions() { try { return this.class52 != null; diff --git a/Client/src/main/java/org/runite/client/QuickChat.java b/Client/src/main/java/org/runite/client/QuickChat.java index 9eeb8d95c..ccd93f9bf 100644 --- a/Client/src/main/java/org/runite/client/QuickChat.java +++ b/Client/src/main/java/org/runite/client/QuickChat.java @@ -11,7 +11,7 @@ public class QuickChat { Class3_Sub28_Sub1 var2 = (Class3_Sub28_Sub1) aClass47_3137.get(fileId); if (null == var2) { byte[] var3; - if (fileId < '\u8000') { + if (fileId < 32768) { var3 = Unsorted.quickChatMessages.getFile(0, fileId); } else { var3 = Unsorted.aClass153_332.getFile(0, fileId & 32767); diff --git a/Client/src/main/java/org/runite/client/RSInterface.java b/Client/src/main/java/org/runite/client/RSInterface.java index f629c71b5..0b5637ee2 100644 --- a/Client/src/main/java/org/runite/client/RSInterface.java +++ b/Client/src/main/java/org/runite/client/RSInterface.java @@ -16,7 +16,7 @@ public final class RSInterface { Object[] anObjectArray165; int defY; boolean aBoolean167; - int width; + public int width; short aShort169 = 3000; Object[] anObjectArray170; RSString[] aClass94Array171; @@ -41,7 +41,7 @@ public final class RSInterface { int parentId; int anInt191 = -1; int anInt192; - int height = 0; + public int height = 0; int anInt194 = 0; boolean aBoolean195; private int secondModelId; @@ -55,7 +55,7 @@ public final class RSInterface { int anInt204; int anInt205 = 0; Object[] anObjectArray206; - int[] anIntArray207; + public int[] anIntArray207; int anInt208 = 0; int anInt210 = 0; int[] anIntArray211; @@ -138,7 +138,7 @@ public final class RSInterface { int anInt288; RSString aClass94_289; int anInt290; - int[] anIntArray291; + public int[] anIntArray291; int anInt292; short aShort293; private int secondModelType; @@ -442,12 +442,12 @@ public final class RSInterface { this.modelType = 1; this.itemId = buffer.readUnsignedShort(); this.secondModelType = 1; - if (this.itemId == '\uffff') { + if (this.itemId == 65535) { this.itemId = -1; } this.secondModelId = buffer.readUnsignedShort(); - if (this.secondModelId == '\uffff') { + if (this.secondModelId == 65535) { this.secondModelId = -1; } @@ -457,7 +457,7 @@ public final class RSInterface { } this.secondAnimationId = buffer.readUnsignedShort(); - if ('\uffff' == this.secondAnimationId) { + if (65535 == this.secondAnimationId) { this.secondAnimationId = -1; } @@ -701,7 +701,7 @@ public final class RSInterface { return null; } else { int var15 = this.itemId >>> 16; - int var11 = this.itemId & '\uffff'; + int var11 = this.itemId & 65535; int var12 = this.anInt265; Model var13 = var7.method1157(var1, var12, var15, var5, var2, var3, var11); if (var13 == null) { @@ -728,7 +728,7 @@ public final class RSInterface { } } - final AbstractSprite method866(boolean var2) { + public final AbstractSprite method866(boolean var2) { try { aBoolean6 = false; int archiveId; @@ -861,7 +861,7 @@ public final class RSInterface { this.anInt280 = buffer.readUnsignedShort(); this.anInt164 = buffer.readUnsignedShort(); this.animationId = buffer.readUnsignedShort(); - if ('\uffff' == this.animationId) { + if (65535 == this.animationId) { this.animationId = -1; } @@ -968,12 +968,12 @@ public final class RSInterface { var8 = -1; } - if ('\uffff' == this.anInt266) { + if (65535 == this.anInt266) { this.anInt266 = -1; } this.anInt238 = buffer.readUnsignedShort(); - if (this.anInt238 == '\uffff') { + if (this.anInt238 == 65535) { this.anInt238 = -1; } } diff --git a/Client/src/main/java/org/runite/client/RSString.java b/Client/src/main/java/org/runite/client/RSString.java index 42261bf3f..7335f7e9d 100644 --- a/Client/src/main/java/org/runite/client/RSString.java +++ b/Client/src/main/java/org/runite/client/RSString.java @@ -49,7 +49,7 @@ public final class RSString implements Interface3 { int i = 0; while (length > i) { - int ascii = bytes[i++] & 255; + int ascii = bytes[i++] & 0xFF; if (ascii <= 45 && ascii >= 40) { if (length <= i) { break; @@ -391,7 +391,7 @@ public final class RSString implements Interface3 { } else if (var3 == 223) { var3 = 115; } else { - var3 = this.buffer[var9] & 255; + var3 = this.buffer[var9] & 0xFF; ++var9; } @@ -593,11 +593,11 @@ public final class RSString implements Interface3 { } for (int var4 = 0; var3 > var4; ++var4) { - if ((255 & this.buffer[var4]) < (var1.buffer[var4] & 255)) { + if ((255 & this.buffer[var4]) < (var1.buffer[var4] & 0xFF)) { return -1; } - if ((this.buffer[var4] & 255) > (var1.buffer[var4] & 255)) { + if ((this.buffer[var4] & 0xFF) > (var1.buffer[var4] & 0xFF)) { return 1; } } @@ -641,7 +641,7 @@ public final class RSString implements Interface3 { } while (var6 < var8) { - Objects.requireNonNull(var10).appendCharacter(this.buffer[var6++] & 255); + Objects.requireNonNull(var10).appendCharacter(this.buffer[var6++] & 0xFF); } Objects.requireNonNull(var10).append(var1); @@ -675,7 +675,7 @@ public final class RSString implements Interface3 { int value = 0; for (int i = 0; i < this.length; ++i) { - int current = this.buffer[i] & 255; + int current = this.buffer[i] & 0xFF; if (0 == i) { if (current == 45) { negate = true; @@ -922,7 +922,7 @@ public final class RSString implements Interface3 { final int charAt(int var1, byte var2) { try { - return this.buffer[var1] & 255; + return this.buffer[var1] & 0xFF; } catch (RuntimeException var4) { throw ClientErrorException.clientError(var4, "na.SA(" + var1 + ',' + var2 + ')'); } @@ -1039,7 +1039,7 @@ public final class RSString implements Interface3 { } } - final long toLong() { + public final long toLong() { long var2 = 0L; for (int var4 = 0; var4 < this.length && var4 < 12; ++var4) { byte var5 = this.buffer[var4]; diff --git a/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java b/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java index 61ffc7b12..f56568100 100644 --- a/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java +++ b/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java @@ -257,7 +257,7 @@ final class RenderAnimationDefinition { this.anInt382 = -1; } - if ('\uffff' == this.anInt368) { + if (65535 == this.anInt368) { this.anInt368 = -1; } } else if (var1 == 2) { diff --git a/Client/src/main/java/org/runite/client/SequenceDefinition.java b/Client/src/main/java/org/runite/client/SequenceDefinition.java index 566abcb11..9f41049fd 100644 --- a/Client/src/main/java/org/runite/client/SequenceDefinition.java +++ b/Client/src/main/java/org/runite/client/SequenceDefinition.java @@ -34,7 +34,7 @@ public final class SequenceDefinition { static SequenceDefinition getAnimationDefinition(int var0) { try { - SequenceDefinition var2 = (SequenceDefinition) Class82.aReferenceCache_1146.get(var0); + SequenceDefinition var2 = (SequenceDefinition) Texture.aReferenceCache_1146.get(var0); if (var2 == null) { byte[] var3 = aClass153_1860.getFile(Class129.method1765(var0), Class67.method1262(117, var0)); var2 = new SequenceDefinition(); @@ -44,7 +44,7 @@ public final class SequenceDefinition { } var2.method2058(); - Class82.aReferenceCache_1146.put(var2, var0); + Texture.aReferenceCache_1146.put(var2, var0); } return var2; } catch (RuntimeException var4) { @@ -75,7 +75,7 @@ public final class SequenceDefinition { int var7 = this.duration[var2]; var2 = this.frames[var2]; Class3_Sub28_Sub5 var8 = Class3_Sub9.method133(var2 >> 16); - var2 &= '\uffff'; + var2 &= 65535; if(var8 == null) { return var4.method1890(true, true, true); } else { @@ -85,7 +85,7 @@ public final class SequenceDefinition { if((this.aBoolean1846 || ClientCommands.tweeningEnabled) && var3 != -1 && this.frames.length > var3) { var3 = this.frames[var3]; var9 = Class3_Sub9.method133(var3 >> 16); - var3 &= '\uffff'; + var3 &= 65535; } Model var10; @@ -140,7 +140,7 @@ public final class SequenceDefinition { int var7 = this.frames[var5]; int var6 = this.duration[var5]; Class3_Sub28_Sub5 var8 = Class3_Sub9.method133(var7 >> 16); - var7 &= '\uffff'; + var7 &= 65535; if(null == var8) { return var1.method1894(true, true, true); } else { @@ -148,7 +148,7 @@ public final class SequenceDefinition { if((this.aBoolean1846 || ClientCommands.tweeningEnabled) && var3 != -1 && this.frames.length > var3) { var3 = this.frames[var3]; var9 = Class3_Sub9.method133(var3 >> 16); - var3 &= '\uffff'; + var3 &= 65535; } Class3_Sub28_Sub5 var10 = null; @@ -160,7 +160,7 @@ public final class SequenceDefinition { var13 = this.baseIds[var5]; if(var13 != 65535) { var10 = Class3_Sub9.method133(var13 >> 16); - var13 &= '\uffff'; + var13 &= 65535; } } @@ -168,7 +168,7 @@ public final class SequenceDefinition { var14 = this.baseIds[var3]; if(var14 != 65535) { var11 = Class3_Sub9.method133(var14 >> 16); - var14 &= '\uffff'; + var14 &= 65535; } } } @@ -208,7 +208,7 @@ public final class SequenceDefinition { int var7 = this.duration[var2]; var2 = this.frames[var2]; Class3_Sub28_Sub5 var8 = Class3_Sub9.method133(var2 >> 16); - var2 &= '\uffff'; + var2 &= 65535; if(null == var8) { return var5.method1894(true, true, true); } else { @@ -217,7 +217,7 @@ public final class SequenceDefinition { if((this.aBoolean1846 || ClientCommands.tweeningEnabled) && var1 != -1 && this.frames.length > var1) { var1 = this.frames[var1]; var9 = Class3_Sub9.method133(var1 >> 16); - var1 &= '\uffff'; + var1 &= 65535; } Model var10; @@ -295,7 +295,7 @@ public final class SequenceDefinition { int var6 = this.duration[var3]; var3 = this.frames[var3]; Class3_Sub28_Sub5 var7 = Class3_Sub9.method133(var3 >> 16); - var3 &= '\uffff'; + var3 &= 65535; if(var7 == null) { return var5.method1882(true, true, true); } else { @@ -303,7 +303,7 @@ public final class SequenceDefinition { if((this.aBoolean1846 || ClientCommands.tweeningEnabled) && var1 != -1 && var1 < this.frames.length) { var1 = this.frames[var1]; var9 = Class3_Sub9.method133(var1 >> 16); - var1 &= '\uffff'; + var1 &= 65535; } Model var10; @@ -409,17 +409,17 @@ public final class SequenceDefinition { static void resetAll() { try { Class3_Sub26.anInt2556 = 0; - Class3_Sub13_Sub13.aBoolean2774 = true; - Class3_Sub13_Sub13.aLong1465 = 0L; - Class3_Sub13_Sub13.aClass67_1443.anInt1018 = 0; - Class3_Sub13_Sub6.aBoolean3078 = true; + TextureOperation20.aBoolean2774 = true; + TextureOperation20.aLong1465 = 0L; + TextureOperation20.aClass67_1443.anInt1018 = 0; + TextureOperation26.aBoolean3078 = true; TextureOperation.method153(112); Class24.anInt469 = -1; Class7.anInt2166 = -1; Unsorted.incomingOpcode = -1; Class159.anInt2023 = 0; Class38_Sub1.anInt2617 = 0; - Class3_Sub13_Sub1.outgoingBuffer.index = 0; + TextureOperation12.outgoingBuffer.index = 0; LinkableRSString.anInt2582 = -1; AbstractSprite.anInt3699 = 0; GraphicDefinition.incomingBuffer.index = 0; @@ -438,7 +438,7 @@ public final class SequenceDefinition { } Class164_Sub1.anInt3012 = 0; - Class3_Sub13_Sub13.anInt3216 = (int)(Math.random() * 100.0D) + -50; + TextureOperation20.anInt3216 = (int)(Math.random() * 100.0D) + -50; Class45.anInt733 = 0; GraphicDefinition.CAMERA_DIRECTION = 2047 & (int)(Math.random() * 20.0D) - 10; Class58.anInt909 = -1; @@ -449,42 +449,42 @@ public final class SequenceDefinition { Class164_Sub2.anInt3020 = -20 + (int)(30.0D * Math.random()); Class113.anInt1552 = 0; Class65.anInt987 = 0; - Class3_Sub13_Sub8.anInt3102 = -60 + (int)(Math.random() * 120.0D); - Class3_Sub13_Sub9.anInt3114 = 0; + TextureOperation9.anInt3102 = -60 + (int)(Math.random() * 120.0D); + TextureOperation16.anInt3114 = 0; LinkableRSString.anInt2589 = (int)(80.0D * Math.random()) - 40; Class163.localNPCCount = 0; for(var1 = 0; 2048 > var1; ++var1) { - Class3_Sub13_Sub22.players[var1] = null; + TextureOperation0.players[var1] = null; Class65.aClass3_Sub30Array986[var1] = null; } - for(var1 = 0; var1 < '\u8000'; ++var1) { + for(var1 = 0; var1 < 32768; ++var1) { NPC.npcs[var1] = null; } - Class102.player = Class3_Sub13_Sub22.players[2047] = new Player(); - Class3_Sub13_Sub30.aClass61_3364.method1211(-112); - Class3_Sub13_Sub15.aClass61_3177.method1211(-58); - if(null != Class3_Sub13_Sub22.aClass61ArrayArrayArray3273) { + Class102.player = TextureOperation0.players[2047] = new Player(); + TextureOperation13.aClass61_3364.method1211(-112); + TextureOperation17.aClass61_3177.method1211(-58); + if(null != TextureOperation0.aClass61ArrayArrayArray3273) { for(var1 = 0; 4 > var1; ++var1) { for(int var2 = 0; var2 < 104; ++var2) { for(int var3 = 0; var3 < 104; ++var3) { - Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[var1][var2][var3] = null; + TextureOperation0.aClass61ArrayArrayArray3273[var1][var2][var3] = null; } } } } - Class3_Sub13_Sub6.aClass61_3075 = new Class61(); + TextureOperation26.aClass61_3075 = new Class61(); CS2Script.anInt1357 = 0; Class8.anInt104 = 0; - Class3_Sub13_Sub2.method176(-114); + TextureOperation6.method176(-114); Class3_Sub2.method103(); Class75.anInt1105 = 0; Class163_Sub2_Sub1.anInt4014 = 0; Class157.anInt1996 = 0; - Class3_Sub13_Sub34.anInt3414 = 0; + TextureOperation25.anInt3414 = 0; Class146.anInt1904 = 0; Unsorted.anInt30 = 0; GraphicDefinition.anInt529 = 0; @@ -500,14 +500,14 @@ public final class SequenceDefinition { Class60.method1208((byte)-128, Class3_Sub28_Sub12.anInt3655); } - for(Class3_Sub31 var7 = Class3_Sub13_Sub17.aHashTable_3208.first(); var7 != null; var7 = Class3_Sub13_Sub17.aHashTable_3208.next()) { - Class3_Sub13_Sub18.method254(true, var7); + for(Class3_Sub31 var7 = TextureOperation23.aHashTable_3208.first(); var7 != null; var7 = TextureOperation23.aHashTable_3208.next()) { + TextureOperation19.method254(true, var7); } Class3_Sub28_Sub12.anInt3655 = -1; - Class3_Sub13_Sub17.aHashTable_3208 = new HashTable(8); + TextureOperation23.aHashTable_3208 = new HashTable(8); Class3_Sub7.method122(-113); - Class3_Sub13_Sub7.aClass11_3087 = null; + TextureOperation27.aClass11_3087 = null; Class38_Sub1.aBoolean2615 = false; Unsorted.menuOptionCount = 0; Unsorted.aClass52_1112.method1161(new int[]{0, 0, 0, 0, 0}, -1, false, null, -1); @@ -515,11 +515,11 @@ public final class SequenceDefinition { for(var1 = 0; 8 > var1; ++var1) { Class91.aClass94Array1299[var1] = null; Class1.aBooleanArray54[var1] = false; - Class3_Sub13_Sub26.anIntArray3328[var1] = -1; + TextureOperation35.anIntArray3328[var1] = -1; } Class3_Sub28_Sub9.method580((byte)80); - Class3_Sub13_Sub4.aBoolean3064 = true; + TextureOperation34.aBoolean3064 = true; for(var1 = 0; var1 < 100; ++var1) { Unsorted.aBooleanArray3674[var1] = true; @@ -530,27 +530,27 @@ public final class SequenceDefinition { RSInterface.aClass94_251 = null; for(var1 = 0; 6 > var1; ++var1) { - Class3_Sub13_Sub33.aClass133Array3393[var1] = new Class133(); + TextureOperation29.aClass133Array3393[var1] = new Class133(); } for(var1 = 0; var1 < 25; ++var1) { - Class3_Sub13_Sub15.anIntArray3185[var1] = 0; + TextureOperation17.anIntArray3185[var1] = 0; Class3_Sub20.anIntArray2480[var1] = 0; Class133.anIntArray1743[var1] = 0; } if(HDToolKit.highDetail) { - Class3_Sub13_Sub14.method236(); + TextureOperation31.method236(); } Unsorted.aBoolean4068 = true; Class113.interfacePacketCounter = 0; - Class3_Sub13_Sub28.aClass94_3353 = TextCore.HasWalkHere; + TextureOperation32.aClass94_3353 = TextCore.HasWalkHere; Unsorted.aBoolean1084 = false; - Class3_Sub13_Sub38.aShortArray3455 = Class3_Sub13_Sub9.aShortArray3110 = Class136.aShortArray1779 = Class3_Sub13_Sub38.aShortArray3453 = new short[256]; - TextureOperation.method165(); + TextureOperation38.aShortArray3455 = TextureOperation16.aShortArray3110 = Class136.aShortArray1779 = TextureOperation38.aShortArray3453 = new short[256]; + InvalidateData.method165(); Unsorted.aBoolean1951 = false; - Class3_Sub13_Sub8.method204(-3); + TextureOperation9.method204(-3); } catch (RuntimeException var6) { throw ClientErrorException.clientError(var6, "tk.A(" + true + ')'); } diff --git a/Client/src/main/java/org/runite/client/Signlink.java b/Client/src/main/java/org/runite/client/Signlink.java index 3a5ca585d..ad0e84b68 100644 --- a/Client/src/main/java/org/runite/client/Signlink.java +++ b/Client/src/main/java/org/runite/client/Signlink.java @@ -363,7 +363,7 @@ public class Signlink implements Runnable { throw new IOException(); } - var4 = (var1.anInt979 >> 24 & 255) + "." + (var1.anInt979 >> 16 & 255) + "." + (var1.anInt979 >> 8 & 255) + "." + (255 & var1.anInt979); + var4 = (var1.anInt979 >> 24 & 0xFF) + "." + (var1.anInt979 >> 16 & 0xFF) + "." + (var1.anInt979 >> 8 & 0xFF) + "." + (255 & var1.anInt979); var1.anObject974 = InetAddress.getByName(var4).getHostName(); } else if (stage == 5) { var1.anObject974 = this.display.method919(true); @@ -371,7 +371,7 @@ public class Signlink implements Runnable { Frame var5 = new Frame("Jagex Full Screen"); var1.anObject974 = var5; var5.setResizable(false); - this.display.method918(-56, var1.anInt980 & '\uffff', var1.anInt980 >> 16, '\uffff' & var1.anInt979, var5, var1.anInt979 >>> 16); + this.display.method918(-56, var1.anInt980 & 65535, var1.anInt980 >> 16, 65535 & var1.anInt979, var5, var1.anInt979 >>> 16); } else if (stage == 7) { this.display.method920(); } else if (10 == stage) { diff --git a/Client/src/main/java/org/runite/client/Sprites.java b/Client/src/main/java/org/runite/client/Sprites.java index ce19c72f5..59421dda9 100644 --- a/Client/src/main/java/org/runite/client/Sprites.java +++ b/Client/src/main/java/org/runite/client/Sprites.java @@ -41,18 +41,18 @@ final class Sprites { aClass3_Sub28_Sub16_Sub2Array2140 = Class157.method2176(mapFunctionSpriteArchive, index8); Class75_Sub3.aAbstractSpriteArray2656 = Class140_Sub6.getSprites(hitmarkSpriteArchive, index8); Unsorted.aAbstractSpriteArray996 = Class140_Sub6.getSprites(hitbarDefaultSpriteArchive, index8); - Class3_Sub13_Sub31.aAbstractSpriteArray3373 = Class140_Sub6.getSprites(headiconsPkSpriteArchive, index8); + TextureOperation2.aAbstractSpriteArray3373 = Class140_Sub6.getSprites(headiconsPkSpriteArchive, index8); NPC.aAbstractSpriteArray3977 = Class140_Sub6.getSprites(headiconsPrayerSpriteArchive, index8); Class166.aAbstractSpriteArray2072 = Class140_Sub6.getSprites(headiconsHintSpriteArchive, index8); Class129_Sub1.aAbstractSpriteArray2690 = Class140_Sub6.getSprites(hintMapMarkersSpriteArchive, index8); Class45.aAbstractSprite_736 = Unsorted.method602(mapFlagSpriteArchive, index8); - Class65.aAbstractSpriteArray1825 = Class3_Sub13_Sub23_Sub1.method286(crossSpriteArchive, index8); - Unsorted.aAbstractSpriteArray1136 = Class3_Sub13_Sub23_Sub1.method286(mapDotsSpriteArchive, index8); + Class65.aAbstractSpriteArray1825 = TextureOperation18.method286(crossSpriteArchive, index8); + Unsorted.aAbstractSpriteArray1136 = TextureOperation18.method286(mapDotsSpriteArchive, index8); GameObject.aClass109Array1831 = Class85.method1424(index8, scrollbarSpriteArchive); - Class3_Sub13_Sub22.nameIconsSpriteArray = Class85.method1424(index8, nameIconsSpriteArchive); - TextureOperation.smallFont.method697(Class3_Sub13_Sub22.nameIconsSpriteArray, null); - Class126.plainFont.method697(Class3_Sub13_Sub22.nameIconsSpriteArray, null); - Class168.bold.method697(Class3_Sub13_Sub22.nameIconsSpriteArray, null); + TextureOperation0.nameIconsSpriteArray = Class85.method1424(index8, nameIconsSpriteArchive); + FontType.smallFont.method697(TextureOperation0.nameIconsSpriteArray, null); + FontType.plainFont.method697(TextureOperation0.nameIconsSpriteArray, null); + FontType.bold.method697(TextureOperation0.nameIconsSpriteArray, null); if (HDToolKit.highDetail) { Class141.aClass109_Sub1Array1843 = method885(floorShadowSpriteArchive, index8); @@ -77,13 +77,13 @@ final class Sprites { } if (HDToolKit.highDetail) { - Class3_Sub13_Sub39.aAbstractSpriteArray3458 = new AbstractSprite[var3.length]; + TextureOperation8.aAbstractSpriteArray3458 = new AbstractSprite[var3.length]; for (var4 = 0; var4 < var3.length; ++var4) { - Class3_Sub13_Sub39.aAbstractSpriteArray3458[var4] = new HDSprite(var3[var4]); + TextureOperation8.aAbstractSpriteArray3458[var4] = new HDSprite(var3[var4]); } } else { - Class3_Sub13_Sub39.aAbstractSpriteArray3458 = var3; + TextureOperation8.aAbstractSpriteArray3458 = var3; } int var5 = (int) ((double) 21 * Math.random()) - 10; diff --git a/Client/src/main/java/org/runite/client/Class82.java b/Client/src/main/java/org/runite/client/Texture.java similarity index 76% rename from Client/src/main/java/org/runite/client/Class82.java rename to Client/src/main/java/org/runite/client/Texture.java index d57c6c570..fc61961d0 100644 --- a/Client/src/main/java/org/runite/client/Class82.java +++ b/Client/src/main/java/org/runite/client/Texture.java @@ -4,22 +4,22 @@ import org.rs09.client.data.ReferenceCache; import java.util.Objects; -final class Class82 { +public final class Texture { static int anInt2208 = -1; - static int[] anIntArray2213 = new int[]{16776960, 16711680, '\uff00', '\uffff', 16711935, 16777215}; - static RSString[] aClass94Array3317 = new RSString[Class3_Sub13_Sub26.anInt3332]; - static int[] anIntArray3318 = new int[Class3_Sub13_Sub26.anInt3332]; - static int[] anIntArray3319 = new int[Class3_Sub13_Sub26.anInt3332]; - static int[] anIntArray3327 = new int[Class3_Sub13_Sub26.anInt3332]; - static int[] anIntArray3329 = new int[Class3_Sub13_Sub26.anInt3332]; - static int[] anIntArray3331 = new int[Class3_Sub13_Sub26.anInt3332]; - static int[] anIntArray3336 = new int[Class3_Sub13_Sub26.anInt3332]; - static int[] anIntArray3337 = new int[Class3_Sub13_Sub26.anInt3332]; + static int[] anIntArray2213 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; + static RSString[] aClass94Array3317 = new RSString[TextureOperation35.anInt3332]; + static int[] anIntArray3318 = new int[TextureOperation35.anInt3332]; + static int[] anIntArray3319 = new int[TextureOperation35.anInt3332]; + static int[] anIntArray3327 = new int[TextureOperation35.anInt3332]; + static int[] anIntArray3329 = new int[TextureOperation35.anInt3332]; + static int[] anIntArray3331 = new int[TextureOperation35.anInt3332]; + static int[] anIntArray3336 = new int[TextureOperation35.anInt3332]; + static int[] anIntArray3337 = new int[TextureOperation35.anInt3332]; static int anInt1668 = -1; static ReferenceCache aReferenceCache_1146 = new ReferenceCache(64); static int anInt1150 = -1; - static int anInt1152; + public static int anInt1152; private final int[] anIntArray1144; private final TextureOperation aClass3_Sub13_1145; private final TextureOperation[] aClass3_Sub13Array1147; @@ -27,21 +27,21 @@ final class Class82 { private final int[] anIntArray1149; - public Class82() { + public Texture() { try { this.anIntArray1149 = new int[0]; this.anIntArray1144 = new int[0]; - this.aClass3_Sub13_1145 = new Class3_Sub13_Sub22(); - this.aClass3_Sub13_1145.anInt2381 = 1; - this.aClass3_Sub13_1148 = new Class3_Sub13_Sub22(); + this.aClass3_Sub13_1145 = new TextureOperation0(); + this.aClass3_Sub13_1145.imageCacheCapacity = 1; + this.aClass3_Sub13_1148 = new TextureOperation0(); this.aClass3_Sub13Array1147 = new TextureOperation[]{this.aClass3_Sub13_1145, this.aClass3_Sub13_1148}; - this.aClass3_Sub13_1148.anInt2381 = 1; + this.aClass3_Sub13_1148.imageCacheCapacity = 1; } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "lc.()"); } } - Class82(DataBuffer var1) { + Texture(DataBuffer var1) { try { int var2 = var1.readUnsignedByte(); this.aClass3_Sub13Array1147 = new TextureOperation[var2]; @@ -50,27 +50,27 @@ final class Class82 { int var3 = 0; int var6; - TextureOperation var7; + TextureOperation textureOperation; int var8; int var9; for (var6 = 0; var2 > var6; ++var6) { - var7 = Unsorted.method63(var1); - if (0 <= var7.method159(4)) { + textureOperation = decodeTexture(var1); + if (0 <= textureOperation.method159(4)) { ++var3; } - if (var7.method155((byte) 19) >= 0) { + if (textureOperation.method155((byte) 19) >= 0) { ++var4; } - var8 = var7.subOperations.length; + var8 = textureOperation.subOperations.length; var5[var6] = new int[var8]; for (var9 = 0; var9 < var8; ++var9) { var5[var6][var9] = var1.readUnsignedByte(); } - this.aClass3_Sub13Array1147[var6] = var7; + this.aClass3_Sub13Array1147[var6] = textureOperation; } this.anIntArray1144 = new int[var3]; @@ -79,15 +79,15 @@ final class Class82 { var4 = 0; for (var6 = 0; var6 < var2; ++var6) { - var7 = this.aClass3_Sub13Array1147[var6]; - var8 = var7.subOperations.length; + textureOperation = this.aClass3_Sub13Array1147[var6]; + var8 = textureOperation.subOperations.length; for (var9 = 0; var8 > var9; ++var9) { - var7.subOperations[var9] = this.aClass3_Sub13Array1147[var5[var6][var9]]; + textureOperation.subOperations[var9] = this.aClass3_Sub13Array1147[var5[var6][var9]]; } - var9 = var7.method159(4); - int var10 = var7.method155((byte) 19); + var9 = textureOperation.method159(4); + int var10 = textureOperation.method155((byte) 19); if (var9 > 0) { this.anIntArray1144[var3++] = var9; } @@ -108,7 +108,7 @@ final class Class82 { static void method1405(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { try { - Class3_Sub13_Sub39.anInt3464 = 0; + TextureOperation8.anInt3464 = 0; int var7; int var15; @@ -122,7 +122,7 @@ final class Class82 { if (var7 == -1) { var8 = Class102.player; } else if (var7 < Class159.localPlayerCount) { - var8 = Class3_Sub13_Sub22.players[Class56.localPlayerIndexes[var7]]; + var8 = TextureOperation0.players[Class56.localPlayerIndexes[var7]]; } else { var8 = NPC.npcs[Class15.localNPCIndexes[-Class159.localPlayerCount + var7]]; } @@ -148,7 +148,7 @@ final class Class82 { Class107.method1647(var4 >> 1, var3, var8, var5, var8.method1975(var6 ^ -28716) - -15, var1 >> 1); if (-1 < Class32.anInt590) { if (var10.skullIcon != -1) { - Class3_Sub13_Sub31.aAbstractSpriteArray3373[var10.skullIcon].drawAt(-12 + Class32.anInt590 + var2, -var19 + var0 + anInt2208); + TextureOperation2.aAbstractSpriteArray3373[var10.skullIcon].drawAt(-12 + Class32.anInt590 + var2, -var19 + var0 + anInt2208); var19 += 25; } @@ -212,16 +212,16 @@ final class Class82 { if (var8.textSpoken != null && (var7 >= Class159.localPlayerCount || CS2Script.anInt3101 == 0 || 3 == CS2Script.anInt3101 || 1 == CS2Script.anInt3101 && ItemDefinition.method1176(((Player) var8).displayName))) { Class107.method1647(var4 >> 1, var3, var8, var5, var8.method1975(27855), var1 >> 1); - if (-1 < Class32.anInt590 && Class3_Sub13_Sub39.anInt3464 < Class3_Sub13_Sub26.anInt3332) { - anIntArray3329[Class3_Sub13_Sub39.anInt3464] = Class168.bold.method682(var8.textSpoken) / 2; - anIntArray3327[Class3_Sub13_Sub39.anInt3464] = Class168.bold.anInt3727; - anIntArray3319[Class3_Sub13_Sub39.anInt3464] = Class32.anInt590; - anIntArray3337[Class3_Sub13_Sub39.anInt3464] = anInt2208; - anIntArray3331[Class3_Sub13_Sub39.anInt3464] = var8.textColor; - anIntArray3336[Class3_Sub13_Sub39.anInt3464] = var8.textEffect; - anIntArray3318[Class3_Sub13_Sub39.anInt3464] = var8.textCycle; - aClass94Array3317[Class3_Sub13_Sub39.anInt3464] = var8.textSpoken; - ++Class3_Sub13_Sub39.anInt3464; + if (-1 < Class32.anInt590 && TextureOperation8.anInt3464 < TextureOperation35.anInt3332) { + anIntArray3329[TextureOperation8.anInt3464] = FontType.bold.method682(var8.textSpoken) / 2; + anIntArray3327[TextureOperation8.anInt3464] = FontType.bold.anInt3727; + anIntArray3319[TextureOperation8.anInt3464] = Class32.anInt590; + anIntArray3337[TextureOperation8.anInt3464] = anInt2208; + anIntArray3331[TextureOperation8.anInt3464] = var8.textColor; + anIntArray3336[TextureOperation8.anInt3464] = var8.textEffect; + anIntArray3318[TextureOperation8.anInt3464] = var8.textCycle; + aClass94Array3317[TextureOperation8.anInt3464] = var8.textSpoken; + ++TextureOperation8.anInt3464; } } @@ -230,11 +230,11 @@ final class Class82 { AbstractSprite var25 = Unsorted.aAbstractSpriteArray996[1]; if (var8 instanceof NPC) { NPC var28 = (NPC) var8; - AbstractSprite[] var31 = (AbstractSprite[]) Class3_Sub13_Sub11.aReferenceCache_3130.get(var28.definition.anInt1279); + AbstractSprite[] var31 = (AbstractSprite[]) TextureOperation1.aReferenceCache_3130.get(var28.definition.anInt1279); if (var31 == null) { var31 = Class140_Sub6.getSprites(var28.definition.anInt1279, CacheIndex.spritesIndex); if (null != var31) { - Class3_Sub13_Sub11.aReferenceCache_3130.put(var31, var28.definition.anInt1279); + TextureOperation1.aReferenceCache_3130.put(var31, var28.definition.anInt1279); } } @@ -306,7 +306,7 @@ final class Class82 { } Class75_Sub3.aAbstractSpriteArray2656[var8.anIntArray2815[var19]].drawAt(-12 + var2 + Class32.anInt590, var0 + anInt2208 - 12); - TextureOperation.smallFont.method699(RSString.stringAnimator(var8.anIntArray2836[var19]), -1 + Class32.anInt590 + var2, 3 + anInt2208 + var0, 16777215, 0); + FontType.smallFont.method699(RSString.stringAnimator(var8.anIntArray2836[var19]), -1 + Class32.anInt590 + var2, 3 + anInt2208 + var0, 16777215, 0); } } } @@ -318,7 +318,7 @@ final class Class82 { method1409(true); } - for (; Class3_Sub13_Sub39.anInt3464 > var7; ++var7) { + for (; TextureOperation8.anInt3464 > var7; ++var7) { var19 = anIntArray3337[var7]; int var18 = anIntArray3319[var7]; var21 = anIntArray3327[var7]; @@ -350,7 +350,7 @@ final class Class82 { } if (anIntArray3331[var7] == 7) { - var32 = Class79.anInt1127 % 20 < 10 ? 255 : '\uffff'; + var32 = Class79.anInt1127 % 20 < 10 ? 255 : 65535; } if (8 == anIntArray3331[var7]) { @@ -362,7 +362,7 @@ final class Class82 { if (var15 >= 50) { if (var15 >= 100) { if (150 > var15) { - var32 = -500 - (-(5 * var15) - '\uff00'); + var32 = -500 - (-(5 * var15) - 65280); } } else { var32 = 16776960 + 16384000 + -(327680 * var15); @@ -393,7 +393,7 @@ final class Class82 { var32 = 16777215 - var15 * 327680 + 32768000; } } else { - var32 = '\uff00' - (-(327685 * var15) - -16384250); + var32 = 65280 - (-(327685 * var15) - -16384250); } } else { var32 = 16777215 - 327685 * var15; @@ -401,30 +401,30 @@ final class Class82 { } if (0 == anIntArray3336[var7]) { - Class168.bold.method699(var33, Class32.anInt590 + var2, var0 + anInt2208, var32, 0); + FontType.bold.method699(var33, Class32.anInt590 + var2, var0 + anInt2208, var32, 0); } if (1 == anIntArray3336[var7]) { - Class168.bold.method696(var33, var2 - -Class32.anInt590, anInt2208 + var0, var32, Class79.anInt1127); + FontType.bold.method696(var33, var2 - -Class32.anInt590, anInt2208 + var0, var32, Class79.anInt1127); } if (anIntArray3336[var7] == 2) { - Class168.bold.method695(var33, var2 - -Class32.anInt590, var0 - -anInt2208, var32, Class79.anInt1127); + FontType.bold.method695(var33, var2 - -Class32.anInt590, var0 - -anInt2208, var32, Class79.anInt1127); } if (anIntArray3336[var7] == 3) { - Class168.bold.method692(var33, var2 + Class32.anInt590, anInt2208 + var0, var32, Class79.anInt1127, 150 - anIntArray3318[var7]); + FontType.bold.method692(var33, var2 + Class32.anInt590, anInt2208 + var0, var32, Class79.anInt1127, 150 - anIntArray3318[var7]); } if (4 == anIntArray3336[var7]) { - var15 = (-anIntArray3318[var7] + 150) * (Class168.bold.method682(var33) - -100) / 150; + var15 = (-anIntArray3318[var7] + 150) * (FontType.bold.method682(var33) - -100) / 150; if (HDToolKit.highDetail) { Class22.method931(Class32.anInt590 + var2 + -50, var0, Class32.anInt590 + var2 - -50, var4 + var0); } else { Class74.method1326(-50 + (var2 - -Class32.anInt590), var0, 50 + Class32.anInt590 + var2, var4 + var0); } - Class168.bold.method681(var33, var2 - (-Class32.anInt590 + -50) + -var15, var0 + anInt2208, var32, 0); + FontType.bold.method681(var33, var2 - (-Class32.anInt590 + -50) + -var15, var0 + anInt2208, var32, 0); if (HDToolKit.highDetail) { Class22.setClipping(var2, var0, var1 + var2, var4 + var0); } else { @@ -436,9 +436,9 @@ final class Class82 { int var16 = 0; var15 = -anIntArray3318[var7] + 150; if (HDToolKit.highDetail) { - Class22.method931(var2, -1 + -Class168.bold.anInt3727 + anInt2208 + var0, var1 + var2, 5 + var0 - -anInt2208); + Class22.method931(var2, -1 + -FontType.bold.anInt3727 + anInt2208 + var0, var1 + var2, 5 + var0 - -anInt2208); } else { - Class74.method1326(var2, -1 + -Class168.bold.anInt3727 + anInt2208 + var0, var2 + var1, 5 + anInt2208 + var0); + Class74.method1326(var2, -1 + -FontType.bold.anInt3727 + anInt2208 + var0, var2 + var1, 5 + anInt2208 + var0); } if (25 > var15) { @@ -447,7 +447,7 @@ final class Class82 { var16 = var15 - 125; } - Class168.bold.method699(var33, Class32.anInt590 + var2, var16 + var0 + anInt2208, var32, 0); + FontType.bold.method699(var33, Class32.anInt590 + var2, var16 + var0 + anInt2208, var32, 0); if (HDToolKit.highDetail) { Class22.setClipping(var2, var0, var2 - -var1, var0 + var4); } else { @@ -455,7 +455,7 @@ final class Class82 { } } } else { - Class168.bold.method699(var33, var2 - -Class32.anInt590, var0 + anInt2208, 16776960, 0); + FontType.bold.method699(var33, var2 - -Class32.anInt590, var0 + anInt2208, 16776960, 0); } } @@ -485,12 +485,117 @@ final class Class82 { } } + public static TextureOperation decodeTexture(DataBuffer var1) { + try { + var1.readUnsignedByte(); + int type = var1.readUnsignedByte(); + TextureOperation var3 = create(type); + Objects.requireNonNull(var3).imageCacheCapacity = var1.readUnsignedByte(); + int codes = var1.readUnsignedByte(); + for (int var5 = 0; var5 < codes; ++var5) { + int opcode = var1.readUnsignedByte(); + var3.method157(opcode, var1, true); + } + + var3.method158(16251); + return var3; + } catch (RuntimeException var7) { + throw ClientErrorException.clientError(var7, "qk.B(" + (byte) -67 + ',' + (var1 != null ? "{...}" : "null") + ')'); + } + } + + public static TextureOperation create(int type) { + if (type == 0) { + return new TextureOperation0(); + } else if (type == 1) { + return new TextureOperation1(); + } else if (2 == type) { + return new TextureOperation2(); + } else if (type == 3) { + return new TextureOperation3(); + } else if (type == 4) { + return new TextureOperation4(); + } else if (type == 5) { + return new TextureOperation5(); + } else if (type == 6) { + return new TextureOperation6(); + } else if (type == 7) { + return new TextureOperation7(); + } else if (type == 8) { + return new TextureOperation8(); + } else if (9 == type) { + return new TextureOperation9(); + } else if (10 == type) { + return new TextureOperation10(); + } else if (type == 11) { + return new TextureOperation11(); + } else if (type == 12) { + return new TextureOperation12(); + } else if (type == 13) { + return new TextureOperation13(); + } else if (14 == type) { + return new TextureOperation14(); + } else if (type == 15) { + return new TextureOperation15(); + } else if (type == 16) { + return new TextureOperation16(); + } else if (17 == type) { + return new TextureOperation17(); + } else if (type == 18) { + return new TextureOperation18(); + } else if (type == 19) { + return new TextureOperation19(); + } else if (type == 20) { + return new TextureOperation20(); + } else if (21 == type) { + return new TextureOperation21(); + } else if (22 == type) { + return new TextureOperation22(); + } else if (type == 23) { + return new TextureOperation23(); + } else if (24 == type) { + return new TextureOperation24(); + } else if (type == 25) { + return new TextureOperation25(); + } else if (type == 26) { + return new TextureOperation26(); + } else if (27 == type) { + return new TextureOperation27(); + } else if (type == 28) { + return new TextureOperation28(); + } else if (type == 29) { + return new TextureOperation29(); + } else if (type == 30) { + return new TextureOperation30(); + } else if (31 == type) { + return new TextureOperation31(); + } else if (32 == type) { + return new TextureOperation32(); + } else if (33 == type) { + return new TextureOperation33(); + } else if (type == 34) { + return new TextureOperation34(); + } else if (type == 35) { + return new TextureOperation35(); + } else if (type == 36) { + return new TextureOperation36(); + } else if (type == 37) { + return new TextureOperation37(); + } else if (38 == type) { + return new TextureOperation38(); + } else if (39 == type) { + return new TextureOperation39(); + } else { + return null; + } + } + final int[] method1404(int var1, boolean var2, int var3, double var4, CacheIndex var7, Interface2 var8, boolean var9) { try { GameObject.method1859(var4); Class17.anInterface2_408 = var8; WaterfallShader.aClass153_2172 = var7; - Class3_Sub13_Sub3.method180(-1, var1, var3); + TextureOperation33.method180(-1, var1, var3); int var11; for (var11 = 0; var11 < this.aClass3_Sub13Array1147.length; ++var11) { @@ -527,7 +632,7 @@ final class Class82 { var17 = var19; var18 = var19; } else { - int[][] var24 = this.aClass3_Sub13_1145.method166(-1, var15); + int[][] var24 = this.aClass3_Sub13_1145.method166(var15); var16 = var24[0]; var18 = var24[2]; var17 = var24[1]; @@ -587,7 +692,7 @@ final class Class82 { GameObject.method1859(0.7); WaterfallShader.aClass153_2172 = var8; Class17.anInterface2_408 = var4; - Class3_Sub13_Sub3.method180(-32, var1, var2); + TextureOperation33.method180(-32, var1, var2); int var10; for (var10 = 0; this.aClass3_Sub13Array1147.length > var10; ++var10) { @@ -612,7 +717,7 @@ final class Class82 { var13 = var15; var14 = var15; } else { - int[][] var22 = this.aClass3_Sub13_1145.method166(-1, var11); + int[][] var22 = this.aClass3_Sub13_1145.method166(var11); var12 = var22[0]; var13 = var22[1]; var14 = var22[2]; @@ -621,7 +726,7 @@ final class Class82 { if (this.aClass3_Sub13_1148.aBoolean2375) { var15 = this.aClass3_Sub13_1148.method154(var11, (byte) -103); } else { - var15 = this.aClass3_Sub13_1148.method166(-1, var11)[0]; + var15 = this.aClass3_Sub13_1148.method166(var11)[0]; } for (int var16 = var2 - 1; var16 >= 0; --var16) { diff --git a/Client/src/main/java/org/runite/client/TextureOperation.java b/Client/src/main/java/org/runite/client/TextureOperation.java index 94b896348..1c43a864c 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation.java +++ b/Client/src/main/java/org/runite/client/TextureOperation.java @@ -1,9 +1,8 @@ package org.runite.client; import org.rs09.client.Linkable; -import org.rs09.client.rendering.Toolkit; +import org.runite.client.drawcalls.LoadingBox; -import java.awt.Graphics; import java.util.Random; public abstract class TextureOperation extends Linkable { @@ -12,8 +11,7 @@ public abstract class TextureOperation extends Linkable { Class97 aClass97_2376; TextureOperation[] subOperations; static int anInt2378 = 0; - public static Font smallFont; - int anInt2381; + int imageCacheCapacity; Class114 aClass114_2382; static int anInt2383 = 0; @@ -31,7 +29,7 @@ public abstract class TextureOperation extends Linkable { var4 = var2.nextInt(); } while (var3 <= var4); - return Class3_Sub13_Sub7.method201(var4, var1, -58); + return TextureOperation27.method201(var4, var1, -58); } } catch (RuntimeException var6) { throw ClientErrorException.clientError(var6, "ni.C(" + var0 + ',' + var1 + ',' + (var2 != null ? "{...}" : "null") + ')'); @@ -45,7 +43,7 @@ public abstract class TextureOperation extends Linkable { anInt2383 = 121; } - return this.subOperations[var1].aBoolean2375 ? this.subOperations[var1].method154(var2, (byte) -118) : this.subOperations[var1].method166(-1, var2)[0]; + return this.subOperations[var1].aBoolean2375 ? this.subOperations[var1].method154(var2, (byte) -118) : this.subOperations[var1].method166(var2)[0]; } catch (RuntimeException var5) { throw ClientErrorException.clientError(var5, "j.RA(" + var1 + ',' + var2 + ',' + var3 + ')'); } @@ -106,7 +104,7 @@ public abstract class TextureOperation extends Linkable { int method159(int var1) { try { if (var1 != 4) { - method164(true, null); + LoadingBox.draw(true, null); } return -1; @@ -118,7 +116,7 @@ public abstract class TextureOperation extends Linkable { final void method160(int var1, int var2) { try { - int var4 = 255 == this.anInt2381 ? var1 : this.anInt2381; + int var4 = 255 == this.imageCacheCapacity ? var1 : this.imageCacheCapacity; if (this.aBoolean2375) { this.aClass114_2382 = new Class114(var4, var1, var2); } else { @@ -157,7 +155,7 @@ public abstract class TextureOperation extends Linkable { int[] var4 = this.subOperations[var2].method154(var1, (byte) -105); return new int[][]{var4, var4, var4}; } else { - return this.subOperations[var2].method166(-1, var1); + return this.subOperations[var2].method166(var1); } } catch (RuntimeException var6) { throw ClientErrorException.clientError(var6, "j.UA(" + var1 + ',' + var2 + ',' + var3 + ')'); @@ -179,39 +177,6 @@ public abstract class TextureOperation extends Linkable { } } - static void method164(boolean var1, RSString var2) { - try { - byte var3 = 4; - int var4 = var3 + 6; - int var5 = var3 + 6; - int var6 = Class126.plainFont.method680(var2, 250); - int var7 = Class126.plainFont.method684(var2, 250) * 13; - //Used for the top left (please wait...) - Toolkit.getActiveToolkit().method934(var4 - var3, -var3 + var5, var3 + var6 - -var3, var3 + var3 + var7, 0); - Toolkit.getActiveToolkit().drawRect(-var3 + var4, -var3 + var5, var6 + var3 - -var3, var3 + var7 + var3, 16777215, 255); - - Class126.plainFont.method676(var2, var4, var5, var6, var7, 16777215, -1, 1, 1, 0); - - Class75.method1340(var4 + -var3, var6 + (var3 - -var3), -var3 + var5, var3 + var7 + var3); - if (var1) { - if (HDToolKit.highDetail) { - HDToolKit.bufferSwap(); - } else { - try { - Graphics var8 = GameShell.canvas.getGraphics(); - Class164_Sub1.aClass158_3009.method2179(var8); - } catch (Exception var9) { - GameShell.canvas.repaint(); - } - } - } else { - Unsorted.method1282(var4, (byte) -97, var5, var7, var6); - } - } catch (RuntimeException var10) { - throw ClientErrorException.clientError(var10, "j.TA(" + ',' + var1 + ',' + (var2 != null ? "{...}" : "null") + ')'); - } - } - TextureOperation(int var1, boolean var2) { try { this.subOperations = new TextureOperation[var1]; @@ -221,29 +186,8 @@ public abstract class TextureOperation extends Linkable { } } - static void method165() { - try { - WorldListEntry.aAbstractSprite_1339 = null; - WorldListEntry.aAbstractSprite_3099 = null; - Class50.aAbstractSprite_824 = null; - - WorldListEntry.aAbstractSprite_1457 = null; - Class3_Sub26.aAbstractSprite_2560 = null; - } catch (RuntimeException var2) { - throw ClientErrorException.clientError(var2, "j.VA(" + -7878 + ')'); - } - } - - int[][] method166(int var1, int var2) { - try { - if (var1 == -1) { - throw new IllegalStateException("This operation does not have a colour output"); - } else { - return null; - } - } catch (RuntimeException var4) { - throw ClientErrorException.clientError(var4, "j.T(" + var1 + ',' + var2 + ')'); - } + int[][] method166(int var2) { + throw new IllegalStateException("This operation does not have a colour output"); } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub22.java b/Client/src/main/java/org/runite/client/TextureOperation0.java similarity index 94% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub22.java rename to Client/src/main/java/org/runite/client/TextureOperation0.java index cb327565a..8725f3c21 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub22.java +++ b/Client/src/main/java/org/runite/client/TextureOperation0.java @@ -2,18 +2,18 @@ package org.runite.client; import org.rs09.client.util.ArrayUtils; -public final class Class3_Sub13_Sub22 extends TextureOperation { +public final class TextureOperation0 extends TextureOperation { - static Player[] players = new Player[2048]; + public static Player[] players = new Player[2048]; public static AbstractIndexedSprite[] nameIconsSpriteArray; static long[] aLongArray3271 = new long[500]; static boolean[] aBooleanArray3272; - static Class61[][][] aClass61ArrayArrayArray3273 = new Class61[4][104][104]; + public static Class61[][][] aClass61ArrayArrayArray3273 = new Class61[4][104][104]; static boolean aBoolean3275 = true; private int anInt3276; - protected Class3_Sub13_Sub22() { + protected TextureOperation0() { super(0, true); this.anInt3276 = 4096; diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub11.java b/Client/src/main/java/org/runite/client/TextureOperation1.java similarity index 79% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub11.java rename to Client/src/main/java/org/runite/client/TextureOperation1.java index 442dc5557..04b0fc67c 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub11.java +++ b/Client/src/main/java/org/runite/client/TextureOperation1.java @@ -3,7 +3,7 @@ package org.runite.client; import org.rs09.client.data.HashTable; import org.rs09.client.data.ReferenceCache; -final class Class3_Sub13_Sub11 extends TextureOperation { +final class TextureOperation1 extends TextureOperation { static int anInt3274; private int anInt3129; @@ -12,7 +12,7 @@ final class Class3_Sub13_Sub11 extends TextureOperation { private int anInt3135; - protected Class3_Sub13_Sub11() { + protected TextureOperation1() { super(0, false); try { @@ -32,9 +32,9 @@ final class Class3_Sub13_Sub11 extends TextureOperation { } } - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { - if(var1 != -1) { + if(-1 != -1) { method222(-87, 26, 75, -56, 22, -68); } @@ -53,7 +53,7 @@ final class Class3_Sub13_Sub11 extends TextureOperation { return var3; } catch (RuntimeException var8) { - throw ClientErrorException.clientError(var8, "fm.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var8, "fm.T(" + -1 + ',' + var2 + ')'); } } @@ -64,21 +64,21 @@ final class Class3_Sub13_Sub11 extends TextureOperation { Class60.method1208((byte)-128, Class3_Sub28_Sub12.anInt3655); } - for(Class3_Sub31 var2 = Class3_Sub13_Sub17.aHashTable_3208.first(); null != var2; var2 = Class3_Sub13_Sub17.aHashTable_3208.next()) { - Class3_Sub13_Sub18.method254(true, var2); + for(Class3_Sub31 var2 = TextureOperation23.aHashTable_3208.first(); null != var2; var2 = TextureOperation23.aHashTable_3208.next()) { + TextureOperation19.method254(true, var2); } Class3_Sub28_Sub12.anInt3655 = -1; - Class3_Sub13_Sub17.aHashTable_3208 = new HashTable(8); + TextureOperation23.aHashTable_3208 = new HashTable(8); Class3_Sub7.method122(3000 + -2918); Class3_Sub28_Sub12.anInt3655 = Client.loginScreenInterfaceID; Class124.method1746(false, (byte)-36); Unsorted.method1093(false); - Class3_Sub13_Sub12.method226(Class3_Sub28_Sub12.anInt3655); + TextureOperation24.method226(Class3_Sub28_Sub12.anInt3655); } Class3_Sub28_Sub5.anInt3590 = -1; - Class3_Sub13_Sub13.method229(Class161.anInt2027); + TextureOperation20.method229(Class161.anInt2027); Class102.player = new Player(); Class102.player.anInt2829 = 3000; Class102.player.anInt2819 = 3000; @@ -90,11 +90,11 @@ final class Class3_Sub13_Sub11 extends TextureOperation { InterfaceWidget.d(3000 ^ '\uf447'); } - Class3_Sub13_Sub14.method236(); - Class3_Sub13_Sub6.method195(); + TextureOperation31.method236(); + TextureOperation26.method195(); Class117.method1719(28); } else { - Class84.method1418(-110, CacheIndex.spritesIndex); + Class84.method1418(CacheIndex.spritesIndex); Class117.method1719(10); } @@ -145,7 +145,7 @@ final class Class3_Sub13_Sub11 extends TextureOperation { if(Class8.method846(var0, var1, var3)) { var6 = var1 << 7; var7 = var3 << 7; - return Class3_Sub13_Sub37.method349(var6 + 1, Class44.anIntArrayArrayArray723[var0][var1][var3] + var5, var7 + 1) && Class3_Sub13_Sub37.method349(var6 + 128 - 1, Class44.anIntArrayArrayArray723[var0][var1 + 1][var3] + var5, var7 + 1) && Class3_Sub13_Sub37.method349(var6 + 128 - 1, Class44.anIntArrayArrayArray723[var0][var1 + 1][var3 + 1] + var5, var7 + 128 - 1) && Class3_Sub13_Sub37.method349(var6 + 1, Class44.anIntArrayArrayArray723[var0][var1][var3 + 1] + var5, var7 + 128 - 1); + return TextureOperation10.method349(var6 + 1, Class44.anIntArrayArrayArray723[var0][var1][var3] + var5, var7 + 1) && TextureOperation10.method349(var6 + 128 - 1, Class44.anIntArrayArrayArray723[var0][var1 + 1][var3] + var5, var7 + 1) && TextureOperation10.method349(var6 + 128 - 1, Class44.anIntArrayArrayArray723[var0][var1 + 1][var3 + 1] + var5, var7 + 128 - 1) && TextureOperation10.method349(var6 + 1, Class44.anIntArrayArrayArray723[var0][var1][var3 + 1] + var5, var7 + 128 - 1); } else { return false; } @@ -161,13 +161,13 @@ final class Class3_Sub13_Sub11 extends TextureOperation { var6 = (var1 << 7) + 1; var7 = (var3 << 7) + 2; int var8 = Class44.anIntArrayArrayArray723[var0][var1][var3] + var5; - if(Class3_Sub13_Sub37.method349(var6, var8, var7)) { + if(TextureOperation10.method349(var6, var8, var7)) { int var9 = (var2 << 7) - 1; - if(Class3_Sub13_Sub37.method349(var9, var8, var7)) { + if(TextureOperation10.method349(var9, var8, var7)) { int var10 = (var4 << 7) - 1; - if(!Class3_Sub13_Sub37.method349(var6, var8, var10)) { + if(!TextureOperation10.method349(var6, var8, var10)) { return false; - } else return Class3_Sub13_Sub37.method349(var9, var8, var10); + } else return TextureOperation10.method349(var9, var8, var10); } else { return false; } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub37.java b/Client/src/main/java/org/runite/client/TextureOperation10.java similarity index 98% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub37.java rename to Client/src/main/java/org/runite/client/TextureOperation10.java index 33e6f83d4..5c79c706d 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub37.java +++ b/Client/src/main/java/org/runite/client/TextureOperation10.java @@ -3,7 +3,7 @@ import org.rs09.client.config.GameConfig; import java.math.BigInteger; -final class Class3_Sub13_Sub37 extends TextureOperation { +final class TextureOperation10 extends TextureOperation { private int[][] anIntArrayArray3438; static Class3_Sub28_Sub17_Sub1 aClass3_Sub28_Sub17_Sub1_3440; @@ -226,7 +226,7 @@ final class Class3_Sub13_Sub37 extends TextureOperation { } } - public Class3_Sub13_Sub37() { + public TextureOperation10() { super(1, false); } @@ -316,7 +316,7 @@ final class Class3_Sub13_Sub37 extends TextureOperation { var4 = 0; } - this.anIntArray3443[var6] = Class3_Sub13_Sub29.bitwiseOr(var4, Class3_Sub13_Sub29.bitwiseOr(var3 << 8, var2 << 16)); + this.anIntArray3443[var6] = TextureOperation3.bitwiseOr(var4, TextureOperation3.bitwiseOr(var3 << 8, var2 << 16)); } } @@ -330,7 +330,7 @@ final class Class3_Sub13_Sub37 extends TextureOperation { PacketParser.inTutorialIsland = 0; int var1 = Class131.anInt1716 + (Class102.player.anInt2819 >> 7); - int var2 = (Class102.player.anInt2829 >> 7) - -Class82.anInt1152; + int var2 = (Class102.player.anInt2829 >> 7) - -Texture.anInt1152; if(var1 >= 3053 && var1 <= 3156 && var2 >= 3056 && var2 <= 3136) { PacketParser.inTutorialIsland = 1; } @@ -348,10 +348,10 @@ final class Class3_Sub13_Sub37 extends TextureOperation { } } - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { int[][] var3 = this.aClass97_2376.method1594((byte)90, var2); - if(var1 != -1) { + if(-1 != -1) { this.method157(-71, null, false); } @@ -380,7 +380,7 @@ final class Class3_Sub13_Sub37 extends TextureOperation { return var3; } catch (RuntimeException var10) { - throw ClientErrorException.clientError(var10, "um.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var10, "um.T(" + -1 + ',' + var2 + ')'); } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub20.java b/Client/src/main/java/org/runite/client/TextureOperation11.java similarity index 92% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub20.java rename to Client/src/main/java/org/runite/client/TextureOperation11.java index 45a7e8054..9bfbd2b70 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub20.java +++ b/Client/src/main/java/org/runite/client/TextureOperation11.java @@ -2,7 +2,7 @@ package org.runite.client; import java.util.Objects; -final class Class3_Sub13_Sub20 extends TextureOperation { +final class TextureOperation11 extends TextureOperation { static int anInt3244 = 0; private int anInt3245 = 4096; @@ -35,9 +35,9 @@ final class Class3_Sub13_Sub20 extends TextureOperation { } } - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { - if(var1 != -1) { + if(-1 != -1) { anInt3244 = -40; } @@ -69,11 +69,11 @@ final class Class3_Sub13_Sub20 extends TextureOperation { return var3; } catch (RuntimeException var15) { - throw ClientErrorException.clientError(var15, "mg.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var15, "mg.T(" + -1 + ',' + var2 + ')'); } } - public Class3_Sub13_Sub20() { + public TextureOperation11() { super(1, false); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub1.java b/Client/src/main/java/org/runite/client/TextureOperation12.java similarity index 93% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub1.java rename to Client/src/main/java/org/runite/client/TextureOperation12.java index d9d807e7c..ca4194fef 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub1.java +++ b/Client/src/main/java/org/runite/client/TextureOperation12.java @@ -3,7 +3,7 @@ package org.runite.client; import org.rs09.client.config.GameConfig; -public final class Class3_Sub13_Sub1 extends TextureOperation { +public final class TextureOperation12 extends TextureOperation { public static Class3_Sub30_Sub1 outgoingBuffer = new Class3_Sub30_Sub1(); private int anInt3036 = 0; @@ -16,10 +16,10 @@ public final class Class3_Sub13_Sub1 extends TextureOperation { static void method167(int var0) { try { - if(Class3_Sub13_Sub3.aClass148_3049 != null) { - KeyboardListener var1 = Class3_Sub13_Sub3.aClass148_3049; + if(TextureOperation33.aClass148_3049 != null) { + KeyboardListener var1 = TextureOperation33.aClass148_3049; synchronized(var1) { - Class3_Sub13_Sub3.aClass148_3049 = null; + TextureOperation33.aClass148_3049 = null; } } @@ -32,7 +32,7 @@ public final class Class3_Sub13_Sub1 extends TextureOperation { } } - public Class3_Sub13_Sub1() { + public TextureOperation12() { super(0, true); } @@ -58,7 +58,7 @@ public final class Class3_Sub13_Sub1 extends TextureOperation { var7 -= var7 & -4096; if(this.anInt3036 == 0) { - var7 = Class3_Sub13_Sub17.anIntArray3212[(var7 & 4085) >> 4] + 4096 >> 1; + var7 = TextureOperation23.anIntArray3212[(var7 & 4085) >> 4] + 4096 >> 1; } else if(this.anInt3036 == 2) { var7 -= 2048; if(var7 < 0) { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub30.java b/Client/src/main/java/org/runite/client/TextureOperation13.java similarity index 95% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub30.java rename to Client/src/main/java/org/runite/client/TextureOperation13.java index a51b2c64c..c09904f2f 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub30.java +++ b/Client/src/main/java/org/runite/client/TextureOperation13.java @@ -2,7 +2,7 @@ package org.runite.client; -final class Class3_Sub13_Sub30 extends TextureOperation { +final class TextureOperation13 extends TextureOperation { static int anInt3362 = -1; static int anInt3363; @@ -68,7 +68,7 @@ final class Class3_Sub13_Sub30 extends TextureOperation { short var15 = Class7.aShortArray2167[var12]; var15 += var14; - Class3_Sub24_Sub4.method1177(Class3_Sub13_Sub26.anIntArray3328[var12], var0, (byte)-73, RSString.stringCombiner(new RSString[]{ColorCore.ContextColor , var5}), var4, var15, Class91.aClass94Array1299[var12], var2); + Class3_Sub24_Sub4.method1177(TextureOperation35.anIntArray3328[var12], var0, (byte)-73, RSString.stringCombiner(new RSString[]{ColorCore.ContextColor , var5}), var4, var15, Class91.aClass94Array1299[var12], var2); } } } else if((8 & Class164.anInt2051) != 0) { @@ -80,7 +80,7 @@ final class Class3_Sub13_Sub30 extends TextureOperation { } for(var12 = 0; var12 < Unsorted.menuOptionCount; ++var12) { - if(Class3_Sub13_Sub7.aShortArray3095[var12] == 60) { + if(TextureOperation27.aShortArray3095[var12] == 60) { Class163_Sub2_Sub1.aClass94Array4016[var12] = RSString.stringCombiner(new RSString[]{ColorCore.ContextColor , var5}); break; } @@ -105,17 +105,17 @@ final class Class3_Sub13_Sub30 extends TextureOperation { Class3_Sub10.method139(69); Class3_Sub26.method512(); WaterfallShader.method1626((byte)-128); - Class3_Sub13_Sub3.method182(); + TextureOperation33.method182(); Class145.method2077(); Class25.method959(); method716(); Class3_Sub15.method370(); - Class3_Sub13_Sub29.method304(); + TextureOperation3.method304(); Class40.method1045(); - Class3_Sub13_Sub3.method183(); + TextureOperation33.method183(); LinkableRSString.method727(); Class3_Sub21.method397((byte)-41); - if(Class3_Sub13_Sub13.paramModeWhat != 0) { + if(TextureOperation20.paramModeWhat != 0) { for(int var1 = 0; var1 < Class3_Sub6.aByteArrayArray2287.length; ++var1) { Class3_Sub6.aByteArrayArray2287[var1] = null; } @@ -142,7 +142,7 @@ final class Class3_Sub13_Sub30 extends TextureOperation { CacheIndex.huffmanEncodingIndex.method2137(); CacheIndex.music2Index.method2137(); CacheIndex.interfaceScriptsIndex.method2137(); - Class3_Sub13_Sub11.aReferenceCache_3130.clear(); + TextureOperation1.aReferenceCache_3130.clear(); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "rj.E(" + var0 + ')'); } @@ -171,7 +171,7 @@ final class Class3_Sub13_Sub30 extends TextureOperation { } } - public Class3_Sub13_Sub30() { + public TextureOperation13() { super(0, true); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub32.java b/Client/src/main/java/org/runite/client/TextureOperation14.java similarity index 91% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub32.java rename to Client/src/main/java/org/runite/client/TextureOperation14.java index 405466e2e..40c551d6d 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub32.java +++ b/Client/src/main/java/org/runite/client/TextureOperation14.java @@ -1,5 +1,5 @@ package org.runite.client; -final class Class3_Sub13_Sub32 extends TextureOperation { +final class TextureOperation14 extends TextureOperation { static int[] anIntArray3383 = new int[5]; private int anInt3385 = 585; @@ -20,16 +20,16 @@ final class Class3_Sub13_Sub32 extends TextureOperation { } } - public Class3_Sub13_Sub32() { + public TextureOperation14() { super(0, true); } static void method320(int var0, int var1, int var2, byte var3, int var4) { try { if(var2 >= var4) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var1], var4, -83, var2, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var1], var4, -83, var2, var0); } else { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var1], var2, -48, var4, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var1], var2, -48, var4, var0); } if(var3 > -55) { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub16.java b/Client/src/main/java/org/runite/client/TextureOperation15.java similarity index 89% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub16.java rename to Client/src/main/java/org/runite/client/TextureOperation15.java index 147c89274..f78342bb9 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub16.java +++ b/Client/src/main/java/org/runite/client/TextureOperation15.java @@ -1,7 +1,7 @@ package org.runite.client; import java.util.Random; -final class Class3_Sub13_Sub16 extends TextureOperation { +final class TextureOperation15 extends TextureOperation { private int anInt3191 = 2; private int anInt3193 = 2048; @@ -45,8 +45,8 @@ final class Class3_Sub13_Sub16 extends TextureOperation { static int compareEnteredLanguageArgument(RSString var0) { try { - for(int var2 = 0; Class3_Sub13_Sub19.aClass94Array3238.length > var2; ++var2) { - if(Class3_Sub13_Sub19.aClass94Array3238[var2].equalsStringIgnoreCase(var0)) { + for(int var2 = 0; TextureOperation4.aClass94Array3238.length > var2; ++var2) { + if(TextureOperation4.aClass94Array3238[var2].equalsStringIgnoreCase(var0)) { return var2; } } @@ -66,7 +66,7 @@ final class Class3_Sub13_Sub16 extends TextureOperation { int var7 = var6 - -1; for(int var15 = 0; var15 < Class113.anInt1559; ++var15) { - Class3_Sub13_Sub36.anInt3422 = Integer.MAX_VALUE; + TextureOperation36.anInt3422 = Integer.MAX_VALUE; KeyboardListener.anInt1914 = Integer.MAX_VALUE; Unsorted.anInt1042 = Integer.MAX_VALUE; Class3_Sub28_Sub5.anInt3589 = Integer.MAX_VALUE; @@ -76,10 +76,10 @@ final class Class3_Sub13_Sub16 extends TextureOperation { int var19; for(int var9 = var6 - 1; var7 >= var9; ++var9) { - int var13 = 255 & this.aByteArray3195[(var9 >= this.anInt3204 ?-this.anInt3204 + var9:var9) & 255]; + int var13 = 255 & this.aByteArray3195[(var9 >= this.anInt3204 ?-this.anInt3204 + var9:var9) & 0xFF]; for(int var8 = var17 + -1; var18 >= var8; ++var8) { - int var14 = (255 & this.aByteArray3195[(var8 >= this.anInt3203 ?-this.anInt3203 + var8:var8) + var13 & 255]) * 2; + int var14 = (255 & this.aByteArray3195[(var8 >= this.anInt3203 ?-this.anInt3203 + var8:var8) + var13 & 0xFF]) * 2; int var10 = -(var8 << 12) - (this.aShortArray3200[var14++] - var16); int var11 = var5 - (this.aShortArray3200[var14] + (var9 << 12)); var19 = this.anInt3194; @@ -107,19 +107,19 @@ final class Class3_Sub13_Sub16 extends TextureOperation { if(var12 >= Class3_Sub28_Sub5.anInt3589) { if(Unsorted.anInt1042 > var12) { - Class3_Sub13_Sub36.anInt3422 = KeyboardListener.anInt1914; + TextureOperation36.anInt3422 = KeyboardListener.anInt1914; KeyboardListener.anInt1914 = Unsorted.anInt1042; Unsorted.anInt1042 = var12; } else if(KeyboardListener.anInt1914 <= var12) { - if(var12 < Class3_Sub13_Sub36.anInt3422) { - Class3_Sub13_Sub36.anInt3422 = var12; + if(var12 < TextureOperation36.anInt3422) { + TextureOperation36.anInt3422 = var12; } } else { - Class3_Sub13_Sub36.anInt3422 = KeyboardListener.anInt1914; + TextureOperation36.anInt3422 = KeyboardListener.anInt1914; KeyboardListener.anInt1914 = var12; } } else { - Class3_Sub13_Sub36.anInt3422 = KeyboardListener.anInt1914; + TextureOperation36.anInt3422 = KeyboardListener.anInt1914; KeyboardListener.anInt1914 = Unsorted.anInt1042; Unsorted.anInt1042 = Class3_Sub28_Sub5.anInt3589; Class3_Sub28_Sub5.anInt3589 = var12; @@ -135,7 +135,7 @@ final class Class3_Sub13_Sub16 extends TextureOperation { } else if (var19 == 3) { var3[var15] = KeyboardListener.anInt1914; } else if (var19 == 4) { - var3[var15] = Class3_Sub13_Sub36.anInt3422; + var3[var15] = TextureOperation36.anInt3422; } else if (var19 == 2) { var3[var15] = Unsorted.anInt1042 + -Class3_Sub28_Sub5.anInt3589; } @@ -193,7 +193,7 @@ final class Class3_Sub13_Sub16 extends TextureOperation { } } - public Class3_Sub13_Sub16() { + public TextureOperation15() { super(0, true); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub9.java b/Client/src/main/java/org/runite/client/TextureOperation16.java similarity index 96% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub9.java rename to Client/src/main/java/org/runite/client/TextureOperation16.java index bb9ae770c..1dbe27d36 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub9.java +++ b/Client/src/main/java/org/runite/client/TextureOperation16.java @@ -1,6 +1,6 @@ package org.runite.client; -final class Class3_Sub13_Sub9 extends TextureOperation { +final class TextureOperation16 extends TextureOperation { private int anInt3108 = 1; private int anInt3109 = 204; @@ -11,7 +11,7 @@ final class Class3_Sub13_Sub9 extends TextureOperation { static int anInt3114 = 0; static int[][] anIntArrayArray3115; - public Class3_Sub13_Sub9() { + public TextureOperation16() { super(0, true); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub15.java b/Client/src/main/java/org/runite/client/TextureOperation17.java similarity index 91% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub15.java rename to Client/src/main/java/org/runite/client/TextureOperation17.java index df379990a..72b0e3ae0 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub15.java +++ b/Client/src/main/java/org/runite/client/TextureOperation17.java @@ -2,7 +2,7 @@ package org.runite.client; import java.util.Objects; -final class Class3_Sub13_Sub15 extends TextureOperation { +final class TextureOperation17 extends TextureOperation { private int anInt3174; private int anInt3175 = 0; @@ -31,7 +31,7 @@ final class Class3_Sub13_Sub15 extends TextureOperation { } if(!var3) { - this.method240((byte)-79, -114, 127, 95); + this.method240(-114, 127, 95); } } catch (RuntimeException var5) { @@ -86,17 +86,13 @@ final class Class3_Sub13_Sub15 extends TextureOperation { } } - public Class3_Sub13_Sub15() { + public TextureOperation17() { super(1, false); } - private void method240(byte var1, int var2, int var3, int var4) { + private void method240(int var2, int var3, int var4) { try { int var5 = var2 > var3?var2:var3; - if(var1 >= -54) { - this.method166(38, -39); - } - var5 = var5 >= var4 ?var5:var4; int var6 = var3 > var2?var2:var3; var6 = var6 <= var4 ?var6:var4; @@ -126,13 +122,13 @@ final class Class3_Sub13_Sub15 extends TextureOperation { } } catch (RuntimeException var11) { - throw ClientErrorException.clientError(var11, "hk.E(" + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ')'); + throw ClientErrorException.clientError(var11, "hk.E(" + ',' + var2 + ',' + var3 + ',' + var4 + ')'); } } - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { - if(var1 != -1) { + if(-1 != -1) { TextCore.COMMAND_HIGHRES_GRAPHICS_FULLSCREEN = null; } @@ -147,7 +143,7 @@ final class Class3_Sub13_Sub15 extends TextureOperation { int[] var8 = var3[0]; for(int var11 = 0; Class113.anInt1559 > var11; ++var11) { - this.method240((byte)-91, var5[var11], var6[var11], var7[var11]); + this.method240(var5[var11], var6[var11], var7[var11]); this.anInt3188 += this.anInt3176; if(0 > this.anInt3188) { this.anInt3188 = 0; @@ -182,7 +178,7 @@ final class Class3_Sub13_Sub15 extends TextureOperation { return var3; } catch (RuntimeException var12) { - throw ClientErrorException.clientError(var12, "hk.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var12, "hk.T(" + -1 + ',' + var2 + ')'); } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub23_Sub1.java b/Client/src/main/java/org/runite/client/TextureOperation18.java similarity index 97% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub23_Sub1.java rename to Client/src/main/java/org/runite/client/TextureOperation18.java index e7b5545d8..aabdbf323 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub23_Sub1.java +++ b/Client/src/main/java/org/runite/client/TextureOperation18.java @@ -5,7 +5,7 @@ import org.rs09.client.config.GameConfig; import java.awt.*; -final class Class3_Sub13_Sub23_Sub1 extends Class3_Sub13_Sub23 { +final class TextureOperation18 extends TextureOperation39 { static int anInt4032 = 0; static int[] anIntArray4035 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; @@ -14,7 +14,7 @@ final class Class3_Sub13_Sub23_Sub1 extends Class3_Sub13_Sub23 { static int anInt4041 = -1; - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { int[][] var3 = this.aClass97_2376.method1594((byte)-119, var2); if(this.aClass97_2376.aBoolean1379 && this.method279(-128)) { @@ -31,13 +31,13 @@ final class Class3_Sub13_Sub23_Sub1 extends Class3_Sub13_Sub23 { } } - if(var1 != -1) { + if(-1 != -1) { anInt4039 = -119; } return var3; } catch (RuntimeException var10) { - throw ClientErrorException.clientError(var10, "kd.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var10, "kd.T(" + -1 + ',' + var2 + ')'); } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub18.java b/Client/src/main/java/org/runite/client/TextureOperation19.java similarity index 86% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub18.java rename to Client/src/main/java/org/runite/client/TextureOperation19.java index 2fa670d3d..865b2bc5a 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub18.java +++ b/Client/src/main/java/org/runite/client/TextureOperation19.java @@ -4,11 +4,11 @@ import org.rs09.client.config.GameConfig; import java.util.Objects; -final class Class3_Sub13_Sub18 extends TextureOperation { +final class TextureOperation19 extends TextureOperation { static CacheIndex aClass153_3214; static int[][] anIntArrayArray3215 = new int[][]{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1}, {0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1}, {1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1}}; - private int anInt3217 = '\u8000'; + private int anInt3217 = 32768; static int[] anIntArray3218 = new int[]{1, 4}; @@ -32,27 +32,27 @@ final class Class3_Sub13_Sub18 extends TextureOperation { int var7; for(var7 = 0; var6 > var7; ++var7) { - if(Unsorted.method73(Class3_Sub13_Sub7.aShortArray3095[var7])) { + if(Unsorted.method73(TextureOperation27.aShortArray3095[var7])) { Class3_Sub25.method509(var7); } } if(Unsorted.menuOptionCount == 1) { Class38_Sub1.aBoolean2615 = false; - Class75.method1340(AbstractIndexedSprite.anInt1462, Class3_Sub28_Sub3.anInt3552, Class3_Sub13_Sub33.anInt3395, Class3_Sub28_Sub1.anInt3537); + Class21.method1340(Class21.anInt1462, Class21.anInt3552, Class21.anInt3395, Class21.anInt3537); } else { - Class75.method1340(AbstractIndexedSprite.anInt1462, Class3_Sub28_Sub3.anInt3552, Class3_Sub13_Sub33.anInt3395, Class3_Sub28_Sub1.anInt3537); - var7 = Class168.bold.method682(RSString.parse(GameConfig.RCM_TITLE)); + Class21.method1340(Class21.anInt1462, Class21.anInt3552, Class21.anInt3395, Class21.anInt3537); + var7 = FontType.bold.method682(RSString.parse(GameConfig.RCM_TITLE)); for(int var8 = 0; Unsorted.menuOptionCount > var8; ++var8) { - int var9 = Class168.bold.method682(Unsorted.method802(var8)); + int var9 = FontType.bold.method682(Unsorted.method802(var8)); if(var7 < var9) { var7 = var9; } } - Class3_Sub28_Sub1.anInt3537 = Unsorted.menuOptionCount * 15 + (Unsorted.aBoolean1951?26:22); - Class3_Sub28_Sub3.anInt3552 = var7 + 8; + Class21.anInt3537 = Unsorted.menuOptionCount * 15 + (Unsorted.aBoolean1951?26:22); + Class21.anInt3552 = var7 + 8; } if(-1 != Class3_Sub28_Sub12.anInt3655) { @@ -74,13 +74,13 @@ final class Class3_Sub13_Sub18 extends TextureOperation { } } - public Class3_Sub13_Sub18() { + public TextureOperation19() { super(3, false); } - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { - if(var1 != -1) { + if(-1 != -1) { aClass153_3214 = null; } @@ -96,7 +96,7 @@ final class Class3_Sub13_Sub18 extends TextureOperation { int var10 = (var4[var9] * 255 & 1046259) >> 12; int var11 = var5[var9] * this.anInt3217 >> 12; int var12 = var11 * Class75_Sub2.anIntArray2639[var10] >> 12; - int var13 = Class3_Sub13_Sub17.anIntArray3212[var10] * var11 >> 12; + int var13 = TextureOperation23.anIntArray3212[var10] * var11 >> 12; int var14 = (var12 >> 12) + var9 & RenderAnimationDefinition.anInt396; int var15 = Class3_Sub20.anInt2487 & var2 - -(var13 >> 12); int[][] var16 = this.method162(var15, 0, (byte)-117); @@ -108,7 +108,7 @@ final class Class3_Sub13_Sub18 extends TextureOperation { return var3; } catch (RuntimeException var17) { - throw ClientErrorException.clientError(var17, "ke.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var17, "ke.T(" + -1 + ',' + var2 + ')'); } } @@ -123,7 +123,7 @@ final class Class3_Sub13_Sub18 extends TextureOperation { int var9 = this.anInt3217 * var6[var7] >> 12; int var8 = (var5[var7] & 4087) >> 4; int var10 = Class75_Sub2.anIntArray2639[var8] * var9 >> 12; - int var11 = Class3_Sub13_Sub17.anIntArray3212[var8] * var9 >> 12; + int var11 = TextureOperation23.anIntArray3212[var8] * var9 >> 12; int var12 = RenderAnimationDefinition.anInt396 & (var10 >> 12) + var7; int var13 = Class3_Sub20.anInt2487 & (var11 >> 12) + var1; int[] var14 = this.method152(0, var13, 32755); @@ -146,7 +146,7 @@ final class Class3_Sub13_Sub18 extends TextureOperation { } if(!var3) { - Class3_Sub13_Sub13.anInt3216 = -7; + TextureOperation20.anInt3216 = -7; } } catch (RuntimeException var5) { @@ -179,7 +179,7 @@ final class Class3_Sub13_Sub18 extends TextureOperation { int var9; int var10 = var9 = (var6 << 7) - Class145.anInt2697; int var11; - int var12 = var11 = (var7 << 7) - Class3_Sub13_Sub30.anInt3363; + int var12 = var11 = (var7 << 7) - TextureOperation13.anInt3363; int var13; int var14 = var13 = var10 + 128; int var15; @@ -226,7 +226,7 @@ final class Class3_Sub13_Sub18 extends TextureOperation { Class51.anInt850 = 0; int var30; if((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { - if(Class3_Sub13_Sub21.aBoolean3261 && Class3_Sub13_Sub4.method185(Class49.anInt819 + Class51.anInt846, Class3_Sub13_Sub23_Sub1.anInt4039 + Class51.anInt835, var27, var29, var25, var26, var28, var24)) { + if(TextureOperation37.aBoolean3261 && TextureOperation34.method185(Class49.anInt819 + Class51.anInt846, TextureOperation18.anInt4039 + Class51.anInt835, var27, var29, var25, var26, var28, var24)) { Class27.anInt515 = var6; Unsorted.anInt999 = var7; } @@ -238,21 +238,21 @@ final class Class3_Sub13_Sub18 extends TextureOperation { if(var0.anInt1664 != 12345678) { Class51.method1154(var27, var29, var25, var26, var28, var24, var0.anInt1664, var0.anInt1663, var0.anInt1667); } - } else if(Class3_Sub13_Sub22.aBoolean3275) { + } else if(TextureOperation0.aBoolean3275) { if(var0.aBoolean1674) { Class51.method1135(var27, var29, var25, var26, var28, var24, var0.anInt1664, var0.anInt1663, var0.anInt1667, var10, var14, var9, var17, var18, var21, var12, var11, var15, var0.anInt1670); } else { Class51.method1135(var27, var29, var25, var26, var28, var24, var0.anInt1664, var0.anInt1663, var0.anInt1667, var13, var9, var14, var19, var21, var18, var16, var15, var11, var0.anInt1670); } } else { - var30 = Class51.anInterface2_838.method15(var0.anInt1670, '\uffff'); + var30 = Class51.anInterface2_838.method15(var0.anInt1670, 65535); Class51.method1154(var27, var29, var25, var26, var28, var24, LoginHandler.method1753(var30, var0.anInt1664), LoginHandler.method1753(var30, var0.anInt1663), LoginHandler.method1753(var30, var0.anInt1667)); } } } if((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { - if(Class3_Sub13_Sub21.aBoolean3261 && Class3_Sub13_Sub4.method185(Class49.anInt819 + Class51.anInt846, Class3_Sub13_Sub23_Sub1.anInt4039 + Class51.anInt835, var23, var25, var29, var22, var24, var28)) { + if(TextureOperation37.aBoolean3261 && TextureOperation34.method185(Class49.anInt819 + Class51.anInt846, TextureOperation18.anInt4039 + Class51.anInt835, var23, var25, var29, var22, var24, var28)) { Class27.anInt515 = var6; Unsorted.anInt999 = var7; } @@ -264,10 +264,10 @@ final class Class3_Sub13_Sub18 extends TextureOperation { if(var0.anInt1675 != 12345678) { Class51.method1154(var23, var25, var29, var22, var24, var28, var0.anInt1675, var0.anInt1667, var0.anInt1663); } - } else if(Class3_Sub13_Sub22.aBoolean3275) { + } else if(TextureOperation0.aBoolean3275) { Class51.method1135(var23, var25, var29, var22, var24, var28, var0.anInt1675, var0.anInt1667, var0.anInt1663, var10, var14, var9, var17, var18, var21, var12, var11, var15, var0.anInt1670); } else { - var30 = Class51.anInterface2_838.method15(var0.anInt1670, '\uffff'); + var30 = Class51.anInterface2_838.method15(var0.anInt1670, 65535); Class51.method1154(var23, var25, var29, var22, var24, var28, LoginHandler.method1753(var30, var0.anInt1675), LoginHandler.method1753(var30, var0.anInt1667), LoginHandler.method1753(var30, var0.anInt1663)); } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub31.java b/Client/src/main/java/org/runite/client/TextureOperation2.java similarity index 83% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub31.java rename to Client/src/main/java/org/runite/client/TextureOperation2.java index f211a2a81..18236bd0b 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub31.java +++ b/Client/src/main/java/org/runite/client/TextureOperation2.java @@ -2,7 +2,7 @@ package org.runite.client; import org.rs09.client.data.ReferenceCache; -final class Class3_Sub13_Sub31 extends TextureOperation { +final class TextureOperation2 extends TextureOperation { static ReferenceCache aReferenceCache_3369 = new ReferenceCache(64); static AbstractSprite[] aAbstractSpriteArray3373; @@ -15,7 +15,7 @@ final class Class3_Sub13_Sub31 extends TextureOperation { } } - public Class3_Sub13_Sub31() { + public TextureOperation2() { super(0, true); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub13.java b/Client/src/main/java/org/runite/client/TextureOperation20.java similarity index 86% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub13.java rename to Client/src/main/java/org/runite/client/TextureOperation20.java index 70145429b..b9b5d947b 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub13.java +++ b/Client/src/main/java/org/runite/client/TextureOperation20.java @@ -5,7 +5,7 @@ import java.awt.Point; import java.io.IOException; import java.util.Objects; -final class Class3_Sub13_Sub13 extends TextureOperation { +final class TextureOperation20 extends TextureOperation { static int anInt2212 = 0; static int anInt2217 = 2; @@ -31,7 +31,7 @@ final class Class3_Sub13_Sub13 extends TextureOperation { if(cursor != Class65.anInt991) { if(cursor != -1) { - CursorDefinition cursorDef = Class3_Sub13_Sub29.method311(cursor); + CursorDefinition cursorDef = TextureOperation3.method311(cursor); Class3_Sub28_Sub16_Sub2 image = cursorDef.getImage(); if(image == null) { cursor = -1; @@ -52,7 +52,7 @@ final class Class3_Sub13_Sub13 extends TextureOperation { } } - public Class3_Sub13_Sub13() { + public TextureOperation20() { super(1, false); } @@ -179,9 +179,9 @@ final class Class3_Sub13_Sub13 extends TextureOperation { } } - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { - if(var1 == -1) { + if(-1 == -1) { int[][] var3 = this.aClass97_2376.method1594((byte)-123, var2); if(this.aClass97_2376.aBoolean1379) { int var5 = Class113.anInt1559 / this.anInt3149; @@ -221,7 +221,7 @@ final class Class3_Sub13_Sub13 extends TextureOperation { return null; } } catch (RuntimeException var16) { - throw ClientErrorException.clientError(var16, "gg.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var16, "gg.T(" + -1 + ',' + var2 + ')'); } } @@ -241,11 +241,11 @@ final class Class3_Sub13_Sub13 extends TextureOperation { breakClientConnection(); } else { int queuedVarpIndex; - for(queuedVarpIndex = 0; queuedVarpIndex < 100 && Class3_Sub13_Sub3.method181(); ++queuedVarpIndex) { + for(queuedVarpIndex = 0; queuedVarpIndex < 100 && TextureOperation33.method181(); ++queuedVarpIndex) { } if(Class143.gameStage == 30) { - Class163_Sub2_Sub1.method2226(Class3_Sub13_Sub1.outgoingBuffer, 163, -116); + Class163_Sub2_Sub1.method2226(TextureOperation12.outgoingBuffer, 163, -116); Object var14 = aClass67_1443.anObject1016; int var2; int var3; @@ -257,12 +257,12 @@ final class Class3_Sub13_Sub13 extends TextureOperation { synchronized(var14) { if(Unsorted.aBoolean29) { if(Unsorted.anInt3644 != 0 || aClass67_1443.anInt1018 >= 40) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(123); + TextureOperation12.outgoingBuffer.putOpcode(123); var3 = 0; - Class3_Sub13_Sub1.outgoingBuffer.writeByte(0); - var2 = Class3_Sub13_Sub1.outgoingBuffer.index; + TextureOperation12.outgoingBuffer.writeByte(0); + var2 = TextureOperation12.outgoingBuffer.index; - for(var4 = 0; aClass67_1443.anInt1018 > var4 && Class3_Sub13_Sub1.outgoingBuffer.index - var2 < 240; ++var4) { + for(var4 = 0; aClass67_1443.anInt1018 > var4 && TextureOperation12.outgoingBuffer.index - var2 < 240; ++var4) { ++var3; var5 = aClass67_1443.anIntArray1019[var4]; var6 = aClass67_1443.anIntArray1020[var4]; @@ -299,29 +299,29 @@ final class Class3_Sub13_Sub13 extends TextureOperation { if(Class3_Sub26.anInt2556 < 8 && var8 >= -32 && 31 >= var8 && -32 <= var9 && var9 <= 31) { var9 += 32; var8 += 32; - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var9 + (Class3_Sub26.anInt2556 << 12) + (var8 << 6)); + TextureOperation12.outgoingBuffer.writeShort(var9 + (Class3_Sub26.anInt2556 << 12) + (var8 << 6)); Class3_Sub26.anInt2556 = 0; } else if(Class3_Sub26.anInt2556 < 32 && var8 >= -128 && var8 <= 127 && var9 >= -128 && var9 <= 127) { - Class3_Sub13_Sub1.outgoingBuffer.writeByte(128 - -Class3_Sub26.anInt2556); + TextureOperation12.outgoingBuffer.writeByte(128 - -Class3_Sub26.anInt2556); var9 += 128; var8 += 128; - Class3_Sub13_Sub1.outgoingBuffer.writeShort((var8 << 8) + var9); + TextureOperation12.outgoingBuffer.writeShort((var8 << 8) + var9); Class3_Sub26.anInt2556 = 0; } else if(32 > Class3_Sub26.anInt2556) { - Class3_Sub13_Sub1.outgoingBuffer.writeByte(192 - -Class3_Sub26.anInt2556); + TextureOperation12.outgoingBuffer.writeByte(192 - -Class3_Sub26.anInt2556); if(var7) { - Class3_Sub13_Sub1.outgoingBuffer.writeInt(Integer.MIN_VALUE); + TextureOperation12.outgoingBuffer.writeInt(Integer.MIN_VALUE); } else { - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var6 | var5 << 16); + TextureOperation12.outgoingBuffer.writeInt(var6 | var5 << 16); } Class3_Sub26.anInt2556 = 0; } else { - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class3_Sub26.anInt2556 + '\ue000'); + TextureOperation12.outgoingBuffer.writeShort(Class3_Sub26.anInt2556 + '\ue000'); if(var7) { - Class3_Sub13_Sub1.outgoingBuffer.writeInt(Integer.MIN_VALUE); + TextureOperation12.outgoingBuffer.writeInt(Integer.MIN_VALUE); } else { - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var6 | var5 << 16); + TextureOperation12.outgoingBuffer.writeInt(var6 | var5 << 16); } Class3_Sub26.anInt2556 = 0; @@ -329,7 +329,7 @@ final class Class3_Sub13_Sub13 extends TextureOperation { } } - Class3_Sub13_Sub1.outgoingBuffer.method769(-var2 + Class3_Sub13_Sub1.outgoingBuffer.index); + TextureOperation12.outgoingBuffer.method769(-var2 + TextureOperation12.outgoingBuffer.index); if(var3 < aClass67_1443.anInt1018) { aClass67_1443.anInt1018 -= var3; @@ -350,8 +350,8 @@ final class Class3_Sub13_Sub13 extends TextureOperation { long var15 = (-aLong1465 + Class75.aLong1102) / 50L; var3 = Class38_Sub1.anInt2614; if(var3 >= 0) { - if(var3 > '\uffff') { - var3 = '\uffff'; + if(var3 > 65535) { + var3 = 65535; } } else { var3 = 0; @@ -365,8 +365,8 @@ final class Class3_Sub13_Sub13 extends TextureOperation { aLong1465 = Class75.aLong1102; byte var19 = 0; if(var4 >= 0) { - if(var4 > '\uffff') { - var4 = '\uffff'; + if(var4 > 65535) { + var4 = 65535; } } else { var4 = 0; @@ -377,9 +377,9 @@ final class Class3_Sub13_Sub13 extends TextureOperation { var19 = 1; } - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(75); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var19 << 15 | var6); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV2(var4 | var3 << 16); + TextureOperation12.outgoingBuffer.putOpcode(75); + TextureOperation12.outgoingBuffer.writeShort128LE(var19 << 15 | var6); + TextureOperation12.outgoingBuffer.writeIntV2(var4 | var3 << 16); } if(0 < anInt2212) { @@ -401,26 +401,26 @@ final class Class3_Sub13_Sub13 extends TextureOperation { if(Unsorted.aBoolean4068 && 0 >= anInt2212) { anInt2212 = 20; Unsorted.aBoolean4068 = false; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(21); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(Unsorted.anInt2309); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(GraphicDefinition.CAMERA_DIRECTION); + TextureOperation12.outgoingBuffer.putOpcode(21); + TextureOperation12.outgoingBuffer.putShortA(Unsorted.anInt2309); + TextureOperation12.outgoingBuffer.writeShortLE(GraphicDefinition.CAMERA_DIRECTION); } - if(Class3_Sub13_Sub6.aBoolean3078 && !aBoolean2774) { + if(TextureOperation26.aBoolean3078 && !aBoolean2774) { aBoolean2774 = true; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(22); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(1); + TextureOperation12.outgoingBuffer.putOpcode(22); + TextureOperation12.outgoingBuffer.writeByte(1); } - if(!Class3_Sub13_Sub6.aBoolean3078 && aBoolean2774) { + if(!TextureOperation26.aBoolean3078 && aBoolean2774) { aBoolean2774 = false; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(22); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(0); + TextureOperation12.outgoingBuffer.putOpcode(22); + TextureOperation12.outgoingBuffer.writeByte(0); } if(!CS2Script.aBoolean2705) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(98); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(Class84.method1421()); + TextureOperation12.outgoingBuffer.putOpcode(98); + TextureOperation12.outgoingBuffer.writeInt(Class84.method1421()); CS2Script.aBoolean2705 = true; } @@ -435,7 +435,7 @@ final class Class3_Sub13_Sub13 extends TextureOperation { } else { Class38.method1028(); Class60.method1207(); - Class3_Sub13_Sub4.method189(); + TextureOperation34.method189(); if(Class3_Sub28_Sub3.aClass11_3551 != null) { Unsorted.method848(); } @@ -589,7 +589,7 @@ final class Class3_Sub13_Sub13 extends TextureOperation { } ++Class40.anInt677; - if(0 == Class3_Sub13_Sub5.anInt3069) { + if(0 == TextureOperation21.anInt3069) { if(Class72.aBoolean1074 && 5 <= Class40.anInt677) { if(Class67.aClass11_1017 == Class99.aClass11_1402 && PacketParser.anInt86 != anInt2701) { var17 = Class67.aClass11_1017; @@ -626,16 +626,16 @@ final class Class3_Sub13_Sub13 extends TextureOperation { var17.method864(anInt2701, PacketParser.anInt86); } - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(231); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(PacketParser.anInt86); - Class3_Sub13_Sub1.outgoingBuffer.writeIntLE2(Class67.aClass11_1017.componentHash); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(anInt2701); - Class3_Sub13_Sub1.outgoingBuffer.write128Byte(var18); + TextureOperation12.outgoingBuffer.putOpcode(231); + TextureOperation12.outgoingBuffer.writeShort(PacketParser.anInt86); + TextureOperation12.outgoingBuffer.writeIntLE2(Class67.aClass11_1017.componentHash); + TextureOperation12.outgoingBuffer.putShortA(anInt2701); + TextureOperation12.outgoingBuffer.write128Byte(var18); } - } else if((Unsorted.anInt998 == 1 || Class3_Sub13_Sub39.method353(-1 + Unsorted.menuOptionCount, 0)) && Unsorted.menuOptionCount > 2) { + } else if((Unsorted.anInt998 == 1 || TextureOperation8.method353(-1 + Unsorted.menuOptionCount, 0)) && Unsorted.menuOptionCount > 2) { Class132.method1801(); } else if(Unsorted.menuOptionCount > 0) { - Class3_Sub13_Sub8.method203(56); + TextureOperation9.method203(56); } Unsorted.anInt3644 = 0; @@ -654,7 +654,7 @@ final class Class3_Sub13_Sub13 extends TextureOperation { for(Class20.aClass11_439 = null; Unsorted.method591(72) && 128 > Class3_Sub23.anInt2537; ++Class3_Sub23.anInt2537) { Class133.inputTextCodeArray[Class3_Sub23.anInt2537] = Class3_Sub28_Sub9.anInt3624; - Class120.anIntArray1638[Class3_Sub23.anInt2537] = Class3_Sub13_Sub27.anInt3342; + Class120.anIntArray1638[Class3_Sub23.anInt2537] = TextureOperation7.anInt3342; } Class3_Sub28_Sub3.aClass11_3551 = null; @@ -691,23 +691,23 @@ final class Class3_Sub13_Sub13 extends TextureOperation { var5 = 3; } - Class30.method979(Class102.player.anIntArray2767[0] + Class131.anInt1716, Class102.player.anIntArray2755[0] + Class82.anInt1152, var5); + Class30.method979(Class102.player.anIntArray2767[0] + Class131.anInt1716, Class102.player.anIntArray2755[0] + Texture.anInt1152, var5); } if(Player.rights > 0 && ObjectDefinition.aBooleanArray1490[82] && ObjectDefinition.aBooleanArray1490[81]) { if(-1 != Class27.anInt515) { - Class30.method979(Class131.anInt1716 + Class27.anInt515, Class82.anInt1152 - -Unsorted.anInt999, WorldListCountry.localPlane); + Class30.method979(Class131.anInt1716 + Class27.anInt515, Texture.anInt1152 - -Unsorted.anInt999, WorldListCountry.localPlane); } ObjectDefinition.anInt1521 = 0; CS2Script.anInt2440 = 0; } else if(CS2Script.anInt2440 == 2) { if(Class27.anInt515 != -1) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(131); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV2(Class3_Sub30_Sub1.anInt872); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(Class131.anInt1716 + Class27.anInt515); - Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(RSInterface.anInt278); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(Unsorted.anInt999 + Class82.anInt1152); + TextureOperation12.outgoingBuffer.putOpcode(131); + TextureOperation12.outgoingBuffer.writeIntV2(Class3_Sub30_Sub1.anInt872); + TextureOperation12.outgoingBuffer.putShortA(Class131.anInt1716 + Class27.anInt515); + TextureOperation12.outgoingBuffer.writeShort128LE(RSInterface.anInt278); + TextureOperation12.outgoingBuffer.putShortA(Unsorted.anInt999 + Texture.anInt1152); Class36.anInt638 = 1; Unsorted.anInt2958 = 0; Unsorted.anInt4062 = Class38_Sub1.anInt2614; @@ -717,9 +717,9 @@ final class Class3_Sub13_Sub13 extends TextureOperation { CS2Script.anInt2440 = 0; } else if(2 == ObjectDefinition.anInt1521) { if(-1 != Class27.anInt515) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(179); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class82.anInt1152 + Unsorted.anInt999); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class27.anInt515 + Class131.anInt1716); + TextureOperation12.outgoingBuffer.putOpcode(179); + TextureOperation12.outgoingBuffer.writeShort(Texture.anInt1152 + Unsorted.anInt999); + TextureOperation12.outgoingBuffer.writeShort(Class27.anInt515 + Class131.anInt1716); Unsorted.anInt2958 = 0; Class36.anInt638 = 1; Class70.anInt1053 = Class163_Sub1.anInt2993; @@ -738,7 +738,7 @@ final class Class3_Sub13_Sub13 extends TextureOperation { } Class27.anInt515 = -1; - Class163_Sub1.method2211(-48); + Class163_Sub1.method2211(); if(Class107.aClass11_1453 != var17) { if(var17 != null) { Class20.method909(var17); @@ -749,7 +749,7 @@ final class Class3_Sub13_Sub13 extends TextureOperation { } } - if(var21 != Class20.aClass11_439 && Class75.anInt1109 == Class3_Sub13_Sub26.anInt3323) { + if(var21 != Class20.aClass11_439 && Class75.anInt1109 == TextureOperation35.anInt3323) { if(null != var21) { Class20.method909(var21); } @@ -763,9 +763,9 @@ final class Class3_Sub13_Sub13 extends TextureOperation { if(Class75.anInt1109 > 0) { --Class75.anInt1109; } - } else if(Class75.anInt1109 < Class3_Sub13_Sub26.anInt3323) { + } else if(Class75.anInt1109 < TextureOperation35.anInt3323) { ++Class75.anInt1109; - if(Class3_Sub13_Sub26.anInt3323 == Class75.anInt1109) { + if(TextureOperation35.anInt3323 == Class75.anInt1109) { Class20.method909(Class20.aClass11_439); } } @@ -775,32 +775,32 @@ final class Class3_Sub13_Sub13 extends TextureOperation { } else if(Class133.anInt1753 == 2) { CS2Script.method379(); } else { - InterfaceWidget.d('\uffff'); + InterfaceWidget.d(65535); } for(var5 = 0; var5 < 5; ++var5) { ++Class163_Sub1_Sub1.anIntArray4009[var5]; } - var5 = Class82.method1406(); - var6 = Class3_Sub13_Sub28.method301((byte)-119); + var5 = Texture.method1406(); + var6 = TextureOperation32.method301((byte)-119); if(var5 > 15000 && var6 > 15000) { Class159.anInt2023 = 250; Class23.method940(112, 14500); - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(245); + TextureOperation12.outgoingBuffer.putOpcode(245); } if(Class15.aClass64_351 != null && Class15.aClass64_351.anInt978 == 1) { if(null != Class15.aClass64_351.anObject974) { - Class99.method1596(Class3_Sub13_Sub24.aClass94_3295, (byte)126, Unsorted.aBoolean2154); + Class99.method1596(TextureOperation5.aClass94_3295, (byte)126, Unsorted.aBoolean2154); } - Class3_Sub13_Sub24.aClass94_3295 = null; + TextureOperation5.aClass94_3295 = null; Class15.aClass64_351 = null; Unsorted.aBoolean2154 = false; } - ++Class3_Sub13_Sub23_Sub1.anInt4032; + ++TextureOperation18.anInt4032; ++Class43.anInt716; ++ClientErrorException.anInt2120; if(ClientErrorException.anInt2120 > 500) { @@ -823,7 +823,7 @@ final class Class3_Sub13_Sub13 extends TextureOperation { Class43.anInt716 = 0; nodeModelID = (int)(8.0D * Math.random()); if((1 & nodeModelID) == 1) { - Class3_Sub13_Sub8.anInt3102 += Unsorted.anInt48; + TextureOperation9.anInt3102 += Unsorted.anInt48; } if((2 & nodeModelID) == 2) { @@ -835,7 +835,7 @@ final class Class3_Sub13_Sub13 extends TextureOperation { Class146.anInt1901 = 2; } - if(Class3_Sub13_Sub8.anInt3102 < -60) { + if(TextureOperation9.anInt3102 < -60) { Unsorted.anInt48 = 2; } @@ -867,12 +867,12 @@ final class Class3_Sub13_Sub13 extends TextureOperation { Unsorted.anInt25 = -1; } - if(60 < Class3_Sub13_Sub8.anInt3102) { + if(60 < TextureOperation9.anInt3102) { Unsorted.anInt48 = -2; } - if(Class3_Sub13_Sub23_Sub1.anInt4032 > 50) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(93); + if(TextureOperation18.anInt4032 > 50) { + TextureOperation12.outgoingBuffer.putOpcode(93); } if(RenderAnimationDefinition.aBoolean402) { @@ -881,10 +881,10 @@ final class Class3_Sub13_Sub13 extends TextureOperation { } try { - if(Class3_Sub15.activeConnection != null && Class3_Sub13_Sub1.outgoingBuffer.index > 0) { - Class3_Sub15.activeConnection.sendBytes(Class3_Sub13_Sub1.outgoingBuffer.buffer, Class3_Sub13_Sub1.outgoingBuffer.index); - Class3_Sub13_Sub23_Sub1.anInt4032 = 0; - Class3_Sub13_Sub1.outgoingBuffer.index = 0; + if(Class3_Sub15.activeConnection != null && TextureOperation12.outgoingBuffer.index > 0) { + Class3_Sub15.activeConnection.sendBytes(TextureOperation12.outgoingBuffer.buffer, TextureOperation12.outgoingBuffer.index); + TextureOperation18.anInt4032 = 0; + TextureOperation12.outgoingBuffer.index = 0; } } catch (IOException var11) { breakClientConnection(); diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub5.java b/Client/src/main/java/org/runite/client/TextureOperation21.java similarity index 93% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub5.java rename to Client/src/main/java/org/runite/client/TextureOperation21.java index 274769518..9f05fbeba 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub5.java +++ b/Client/src/main/java/org/runite/client/TextureOperation21.java @@ -2,14 +2,14 @@ package org.runite.client; import java.util.Objects; -final class Class3_Sub13_Sub5 extends TextureOperation { +final class TextureOperation21 extends TextureOperation { static int anInt3069 = 0; - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { - if(var1 != -1) { + if(-1 != -1) { anInt3069 = 67; } @@ -49,11 +49,11 @@ final class Class3_Sub13_Sub5 extends TextureOperation { return var3; } catch (RuntimeException var19) { - throw ClientErrorException.clientError(var19, "bl.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var19, "bl.T(" + -1 + ',' + var2 + ')'); } } - public Class3_Sub13_Sub5() { + public TextureOperation21() { super(3, false); } @@ -75,7 +75,7 @@ final class Class3_Sub13_Sub5 extends TextureOperation { static void method194(int var0, int var1, int var2, int var3, int var4, int var6, int var7) { try { if(var7 >= Class101.anInt1425 && Class3_Sub28_Sub18.anInt3765 >= var6 && var4 >= Class159.anInt2020 && var1 <= Class57.anInt902) { - Class3_Sub13_Sub19.method262(var3, var4, var1, var2, var0, var6, var7); + TextureOperation4.method262(var3, var4, var1, var2, var0, var6, var7); } else { Class143.method2062(var6, var2, var1, var0, var3, var4, var7); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub35.java b/Client/src/main/java/org/runite/client/TextureOperation22.java similarity index 91% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub35.java rename to Client/src/main/java/org/runite/client/TextureOperation22.java index bb7bde7e5..2019d421d 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub35.java +++ b/Client/src/main/java/org/runite/client/TextureOperation22.java @@ -2,10 +2,10 @@ package org.runite.client; import java.util.Objects; -final class Class3_Sub13_Sub35 extends TextureOperation { +public final class TextureOperation22 extends TextureOperation { static int anInt3419 = 0; - static Class131 aClass131_3421; + public static Class131 aClass131_3421; final int[] method154(int var1, byte var2) { @@ -25,7 +25,7 @@ final class Class3_Sub13_Sub35 extends TextureOperation { } } - public Class3_Sub13_Sub35() { + public TextureOperation22() { super(1, false); } @@ -54,9 +54,9 @@ final class Class3_Sub13_Sub35 extends TextureOperation { } } - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { - if(var1 == -1) { + if(-1 == -1) { int[][] var3 = this.aClass97_2376.method1594((byte)-128, var2); if(this.aClass97_2376.aBoolean1379) { int[][] var4 = this.method162(var2, 0, (byte)-51); @@ -79,7 +79,7 @@ final class Class3_Sub13_Sub35 extends TextureOperation { return null; } } catch (RuntimeException var12) { - throw ClientErrorException.clientError(var12, "tb.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var12, "tb.T(" + -1 + ',' + var2 + ')'); } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub17.java b/Client/src/main/java/org/runite/client/TextureOperation23.java similarity index 95% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub17.java rename to Client/src/main/java/org/runite/client/TextureOperation23.java index 82ab521dd..a241b05ce 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub17.java +++ b/Client/src/main/java/org/runite/client/TextureOperation23.java @@ -4,7 +4,7 @@ import org.rs09.client.data.HashTable; import java.util.Objects; -final class Class3_Sub13_Sub17 extends TextureOperation { +final class TextureOperation23 extends TextureOperation { static boolean aBoolean3207 = false; static HashTable aHashTable_3208 = new HashTable<>(8); @@ -12,7 +12,7 @@ final class Class3_Sub13_Sub17 extends TextureOperation { static int anInt1780; - public Class3_Sub13_Sub17() { + public TextureOperation23() { super(1, false); } @@ -153,20 +153,16 @@ final class Class3_Sub13_Sub17 extends TextureOperation { Class3_Sub28_Sub1.anInt3536 = Class23.anInt455 * var3 / var1; Class3_Sub4.anInt2251 = Class108.anInt1460 * var2 / var4; - Class82.anInt1150 = -1; - Class3_Sub13_Sub30.anInt3362 = -1; + Texture.anInt1150 = -1; + TextureOperation13.anInt3362 = -1; Class3_Sub5.method117(); } catch (RuntimeException var6) { throw ClientErrorException.clientError(var6, "je.E(" + -22611 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ')'); } } - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { - if(var1 != -1) { - this.method166(-38, 67); - } - int[][] var3 = this.aClass97_2376.method1594((byte)-125, var2); if(this.aClass97_2376.aBoolean1379) { int[] var4 = var3[0]; @@ -184,7 +180,7 @@ final class Class3_Sub13_Sub17 extends TextureOperation { return var3; } catch (RuntimeException var9) { - throw ClientErrorException.clientError(var9, "je.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var9, "je.T(" + ',' + var2 + ')'); } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub12.java b/Client/src/main/java/org/runite/client/TextureOperation24.java similarity index 97% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub12.java rename to Client/src/main/java/org/runite/client/TextureOperation24.java index 5d06bda76..4471ce7a1 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub12.java +++ b/Client/src/main/java/org/runite/client/TextureOperation24.java @@ -5,7 +5,7 @@ import org.rs09.client.rendering.Toolkit; import java.util.Objects; import java.util.zip.CRC32; -final class Class3_Sub13_Sub12 extends TextureOperation { +final class TextureOperation24 extends TextureOperation { static CRC32 CRC32 = new CRC32(); static int anInt3377 = 7759444;//Very light Brown 7759444 // #766654 @@ -23,7 +23,7 @@ final class Class3_Sub13_Sub12 extends TextureOperation { if (Class101.anInt1425 <= var2 - var7 && var7 + var2 <= Class3_Sub28_Sub18.anInt3765 && var3 - var4 >= Class159.anInt2020 && Class57.anInt902 >= var3 + var4) { Class161.method2200(var6, var2, var3, var5, var7, 95, var4, var1); } else { - Class3_Sub13_Sub34.method329(var7, var6, var5, var1, var3, var2, var4); + TextureOperation25.method329(var7, var6, var5, var1, var3, var2, var4); } } @@ -32,7 +32,7 @@ final class Class3_Sub13_Sub12 extends TextureOperation { } } - public Class3_Sub13_Sub12() { + public TextureOperation24() { super(1, true); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub34.java b/Client/src/main/java/org/runite/client/TextureOperation25.java similarity index 90% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub34.java rename to Client/src/main/java/org/runite/client/TextureOperation25.java index cca0e8133..0c63f5b56 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub34.java +++ b/Client/src/main/java/org/runite/client/TextureOperation25.java @@ -4,7 +4,7 @@ import org.rs09.client.data.ReferenceCache; import java.util.Objects; -public final class Class3_Sub13_Sub34 extends TextureOperation { +public final class TextureOperation25 extends TextureOperation { private final int[] anIntArray3403 = new int[3]; private int anInt3404 = 409; @@ -34,7 +34,7 @@ public final class Class3_Sub13_Sub34 extends TextureOperation { int var6 = var1.readUnsignedByte(); int var7 = var1.readUnsignedByte(); - int var8 = -Class3_Sub13_Sub21.anInt3256 + var6 * 64; + int var8 = -TextureOperation37.anInt3256 + var6 * 64; int var9 = Class108.anInt1460 + -1 - -Unsorted.anInt65 - 64 * var7; byte var2; int var10; @@ -47,11 +47,11 @@ public final class Class3_Sub13_Sub34 extends TextureOperation { if (!var3 || var12 >= (var4 * 8) && 8 + 8 * var4 > var12 && var13 >= var5 * 8 && 8 + var5 * 8 > var13) { var2 = var1.readSignedByte(); if (var2 != 0) { - if (null == Class3_Sub13_Sub33.aByteArrayArrayArray3390[var10][var11]) { - Class3_Sub13_Sub33.aByteArrayArrayArray3390[var10][var11] = new byte[4096]; + if (null == TextureOperation29.aByteArrayArrayArray3390[var10][var11]) { + TextureOperation29.aByteArrayArrayArray3390[var10][var11] = new byte[4096]; } - Class3_Sub13_Sub33.aByteArrayArrayArray3390[var10][var11][(63 + -var13 << 6) + var12] = var2; + TextureOperation29.aByteArrayArrayArray3390[var10][var11][(63 + -var13 << 6) + var12] = var2; byte var14 = var1.readSignedByte(); if (null == CS2Script.aByteArrayArrayArray2452[var10][var11]) { CS2Script.aByteArrayArrayArray2452[var10][var11] = new byte[4096]; @@ -120,9 +120,9 @@ public final class Class3_Sub13_Sub34 extends TextureOperation { var42 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var6 - -var0, Class101.anInt1425); var43 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var6 + -var11, Class101.anInt1425); var44 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var6 - -var11, Class101.anInt1425); - Class3_Sub13_Sub23_Sub1.method282(var40, var41, 127, var43, var2); - Class3_Sub13_Sub23_Sub1.method282(var40, var43, 105, var44, var1); - Class3_Sub13_Sub23_Sub1.method282(var40, var44, -67, var42, var2); + TextureOperation18.method282(var40, var41, 127, var43, var2); + TextureOperation18.method282(var40, var43, 105, var44, var1); + TextureOperation18.method282(var40, var44, -67, var42, var2); } while (var9 > 0) { @@ -183,24 +183,24 @@ public final class Class3_Sub13_Sub34 extends TextureOperation { int[] var47; if (Class159.anInt2020 <= var41) { var47 = Class38.anIntArrayArray663[var41]; - Class3_Sub13_Sub23_Sub1.method282(var47, var44, 120, var46, var2); - Class3_Sub13_Sub23_Sub1.method282(var47, var46, -107, var45, var1); - Class3_Sub13_Sub23_Sub1.method282(var47, var45, -102, var43, var2); + TextureOperation18.method282(var47, var44, 120, var46, var2); + TextureOperation18.method282(var47, var46, -107, var45, var1); + TextureOperation18.method282(var47, var45, -102, var43, var2); } if (Class57.anInt902 >= var42) { var47 = Class38.anIntArrayArray663[var42]; - Class3_Sub13_Sub23_Sub1.method282(var47, var44, 87, var46, var2); - Class3_Sub13_Sub23_Sub1.method282(var47, var46, -92, var45, var1); - Class3_Sub13_Sub23_Sub1.method282(var47, var45, 124, var43, var2); + TextureOperation18.method282(var47, var44, 87, var46, var2); + TextureOperation18.method282(var47, var46, -92, var45, var1); + TextureOperation18.method282(var47, var45, 124, var43, var2); } } else { if (var41 >= Class159.anInt2020) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var41], var44, -122, var43, var2); + TextureOperation18.method282(Class38.anIntArrayArray663[var41], var44, -122, var43, var2); } if (Class57.anInt902 >= var42) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var42], var44, 89, var43, var2); + TextureOperation18.method282(Class38.anIntArrayArray663[var42], var44, 89, var43, var2); } } } @@ -306,7 +306,7 @@ public final class Class3_Sub13_Sub34 extends TextureOperation { } } - public Class3_Sub13_Sub34() { + public TextureOperation25() { super(1, false); } @@ -334,12 +334,8 @@ public final class Class3_Sub13_Sub34 extends TextureOperation { } } - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { - if (var1 != -1) { - this.method166(51, 104); - } - int[][] var3 = this.aClass97_2376.method1594((byte) 91, var2); if (this.aClass97_2376.aBoolean1379) { int[][] var4 = this.method162(var2, 0, (byte) -96); @@ -395,7 +391,7 @@ public final class Class3_Sub13_Sub34 extends TextureOperation { return var3; } catch (RuntimeException var16) { - throw ClientErrorException.clientError(var16, "sk.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var16, "sk.T(" + ',' + var2 + ')'); } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub6.java b/Client/src/main/java/org/runite/client/TextureOperation26.java similarity index 94% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub6.java rename to Client/src/main/java/org/runite/client/TextureOperation26.java index 436e4b0f1..2b16bcaf2 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub6.java +++ b/Client/src/main/java/org/runite/client/TextureOperation26.java @@ -2,7 +2,7 @@ package org.runite.client; import org.rs09.client.config.GameConfig; -final class Class3_Sub13_Sub6 extends TextureOperation { +final class TextureOperation26 extends TextureOperation { private int anInt3073 = 0; private int anInt3074 = 4096; @@ -14,20 +14,20 @@ final class Class3_Sub13_Sub6 extends TextureOperation { static void method195() { try { int regionX = (NPC.anInt3995 >> 10) - -(Class131.anInt1716 >> 3); - int regionY = (Class77.anInt1111 >> 10) - -(Class82.anInt1152 >> 3); + int regionY = (Class77.anInt1111 >> 10) - -(Texture.anInt1152 >> 3); byte plane = 0; byte sceneX = 8; byte var6 = 18; Class3_Sub22.aByteArrayArray2521 = new byte[var6][]; Class3_Sub28_Sub5.anIntArray3587 = new int[var6]; - Class3_Sub13_Sub26.aByteArrayArray3335 = new byte[var6][]; + TextureOperation35.aByteArrayArray3335 = new byte[var6][]; Client.anIntArray2200 = new int[var6]; Class39.regionXteaKeys = new int[var6][4]; Class40.aByteArrayArray3669 = new byte[var6][]; Class3_Sub24_Sub3.anIntArray3494 = new int[var6]; Class164_Sub2.aByteArrayArray3027 = new byte[var6][]; NPC.npcSpawnCacheIndices = new int[var6]; - Class3_Sub13_Sub15.anIntArray3181 = new int[var6]; + TextureOperation17.anIntArray3181 = new int[var6]; Class101.anIntArray1426 = new int[var6]; byte sceneY = 8; Class40.aByteArrayArray3057 = new byte[var6][]; @@ -75,9 +75,9 @@ final class Class3_Sub13_Sub6 extends TextureOperation { } - Class3_Sub13_Sub15.anIntArray3181[var11] = CacheIndex.landscapesIndex.getArchiveForName(RSString.stringCombiner(new RSString[]{RSString.parse("um"), RSString.stringAnimator(var7), RSString.parse("_"), RSString.stringAnimator(var8)})); + TextureOperation17.anIntArray3181[var11] = CacheIndex.landscapesIndex.getArchiveForName(RSString.stringCombiner(new RSString[]{RSString.parse("um"), RSString.stringAnimator(var7), RSString.parse("_"), RSString.stringAnimator(var8)})); if (GameConfig.HD_LOGIN_DEBUG) { - System.out.println("Class3_Sub13_sub6: HD Login Screen Debug: Getting archive for map underlays: " + Class3_Sub13_Sub15.anIntArray3181[var11]); + System.out.println("Class3_Sub13_sub6: HD Login Screen Debug: Getting archive for map underlays: " + TextureOperation17.anIntArray3181[var11]); if (GameConfig.HD_LOGIN_VERBOSE) { System.out.println("Class3_Sub13_sub6: HD Login Screen Debug: Getting specific info for map underlays: " + "Type: " + RSString.parse("um") + " Place in cache: " + RSString.stringAnimator(var7) + RSString.parse("_") + RSString.stringAnimator(var8)); } @@ -97,7 +97,7 @@ final class Class3_Sub13_Sub6 extends TextureOperation { if(NPC.npcSpawnCacheIndices[var11] == -1) { Client.anIntArray2200[var11] = -1; Class101.anIntArray1426[var11] = -1; - Class3_Sub13_Sub15.anIntArray3181[var11] = -1; + TextureOperation17.anIntArray3181[var11] = -1; Class3_Sub28_Sub5.anIntArray3587[var11] = -1; } @@ -109,7 +109,7 @@ final class Class3_Sub13_Sub6 extends TextureOperation { NPC.npcSpawnCacheIndices[var7] = -1; Client.anIntArray2200[var7] = -1; Class101.anIntArray1426[var7] = -1; - Class3_Sub13_Sub15.anIntArray3181[var7] = -1; + TextureOperation17.anIntArray3181[var7] = -1; Class3_Sub28_Sub5.anIntArray3587[var7] = -1; } @@ -163,7 +163,7 @@ final class Class3_Sub13_Sub6 extends TextureOperation { } } - public Class3_Sub13_Sub6() { + public TextureOperation26() { super(1, true); } @@ -182,7 +182,7 @@ final class Class3_Sub13_Sub6 extends TextureOperation { byte[] var5 = var2[var4]; if(var5 != null) { int var6 = -Class131.anInt1716 + 64 * (Class3_Sub24_Sub3.anIntArray3494[var4] >> 8); - int var7 = (Class3_Sub24_Sub3.anIntArray3494[var4] & 255) * 64 + -Class82.anInt1152; + int var7 = (Class3_Sub24_Sub3.anIntArray3494[var4] & 0xFF) * 64 + -Texture.anInt1152; Class58.method1194(); Class3_Sub15.method374(var6, var0, var5, var7, AtmosphereParser.aClass91Array1182); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub7.java b/Client/src/main/java/org/runite/client/TextureOperation27.java similarity index 97% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub7.java rename to Client/src/main/java/org/runite/client/TextureOperation27.java index 6e2749c04..17fe41918 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub7.java +++ b/Client/src/main/java/org/runite/client/TextureOperation27.java @@ -2,7 +2,7 @@ package org.runite.client; import org.rs09.client.util.ArrayUtils; -final class Class3_Sub13_Sub7 extends TextureOperation { +final class TextureOperation27 extends TextureOperation { private int anInt3085 = 10; private int anInt3086 = 0; @@ -73,7 +73,7 @@ final class Class3_Sub13_Sub7 extends TextureOperation { } } - public Class3_Sub13_Sub7() { + public TextureOperation27() { super(0, true); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub25.java b/Client/src/main/java/org/runite/client/TextureOperation28.java similarity index 99% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub25.java rename to Client/src/main/java/org/runite/client/TextureOperation28.java index d0ab5370a..2ee0fdccc 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub25.java +++ b/Client/src/main/java/org/runite/client/TextureOperation28.java @@ -4,7 +4,7 @@ import org.rs09.client.util.ArrayUtils; import java.util.Objects; import java.util.Random; -final class Class3_Sub13_Sub25 extends TextureOperation { +final class TextureOperation28 extends TextureOperation { private int anInt3299 = 1024; private int anInt3300 = 1024; @@ -210,7 +210,7 @@ final class Class3_Sub13_Sub25 extends TextureOperation { } } - public Class3_Sub13_Sub25() { + public TextureOperation28() { super(0, true); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub33.java b/Client/src/main/java/org/runite/client/TextureOperation29.java similarity index 95% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub33.java rename to Client/src/main/java/org/runite/client/TextureOperation29.java index 35de172c3..1b44bb65c 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub33.java +++ b/Client/src/main/java/org/runite/client/TextureOperation29.java @@ -1,12 +1,11 @@ package org.runite.client; -final class Class3_Sub13_Sub33 extends TextureOperation { +final class TextureOperation29 extends TextureOperation { static byte[][][] aByteArrayArrayArray3390; static RSString[] aClass94Array3391; private Class75[] aClass75Array3392; static Class133[] aClass133Array3393 = new Class133[6]; - static int anInt3395; static byte[] aByteArray3396; static volatile int anInt3398 = 0; @@ -36,7 +35,7 @@ final class Class3_Sub13_Sub33 extends TextureOperation { try { int var4 = Class101.anInt1427; int var3 = Class113.anInt1559; - Class3_Sub13_Sub13.method230(var2); + TextureOperation20.method230(var2); Class58.method1196(Class3_Sub20.anInt2487, RenderAnimationDefinition.anInt396); if(this.aClass75Array3392 != null) { for(int var5 = 0; this.aClass75Array3392.length > var5; ++var5) { @@ -118,9 +117,9 @@ final class Class3_Sub13_Sub33 extends TextureOperation { } } - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { - if(var1 == -1) { + if(-1 == -1) { int[][] var3 = this.aClass97_2376.method1594((byte)-117, var2); if(this.aClass97_2376.aBoolean1379) { int var4 = Class113.anInt1559; @@ -150,11 +149,11 @@ final class Class3_Sub13_Sub33 extends TextureOperation { return null; } } catch (RuntimeException var16) { - throw ClientErrorException.clientError(var16, "si.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var16, "si.T(" + -1 + ',' + var2 + ')'); } } - public Class3_Sub13_Sub33() { + public TextureOperation29() { super(0, true); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub29.java b/Client/src/main/java/org/runite/client/TextureOperation3.java similarity index 93% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub29.java rename to Client/src/main/java/org/runite/client/TextureOperation3.java index 7cd866727..c310dcf4d 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub29.java +++ b/Client/src/main/java/org/runite/client/TextureOperation3.java @@ -5,7 +5,7 @@ import org.rs09.client.filestore.resources.configs.cursors.CursorDefinition; import java.util.Objects; -final class Class3_Sub13_Sub29 extends TextureOperation { +final class TextureOperation3 extends TextureOperation { static boolean disableGEBoxes = false; static int[] anIntArray3359 = new int[5]; @@ -27,8 +27,8 @@ final class Class3_Sub13_Sub29 extends TextureOperation { static void method304() { try { - Class3_Sub13_Sub34.aReferenceCache_3412.clear(); - Class3_Sub13_Sub31.aReferenceCache_3369.clear(); + TextureOperation25.aReferenceCache_3412.clear(); + TextureOperation2.aReferenceCache_3369.clear(); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "qg.F(" + 6799 + ')'); } @@ -62,7 +62,7 @@ final class Class3_Sub13_Sub29 extends TextureOperation { var4.anIntArray2301[var6] = var7; var4.anIntArray2299[var6] = var10; - var4.aClass64Array2303[var6] = var0.method1447(-41, var9, Class3_Sub13_Sub1.method170(var8)); + var4.aClass64Array2303[var6] = var0.method1447(-41, var9, TextureOperation12.method170(var8)); } else if (var7 == 3 || var7 == 4) { var8 = new String(var1.readString().method1568()); var9 = new String(var1.readString().method1568()); @@ -87,10 +87,10 @@ final class Class3_Sub13_Sub29 extends TextureOperation { Class[] var22 = new Class[var10]; for (var14 = 0; var10 > var14; ++var14) { - var22[var14] = Class3_Sub13_Sub1.method170(var11[var14]); + var22[var14] = TextureOperation12.method170(var11[var14]); } - var4.aClass64Array2298[var6] = var0.method1443(Class3_Sub13_Sub1.method170(var8), var22, -80, var9); + var4.aClass64Array2298[var6] = var0.method1443(TextureOperation12.method170(var8), var22, -80, var9); var4.aByteArrayArrayArray2302[var6] = var21; } } catch (ClassNotFoundException var15) { @@ -146,7 +146,7 @@ final class Class3_Sub13_Sub29 extends TextureOperation { } } - public Class3_Sub13_Sub29() { + public TextureOperation3() { super(0, true); } @@ -171,7 +171,7 @@ final class Class3_Sub13_Sub29 extends TextureOperation { try { CursorDefinition var2 = (CursorDefinition) Unsorted.aReferenceCache_684.get(var0); if(var2 == null) { - byte[] var3 = Class3_Sub13_Sub19.aClass153_3227.getFile(33, var0); + byte[] var3 = TextureOperation4.aClass153_3227.getFile(33, var0); var2 = new CursorDefinition(); if(var3 != null) { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub10.java b/Client/src/main/java/org/runite/client/TextureOperation30.java similarity index 95% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub10.java rename to Client/src/main/java/org/runite/client/TextureOperation30.java index 511ed1403..32c9662a6 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub10.java +++ b/Client/src/main/java/org/runite/client/TextureOperation30.java @@ -2,7 +2,7 @@ package org.runite.client; import java.awt.Frame; import java.util.Objects; -final class Class3_Sub13_Sub10 extends TextureOperation { +final class TextureOperation30 extends TextureOperation { static volatile boolean aBoolean3116 = true; @@ -88,12 +88,12 @@ final class Class3_Sub13_Sub10 extends TextureOperation { for(int var4 = var3; var4 < Class3_Sub28_Sub5.anInt3591; ++var4) { Class114.ignores[var4] = Class114.ignores[var4 + 1]; - Class3_Sub13_Sub27.aClass94Array3341[var4] = Class3_Sub13_Sub27.aClass94Array3341[1 + var4]; + TextureOperation7.aClass94Array3341[var4] = TextureOperation7.aClass94Array3341[1 + var4]; } Class110.anInt1472 = PacketParser.anInt3213; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(213); - Class3_Sub13_Sub1.outgoingBuffer.writeLong(var0); + TextureOperation12.outgoingBuffer.putOpcode(213); + TextureOperation12.outgoingBuffer.writeLong(var0); break; } } @@ -147,7 +147,7 @@ final class Class3_Sub13_Sub10 extends TextureOperation { for(int var12 = var7; var12 <= var8; ++var12) { if(var12 >= 0 && var12 < Unsorted.anInt1234) { for(int var13 = var9; var13 <= var10; ++var13) { - if(var13 >= 0 && var13 < Class3_Sub13_Sub15.anInt3179 && (!var6 || var12 >= var8 || var13 >= var10 || var13 < var3 && var12 != var2)) { + if(var13 >= 0 && var13 < TextureOperation17.anInt3179 && (!var6 || var12 >= var8 || var13 >= var10 || var13 < var3 && var12 != var2)) { Class3_Sub2 var14 = Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var11][var12][var13]; if(var14 != null) { int var15 = (Class44.anIntArrayArrayArray723[var11][var12][var13] + Class44.anIntArrayArrayArray723[var11][var12 + 1][var13] + Class44.anIntArrayArrayArray723[var11][var12][var13 + 1] + Class44.anIntArrayArrayArray723[var11][var12 + 1][var13 + 1]) / 4 - (Class44.anIntArrayArrayArray723[var1][var2][var3] + Class44.anIntArrayArrayArray723[var1][var2 + 1][var3] + Class44.anIntArrayArrayArray723[var1][var2][var3 + 1] + Class44.anIntArrayArrayArray723[var1][var2 + 1][var3 + 1]) / 4; @@ -232,7 +232,7 @@ final class Class3_Sub13_Sub10 extends TextureOperation { } } - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { int[][] var3 = this.aClass97_2376.method1594((byte)-118, var2); if(this.aClass97_2376.aBoolean1379) { @@ -251,13 +251,13 @@ final class Class3_Sub13_Sub10 extends TextureOperation { } } - if(var1 != -1) { + if(-1 != -1) { method211(51); } return var3; } catch (RuntimeException var12) { - throw ClientErrorException.clientError(var12, "fh.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var12, "fh.T(" + -1 + ',' + var2 + ')'); } } @@ -271,7 +271,7 @@ final class Class3_Sub13_Sub10 extends TextureOperation { } } - public Class3_Sub13_Sub10() { + public TextureOperation30() { super(1, false); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub14.java b/Client/src/main/java/org/runite/client/TextureOperation31.java similarity index 96% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub14.java rename to Client/src/main/java/org/runite/client/TextureOperation31.java index 90391f426..fd24bbcb4 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub14.java +++ b/Client/src/main/java/org/runite/client/TextureOperation31.java @@ -3,7 +3,7 @@ import org.rs09.client.config.GameConfig; import java.math.BigInteger; -final class Class3_Sub13_Sub14 extends TextureOperation { +final class TextureOperation31 extends TextureOperation { static CacheResourceWorker aCacheResourceWorker_3159; private int anInt3160 = 0; @@ -32,7 +32,7 @@ final class Class3_Sub13_Sub14 extends TextureOperation { static void method236() { try { - Class3_Sub13_Sub32.aBoolean3387 = true; + TextureOperation14.aBoolean3387 = true; } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "gm.C(" + (byte) 64 + ')'); } @@ -115,7 +115,7 @@ final class Class3_Sub13_Sub14 extends TextureOperation { } } - public Class3_Sub13_Sub14() { + public TextureOperation31() { super(0, true); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub28.java b/Client/src/main/java/org/runite/client/TextureOperation32.java similarity index 93% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub28.java rename to Client/src/main/java/org/runite/client/TextureOperation32.java index 7937d30a4..9449d0b5e 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub28.java +++ b/Client/src/main/java/org/runite/client/TextureOperation32.java @@ -1,6 +1,6 @@ package org.runite.client; -final class Class3_Sub13_Sub28 extends TextureOperation { +final class TextureOperation32 extends TextureOperation { static Class3_Sub11[][] aClass3_Sub11ArrayArray3346; private int anInt3347 = 3216; @@ -32,13 +32,13 @@ final class Class3_Sub13_Sub28 extends TextureOperation { static int method301(byte var0) { try { //int var1 = -47 / ((45 - var0) / 57); - return Class3_Sub13_Sub33.anInt3398; + return TextureOperation29.anInt3398; } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "pk.E(" + var0 + ')'); } } - public Class3_Sub13_Sub28() { + public TextureOperation32() { super(1, true); } @@ -82,7 +82,7 @@ final class Class3_Sub13_Sub28 extends TextureOperation { var16 = 255; } - int var17 = Class97.aByteArray1364[(var16 * (var16 - -1) >> 1) + var15] & 255; + int var17 = Class97.aByteArray1364[(var16 * (var16 - -1) >> 1) + var15] & 0xFF; int var6 = var13 * var17 >> 8; int var5 = var17 * var14 >> 8; var6 = var6 * this.anIntArray3348[1] >> 12; @@ -105,7 +105,7 @@ final class Class3_Sub13_Sub28 extends TextureOperation { method301((byte)56); } - for(Class3_Sub28_Sub19 var1 = (Class3_Sub28_Sub19)Class3_Sub13_Sub30.aClass61_3364.method1222(); var1 != null; var1 = (Class3_Sub28_Sub19)Class3_Sub13_Sub30.aClass61_3364.method1221()) { + for(Class3_Sub28_Sub19 var1 = (Class3_Sub28_Sub19) TextureOperation13.aClass61_3364.method1222(); var1 != null; var1 = (Class3_Sub28_Sub19) TextureOperation13.aClass61_3364.method1221()) { Class140_Sub6 var2 = var1.aClass140_Sub6_3778; if(var2.anInt2907 == WorldListCountry.localPlane && Class44.anInt719 <= var2.anInt2899) { if(Class44.anInt719 >= var2.anInt2925) { @@ -122,7 +122,7 @@ final class Class3_Sub13_Sub28 extends TextureOperation { if(Class3_Sub1.localIndex == var4) { var6 = Class102.player; } else { - var6 = Class3_Sub13_Sub22.players[var4]; + var6 = TextureOperation0.players[var4]; } if(null != var6 && var6.anInt2819 >= 0 && var6.anInt2819 < 13312 && var6.anInt2829 >= 0 && var6.anInt2829 < 13312) { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub3.java b/Client/src/main/java/org/runite/client/TextureOperation33.java similarity index 92% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub3.java rename to Client/src/main/java/org/runite/client/TextureOperation33.java index d3c2154d5..db2c64f48 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub3.java +++ b/Client/src/main/java/org/runite/client/TextureOperation33.java @@ -6,7 +6,7 @@ import org.rs09.client.net.game.PacketDecoder; import java.io.IOException; -public final class Class3_Sub13_Sub3 extends TextureOperation { +public final class TextureOperation33 extends TextureOperation { private int anInt3047 = 4096; static KeyboardListener aClass148_3049 = new KeyboardListener(); @@ -41,7 +41,7 @@ public final class Class3_Sub13_Sub3 extends TextureOperation { } } - public Class3_Sub13_Sub3() { + public TextureOperation33() { super(1, false); } @@ -133,10 +133,10 @@ public final class Class3_Sub13_Sub3 extends TextureOperation { // return PacketParser.parseIncomingPackets(); return PacketDecoder.INSTANCE.decodePacket(); } catch (IOException var4) { - Class3_Sub13_Sub13.breakClientConnection(); + TextureOperation20.breakClientConnection(); return true; } catch (Exception var5) { - String var2 = "T2 - " + Unsorted.incomingOpcode + "," + Class7.anInt2166 + "," + Class24.anInt469 + " - " + Unsorted.incomingPacketLength + "," + (Class131.anInt1716 - -Class102.player.anIntArray2767[0]) + "," + (Class102.player.anIntArray2755[0] + Class82.anInt1152) + " - "; + String var2 = "T2 - " + Unsorted.incomingOpcode + "," + Class7.anInt2166 + "," + Class24.anInt469 + " - " + Unsorted.incomingPacketLength + "," + (Class131.anInt1716 - -Class102.player.anIntArray2767[0]) + "," + (Class102.player.anIntArray2755[0] + Texture.anInt1152) + " - "; for (int var3 = 0; var3 < Unsorted.incomingPacketLength && 50 > var3; ++var3) { var2 = var2 + GraphicDefinition.incomingBuffer.buffer[var3] + ","; @@ -154,7 +154,7 @@ public final class Class3_Sub13_Sub3 extends TextureOperation { method179((byte) 120, -73); } - Class82.aReferenceCache_1146.clear(); + Texture.aReferenceCache_1146.clear(); Class159.aReferenceCache_2016.clear(); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "an.Q(" + true + ')'); @@ -183,11 +183,11 @@ public final class Class3_Sub13_Sub3 extends TextureOperation { int var15; for (var15 = var11; var7 > var15; ++var15) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var15], var13, 127, var14, var5); + TextureOperation18.method282(Class38.anIntArrayArray663[var15], var13, 127, var14, var5); } for (var15 = var12; var15 > var8; --var15) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var15], var13, -76, var14, var5); + TextureOperation18.method282(Class38.anIntArrayArray663[var15], var13, -76, var14, var5); } int var9 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var1 + var3, Class101.anInt1425); @@ -195,8 +195,8 @@ public final class Class3_Sub13_Sub3 extends TextureOperation { for (var15 = var7; var8 >= var15; ++var15) { int[] var16 = Class38.anIntArrayArray663[var15]; - Class3_Sub13_Sub23_Sub1.method282(var16, var13, -59, var9, var5); - Class3_Sub13_Sub23_Sub1.method282(var16, var10, 1 + -97, var14, var5); + TextureOperation18.method282(var16, var13, -59, var9, var5); + TextureOperation18.method282(var16, var10, 1 + -97, var14, var5); } } catch (RuntimeException var17) { @@ -204,7 +204,7 @@ public final class Class3_Sub13_Sub3 extends TextureOperation { } } - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { int[][] var3 = this.aClass97_2376.method1594((byte) 58, var2); if (this.aClass97_2376.aBoolean1379) { @@ -248,13 +248,13 @@ public final class Class3_Sub13_Sub3 extends TextureOperation { } } - if (var1 != -1) { + if (-1 != -1) { method180(-55, -63, -5); } return var3; } catch (RuntimeException var21) { - throw ClientErrorException.clientError(var21, "an.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var21, "an.T(" + -1 + ',' + var2 + ')'); } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub4.java b/Client/src/main/java/org/runite/client/TextureOperation34.java similarity index 91% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub4.java rename to Client/src/main/java/org/runite/client/TextureOperation34.java index ba5a76405..fe2251396 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub4.java +++ b/Client/src/main/java/org/runite/client/TextureOperation34.java @@ -2,7 +2,7 @@ package org.runite.client; import java.awt.Component; import java.lang.reflect.Method; -final class Class3_Sub13_Sub4 extends TextureOperation { +final class TextureOperation34 extends TextureOperation { int anInt3056 = 4; int anInt3058 = 4; @@ -56,7 +56,7 @@ final class Class3_Sub13_Sub4 extends TextureOperation { var12 = this.anInt3060 * var8 >> 12; var13 = var8 * this.anInt3056 >> 12; var15 = var11 >> 12; - var17 = this.aByteArray3059[255 & var15] & 255; + var17 = this.aByteArray3059[255 & var15] & 0xFF; var11 &= 4095; var14 = Class1.anIntArray52[var11]; var16 = var15 - -1; @@ -88,7 +88,7 @@ final class Class3_Sub13_Sub4 extends TextureOperation { var11 = var5 * var8 >> 12; var15 = var11 >> 12; var16 = 1 + var15; - var17 = this.aByteArray3059[var15 & 255] & 255; + var17 = this.aByteArray3059[var15 & 0xFF] & 0xFF; var11 &= 4095; var14 = Class1.anIntArray52[var11]; if(var13 <= var16) { @@ -110,7 +110,7 @@ final class Class3_Sub13_Sub4 extends TextureOperation { var8 = this.aShortArray3063[var7] << 12; var11 = var8 * var5 >> 12; var15 = var11 >> 12; - var17 = this.aByteArray3059[255 & var15] & 255; + var17 = this.aByteArray3059[255 & var15] & 0xFF; var12 = this.anInt3060 * var8 >> 12; var16 = var15 + 1; var11 &= 4095; @@ -120,7 +120,7 @@ final class Class3_Sub13_Sub4 extends TextureOperation { var16 = 0; } - var18 = 255 & this.aByteArray3059[var16 & 255]; + var18 = 255 & this.aByteArray3059[var16 & 0xFF]; if(this.aBoolean3065 && this.anInt3058 + -1 == var7) { for(var10 = 0; var10 < Class113.anInt1559; ++var10) { var4 = Class102.anIntArray2125[var10] * this.anInt3060; @@ -180,7 +180,7 @@ final class Class3_Sub13_Sub4 extends TextureOperation { var3 = Class56.localPlayerIndexes[var1]; } - Player var4 = Class3_Sub13_Sub22.players[var3]; + Player var4 = TextureOperation0.players[var3]; if(var4 != null && 0 < var4.textCycle) { --var4.textCycle; if(var4.textCycle == 0) { @@ -243,7 +243,7 @@ final class Class3_Sub13_Sub4 extends TextureOperation { try { int var5 = Class51.anIntArray834[Class140_Sub1_Sub2.method1940(var1, var3)]; if(var0 > 0) { - int var6 = Class51.anInterface2_838.method19(111, var0 & '\uffff'); + int var6 = Class51.anInterface2_838.method19(111, var0 & 65535); int var7; int var9; if(var6 != 0) { @@ -261,29 +261,29 @@ final class Class3_Sub13_Sub4 extends TextureOperation { var5 = var7; } else { var9 = -var6 + 256; - var5 = (16711680 & (var7 & '\uff00') * var6 + var9 * (var5 & '\uff00')) + (var6 * (var7 & 16711935) - -((16711935 & var5) * var9) & -16711936) >> 8; + var5 = (16711680 & (var7 & 65280) * var6 + var9 * (var5 & 65280)) + (var6 * (var7 & 16711935) - -((16711935 & var5) * var9) & -16711936) >> 8; } } - var7 = Class51.anInterface2_838.method10(106, '\uffff' & var0); + var7 = Class51.anInterface2_838.method10(106, 65535 & var0); if(var7 != 0) { var7 += 256; int var8 = ((16711680 & var5) >> 16) * var7; - if('\uffff' < var8) { - var8 = '\uffff'; + if(65535 < var8) { + var8 = 65535; } - var9 = ((var5 & '\uff00') >> 8) * var7; - if(var9 > '\uffff') { - var9 = '\uffff'; + var9 = ((var5 & 65280) >> 8) * var7; + if(var9 > 65535) { + var9 = 65535; } - int var10 = var7 * (var5 & 255); - if(var10 > '\uffff') { - var10 = '\uffff'; + int var10 = var7 * (var5 & 0xFF); + if(var10 > 65535) { + var10 = 65535; } - var5 = (var10 >> 8) + ('\uff00' & var9) + (16711711 & var8 << 8); + var5 = (var10 >> 8) + (65280 & var9) + (16711711 & var8 << 8); } } @@ -389,14 +389,14 @@ final class Class3_Sub13_Sub4 extends TextureOperation { } } - var1.addKeyListener(Class3_Sub13_Sub3.aClass148_3049); - var1.addFocusListener(Class3_Sub13_Sub3.aClass148_3049); + var1.addKeyListener(TextureOperation33.aClass148_3049); + var1.addFocusListener(TextureOperation33.aClass148_3049); } catch (RuntimeException var5) { throw ClientErrorException.clientError(var5, "bi.Q(" + var0 + ',' + (var1 != null?"{...}":"null") + ')'); } } - public Class3_Sub13_Sub4() { + public TextureOperation34() { super(0, true); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub26.java b/Client/src/main/java/org/runite/client/TextureOperation35.java similarity index 84% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub26.java rename to Client/src/main/java/org/runite/client/TextureOperation35.java index 73e869aaf..42dfc53c7 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub26.java +++ b/Client/src/main/java/org/runite/client/TextureOperation35.java @@ -1,6 +1,6 @@ package org.runite.client; -final class Class3_Sub13_Sub26 extends TextureOperation { +final class TextureOperation35 extends TextureOperation { static int anInt3332 = 50; static int[] anIntArray3321 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; @@ -12,23 +12,23 @@ final class Class3_Sub13_Sub26 extends TextureOperation { public static void method294(byte var0) { try { - Class82.anIntArray3327 = null; - Class82.anIntArray3337 = null; - Class82.aClass94Array3317 = null; + Texture.anIntArray3327 = null; + Texture.anIntArray3337 = null; + Texture.aClass94Array3317 = null; anIntArray3328 = null; - Class82.anIntArray3319 = null; + Texture.anIntArray3319 = null; aByteArrayArray3335 = null; - Class82.anIntArray3329 = null; - Class82.anIntArray3336 = null; + Texture.anIntArray3329 = null; + Texture.anIntArray3336 = null; anIntArray3321 = null; - Class82.anIntArray3318 = null; - Class82.anIntArray3331 = null; + Texture.anIntArray3318 = null; + Texture.anIntArray3331 = null; } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "pg.B(" + var0 + ')'); } } - public Class3_Sub13_Sub26() { + public TextureOperation35() { super(1, true); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub36.java b/Client/src/main/java/org/runite/client/TextureOperation36.java similarity index 90% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub36.java rename to Client/src/main/java/org/runite/client/TextureOperation36.java index f55e0a6ce..63a164fc2 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub36.java +++ b/Client/src/main/java/org/runite/client/TextureOperation36.java @@ -2,8 +2,9 @@ package org.runite.client; import org.rs09.client.config.GameConfig; import org.rs09.client.rendering.Toolkit; +import org.runite.client.drawcalls.LoadingBox; -public final class Class3_Sub13_Sub36 extends TextureOperation { +public final class TextureOperation36 extends TextureOperation { static int anInt3422; static int anInt3423; @@ -28,7 +29,7 @@ public final class Class3_Sub13_Sub36 extends TextureOperation { Class102.method1611(100, false); if(!var2) { - Class3_Sub13_Sub28.method302(2); + TextureOperation32.method302(2); } Unsorted.method2067(); @@ -60,15 +61,15 @@ public final class Class3_Sub13_Sub36 extends TextureOperation { var6 = NPC.anInt3995; int var8 = Class77.anInt1111; int var9 = Class139.anInt1823; - int var10 = Class3_Sub13_Sub25.anInt3315; + int var10 = TextureOperation28.anInt3315; int var11; int var12; for(var11 = 0; 5 > var11; ++var11) { if(WaterfallShader.aBooleanArray2169[var11]) { - var12 = (int)((double)(-Class3_Sub13_Sub32.anIntArray3383[var11]) + (double)(Class3_Sub13_Sub32.anIntArray3383[var11] * 2 + 1) * Math.random() + Math.sin((double)Class163_Sub1_Sub1.anIntArray4009[var11] * ((double)Class3_Sub13_Sub29.anIntArray3359[var11] / 100.0D)) * (double)Class166.anIntArray2073[var11]); + var12 = (int)((double)(-TextureOperation14.anIntArray3383[var11]) + (double)(TextureOperation14.anIntArray3383[var11] * 2 + 1) * Math.random() + Math.sin((double)Class163_Sub1_Sub1.anIntArray4009[var11] * ((double) TextureOperation3.anIntArray3359[var11] / 100.0D)) * (double)Class166.anIntArray2073[var11]); if(var11 == 3) { - Class3_Sub13_Sub25.anInt3315 = var12 + Class3_Sub13_Sub25.anInt3315 & 2047; + TextureOperation28.anInt3315 = var12 + TextureOperation28.anInt3315 & 0x7FF; } if(var11 == 4) { @@ -100,7 +101,7 @@ public final class Class3_Sub13_Sub36 extends TextureOperation { if(HDToolKit.highDetail) { Class22.setClipping(var3, var5, var3 + var4, var5 - -var1); float var17 = (float)Class139.anInt1823 * 0.17578125F; - float var16 = 0.17578125F * (float)Class3_Sub13_Sub25.anInt3315; + float var16 = 0.17578125F * (float) TextureOperation28.anInt3315; if(Class133.anInt1753 == 3) { var17 = 360.0F * InterfaceWidget.aFloat1169 / 6.2831855F; var16 = Class45.aFloat730 * 360.0F / 6.2831855F; @@ -140,22 +141,22 @@ public final class Class3_Sub13_Sub36 extends TextureOperation { Class68.method1269(Class44.anInt719, !WorldListEntry.aBoolean2623); HDToolKit.clearScreen(var12); - ClientErrorException.method2285(Class139.anInt1823, Class77.anInt1111, Class7.anInt2162, NPC.anInt3995, Class3_Sub13_Sub25.anInt3315); + ClientErrorException.method2285(Class139.anInt1823, Class77.anInt1111, Class7.anInt2162, NPC.anInt3995, TextureOperation28.anInt3315); HDToolKit.anInt1791 = Class44.anInt719; - Class3_Sub22.method398(NPC.anInt3995, Class7.anInt2162, Class77.anInt1111, Class139.anInt1823, Class3_Sub13_Sub25.anInt3315, Class158.aByteArrayArrayArray2008, Unsorted.anIntArray686, Class129_Sub1.anIntArray2696, Class159.anIntArray2021, Player.anIntArray3959, SequenceDefinition.anIntArray1871, WorldListCountry.localPlane + 1, var19, Class102.player.anInt2819 >> 7, Class102.player.anInt2829 >> 7); + Class3_Sub22.method398(NPC.anInt3995, Class7.anInt2162, Class77.anInt1111, Class139.anInt1823, TextureOperation28.anInt3315, Class158.aByteArrayArrayArray2008, Unsorted.anIntArray686, Class129_Sub1.anIntArray2696, Class159.anIntArray2021, Player.anIntArray3959, SequenceDefinition.anIntArray1871, WorldListCountry.localPlane + 1, var19, Class102.player.anInt2819 >> 7, Class102.player.anInt2829 >> 7); Unsorted.aBoolean47 = true; Class68.method1265(); ClientErrorException.method2285(0, 0, 0, 0, 0); Class58.method1194(); Unsorted.method1775(); - Class82.method1405(var5, var4, var3, Unsorted.anInt1705, var1, Unsorted.anInt1705, -7397); + Texture.method1405(var5, var4, var3, Unsorted.anInt1705, var1, Unsorted.anInt1705, -7397); Class163_Sub2_Sub1.method2221(var4, var3, var1, Unsorted.anInt1705, Unsorted.anInt1705, var5); } else { Toolkit.JAVA_TOOLKIT.method934(var3, var5, var4, var1, 0); - Class3_Sub22.method398(NPC.anInt3995, Class7.anInt2162, Class77.anInt1111, Class139.anInt1823, Class3_Sub13_Sub25.anInt3315, Class158.aByteArrayArrayArray2008, Unsorted.anIntArray686, Class129_Sub1.anIntArray2696, Class159.anIntArray2021, Player.anIntArray3959, SequenceDefinition.anIntArray1871, WorldListCountry.localPlane - -1, var19, Class102.player.anInt2819 >> 7, Class102.player.anInt2829 >> 7); + Class3_Sub22.method398(NPC.anInt3995, Class7.anInt2162, Class77.anInt1111, Class139.anInt1823, TextureOperation28.anInt3315, Class158.aByteArrayArrayArray2008, Unsorted.anIntArray686, Class129_Sub1.anIntArray2696, Class159.anIntArray2021, Player.anIntArray3959, SequenceDefinition.anIntArray1871, WorldListCountry.localPlane - -1, var19, Class102.player.anInt2819 >> 7, Class102.player.anInt2829 >> 7); Class58.method1194(); Unsorted.method1775(); - Class82.method1405(var5, var4, var3, 256, var1, 256, -6403 + -994); + Texture.method1405(var5, var4, var3, 256, var1, 256, -6403 + -994); Class163_Sub2_Sub1.method2221(var4, var3, var1, 256, 256, var5); } @@ -165,17 +166,17 @@ public final class Class3_Sub13_Sub36 extends TextureOperation { Class77.anInt1111 = var8; Class7.anInt2162 = var7; NPC.anInt3995 = var6; - Class3_Sub13_Sub25.anInt3315 = var10; - if(Class3_Sub13_Sub4.aBoolean3064 && Class58.aJs5Worker_917.countPriorityRequests() == 0) { - Class3_Sub13_Sub4.aBoolean3064 = false; + TextureOperation28.anInt3315 = var10; + if(TextureOperation34.aBoolean3064 && Class58.aJs5Worker_917.countPriorityRequests() == 0) { + TextureOperation34.aBoolean3064 = false; } - if(Class3_Sub13_Sub4.aBoolean3064) { + if(TextureOperation34.aBoolean3064) { Toolkit.getActiveToolkit().method934(var3, var5, var4, var1, 0); - TextureOperation.method164(false, TextCore.LoadingPleaseWait2); + LoadingBox.draw(false, TextCore.LoadingPleaseWait2); } - if(!var2 && !Class3_Sub13_Sub4.aBoolean3064 && !Class38_Sub1.aBoolean2615 && var3 <= NPCDefinition.anInt1297 && var4 + var3 > NPCDefinition.anInt1297 && Class38_Sub1.anInt2612 >= var5 && var1 + var5 > Class38_Sub1.anInt2612) { + if(!var2 && !TextureOperation34.aBoolean3064 && !Class38_Sub1.aBoolean2615 && var3 <= NPCDefinition.anInt1297 && var4 + var3 > NPCDefinition.anInt1297 && Class38_Sub1.anInt2612 >= var5 && var1 + var5 > Class38_Sub1.anInt2612) { method1628(var5, var4, var1, var3, Class38_Sub1.anInt2612, NPCDefinition.anInt1297); } @@ -207,14 +208,14 @@ public final class Class3_Sub13_Sub36 extends TextureOperation { Class3_Sub24_Sub4.method1177(-1, 0L, (byte)-62, TextCore.emptyJagexString, var11, (short)36, TextCore.HasFaceHere, var12); } - Class3_Sub24_Sub4.method1177(-1, 0L, (byte)-75, TextCore.emptyJagexString, var11, (short)60, Class3_Sub13_Sub28.aClass94_3353, var12); + Class3_Sub24_Sub4.method1177(-1, 0L, (byte)-75, TextCore.emptyJagexString, var11, (short)60, TextureOperation32.aClass94_3353, var12); } } long var25 = -1L; for(var9 = 0; Unsorted.anInt59 > var9; ++var9) { - long var26 = Class3_Sub13_Sub38.aLongArray3448[var9]; + long var26 = TextureOperation38.aLongArray3448[var9]; var12 = (int)var26 & 127; int var14 = ((int)var26 & 2009320690) >> 29; int var15 = (int)(var26 >>> 32) & Integer.MAX_VALUE; @@ -318,11 +319,11 @@ public final class Class3_Sub13_Sub36 extends TextureOperation { } for(var37 = 0; var37 < Class159.localPlayerCount; ++var37) { - var38 = Class3_Sub13_Sub22.players[Class56.localPlayerIndexes[var37]]; + var38 = TextureOperation0.players[Class56.localPlayerIndexes[var37]]; var21 = var38.anInt2819 + 64 + -(64 * var38.getSize()); var22 = var38.anInt2829 - (var38.getSize() * 64 + -64); if(var21 >= var33 && var31.definition.size - (var21 - var33 >> 7) >= var38.getSize() && var18 <= var22 && var38.getSize() <= -(-var18 + var22 >> 7) + var31.definition.size) { - Class3_Sub13_Sub30.method312(Class56.localPlayerIndexes[var37], 5, var27, var38, var12); + TextureOperation13.method312(Class56.localPlayerIndexes[var37], 5, var27, var38, var12); } } } @@ -331,7 +332,7 @@ public final class Class3_Sub13_Sub36 extends TextureOperation { } if(var14 == 0) { - Player var30 = Class3_Sub13_Sub22.players[var15]; + Player var30 = TextureOperation0.players[var15]; if((127 & var30.anInt2819) == 64 && 64 == (127 & var30.anInt2829)) { var33 = var30.anInt2819 + -(64 * (-1 + var30.getSize())); var18 = var30.anInt2829 + 64 + -(var30.getSize() * 64); @@ -346,20 +347,20 @@ public final class Class3_Sub13_Sub36 extends TextureOperation { } for(var37 = 0; var37 < Class159.localPlayerCount; ++var37) { - var38 = Class3_Sub13_Sub22.players[Class56.localPlayerIndexes[var37]]; + var38 = TextureOperation0.players[Class56.localPlayerIndexes[var37]]; var21 = var38.anInt2819 - (var38.getSize() + -1) * 64; var22 = var38.anInt2829 - (-64 + 64 * var38.getSize()); if(var38 != var30 && var21 >= var33 && var38.getSize() <= var30.getSize() - (var21 - var33 >> 7) && var18 <= var22 && -(var22 + -var18 >> 7) + var30.getSize() >= var38.getSize()) { - Class3_Sub13_Sub30.method312(Class56.localPlayerIndexes[var37], 9, var27, var38, var12); + TextureOperation13.method312(Class56.localPlayerIndexes[var37], 9, var27, var38, var12); } } } - Class3_Sub13_Sub30.method312(var15, 31, var27, var30, var12); + TextureOperation13.method312(var15, 31, var27, var30, var12); } if(var14 == 3) { - Class61 var28 = Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var12][var27]; + Class61 var28 = TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var12][var27]; if(null != var28) { for(WorldMap var32 = (WorldMap)var28.method1212(); null != var32; var32 = (WorldMap)var28.method1219(41)) { var18 = var32.aClass140_Sub7_3676.anInt2936; @@ -429,9 +430,9 @@ public final class Class3_Sub13_Sub36 extends TextureOperation { } } - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { - if(var1 != -1) { + if(-1 != -1) { this.anInt3434 = 6; } @@ -447,7 +448,7 @@ public final class Class3_Sub13_Sub36 extends TextureOperation { for(var8 = 0; var8 < Class113.anInt1559; ++var8) { var9 = this.anIntArray3425[var4++]; var7[var8] = Unsorted.bitwiseAnd(var9 << 4, 4080); - var6[var8] = Unsorted.bitwiseAnd(var9, '\uff00') >> 4; + var6[var8] = Unsorted.bitwiseAnd(var9, 65280) >> 4; var5[var8] = Unsorted.bitwiseAnd(var9, 16711680) >> 12; } } else { @@ -455,7 +456,7 @@ public final class Class3_Sub13_Sub36 extends TextureOperation { var9 = this.anInt3431 * var8 / Class113.anInt1559; int var10 = this.anIntArray3425[var4 - -var9]; var7[var8] = Unsorted.bitwiseAnd(var10 << 4, 4080); - var6[var8] = Unsorted.bitwiseAnd('\uff00', var10) >> 4; + var6[var8] = Unsorted.bitwiseAnd(65280, var10) >> 4; var5[var8] = Unsorted.bitwiseAnd(var10 >> 12, 4080); } } @@ -463,7 +464,7 @@ public final class Class3_Sub13_Sub36 extends TextureOperation { return var3; } catch (RuntimeException var11) { - throw ClientErrorException.clientError(var11, "ui.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var11, "ui.T(" + -1 + ',' + var2 + ')'); } } @@ -479,7 +480,7 @@ public final class Class3_Sub13_Sub36 extends TextureOperation { this.anIntArray3425 = Class17.anInterface2_408.method16(64, this.anInt3434); this.anInt3433 = var4; this.anInt3431 = var4; - Class3_Sub13_Sub3.method180(18, var3, var2); + TextureOperation33.method180(18, var3, var2); return this.anIntArray3425 != null; } } else { @@ -513,7 +514,7 @@ public final class Class3_Sub13_Sub36 extends TextureOperation { } } - public Class3_Sub13_Sub36() { + public TextureOperation36() { super(0, false); } @@ -532,9 +533,9 @@ public final class Class3_Sub13_Sub36 extends TextureOperation { for(int var2 = 0; var2 < Class95.anInt1338; ++var2) { if(HDToolKit.highDetail) { - var1[var2] = new HDIndexedSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[var2], Unsorted.anIntArray2591[var2], Class140_Sub7.anIntArray2931[var2], Unsorted.anIntArray3076[var2], Class163_Sub1.aByteArrayArray2987[var2], Class3_Sub13_Sub38.spritePalette); + var1[var2] = new HDIndexedSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[var2], Unsorted.anIntArray2591[var2], Class140_Sub7.anIntArray2931[var2], Unsorted.anIntArray3076[var2], Class163_Sub1.aByteArrayArray2987[var2], TextureOperation38.spritePalette); } else { - var1[var2] = new LDIndexedSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[var2], Unsorted.anIntArray2591[var2], Class140_Sub7.anIntArray2931[var2], Unsorted.anIntArray3076[var2], Class163_Sub1.aByteArrayArray2987[var2], Class3_Sub13_Sub38.spritePalette); + var1[var2] = new LDIndexedSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[var2], Unsorted.anIntArray2591[var2], Class140_Sub7.anIntArray2931[var2], Unsorted.anIntArray3076[var2], Class163_Sub1.aByteArrayArray2987[var2], TextureOperation38.spritePalette); } } Class39.method1035((byte)113); diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub21.java b/Client/src/main/java/org/runite/client/TextureOperation37.java similarity index 89% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub21.java rename to Client/src/main/java/org/runite/client/TextureOperation37.java index 7d4d4ae1d..c92eddd79 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub21.java +++ b/Client/src/main/java/org/runite/client/TextureOperation37.java @@ -5,7 +5,7 @@ import java.io.IOException; import java.net.Socket; import java.util.Objects; -final class Class3_Sub13_Sub21 extends TextureOperation { +final class TextureOperation37 extends TextureOperation { //Class3_Sub13_Sub21 private int anInt3253 = 0; private int anInt3254 = 4096; @@ -90,7 +90,7 @@ final class Class3_Sub13_Sub21 extends TextureOperation { } Class3_Sub15.activeConnection = new Connection((Socket)Class3_Sub9.aClass64_2318.anObject974, Class38.signlink); Class3_Sub9.aClass64_2318 = null; - Class3_Sub15.activeConnection.sendBytes(Class3_Sub13_Sub1.outgoingBuffer.buffer, Class3_Sub13_Sub1.outgoingBuffer.index); + Class3_Sub15.activeConnection.sendBytes(TextureOperation12.outgoingBuffer.buffer, TextureOperation12.outgoingBuffer.index); if(WorldListEntry.aClass155_2627 != null) { WorldListEntry.aClass155_2627.method2159(63); } @@ -120,20 +120,20 @@ final class Class3_Sub13_Sub21 extends TextureOperation { return; } - Class3_Sub13_Sub33.aClass94Array3391 = new RSString[Class3_Sub15.activeConnection.readByte()]; + TextureOperation29.aClass94Array3391 = new RSString[Class3_Sub15.activeConnection.readByte()]; Unsorted.registryStage = 4; } if(Unsorted.registryStage == 4) { - if(8 * Class3_Sub13_Sub33.aClass94Array3391.length > Class3_Sub15.activeConnection.availableBytes()) { + if(8 * TextureOperation29.aClass94Array3391.length > Class3_Sub15.activeConnection.availableBytes()) { return; } GraphicDefinition.incomingBuffer.index = 0; - Class3_Sub15.activeConnection.readBytes(GraphicDefinition.incomingBuffer.buffer, 0, 8 * Class3_Sub13_Sub33.aClass94Array3391.length); + Class3_Sub15.activeConnection.readBytes(GraphicDefinition.incomingBuffer.buffer, 0, 8 * TextureOperation29.aClass94Array3391.length); - for(response = 0; response < Class3_Sub13_Sub33.aClass94Array3391.length; ++response) { - Class3_Sub13_Sub33.aClass94Array3391[response] = Unsorted.method1052(GraphicDefinition.incomingBuffer.readLong()); + for(response = 0; response < TextureOperation29.aClass94Array3391.length; ++response) { + TextureOperation29.aClass94Array3391[response] = Unsorted.method1052(GraphicDefinition.incomingBuffer.readLong()); } Unsorted.anInt1711 = 21; @@ -170,7 +170,7 @@ final class Class3_Sub13_Sub21 extends TextureOperation { } } - public Class3_Sub13_Sub21() { + public TextureOperation37() { super(0, true); } @@ -208,7 +208,7 @@ final class Class3_Sub13_Sub21 extends TextureOperation { try { int var4 = this.anInt3257 * (var2 + var3) >> 12; - int var5 = Class75_Sub2.anIntArray2639[var4 * 255 >> 12 & 255]; + int var5 = Class75_Sub2.anIntArray2639[var4 * 255 >> 12 & 0xFF]; var5 = (var5 << 12) / this.anInt3257; var5 = (var5 << 12) / this.anInt3266; var5 = var5 * this.anInt3254 >> 12; @@ -250,35 +250,35 @@ final class Class3_Sub13_Sub21 extends TextureOperation { aClass3_Sub28_Sub3_3264 = null; } - int var1 = Class3_Sub13_Sub26.aByteArrayArray3335.length; + int var1 = TextureOperation35.aByteArrayArray3335.length; for(int var2 = 0; var2 < var1; ++var2) { - if(Class3_Sub13_Sub26.aByteArrayArray3335[var2] != null) { + if(TextureOperation35.aByteArrayArray3335[var2] != null) { int var3 = -1; - for(int var4 = 0; Class3_Sub13_Sub20.anInt3244 > var4; ++var4) { - if(Class3_Sub13_Sub30.anIntArray3367[var4] == Class3_Sub24_Sub3.anIntArray3494[var2]) { + for(int var4 = 0; TextureOperation11.anInt3244 > var4; ++var4) { + if(TextureOperation13.anIntArray3367[var4] == Class3_Sub24_Sub3.anIntArray3494[var2]) { var3 = var4; break; } } if(var3 == -1) { - Class3_Sub13_Sub30.anIntArray3367[Class3_Sub13_Sub20.anInt3244] = Class3_Sub24_Sub3.anIntArray3494[var2]; - var3 = Class3_Sub13_Sub20.anInt3244++; + TextureOperation13.anIntArray3367[TextureOperation11.anInt3244] = Class3_Sub24_Sub3.anIntArray3494[var2]; + var3 = TextureOperation11.anInt3244++; } int var5 = 0; - DataBuffer var16 = new DataBuffer(Class3_Sub13_Sub26.aByteArrayArray3335[var2]); + DataBuffer var16 = new DataBuffer(TextureOperation35.aByteArrayArray3335[var2]); - while(Class3_Sub13_Sub26.aByteArrayArray3335[var2].length > var16.index && 511 > var5) { + while(TextureOperation35.aByteArrayArray3335[var2].length > var16.index && 511 > var5) { int var6 = var5++ << 6 | var3; int var7 = var16.readUnsignedShort(); int var8 = var7 >> 14; int var9 = 63 & var7 >> 7; int var11 = var9 + 64 * (Class3_Sub24_Sub3.anIntArray3494[var2] >> 8) - Class131.anInt1716; int var10 = var7 & 63; - int var12 = var10 + -Class82.anInt1152 + 64 * (255 & Class3_Sub24_Sub3.anIntArray3494[var2]); + int var12 = var10 + -Texture.anInt1152 + 64 * (255 & Class3_Sub24_Sub3.anIntArray3494[var2]); NPCDefinition var13 = NPCDefinition.getNPCDefinition(var16.readUnsignedShort()); if(NPC.npcs[var6] == null && (var13.aByte1267 & 1) > 0 && Class140_Sub3.anInt2745 == var8 && var11 >= 0 && 104 > var13.size + var11 && var12 >= 0 && 104 > var12 - -var13.size) { NPC.npcs[var6] = new NPC(); diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub38.java b/Client/src/main/java/org/runite/client/TextureOperation38.java similarity index 96% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub38.java rename to Client/src/main/java/org/runite/client/TextureOperation38.java index 95136d2ef..6ef8b739b 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub38.java +++ b/Client/src/main/java/org/runite/client/TextureOperation38.java @@ -2,7 +2,7 @@ package org.runite.client; import java.util.Objects; import java.util.Random; -final class Class3_Sub13_Sub38 extends TextureOperation { +final class TextureOperation38 extends TextureOperation { private int anInt3444 = 0; @@ -47,7 +47,7 @@ final class Class3_Sub13_Sub38 extends TextureOperation { } } - public Class3_Sub13_Sub38() { + public TextureOperation38() { super(0, true); } @@ -65,7 +65,7 @@ final class Class3_Sub13_Sub38 extends TextureOperation { var9 = (var9 & 4088) >> 4; int var11 = TextureOperation.method1603((byte)62, Class101.anInt1427, var7); int var12 = var10 - -(this.anInt3451 * Class75_Sub2.anIntArray2639[var9] >> 12); - int var13 = var11 + (Class3_Sub13_Sub17.anIntArray3212[var9] * this.anInt3451 >> 12); + int var13 = var11 + (TextureOperation23.anIntArray3212[var9] * this.anInt3451 >> 12); int var15 = var12 - var10; int var14 = -var11 + var13; if(var15 != 0 || var14 != 0) { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub23.java b/Client/src/main/java/org/runite/client/TextureOperation39.java similarity index 93% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub23.java rename to Client/src/main/java/org/runite/client/TextureOperation39.java index 4344a79bb..faaa02c7a 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub23.java +++ b/Client/src/main/java/org/runite/client/TextureOperation39.java @@ -4,7 +4,7 @@ import org.rs09.CustomVars; import java.util.Objects; -class Class3_Sub13_Sub23 extends TextureOperation { +class TextureOperation39 extends TextureOperation { private int anInt3278 = -1; int anInt3280; @@ -49,7 +49,7 @@ class Class3_Sub13_Sub23 extends TextureOperation { WorldListEntry.parseWorldList(buffer); } - Class3_Sub13_Sub10.method216(buffer); + TextureOperation30.method216(buffer); return true; } else { return false; @@ -65,7 +65,7 @@ class Class3_Sub13_Sub23 extends TextureOperation { if(this.anInt3278 < 0) { return false; } else { - Class3_Sub28_Sub16_Sub2 var3 = Class82.anInt1668 < 0 ? Unsorted.method1537(WaterfallShader.aClass153_2172, this.anInt3278):Class40.method1043(this.anInt3278, WaterfallShader.aClass153_2172, Class82.anInt1668); + Class3_Sub28_Sub16_Sub2 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; @@ -88,7 +88,7 @@ class Class3_Sub13_Sub23 extends TextureOperation { } } - public Class3_Sub13_Sub23() { + public TextureOperation39() { super(0, false); } @@ -113,9 +113,9 @@ class Class3_Sub13_Sub23 extends TextureOperation { } } - int[][] method166(int var1, int var2) { + int[][] method166(int var2) { try { - if(var1 != -1) { + if(-1 != -1) { this.method159(32); } @@ -131,7 +131,7 @@ class Class3_Sub13_Sub23 extends TextureOperation { for(var8 = 0; var8 < Class113.anInt1559; ++var8) { var9 = this.anIntArray3284[var7++]; var6[var8] = Unsorted.bitwiseAnd(255, var9) << 4; - var5[var8] = Unsorted.bitwiseAnd('\uff00', var9) >> 4; + var5[var8] = Unsorted.bitwiseAnd(65280, var9) >> 4; var4[var8] = Unsorted.bitwiseAnd(var9, 16711680) >> 12; } } else { @@ -139,7 +139,7 @@ class Class3_Sub13_Sub23 extends TextureOperation { var9 = this.anInt3280 * var8 / Class113.anInt1559; int var10 = this.anIntArray3284[var7 - -var9]; var6[var8] = Unsorted.bitwiseAnd(var10 << 4, 4080); - var5[var8] = Unsorted.bitwiseAnd(var10, '\uff00') >> 4; + var5[var8] = Unsorted.bitwiseAnd(var10, 65280) >> 4; var4[var8] = Unsorted.bitwiseAnd(var10 >> 12, 4080); } } @@ -147,7 +147,7 @@ class Class3_Sub13_Sub23 extends TextureOperation { return var3; } catch (RuntimeException var11) { - throw ClientErrorException.clientError(var11, "nh.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var11, "nh.T(" + -1 + ',' + var2 + ')'); } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub19.java b/Client/src/main/java/org/runite/client/TextureOperation4.java similarity index 89% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub19.java rename to Client/src/main/java/org/runite/client/TextureOperation4.java index df8059b2c..97c2d7b2a 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub19.java +++ b/Client/src/main/java/org/runite/client/TextureOperation4.java @@ -3,7 +3,7 @@ import org.rs09.client.util.ArrayUtils; import java.util.Random; -final class Class3_Sub13_Sub19 extends TextureOperation { +final class TextureOperation4 extends TextureOperation { private int anInt3219 = 204; private int anInt3223; @@ -85,21 +85,21 @@ final class Class3_Sub13_Sub19 extends TextureOperation { int var12; for(var12 = var2; var12 < var8; ++var12) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var12], var7, 125, var6, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var12], var7, 125, var6, var0); } int var9 = -var5 + var3; int var11 = -var5 + var6; for(var12 = var3; var12 > var9; --var12) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var12], var7, 103, var6, var0); + TextureOperation18.method282(Class38.anIntArrayArray663[var12], var7, 103, var6, var0); } for(var12 = var8; var12 <= var9; ++var12) { int[] var13 = Class38.anIntArrayArray663[var12]; - Class3_Sub13_Sub23_Sub1.method282(var13, var7, 117, var10, var0); - Class3_Sub13_Sub23_Sub1.method282(var13, var10, 111, var11, var4); - Class3_Sub13_Sub23_Sub1.method282(var13, var11, -75, var6, var0); + TextureOperation18.method282(var13, var7, 117, var10, var0); + TextureOperation18.method282(var13, var10, 111, var11, var4); + TextureOperation18.method282(var13, var11, -75, var6, var0); } } catch (RuntimeException var14) { @@ -154,11 +154,11 @@ final class Class3_Sub13_Sub19 extends TextureOperation { static void method264(byte var0) { try { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(184); + TextureOperation12.outgoingBuffer.putOpcode(184); - for(Class3_Sub31 var1 = Class3_Sub13_Sub17.aHashTable_3208.first(); null != var1; var1 = Class3_Sub13_Sub17.aHashTable_3208.next()) { + for(Class3_Sub31 var1 = TextureOperation23.aHashTable_3208.first(); null != var1; var1 = TextureOperation23.aHashTable_3208.next()) { if(var1.anInt2603 == 0) { - Class3_Sub13_Sub18.method254(true, var1); + TextureOperation19.method254(true, var1); } } @@ -166,9 +166,9 @@ final class Class3_Sub13_Sub19 extends TextureOperation { aClass94_3232 = null; } - if(null != Class3_Sub13_Sub7.aClass11_3087) { - Class20.method909(Class3_Sub13_Sub7.aClass11_3087); - Class3_Sub13_Sub7.aClass11_3087 = null; + if(null != TextureOperation27.aClass11_3087) { + Class20.method909(TextureOperation27.aClass11_3087); + TextureOperation27.aClass11_3087 = null; } } catch (RuntimeException var2) { @@ -236,7 +236,7 @@ final class Class3_Sub13_Sub19 extends TextureOperation { } } - public Class3_Sub13_Sub19() { + public TextureOperation4() { super(0, true); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub24.java b/Client/src/main/java/org/runite/client/TextureOperation5.java similarity index 97% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub24.java rename to Client/src/main/java/org/runite/client/TextureOperation5.java index b027e76ce..8769a7521 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub24.java +++ b/Client/src/main/java/org/runite/client/TextureOperation5.java @@ -2,7 +2,7 @@ package org.runite.client; import java.util.Objects; -final class Class3_Sub13_Sub24 extends TextureOperation { +final class TextureOperation5 extends TextureOperation { private int anInt3294 = 1; static RSString aClass94_3295; @@ -56,11 +56,11 @@ final class Class3_Sub13_Sub24 extends TextureOperation { } } - public Class3_Sub13_Sub24() { + public TextureOperation5() { super(1, false); } - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { int[][] var3 = this.aClass97_2376.method1594((byte)90, var2); @@ -137,7 +137,7 @@ final class Class3_Sub13_Sub24 extends TextureOperation { return var3; } catch (RuntimeException var23) { - throw ClientErrorException.clientError(var23, "nm.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var23, "nm.T(" + -1 + ',' + var2 + ')'); } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub2.java b/Client/src/main/java/org/runite/client/TextureOperation6.java similarity index 79% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub2.java rename to Client/src/main/java/org/runite/client/TextureOperation6.java index 86b23b55b..a04c70622 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub2.java +++ b/Client/src/main/java/org/runite/client/TextureOperation6.java @@ -4,7 +4,7 @@ import org.rs09.client.data.HashTable; import java.util.Objects; -final class Class3_Sub13_Sub2 extends TextureOperation { +final class TextureOperation6 extends TextureOperation { //static RSString aClass94_3042 = RSString.createRSString(""); private int anInt3043 = 0; @@ -28,9 +28,9 @@ final class Class3_Sub13_Sub2 extends TextureOperation { } } - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { - if(var1 != -1) { + if(-1 != -1) { method175(2, -7, -114, -24, 102, -125); } @@ -80,7 +80,7 @@ final class Class3_Sub13_Sub2 extends TextureOperation { return var3; } catch (RuntimeException var15) { - throw ClientErrorException.clientError(var15, "aj.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var15, "aj.T(" + -1 + ',' + var2 + ')'); } } @@ -114,9 +114,9 @@ final class Class3_Sub13_Sub2 extends TextureOperation { int var17 = var6 - -var8; int var13 = -1; int var16 = -var8 + var6; - Class3_Sub13_Sub23_Sub1.method282(var15, -var5 + var6, -40, var16, var0); - Class3_Sub13_Sub23_Sub1.method282(var15, var16, -51, var17, var4); - Class3_Sub13_Sub23_Sub1.method282(var15, var17, -41, var6 - -var5, var0); + TextureOperation18.method282(var15, -var5 + var6, -40, var16, var0); + TextureOperation18.method282(var15, var16, -51, var17, var4); + TextureOperation18.method282(var15, var17, -41, var6 - -var5, var0); while(var9 > var7) { var14 += 2; @@ -148,19 +148,19 @@ final class Class3_Sub13_Sub2 extends TextureOperation { var20 = GameObject.anIntArray1838[var9]; var24 = -var20 + var6; var23 = var20 + var6; - Class3_Sub13_Sub23_Sub1.method282(var18, var22, -113, var24, var0); - Class3_Sub13_Sub23_Sub1.method282(var18, var24, 95, var23, var4); - Class3_Sub13_Sub23_Sub1.method282(var18, var23, 117, var21, var0); - Class3_Sub13_Sub23_Sub1.method282(var19, var22, 113, var24, var0); - Class3_Sub13_Sub23_Sub1.method282(var19, var24, -76, var23, var4); - Class3_Sub13_Sub23_Sub1.method282(var19, var23, -97, var21, var0); + TextureOperation18.method282(var18, var22, -113, var24, var0); + TextureOperation18.method282(var18, var24, 95, var23, var4); + TextureOperation18.method282(var18, var23, 117, var21, var0); + TextureOperation18.method282(var19, var22, 113, var24, var0); + TextureOperation18.method282(var19, var24, -76, var23, var4); + TextureOperation18.method282(var19, var23, -97, var21, var0); } else { var18 = Class38.anIntArrayArray663[var2 + var9]; var19 = Class38.anIntArrayArray663[var2 - var9]; var20 = var7 + var6; var21 = var6 + -var7; - Class3_Sub13_Sub23_Sub1.method282(var18, var21, 113, var20, var0); - Class3_Sub13_Sub23_Sub1.method282(var19, var21, -100, var20, var0); + TextureOperation18.method282(var18, var21, 113, var20, var0); + TextureOperation18.method282(var19, var21, -100, var20, var0); } } @@ -169,18 +169,18 @@ final class Class3_Sub13_Sub2 extends TextureOperation { var20 = var9 + var6; var21 = -var9 + var6; if(var8 <= var7) { - Class3_Sub13_Sub23_Sub1.method282(var18, var21, 104, var20, var0); - Class3_Sub13_Sub23_Sub1.method282(var19, var21, -127, var20, var0); + TextureOperation18.method282(var18, var21, 104, var20, var0); + TextureOperation18.method282(var19, var21, -127, var20, var0); } else { var22 = var7 <= var11?var11:GameObject.anIntArray1838[var7]; var23 = var22 + var6; var24 = var6 + -var22; - Class3_Sub13_Sub23_Sub1.method282(var18, var21, -94, var24, var0); - Class3_Sub13_Sub23_Sub1.method282(var18, var24, 115, var23, var4); - Class3_Sub13_Sub23_Sub1.method282(var18, var23, 110, var20, var0); - Class3_Sub13_Sub23_Sub1.method282(var19, var21, -114, var24, var0); - Class3_Sub13_Sub23_Sub1.method282(var19, var24, -79, var23, var4); - Class3_Sub13_Sub23_Sub1.method282(var19, var23, 120, var20, var0); + TextureOperation18.method282(var18, var21, -94, var24, var0); + TextureOperation18.method282(var18, var24, 115, var23, var4); + TextureOperation18.method282(var18, var23, 110, var20, var0); + TextureOperation18.method282(var19, var21, -114, var24, var0); + TextureOperation18.method282(var19, var24, -79, var23, var4); + TextureOperation18.method282(var19, var23, 120, var20, var0); } } @@ -189,7 +189,7 @@ final class Class3_Sub13_Sub2 extends TextureOperation { } } - public Class3_Sub13_Sub2() { + public TextureOperation6() { super(1, false); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub27.java b/Client/src/main/java/org/runite/client/TextureOperation7.java similarity index 87% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub27.java rename to Client/src/main/java/org/runite/client/TextureOperation7.java index 21c1c609d..b40499f6e 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub27.java +++ b/Client/src/main/java/org/runite/client/TextureOperation7.java @@ -4,7 +4,7 @@ import org.rs09.client.data.HashTable; import java.util.Objects; -final class Class3_Sub13_Sub27 extends TextureOperation { +final class TextureOperation7 extends TextureOperation { static RSString[] aClass94Array3341 = new RSString[100]; static int anInt3342; @@ -91,9 +91,9 @@ final class Class3_Sub13_Sub27 extends TextureOperation { } } - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { - if(var1 != -1) { + if(-1 != -1) { this.method157(-8, null, false); } @@ -234,7 +234,7 @@ final class Class3_Sub13_Sub27 extends TextureOperation { return var3; } catch (RuntimeException var22) { - throw ClientErrorException.clientError(var22, "pi.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var22, "pi.T(" + -1 + ',' + var2 + ')'); } } @@ -255,8 +255,8 @@ final class Class3_Sub13_Sub27 extends TextureOperation { } Class110.anInt1472 = PacketParser.anInt3213; - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(57); - Class3_Sub13_Sub1.outgoingBuffer.writeLong(var0); + TextureOperation12.outgoingBuffer.putOpcode(57); + TextureOperation12.outgoingBuffer.writeLong(var0); break; } } @@ -332,7 +332,7 @@ final class Class3_Sub13_Sub27 extends TextureOperation { long var25 = (long)var20 | (long)var21 << 32; Class3_Sub11 var34 = (Class3_Sub11)var52.get(var25); if(null == var34) { - var34 = new Class3_Sub11(-1 + (var21 >> 16), (float)('\uffff' & var21), false, null != var13, var20); + var34 = new Class3_Sub11(-1 + (var21 >> 16), (float)(65535 & var21), false, null != var13, var20); var52.put(var25, var34); } @@ -341,7 +341,7 @@ final class Class3_Sub13_Sub27 extends TextureOperation { if(var25 != var27) { var34 = (Class3_Sub11)var52.get(var27); if(var34 == null) { - var34 = new Class3_Sub11((var22 >> 16) - 1, (float)('\uffff' & var22), false, null != var13, var20); + var34 = new Class3_Sub11((var22 >> 16) - 1, (float)(65535 & var22), false, null != var13, var20); var52.put(var27, var34); } @@ -353,7 +353,7 @@ final class Class3_Sub13_Sub27 extends TextureOperation { if(var25 != var29 && var27 != var29) { var34 = (Class3_Sub11)var52.get(var29); if(var34 == null) { - var34 = new Class3_Sub11((var23 >> 16) + -1, (float)('\uffff' & var23), false, null != var13, var20); + var34 = new Class3_Sub11((var23 >> 16) + -1, (float)(65535 & var23), false, null != var13, var20); var52.put(var29, var34); } @@ -364,7 +364,7 @@ final class Class3_Sub13_Sub27 extends TextureOperation { if(var25 != var31 && var31 != var27 && var31 != var29) { var34 = (Class3_Sub11)var52.get(var31); if(null == var34) { - var34 = new Class3_Sub11((var24 >> 16) - 1, (float)(var24 & '\uffff'), false, null != var13, var20); + var34 = new Class3_Sub11((var24 >> 16) - 1, (float)(var24 & 65535), false, null != var13, var20); var52.put(var31, var34); } @@ -468,7 +468,7 @@ final class Class3_Sub13_Sub27 extends TextureOperation { var7[var17][var56] = var61; } else { var58 = Class25.anIntArrayArray499[var1[var17][var56]]; - var60 = Class3_Sub13_Sub10.aBooleanArrayArray3118[var1[var17][var56]]; + var60 = TextureOperation30.aBooleanArrayArray3118[var1[var17][var56]]; var61 = var7[var17][var56]; if(var58.length == 0) { continue; @@ -495,21 +495,21 @@ final class Class3_Sub13_Sub27 extends TextureOperation { int var46 = (var64 >> 16) - 1; int var48 = (var63 >> 16) - 1; Class3_Sub11 var50 = (Class3_Sub11)var52.get(var67); - Class25.method955(var13, var64 <= var64, Class3_Sub13_Sub4.method190(var46, var38, (byte)-92, var42), var50, var58, var56, var20, var17, var64 <= var63, var8, var69 >= var64, 2, var4, var22, Class3_Sub13_Sub4.method190(var46, var41, (byte)-80, var45), Class3_Sub13_Sub4.method190(var46, var40, (byte)-103, var44), var62 >= var64, var12, var10, var61, Class3_Sub13_Sub4.method190(var46, var39, (byte)-118, var43), var60); + Class25.method955(var13, var64 <= var64, TextureOperation34.method190(var46, var38, (byte)-92, var42), var50, var58, var56, var20, var17, var64 <= var63, var8, var69 >= var64, 2, var4, var22, TextureOperation34.method190(var46, var41, (byte)-80, var45), TextureOperation34.method190(var46, var40, (byte)-103, var44), var62 >= var64, var12, var10, var61, TextureOperation34.method190(var46, var39, (byte)-118, var43), var60); int var49 = (var69 >> 16) - 1; if(var32 != var67) { var50 = (Class3_Sub11)var52.get(var32); - Class25.method955(var13, var62 <= var64, Class3_Sub13_Sub4.method190(var47, var38, (byte)88, var42), var50, var58, var56, var20, var17, var63 >= var62, var8, var62 <= var69, 2, var4, var22, Class3_Sub13_Sub4.method190(var47, var41, (byte)-82, var45), Class3_Sub13_Sub4.method190(var47, var40, (byte)-113, var44), var62 <= var62, var12, var10, var61, Class3_Sub13_Sub4.method190(var47, var39, (byte)113, var43), var60); + Class25.method955(var13, var62 <= var64, TextureOperation34.method190(var47, var38, (byte)88, var42), var50, var58, var56, var20, var17, var63 >= var62, var8, var62 <= var69, 2, var4, var22, TextureOperation34.method190(var47, var41, (byte)-82, var45), TextureOperation34.method190(var47, var40, (byte)-113, var44), var62 <= var62, var12, var10, var61, TextureOperation34.method190(var47, var39, (byte)113, var43), var60); } if(var70 != var67 && var32 != var70) { var50 = (Class3_Sub11)var52.get(var70); - Class25.method955(var13, var63 <= var64, Class3_Sub13_Sub4.method190(var48, var38, (byte)59, var42), var50, var58, var56, var20, var17, var63 <= var63, var8, var63 <= var69, 4096 ^ 4098, var4, var22, Class3_Sub13_Sub4.method190(var48, var41, (byte)54, var45), Class3_Sub13_Sub4.method190(var48, var40, (byte)-87, var44), var63 <= var62, var12, var10, var61, Class3_Sub13_Sub4.method190(var48, var39, (byte)-77, var43), var60); + Class25.method955(var13, var63 <= var64, TextureOperation34.method190(var48, var38, (byte)59, var42), var50, var58, var56, var20, var17, var63 <= var63, var8, var63 <= var69, 4096 ^ 4098, var4, var22, TextureOperation34.method190(var48, var41, (byte)54, var45), TextureOperation34.method190(var48, var40, (byte)-87, var44), var63 <= var62, var12, var10, var61, TextureOperation34.method190(var48, var39, (byte)-77, var43), var60); } if(var67 != var36 && var32 != var36 && var36 != var70) { var50 = (Class3_Sub11)var52.get(var36); - Class25.method955(var13, var64 >= var69, Class3_Sub13_Sub4.method190(var49, var38, (byte)-118, var42), var50, var58, var56, var20, var17, var69 <= var63, var8, var69 <= var69, 4096 ^ 4098, var4, var22, Class3_Sub13_Sub4.method190(var49, var41, (byte)-96, var45), Class3_Sub13_Sub4.method190(var49, var40, (byte)115, var44), var69 <= var62, var12, var10, var61, Class3_Sub13_Sub4.method190(var49, var39, (byte)58, var43), var60); + Class25.method955(var13, var64 >= var69, TextureOperation34.method190(var49, var38, (byte)-118, var42), var50, var58, var56, var20, var17, var69 <= var63, var8, var69 <= var69, 4096 ^ 4098, var4, var22, TextureOperation34.method190(var49, var41, (byte)-96, var45), TextureOperation34.method190(var49, var40, (byte)115, var44), var69 <= var62, var12, var10, var61, TextureOperation34.method190(var49, var39, (byte)58, var43), var60); } } } @@ -539,7 +539,7 @@ final class Class3_Sub13_Sub27 extends TextureOperation { } } - public Class3_Sub13_Sub27() { + public TextureOperation7() { super(2, false); } @@ -555,33 +555,33 @@ final class Class3_Sub13_Sub27 extends TextureOperation { } --var1; - int var4 = Class3_Sub13_Sub38.anIntArray3456[var1]; + int var4 = TextureOperation38.anIntArray3456[var1]; int var5 = Class45.anIntArray729[var1]; if(0 == var2) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(215); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(var3 - -var3 + 3); + TextureOperation12.outgoingBuffer.putOpcode(215); + TextureOperation12.outgoingBuffer.writeByte(var3 - -var3 + 3); } if(var2 == 1) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(39); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(3 + var3 - (-var3 - 14)); + TextureOperation12.outgoingBuffer.putOpcode(39); + TextureOperation12.outgoingBuffer.writeByte(3 + var3 - (-var3 - 14)); } if(var2 == 2) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(77); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(var3 + var3 - -3); + TextureOperation12.outgoingBuffer.putOpcode(77); + TextureOperation12.outgoingBuffer.writeByte(var3 + var3 - -3); } - Class3_Sub13_Sub1.outgoingBuffer.writeByte128(ObjectDefinition.aBooleanArray1490[82]?1:0); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class131.anInt1716 + var4); - Class3_Sub13_Sub1.outgoingBuffer.putShortA(Class82.anInt1152 + var5); + TextureOperation12.outgoingBuffer.writeByte128(ObjectDefinition.aBooleanArray1490[82]?1:0); + TextureOperation12.outgoingBuffer.writeShort(Class131.anInt1716 + var4); + TextureOperation12.outgoingBuffer.putShortA(Texture.anInt1152 + var5); Class45.anInt733 = Class45.anIntArray729[0]; - Class65.anInt987 = Class3_Sub13_Sub38.anIntArray3456[0]; + Class65.anInt987 = TextureOperation38.anIntArray3456[0]; for(int var6 = 1; var3 > var6; ++var6) { --var1; - Class3_Sub13_Sub1.outgoingBuffer.writeByte128(-var4 + Class3_Sub13_Sub38.anIntArray3456[var1]); - Class3_Sub13_Sub1.outgoingBuffer.write128Byte(Class45.anIntArray729[var1] + -var5); + TextureOperation12.outgoingBuffer.writeByte128(-var4 + TextureOperation38.anIntArray3456[var1]); + TextureOperation12.outgoingBuffer.write128Byte(Class45.anIntArray729[var1] + -var5); } } catch (RuntimeException var7) { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub39.java b/Client/src/main/java/org/runite/client/TextureOperation8.java similarity index 96% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub39.java rename to Client/src/main/java/org/runite/client/TextureOperation8.java index 4c96448f8..aef0715c4 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub39.java +++ b/Client/src/main/java/org/runite/client/TextureOperation8.java @@ -1,6 +1,6 @@ package org.runite.client; -final class Class3_Sub13_Sub39 extends TextureOperation { +final class TextureOperation8 extends TextureOperation { private int[] anIntArray3457; static AbstractSprite[] aAbstractSpriteArray3458; @@ -75,7 +75,7 @@ final class Class3_Sub13_Sub39 extends TextureOperation { var10 = -32767; } - if ('\u8000' <= var10) { + if (32768 <= var10) { var10 = 32767; } @@ -97,7 +97,7 @@ final class Class3_Sub13_Sub39 extends TextureOperation { var9 = -32767; } - if ('\u8000' <= var9) { + if (32768 <= var9) { var9 = 32767; } @@ -136,7 +136,7 @@ final class Class3_Sub13_Sub39 extends TextureOperation { } } - public Class3_Sub13_Sub39() { + public TextureOperation8() { super(1, true); } @@ -145,7 +145,7 @@ final class Class3_Sub13_Sub39 extends TextureOperation { if(var1 > var0) { return false; } else { - int var2 = Class3_Sub13_Sub7.aShortArray3095[var0]; + int var2 = TextureOperation27.aShortArray3095[var0]; if(var2 >= 2000) { var2 -= 2000; } @@ -159,7 +159,7 @@ final class Class3_Sub13_Sub39 extends TextureOperation { static void method354(int var1) { try { - Class3_Sub13_Sub30.anInt3362 = -1; + TextureOperation13.anInt3362 = -1; Class3_Sub4.anInt2251 = var1; Class3_Sub5.method117(); diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub8.java b/Client/src/main/java/org/runite/client/TextureOperation9.java similarity index 87% rename from Client/src/main/java/org/runite/client/Class3_Sub13_Sub8.java rename to Client/src/main/java/org/runite/client/TextureOperation9.java index 5ace42053..893d8ef1e 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub8.java +++ b/Client/src/main/java/org/runite/client/TextureOperation9.java @@ -4,11 +4,11 @@ import org.rs09.client.util.ArrayUtils; import java.util.Objects; -final class Class3_Sub13_Sub8 extends TextureOperation { +public final class TextureOperation9 extends TextureOperation { static CacheIndex aClass153_1967; private boolean aBoolean3100 = true; - static int anInt3102 = 0; + public static int anInt3102 = 0; static int anInt3103; private boolean aBoolean3104 = true; static float aFloat3105; @@ -33,9 +33,9 @@ final class Class3_Sub13_Sub8 extends TextureOperation { } } - final int[][] method166(int var1, int var2) { + final int[][] method166(int var2) { try { - if(var1 != -1) { + if(-1 != -1) { method207(-98, true, 95, 79L); } @@ -66,7 +66,7 @@ final class Class3_Sub13_Sub8 extends TextureOperation { return var3; } catch (RuntimeException var12) { - throw ClientErrorException.clientError(var12, "ej.T(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var12, "ej.T(" + -1 + ',' + var2 + ')'); } } @@ -74,7 +74,7 @@ final class Class3_Sub13_Sub8 extends TextureOperation { try { //int var1 = 15 / ((-11 - var0) / 63); if(Unsorted.anInt3660 == 2) { - if(Class3_Sub13_Sub39.anInt3460 == NPCDefinition.anInt1297 && Class38_Sub1.anInt2612 == Class168.anInt2099) { + if(TextureOperation8.anInt3460 == NPCDefinition.anInt1297 && Class38_Sub1.anInt2612 == Class168.anInt2099) { Unsorted.anInt3660 = 0; if(ClientCommands.shiftClickEnabled && ObjectDefinition.aBooleanArray1490[81] && Unsorted.menuOptionCount > 2) { Class3_Sub30_Sub1.method806(Unsorted.menuOptionCount + -2); @@ -92,7 +92,7 @@ final class Class3_Sub13_Sub8 extends TextureOperation { } else { Class168.anInt2099 = Class38_Sub1.anInt2614; Unsorted.anInt3660 = 2; - Class3_Sub13_Sub39.anInt3460 = Class163_Sub1.anInt2993; + TextureOperation8.anInt3460 = Class163_Sub1.anInt2993; } } catch (RuntimeException var2) { @@ -103,15 +103,15 @@ final class Class3_Sub13_Sub8 extends TextureOperation { static void method204(int var0) { try { //Client Resize. - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(243); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(Class83.getWindowType()); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class23.canvasWidth); + TextureOperation12.outgoingBuffer.putOpcode(243); + TextureOperation12.outgoingBuffer.writeByte(Class83.getWindowType()); + TextureOperation12.outgoingBuffer.writeShort(Class23.canvasWidth); if(var0 != -3) { anInt3103 = -41; } - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class140_Sub7.canvasHeight); - Class3_Sub13_Sub1.outgoingBuffer.writeByte(Unsorted.anInt3671); + TextureOperation12.outgoingBuffer.writeShort(Class140_Sub7.canvasHeight); + TextureOperation12.outgoingBuffer.writeByte(Unsorted.anInt3671); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "ej.C(" + var0 + ')'); } @@ -134,7 +134,7 @@ final class Class3_Sub13_Sub8 extends TextureOperation { } } - public Class3_Sub13_Sub8() { + public TextureOperation9() { super(1, false); } diff --git a/Client/src/main/java/org/runite/client/Unsorted.java b/Client/src/main/java/org/runite/client/Unsorted.java index 83950b77f..dc4e7cf67 100644 --- a/Client/src/main/java/org/runite/client/Unsorted.java +++ b/Client/src/main/java/org/runite/client/Unsorted.java @@ -9,6 +9,9 @@ import org.rs09.client.data.ReferenceCache; import org.rs09.client.net.Connection; import org.rs09.client.rendering.Toolkit; import org.rs09.client.util.ArrayUtils; +import org.runite.client.drawcalls.Compass; +import org.runite.client.drawcalls.LoadingBox; +import org.runite.client.drawcalls.Minimap; import java.awt.*; import java.io.IOException; @@ -144,7 +147,7 @@ public class Unsorted { static int anInt689; static RSString[] aClass94Array2566 = new RSString[200]; static int anInt2567 = -1; - static int clanSize; + public static int clanSize; static int[] anIntArray2574 = new int[14]; static int anInt2577 = 0; static boolean aBoolean29 = false; @@ -166,12 +169,13 @@ public class Unsorted { static int anInt1165 = -1; static byte[][][] aByteArrayArrayArray1774; static int[][] anIntArrayArray2039 = new int[][]{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3}, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}, {3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12}}; - static int menuOptionCount = 0; + public static int menuOptionCount = 0; static boolean aBoolean11 = false; + public static Class158 aClass158_3009; static void method2086() { try { - int var1 = Class102.player.anInt2819 + Class3_Sub13_Sub13.anInt3216; + int var1 = Class102.player.anInt2819 + TextureOperation20.anInt3216; int var2 = Class102.player.anInt2829 - -anInt42; if (-var1 + anInt3155 < -500 || -var1 + anInt3155 > 500 || anInt942 + -var2 < -500 || -var2 + anInt942 > 500) { anInt3155 = var1; @@ -481,7 +485,7 @@ public class Unsorted { } if (var4 && (item.stackingType == 1 || var6 != 1) && var6 != -1) { - Class3_Sub13_Sub37.aClass3_Sub28_Sub17_Sub1_3440.method681(Class3_Sub7.itemStackColor(1000, var6), 0, 9, 16776960, 1); + TextureOperation10.aClass3_Sub28_Sub17_Sub1_3440.method681(Class3_Sub7.itemStackColor(1000, var6), 0, 9, 16776960, 1); } Class74.setBuffer(var11, var12, var13); @@ -495,7 +499,7 @@ public class Unsorted { } } - static RSString method802(int var0) { + public static RSString method802(int var0) { try { return Class163_Sub2_Sub1.aClass94Array4016[var0].length() > 0 ? RSString.stringCombiner(new RSString[]{Class140_Sub7.aClass94Array2935[var0], TextCore.Spacer, Class163_Sub2_Sub1.aClass94Array4016[var0]}) : Class140_Sub7.aClass94Array2935[var0]; @@ -567,13 +571,13 @@ public class Unsorted { MouseListeningClass var1 = aClass149_4047; synchronized (var1) { - Class3_Sub13_Sub5.anInt3069 = GraphicDefinition.anInt549; + TextureOperation21.anInt3069 = GraphicDefinition.anInt549; Class126.anInt1676 = Class3_Sub21.anInt2493; anInt1709 = MouseListeningClass.anInt1340; anInt3644 = Class140_Sub3.anInt2743; Class163_Sub1.anInt2993 = RenderAnimationDefinition.anInt362; ++anInt4045; - Class38_Sub1.anInt2614 = Class3_Sub13_Sub32.anInt3389; + Class38_Sub1.anInt2614 = TextureOperation14.anInt3389; Class75.aLong1102 = Class140_Sub6.aLong2926; Class140_Sub3.anInt2743 = 0; } @@ -600,13 +604,13 @@ public class Unsorted { Class3_Sub5.method117(); } - if (Class82.anInt1150 != -1 && -1 != Class3_Sub13_Sub30.anInt3362) { - int var1 = -Class3_Sub28_Sub1.anInt3536 + Class82.anInt1150; + if (Texture.anInt1150 != -1 && -1 != TextureOperation13.anInt3362) { + int var1 = -Class3_Sub28_Sub1.anInt3536 + Texture.anInt1150; if (2 > var1 || var1 > 2) { var1 >>= 4; } - int var2 = -Class3_Sub4.anInt2251 + Class3_Sub13_Sub30.anInt3362; + int var2 = -Class3_Sub4.anInt2251 + TextureOperation13.anInt3362; if (var2 < 2 || var2 > 2) { var2 >>= 4; } @@ -614,8 +618,8 @@ public class Unsorted { Class3_Sub4.anInt2251 -= -var2; Class3_Sub28_Sub1.anInt3536 += var1; if (0 == var1 && 0 == var2) { - Class82.anInt1150 = -1; - Class3_Sub13_Sub30.anInt3362 = -1; + Texture.anInt1150 = -1; + TextureOperation13.anInt3362 = -1; } Class3_Sub5.method117(); @@ -639,7 +643,7 @@ public class Unsorted { LDIndexedSprite[] var1 = new LDIndexedSprite[Class95.anInt1338]; for (int var2 = 0; Class95.anInt1338 > var2; ++var2) { - var1[var2] = new LDIndexedSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[var2], anIntArray2591[var2], Class140_Sub7.anIntArray2931[var2], anIntArray3076[var2], Class163_Sub1.aByteArrayArray2987[var2], Class3_Sub13_Sub38.spritePalette); + var1[var2] = new LDIndexedSprite(Class3_Sub15.anInt2426, Class133.anInt1748, Class164.anIntArray2048[var2], anIntArray2591[var2], Class140_Sub7.anIntArray2931[var2], anIntArray3076[var2], Class163_Sub1.aByteArrayArray2987[var2], TextureOperation38.spritePalette); } Class39.method1035((byte) 116); @@ -649,7 +653,7 @@ public class Unsorted { } } - static void method1282(int var0, byte var1, int var2, int var3, int var4) { + public static void method1282(int var0, int var2, int var3, int var4) { try { for (int var5 = 0; var5 < Class3_Sub28_Sub3.anInt3557; ++var5) { if (var0 < Class155.anIntArray1969[var5] - -Class3_Sub28_Sub18.anIntArray3768[var5] && var0 + var4 > Class155.anIntArray1969[var5] && var2 < Player.anIntArray3954[var5] - -Class140_Sub4.anIntArray2794[var5] && var3 + var2 > Player.anIntArray3954[var5]) { @@ -658,7 +662,7 @@ public class Unsorted { } } catch (RuntimeException var7) { - throw ClientErrorException.clientError(var7, "jg.C(" + var0 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ')'); + throw ClientErrorException.clientError(var7, "jg.C(" + var0 + ',' + (byte) 122 + ',' + var2 + ',' + var3 + ',' + var4 + ')'); } } @@ -691,14 +695,14 @@ public class Unsorted { } Class36.aByteArrayArrayArray640 = null; - Class3_Sub13_Sub33.aByteArrayArrayArray3390 = null; + TextureOperation29.aByteArrayArrayArray3390 = null; Class29.anIntArrayArrayArray558 = null; Class146.anIntArrayArrayArray1903 = null; WorldMap.anInt2737 = 0; aClass3_Sub28_Sub3_2600 = null; Class84.aClass61_1162.method1211(-108); Class119.aClass131_1624 = null; - Class3_Sub13_Sub30.anInt3362 = -1; + TextureOperation13.anInt3362 = -1; Class75_Sub2.aClass33_2648 = null; Class91.aClass33_1305 = null; aClass33_1238 = null; @@ -708,7 +712,7 @@ public class Unsorted { Class75_Sub2.aClass33_2637 = null; Class119.aClass33_1626 = null; Class36.aAbstractSprite_637 = null; - Class82.anInt1150 = -1; + Texture.anInt1150 = -1; WorldMap.aClass3_Sub28_Sub16_Sub2_3221 = null; } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "jb.E(" + var0 + ',' + var1 + ')'); @@ -719,7 +723,7 @@ public class Unsorted { try { int[] var8 = new int[2048]; - Class3_Sub13_Sub4 var9 = new Class3_Sub13_Sub4(); + TextureOperation34 var9 = new TextureOperation34(); var9.anInt3060 = 8; var9.anInt3058 = 4; var9.anInt3067 = 35; @@ -727,7 +731,7 @@ public class Unsorted { var9.anInt3062 = (int) ((float) 0.4 * 4096.0F); var9.aBoolean3065 = true; var9.method158(16251); - Class3_Sub13_Sub3.method180(-106, 1, 2048); + TextureOperation33.method180(-106, 1, 2048); var9.method186(0, var8); return var8; } catch (RuntimeException var10) { @@ -735,25 +739,6 @@ public class Unsorted { } } - public static TextureOperation method63(DataBuffer var1) { - try { - var1.readUnsignedByte(); - int var2 = var1.readUnsignedByte(); - TextureOperation var3 = method1777(var2); - Objects.requireNonNull(var3).anInt2381 = var1.readUnsignedByte(); - int var4 = var1.readUnsignedByte(); - for (int var5 = 0; var5 < var4; ++var5) { - int var6 = var1.readUnsignedByte(); - var3.method157(var6, var1, true); - } - - var3.method158(16251); - return var3; - } catch (RuntimeException var7) { - throw ClientErrorException.clientError(var7, "qk.B(" + (byte) -67 + ',' + (var1 != null ? "{...}" : "null") + ')'); - } - } - public static int method64(int var1) { try { return var1 >>> 8; @@ -797,64 +782,64 @@ public class Unsorted { if (var8) { if (Client.method44(var5).method92(var2 - 1, (byte) -108)) { if (1 == var2) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(155); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var4); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var1); + TextureOperation12.outgoingBuffer.putOpcode(155); + TextureOperation12.outgoingBuffer.writeInt(var4); + TextureOperation12.outgoingBuffer.writeShort(var1); } if (var3 < -7) { if (var2 == 2) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(196); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var4); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var1); + TextureOperation12.outgoingBuffer.putOpcode(196); + TextureOperation12.outgoingBuffer.writeInt(var4); + TextureOperation12.outgoingBuffer.writeShort(var1); } if (var2 == 3) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(124); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var4); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var1); + TextureOperation12.outgoingBuffer.putOpcode(124); + TextureOperation12.outgoingBuffer.writeInt(var4); + TextureOperation12.outgoingBuffer.writeShort(var1); } if (var2 == 4) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(199); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var4); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var1); + TextureOperation12.outgoingBuffer.putOpcode(199); + TextureOperation12.outgoingBuffer.writeInt(var4); + TextureOperation12.outgoingBuffer.writeShort(var1); } if (var2 == 5) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(234); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var4); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var1); + TextureOperation12.outgoingBuffer.putOpcode(234); + TextureOperation12.outgoingBuffer.writeInt(var4); + TextureOperation12.outgoingBuffer.writeShort(var1); } if (6 == var2) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(168); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var4); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var1); + TextureOperation12.outgoingBuffer.putOpcode(168); + TextureOperation12.outgoingBuffer.writeInt(var4); + TextureOperation12.outgoingBuffer.writeShort(var1); } if (var2 == 7) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(166); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var4); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var1); + TextureOperation12.outgoingBuffer.putOpcode(166); + TextureOperation12.outgoingBuffer.writeInt(var4); + TextureOperation12.outgoingBuffer.writeShort(var1); } if (var2 == 8) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(64); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var4); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var1); + TextureOperation12.outgoingBuffer.putOpcode(64); + TextureOperation12.outgoingBuffer.writeInt(var4); + TextureOperation12.outgoingBuffer.writeShort(var1); } if (var2 == 9) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(53); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var4); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var1); + TextureOperation12.outgoingBuffer.putOpcode(53); + TextureOperation12.outgoingBuffer.writeInt(var4); + TextureOperation12.outgoingBuffer.writeShort(var1); } if (var2 == 10) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(9); - Class3_Sub13_Sub1.outgoingBuffer.writeInt(var4); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(var1); + TextureOperation12.outgoingBuffer.putOpcode(9); + TextureOperation12.outgoingBuffer.writeInt(var4); + TextureOperation12.outgoingBuffer.writeShort(var1); } } @@ -923,7 +908,7 @@ public class Unsorted { int var9 = var6 & 31; if (var9 == 0) { if (var4) { - Class3_Sub13_Sub6.method199(var8, var7, 0); + TextureOperation26.method199(var8, var7, 0); } } else if (0 != Sprites.anInt340) { @@ -950,7 +935,7 @@ public class Unsorted { public static void method1460(int var0, int var1, int var3, int var4, int var5, int var6) { try { if (Class101.anInt1425 <= var5 - var4 && Class3_Sub28_Sub18.anInt3765 >= var5 - -var4 && Class159.anInt2020 <= -var4 + var1 && Class57.anInt902 >= var4 + var1) { - Class3_Sub13_Sub2.method175(var6, var0, var1, var3, var4, var5); + TextureOperation6.method175(var6, var0, var1, var3, var4, var5); } else { Class168.method2275(var3, var1, var4, var6, var0, var5); } @@ -972,7 +957,7 @@ public class Unsorted { int var10 = var8.anInt612; int var11 = var8.anInt626; int var12 = var8.anInt621; - int[] var13 = Class3_Sub13_Sub18.anIntArrayArray3215[var9]; + int[] var13 = TextureOperation19.anIntArrayArray3215[var9]; int[] var14 = anIntArrayArray2039[var10]; int var15 = 0; int var16; @@ -1048,12 +1033,12 @@ public class Unsorted { try { Class101.aClass153_1423 = var3; Class132.anInt1741 = 0; - Class3_Sub13_Sub39.anInt3463 = var1; + TextureOperation8.anInt3463 = var1; aBoolean2311 = false; Class10.anInt154 = 1; GraphicDefinition.anInt546 = 2; - Class3_Sub13_Sub36.anInt3423 = var5; + TextureOperation36.anInt3423 = var5; } catch (RuntimeException var8) { throw ClientErrorException.clientError(var8, "v.Q(" + true + ',' + var1 + ',' + 0 + ',' + (var3 != null ? "{...}" : "null") + ',' + false + ',' + var5 + ',' + 2 + ')'); } @@ -1061,11 +1046,11 @@ public class Unsorted { public static void updateLocalPosition() { try { - GraphicDefinition.incomingBuffer.setBitAccess((byte) 118); + GraphicDefinition.incomingBuffer.setBitAccess(); int opcode = GraphicDefinition.incomingBuffer.getBits(1); if (opcode != 0) { int type = GraphicDefinition.incomingBuffer.getBits(2); - if (0 == type) { + if (type == 0) { Class21.maskUpdateIndexes[maskUpdateCount++] = 2047; } else { int var4; @@ -1078,7 +1063,7 @@ public class Unsorted { Class21.maskUpdateIndexes[maskUpdateCount++] = 2047; } - } else if (2 == type) { + } else if (type == 2) { if (GraphicDefinition.incomingBuffer.getBits(1) == 1) { var4 = GraphicDefinition.incomingBuffer.getBits(3); Class102.player.walkStep(2, (byte) -104, var4); @@ -1130,7 +1115,7 @@ public class Unsorted { Class158.method2183(var0.componentHash, var1, var4, var5, var0.aClass11Array262); } - Class3_Sub31 var6 = Class3_Sub13_Sub17.aHashTable_3208.get(var0.componentHash); + Class3_Sub31 var6 = TextureOperation23.aHashTable_3208.get(var0.componentHash); if (var6 != null) { Class75_Sub4.method1352(var5, var1, var6.anInt2602, var4); } @@ -1179,8 +1164,7 @@ public class Unsorted { int var3 = 0; label58: - for (int var4 = 0; var4 < var1.length; ++var4) { - Class106 var5 = var1[var4]; + for (Class106 var5 : var1) { if ((0 >= var5.anInt1450 || var5.anInt1450 >= 24) && var5.anInt1447 >= 800 && 600 <= var5.anInt1449) { for (int var6 = 0; var3 > var6; ++var6) { Class106 var7 = var2[var6]; @@ -1278,97 +1262,6 @@ public class Unsorted { anInt3070 = 0; } - public static TextureOperation method1777(int var0) { - try { - if (var0 == 0) { - return new Class3_Sub13_Sub22(); - } else if (var0 == 1) { - return new Class3_Sub13_Sub11(); - } else if (2 == var0) { - return new Class3_Sub13_Sub31(); - } else if (var0 == 3) { - return new Class3_Sub13_Sub29(); - } else if (var0 == 4) { - return new Class3_Sub13_Sub19(); - } else if (var0 == 5) { - return new Class3_Sub13_Sub24(); - } else if (var0 == 6) { - return new Class3_Sub13_Sub2(); - } else if (var0 == 7) { - return new Class3_Sub13_Sub27(); - } else if (var0 == 8) { - return new Class3_Sub13_Sub39(); - } else if (9 == var0) { - return new Class3_Sub13_Sub8(); - } else if (10 == var0) { - return new Class3_Sub13_Sub37(); - } else if (var0 == 11) { - return new Class3_Sub13_Sub20(); - } else if (var0 == 12) { - return new Class3_Sub13_Sub1(); - } else if (var0 == 13) { - return new Class3_Sub13_Sub30(); - } else if (14 == var0) { - return new Class3_Sub13_Sub32(); - } else if (var0 == 15) { - return new Class3_Sub13_Sub16(); - } else if (var0 == 16) { - return new Class3_Sub13_Sub9(); - } else if (17 == var0) { - return new Class3_Sub13_Sub15(); - } else if (var0 == 18) { - return new Class3_Sub13_Sub23_Sub1(); - } else if (var0 == 19) { - return new Class3_Sub13_Sub18(); - } else if (var0 == 20) { - return new Class3_Sub13_Sub13(); - } else if (21 == var0) { - return new Class3_Sub13_Sub5(); - } else if (22 == var0) { - return new Class3_Sub13_Sub35(); - } else if (var0 == 23) { - return new Class3_Sub13_Sub17(); - } else if (24 == var0) { - return new Class3_Sub13_Sub12(); - } else if (var0 == 25) { - return new Class3_Sub13_Sub34(); - } else if (var0 == 26) { - return new Class3_Sub13_Sub6(); - } else if (27 == var0) { - return new Class3_Sub13_Sub7(); - } else if (var0 == 28) { - return new Class3_Sub13_Sub25(); - } else if (var0 == 29) { - return new Class3_Sub13_Sub33(); - } else if (var0 == 30) { - return new Class3_Sub13_Sub10(); - } else if (31 == var0) { - return new Class3_Sub13_Sub14(); - } else if (32 == var0) { - return new Class3_Sub13_Sub28(); - } else if (33 == var0) { - return new Class3_Sub13_Sub3(); - } else if (var0 == 34) { - return new Class3_Sub13_Sub4(); - } else if (var0 == 35) { - return new Class3_Sub13_Sub26(); - } else if (var0 == 36) { - return new Class3_Sub13_Sub36(); - } else if (var0 == 37) { - return new Class3_Sub13_Sub21(); - } else if (38 == var0) { - return new Class3_Sub13_Sub38(); - } else if (39 == var0) { - return new Class3_Sub13_Sub23(); - } else { - - return null; - } - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "sc.I(" + var0 + ')'); - } - } - public static void method1783(Component var1) { try { var1.removeMouseListener(aClass149_4047); @@ -1394,8 +1287,8 @@ public class Unsorted { if (~var1 < var0 || var3 > 0 || var2 > 0 || var4 > 0) { try { Object var5; - if (null != Class3_Sub13_Sub10.aFrame3121) { - var5 = Class3_Sub13_Sub10.aFrame3121; + if (null != TextureOperation30.aFrame3121) { + var5 = TextureOperation30.aFrame3121; } else if (GameShell.frame == null) { var5 = Class38.signlink.gameApplet; } else { @@ -1437,10 +1330,10 @@ public class Unsorted { } public static void method589(int var0, int var1, int var2) { - Class3_Sub13_Sub21.aBoolean3261 = true; + TextureOperation37.aBoolean3261 = true; Class91.anInt1302 = var0; Class49.anInt819 = var1; - Class3_Sub13_Sub23_Sub1.anInt4039 = var2; + TextureOperation18.anInt4039 = var2; Class27.anInt515 = -1; anInt999 = -1; } @@ -1464,13 +1357,13 @@ public class Unsorted { public static boolean method591(int var0) { try { - KeyboardListener var1 = Class3_Sub13_Sub3.aClass148_3049; + KeyboardListener var1 = TextureOperation33.aClass148_3049; synchronized (var1) { if (Class3_Sub28_Sub9.anInt3620 == Class134.anInt1762) { return false; } else { Class3_Sub28_Sub9.anInt3624 = Class129.anIntArray1693[Class3_Sub28_Sub9.anInt3620]; - Class3_Sub13_Sub27.anInt3342 = KeyboardListener.anIntArray1978[Class3_Sub28_Sub9.anInt3620]; + TextureOperation7.anInt3342 = KeyboardListener.anIntArray1978[Class3_Sub28_Sub9.anInt3620]; Class3_Sub28_Sub9.anInt3620 = 1 + Class3_Sub28_Sub9.anInt3620 & 127; if (var0 < 58) { method591(68); @@ -1555,32 +1448,32 @@ public class Unsorted { HDToolKit.method1842(); } - if (null != Class3_Sub13_Sub10.aFrame3121 && (3 != var1 || TextureOperation.anInt2378 != var5 || anInt3071 != var6)) { - method593(Class3_Sub13_Sub10.aFrame3121, Class38.signlink); - Class3_Sub13_Sub10.aFrame3121 = null; + if (null != TextureOperation30.aFrame3121 && (3 != var1 || TextureOperation.anInt2378 != var5 || anInt3071 != var6)) { + method593(TextureOperation30.aFrame3121, Class38.signlink); + TextureOperation30.aFrame3121 = null; } - if (3 == var1 && null == Class3_Sub13_Sub10.aFrame3121) { - Class3_Sub13_Sub10.aFrame3121 = Class99.method1597(0, var6, var5, Class38.signlink); - if (null != Class3_Sub13_Sub10.aFrame3121) { + if (3 == var1 && null == TextureOperation30.aFrame3121) { + TextureOperation30.aFrame3121 = Class99.method1597(0, var6, var5, Class38.signlink); + if (null != TextureOperation30.aFrame3121) { anInt3071 = var6; TextureOperation.anInt2378 = var5; Class119.method1730(Class38.signlink); } } - if (var1 == 3 && Class3_Sub13_Sub10.aFrame3121 == null) { + if (var1 == 3 && TextureOperation30.aFrame3121 == null) { method598(true, anInt2577, true, var3, var4, -1, -1); } else { Object var7; - if (null == Class3_Sub13_Sub10.aFrame3121) { + if (null == TextureOperation30.aFrame3121) { if (null == GameShell.frame) { var7 = Class38.signlink.gameApplet; } else { var7 = GameShell.frame; } } else { - var7 = Class3_Sub13_Sub10.aFrame3121; + var7 = TextureOperation30.aFrame3121; } anInt2334 = ((Container) var7).getSize().width; @@ -1612,7 +1505,7 @@ public class Unsorted { } Client.clientInstance.addCanvas(); - Class3_Sub13_Sub4.method193((byte) 97, GameShell.canvas); + TextureOperation34.method193((byte) 97, GameShell.canvas); ItemDefinition.method1119(GameShell.canvas, var4); if (Class38.aClass146_668 != null) { Class38.aClass146_668.method2084(GameShell.canvas, -103); @@ -1640,26 +1533,26 @@ public class Unsorted { GameShell.canvas.setIgnoreRepaint(true); if (!aBoolean11) { Class32.method995(); - Class164_Sub1.aClass158_3009 = null; - Class164_Sub1.aClass158_3009 = Class3_Sub13_Sub23_Sub1.method285(Class140_Sub7.canvasHeight, Class23.canvasWidth, GameShell.canvas); + aClass158_3009 = null; + aClass158_3009 = TextureOperation18.method285(Class140_Sub7.canvasHeight, Class23.canvasWidth, GameShell.canvas); Class74.method1320(); if (5 == Class143.gameStage) { - Class3_Sub23.method406((byte) 122, true, Class168.bold); + Class3_Sub23.method406((byte) 122, true, FontType.bold); } else { - TextureOperation.method164(false, TextCore.LoadingPleaseWait2); + LoadingBox.draw(false, TextCore.LoadingPleaseWait2); } try { Graphics var11 = GameShell.canvas.getGraphics(); - Class164_Sub1.aClass158_3009.method2179(var11); + aClass158_3009.method2179(var11); } catch (Exception var9) { } method1396(-1); if (var3 == 0) { - Class164_Sub1.aClass158_3009 = Class3_Sub13_Sub23_Sub1.method285(503, 765, GameShell.canvas); + aClass158_3009 = TextureOperation18.method285(503, 765, GameShell.canvas); } else { - Class164_Sub1.aClass158_3009 = null; + aClass158_3009 = null; } Class64 var13 = Class38.signlink.method1444(-43, Client.clientInstance.getClass()); @@ -1683,17 +1576,17 @@ public class Unsorted { } else { if (var1 > 0 && var3 == 0) { Class17.aThread409.setPriority(5); - Class164_Sub1.aClass158_3009 = null; + aClass158_3009 = null; Class140_Sub1_Sub2.method1935(); ((Class102) Class51.anInterface2_838).method1619(200); if (Class106.aBoolean1441) { Class51.method1137(0.7F); } - TextureOperation.method165(); + InvalidateData.method165(); } else if (0 == var1 && var3 > 0) { Class17.aThread409.setPriority(1); - Class164_Sub1.aClass158_3009 = Class3_Sub13_Sub23_Sub1.method285(503, 765, GameShell.canvas); + aClass158_3009 = TextureOperation18.method285(503, 765, GameShell.canvas); Class140_Sub1_Sub2.method1938(); ((Class102) Class51.anInterface2_838).method1619(20); if (Class106.aBoolean1441) { @@ -1715,7 +1608,7 @@ public class Unsorted { } Class3_Sub11.method144(); - TextureOperation.method165(); + InvalidateData.method165(); } aBoolean742 = !NPC.method1986(89); @@ -1730,14 +1623,14 @@ public class Unsorted { } if (null != Class3_Sub15.activeConnection && (Class143.gameStage == 30 || Class143.gameStage == 25)) { - Class3_Sub13_Sub8.method204(-3); + TextureOperation9.method204(-3); } for (int var12 = 0; var12 < 100; ++var12) { aBooleanArray3674[var12] = true; } - Class3_Sub13_Sub10.aBoolean3116 = true; + TextureOperation30.aBoolean3116 = true; } } } catch (RuntimeException var10) { @@ -1878,7 +1771,7 @@ public class Unsorted { if (var2 <= -65) { Class3_Sub4 var10 = null; - for (Class3_Sub4 var11 = (Class3_Sub4) Class3_Sub13_Sub6.aClass61_3075.method1222(); var11 != null; var11 = (Class3_Sub4) Class3_Sub13_Sub6.aClass61_3075.method1221()) { + for (Class3_Sub4 var11 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1222(); var11 != null; var11 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1221()) { if (var11.anInt2250 == var0 && var11.anInt2264 == var4 && var11.anInt2248 == var1 && var11.anInt2263 == var7) { var10 = var11; break; @@ -1892,7 +1785,7 @@ public class Unsorted { var10.anInt2250 = var0; var10.anInt2263 = var7; Class132.method1798(72, var10); - Class3_Sub13_Sub6.aClass61_3075.method1215(var10); + TextureOperation26.aClass61_3075.method1215(var10); } var10.anInt2262 = var8; @@ -1908,13 +1801,13 @@ public class Unsorted { public static void method882() { try { - Class3_Sub13_Sub36.anInt3423 = 0; + TextureOperation36.anInt3423 = 0; Class132.anInt1741 = -1; Class10.anInt154 = 1; GraphicDefinition.anInt546 = 2; aBoolean2311 = false; Class101.aClass153_1423 = null; - Class3_Sub13_Sub39.anInt3463 = -1; + TextureOperation8.anInt3463 = -1; } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "ce.F(" + -1 + ',' + 2 + ')'); } @@ -1975,7 +1868,7 @@ public class Unsorted { int var11 = (-var5 + var0 << 16) / var9; int var10 = -var4 + var6; int var12 = (var7 + -var1 << 16) / var10; - Class83.method1410(var1, 0, var6, var4, var3, var5, var8, var12, var11, 0, -12541); + Class83.method1410(var1, var6, var4, var3, var5, var8, var12, var11); } catch (RuntimeException var13) { throw ClientErrorException.clientError(var13, "rg.SA(" + var0 + ',' + var1 + ',' + 0 + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ',' + var7 + ',' + var8 + ')'); } @@ -2233,9 +2126,9 @@ public class Unsorted { } else if (var1 == 1) { Class3_Sub5.method112((byte) 0); Class136.method1816(512, -7); - Class3_Sub13_Sub18.method257(); + TextureOperation19.method257(); } else { - Class3_Sub5.method112((byte) (-4 + Class79.anInt1127 & 255)); + Class3_Sub5.method112((byte) (-4 + Class79.anInt1127 & 0xFF)); Class136.method1816(2, -7); } @@ -2265,15 +2158,15 @@ public class Unsorted { Class117.method1719(25); } - TextureOperation.method164(true, TextCore.LoadingPleaseWait2); - int var8 = Class82.anInt1152; + LoadingBox.draw(true, TextCore.LoadingPleaseWait2); + int var8 = Texture.anInt1152; int var7 = Class131.anInt1716; - Class82.anInt1152 = regionY * 8 - 48; + Texture.anInt1152 = regionY * 8 - 48; Class131.anInt1716 = 8 * (-6 + regionX); - Class3_Sub13_Sub21.aClass3_Sub28_Sub3_3264 = method884(8 * anInt3606, (byte) 88, 8 * Class3_Sub7.anInt2294); - int var10 = -var8 + Class82.anInt1152; + TextureOperation37.aClass3_Sub28_Sub3_3264 = method884(8 * anInt3606, (byte) 88, 8 * Class3_Sub7.anInt2294); + int var10 = -var8 + Texture.anInt1152; int var9 = Class131.anInt1716 + -var7; - Class3_Sub13_Sub35.aClass131_3421 = null; + TextureOperation22.aClass131_3421 = null; int var11; NPC var12; int var13; @@ -2299,7 +2192,7 @@ public class Unsorted { } } } else { - for (var11 = 0; var11 < '\u8000'; ++var11) { + for (var11 = 0; var11 < 32768; ++var11) { var12 = NPC.npcs[var11]; if (null != var12) { for (var13 = 0; var13 < 10; ++var13) { @@ -2314,7 +2207,7 @@ public class Unsorted { } for (var11 = 0; var11 < 2048; ++var11) { - Player var23 = Class3_Sub13_Sub22.players[var11]; + Player var23 = TextureOperation0.players[var11]; if (null != var23) { for (var13 = 0; 10 > var13; ++var13) { var23.anIntArray2767[var13] -= var9; @@ -2353,15 +2246,15 @@ public class Unsorted { for (int var21 = 0; 4 > var21; ++var21) { if (var19 >= 0 && var20 >= 0 && var19 < 104 && var20 < 104) { - Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[var21][var17][var18] = Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[var21][var19][var20]; + TextureOperation0.aClass61ArrayArrayArray3273[var21][var17][var18] = TextureOperation0.aClass61ArrayArrayArray3273[var21][var19][var20]; } else { - Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[var21][var17][var18] = null; + TextureOperation0.aClass61ArrayArrayArray3273[var21][var17][var18] = null; } } } } - for (Class3_Sub4 var27 = (Class3_Sub4) Class3_Sub13_Sub6.aClass61_3075.method1222(); var27 != null; var27 = (Class3_Sub4) Class3_Sub13_Sub6.aClass61_3075.method1221()) { + for (Class3_Sub4 var27 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1222(); var27 != null; var27 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1221()) { var27.anInt2248 -= var10; var27.anInt2264 -= var9; if (0 > var27.anInt2264 || var27.anInt2248 < 0 || var27.anInt2264 >= 104 || var27.anInt2248 >= 104) { @@ -2387,12 +2280,12 @@ public class Unsorted { } if (HDToolKit.highDetail && var4 && (Math.abs(var9) > 104 || 104 < Math.abs(var10))) { - Class3_Sub13_Sub14.method236(); + TextureOperation31.method236(); } Class58.anInt909 = -1; - Class3_Sub13_Sub15.aClass61_3177.method1211(-122); - Class3_Sub13_Sub30.aClass61_3364.method1211(-87); + TextureOperation17.aClass61_3177.method1211(-122); + TextureOperation13.aClass61_3364.method1211(-87); } } catch (RuntimeException var22) { throw ClientErrorException.clientError(var22, "k.D(" + plane + ',' + regionY + ',' + regionX + ',' + sceneY + ',' + var4 + ',' + sceneX + ',' + true + ')'); @@ -2460,7 +2353,7 @@ public class Unsorted { if (null != Class136.aClass64_1778.anObject974) { byte[] var5 = ((String) Class136.aClass64_1778.anObject974).getBytes(StandardCharsets.ISO_8859_1); - var4 = Class3_Sub13_Sub3.bufferToString(var5, var5.length, 0); + var4 = TextureOperation33.bufferToString(var5, var5.length, 0); } } @@ -2510,7 +2403,7 @@ public class Unsorted { public static void method2065(CacheIndex var1, CacheIndex var2) { try { - Class3_Sub13_Sub19.aClass153_3227 = var1; + TextureOperation4.aClass153_3227 = var1; SequenceDefinition.aClass153_1852 = var2; } catch (RuntimeException var4) { throw ClientErrorException.clientError(var4, "u.D(" + (byte) -125 + ',' + (var1 != null ? "{...}" : "null") + ',' + (var2 != null ? "{...}" : "null") + ')'); @@ -2519,7 +2412,7 @@ public class Unsorted { public static void method2067() { try { - for (Class3_Sub28_Sub2 var1 = (Class3_Sub28_Sub2) Class3_Sub13_Sub15.aClass61_3177.method1222(); null != var1; var1 = (Class3_Sub28_Sub2) Class3_Sub13_Sub15.aClass61_3177.method1221()) { + for (Class3_Sub28_Sub2 var1 = (Class3_Sub28_Sub2) TextureOperation17.aClass61_3177.method1222(); null != var1; var1 = (Class3_Sub28_Sub2) TextureOperation17.aClass61_3177.method1221()) { Class140_Sub2 var2 = var1.aClass140_Sub2_3545; if (WorldListCountry.localPlane == var2.anInt2717 && !var2.aBoolean2718) { if (Class44.anInt719 >= var2.anInt2703) { @@ -2725,7 +2618,7 @@ public class Unsorted { while (var1 < maskUpdateCount) { int var2 = Class21.maskUpdateIndexes[var1]; - Player var3 = Class3_Sub13_Sub22.players[var2]; + Player var3 = TextureOperation0.players[var2]; int var4 = GraphicDefinition.incomingBuffer.readUnsignedByte(); if ((16 & var4) != 0) { var4 += GraphicDefinition.incomingBuffer.readUnsignedByte() << 8; @@ -2762,7 +2655,7 @@ public class Unsorted { for (var14 = 0; var14 < 64; ++var14) { for (var15 = 0; var15 < 64; ++var15) { if (var13 == var7 && var9 <= var14 && 8 + var9 > var14 && var8 <= var15 && var15 < 8 + var8) { - Class167.method2267(0, 0, var10, var25, Class3_Sub13_Sub29.method310(var0, (byte) -117, 7 & var14, 7 & var15) + var4, method519(var0, var15 & 7, var14 & 7) + var1, (byte) 63, var0, var2); + Class167.method2267(0, 0, var10, var25, TextureOperation3.method310(var0, (byte) -117, 7 & var14, 7 & var15) + var4, method519(var0, var15 & 7, var14 & 7) + var1, (byte) 63, var0, var2); } else { Class167.method2267(0, 0, var10, var25, -1, -1, (byte) 123, 0, 0); } @@ -2795,7 +2688,7 @@ public class Unsorted { for (var21 = var18; var21 < 4 + var18; ++var21) { if (var9 <= var20 && 8 + var9 > var20 && var8 <= var21) { var22 = var1 - -method519(var0, var21 & 7, var20 & 7); - int var23 = Class3_Sub13_Sub29.method310(var0, (byte) -97, 7 & var20, var21 & 7) + var4; + int var23 = TextureOperation3.method310(var0, (byte) -97, 7 & var20, var21 & 7) + var4; if (0 <= var22 && 104 > var22 && var23 >= 0 && var23 < 104) { aByteArrayArrayArray1774[var2][var22][var23] = var19; } @@ -2875,7 +2768,7 @@ public class Unsorted { var20 = var30.anInt708 >> 7; if (var30.anInt704 == var7 && var9 <= var29 && var9 - -8 > var29 && var20 >= var8 && var20 < var8 - -8) { var21 = Class3_Sub26.method514(var0, var30.anInt703 & 1023, 1023 & var30.anInt708) + (var1 << 7); - var22 = Class3_Sub13_Sub25.method293(var30.anInt703 & 1023, var0, 1023 & var30.anInt708) + (var4 << 7); + var22 = TextureOperation28.method293(var30.anInt703 & 1023, var0, 1023 & var30.anInt708) + (var4 << 7); var30.anInt703 = var21; var30.anInt708 = var22; var29 = var30.anInt703 >> 7; @@ -2940,7 +2833,7 @@ public class Unsorted { try { if (var1 == Class23.anInt453 && var1 != 0) { ShaderInterface var2 = anShaderInterfaceArray70[var1]; - var2.method23(Class3_Sub13_Sub21.anInt3263); + var2.method23(TextureOperation37.anInt3263); } if (var0 != -32584) { @@ -3423,7 +3316,7 @@ public class Unsorted { method75(var4.aClass11Array262, var2); } - Class3_Sub31 var5 = Class3_Sub13_Sub17.aHashTable_3208.get(var4.componentHash); + Class3_Sub31 var5 = TextureOperation23.aHashTable_3208.get(var4.componentHash); if (null != var5) { Class3_Sub8.method124(49, var2, var5.anInt2602); } @@ -3474,7 +3367,7 @@ public class Unsorted { var13 = var3; var12 = var11; byte var14 = 0; - Class3_Sub13_Sub38.anIntArray3456[var14] = var11; + TextureOperation38.anIntArray3456[var14] = var11; boolean var16 = false; int var15 = 0; int var27 = var14 + 1; @@ -3483,7 +3376,7 @@ public class Unsorted { int var18; while (var15 != var27) { - var12 = Class3_Sub13_Sub38.anIntArray3456[var15]; + var12 = TextureOperation38.anIntArray3456[var15]; var13 = Class45.anIntArray729[var15]; var15 = 4095 & var15 - -1; if (var8 == var12 && var13 == var4) { @@ -3510,7 +3403,7 @@ public class Unsorted { var18 = Class97.anIntArrayArray1373[var12][var13] - -1; if (var12 > 0 && Class84.anIntArrayArray1160[var12 + -1][var13] == 0 && 0 == (var17[-1 + var12][var13] & 19661070) && (var17[-1 + var12][var13 + 1] & 19661112) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var27] = var12 + -1; + TextureOperation38.anIntArray3456[var27] = var12 + -1; Class45.anIntArray729[var27] = var13; var27 = 1 + var27 & 4095; Class84.anIntArrayArray1160[var12 - 1][var13] = 2; @@ -3518,7 +3411,7 @@ public class Unsorted { } if (102 > var12 && Class84.anIntArrayArray1160[1 + var12][var13] == 0 && 0 == (var17[2 + var12][var13] & 19661187) && 0 == (var17[var12 + 2][1 + var13] & 19661280)) { - Class3_Sub13_Sub38.anIntArray3456[var27] = 1 + var12; + TextureOperation38.anIntArray3456[var27] = 1 + var12; Class45.anIntArray729[var27] = var13; var27 = 4095 & var27 + 1; Class84.anIntArrayArray1160[var12 - -1][var13] = 8; @@ -3526,7 +3419,7 @@ public class Unsorted { } if (var13 > 0 && Class84.anIntArrayArray1160[var12][var13 + -1] == 0 && (19661070 & var17[var12][-1 + var13]) == 0 && (var17[var12 + 1][var13 - 1] & 19661187) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var27] = var12; + TextureOperation38.anIntArray3456[var27] = var12; Class45.anIntArray729[var27] = -1 + var13; Class84.anIntArrayArray1160[var12][-1 + var13] = 1; Class97.anIntArrayArray1373[var12][-1 + var13] = var18; @@ -3534,7 +3427,7 @@ public class Unsorted { } if (var13 < 102 && Class84.anIntArrayArray1160[var12][var13 + 1] == 0 && (var17[var12][2 + var13] & 19661112) == 0 && (var17[1 + var12][var13 + 2] & 19661280) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var27] = var12; + TextureOperation38.anIntArray3456[var27] = var12; Class45.anIntArray729[var27] = var13 + 1; Class84.anIntArrayArray1160[var12][1 + var13] = 4; var27 = 1 + var27 & 4095; @@ -3542,7 +3435,7 @@ public class Unsorted { } if (var12 > 0 && var13 > 0 && Class84.anIntArrayArray1160[-1 + var12][-1 + var13] == 0 && (19661112 & var17[-1 + var12][var13]) == 0 && 0 == (var17[-1 + var12][-1 + var13] & 19661070) && 0 == (19661187 & var17[var12][-1 + var13])) { - Class3_Sub13_Sub38.anIntArray3456[var27] = -1 + var12; + TextureOperation38.anIntArray3456[var27] = -1 + var12; Class45.anIntArray729[var27] = -1 + var13; Class84.anIntArrayArray1160[-1 + var12][-1 + var13] = 3; Class97.anIntArrayArray1373[-1 + var12][-1 + var13] = var18; @@ -3550,7 +3443,7 @@ public class Unsorted { } if (var12 < 102 && 0 < var13 && Class84.anIntArrayArray1160[1 + var12][var13 + -1] == 0 && (var17[var12 - -1][var13 - 1] & 19661070) == 0 && (19661187 & var17[2 + var12][var13 + -1]) == 0 && (19661280 & var17[var12 + 2][var13]) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var27] = var12 - -1; + TextureOperation38.anIntArray3456[var27] = var12 - -1; Class45.anIntArray729[var27] = var13 - 1; var27 = 4095 & 1 + var27; Class84.anIntArrayArray1160[var12 - -1][-1 + var13] = 9; @@ -3558,7 +3451,7 @@ public class Unsorted { } if (var12 > 0 && var13 < 102 && 0 == Class84.anIntArrayArray1160[var12 - 1][var13 + 1] && (var17[-1 + var12][var13 - -1] & 19661070) == 0 && 0 == (19661112 & var17[-1 + var12][var13 - -2]) && (19661280 & var17[var12][var13 + 2]) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var27] = var12 - 1; + TextureOperation38.anIntArray3456[var27] = var12 - 1; Class45.anIntArray729[var27] = 1 + var13; Class84.anIntArrayArray1160[var12 - 1][1 + var13] = 6; Class97.anIntArrayArray1373[-1 + var12][1 + var13] = var18; @@ -3566,7 +3459,7 @@ public class Unsorted { } if (var12 < 102 && var13 < 102 && Class84.anIntArrayArray1160[1 + var12][1 + var13] == 0 && (19661112 & var17[var12 - -1][2 + var13]) == 0 && (19661280 & var17[var12 + 2][var13 - -2]) == 0 && (19661187 & var17[var12 - -2][var13 + 1]) == 0) { - Class3_Sub13_Sub38.anIntArray3456[var27] = 1 + var12; + TextureOperation38.anIntArray3456[var27] = 1 + var12; Class45.anIntArray729[var27] = var13 + 1; var27 = var27 - -1 & 4095; Class84.anIntArrayArray1160[var12 - -1][var13 + 1] = 12; @@ -3629,14 +3522,14 @@ public class Unsorted { } byte var28 = 0; - Class3_Sub13_Sub38.anIntArray3456[var28] = var12; + TextureOperation38.anIntArray3456[var28] = var12; var15 = var28 + 1; Class45.anIntArray729[var28] = var13; var18 = var19 = Class84.anIntArrayArray1160[var12][var13]; for (; var12 != var11 || var13 != var3; var18 = Class84.anIntArrayArray1160[var12][var13]) { if (var19 != var18) { - Class3_Sub13_Sub38.anIntArray3456[var15] = var12; + TextureOperation38.anIntArray3456[var15] = var12; Class45.anIntArray729[var15++] = var13; var19 = var18; } @@ -3659,7 +3552,7 @@ public class Unsorted { if (var15 <= 0) { return 1 != var9; } else { - Class3_Sub13_Sub27.method299(113, var15, var9); + TextureOperation7.method299(113, var15, var9); return true; } } catch (RuntimeException var26) { @@ -3669,9 +3562,9 @@ public class Unsorted { public static void method78(int var0, int var2) { try { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(132); - Class3_Sub13_Sub1.outgoingBuffer.writeIntV1(var2); - Class3_Sub13_Sub1.outgoingBuffer.writeShortLE(var0); + TextureOperation12.outgoingBuffer.putOpcode(132); + TextureOperation12.outgoingBuffer.writeIntV1(var2); + TextureOperation12.outgoingBuffer.writeShortLE(var0); } catch (RuntimeException var4) { throw ClientErrorException.clientError(var4, "aa.E(" + var0 + ',' + false + ',' + var2 + ')'); } @@ -3682,27 +3575,27 @@ public class Unsorted { int var2 = var1.anInt189; if (324 == var2) { - if (-1 == Class3_Sub13_Sub21.anInt3260) { - Class3_Sub13_Sub21.anInt3260 = var1.spriteArchiveId; + if (-1 == TextureOperation37.anInt3260) { + TextureOperation37.anInt3260 = var1.spriteArchiveId; anInt1165 = var1.anInt296; } if (aClass52_1112.aBoolean864) { - var1.spriteArchiveId = Class3_Sub13_Sub21.anInt3260; + var1.spriteArchiveId = TextureOperation37.anInt3260; } else { var1.spriteArchiveId = anInt1165; } } else if (var2 == 325) { - if (-1 == Class3_Sub13_Sub21.anInt3260) { + if (-1 == TextureOperation37.anInt3260) { anInt1165 = var1.anInt296; - Class3_Sub13_Sub21.anInt3260 = var1.spriteArchiveId; + TextureOperation37.anInt3260 = var1.spriteArchiveId; } if (aClass52_1112.aBoolean864) { var1.spriteArchiveId = anInt1165; } else { - var1.spriteArchiveId = Class3_Sub13_Sub21.anInt3260; + var1.spriteArchiveId = TextureOperation37.anInt3260; } } else if (var2 == 327) { @@ -3759,7 +3652,7 @@ public class Unsorted { if (var8 == null) { var5 = false; } else { - int var9 = (255 & var8[0]) << 8 | var8[1] & 255; + int var9 = (255 & var8[0]) << 8 | var8[1] & 0xFF; byte[] var10; var10 = var2.method2140(0, var9); @@ -3811,7 +3704,7 @@ public class Unsorted { byte[] var8; for (var5 = 0; var5 < var4; ++var5) { var6 = -Class131.anInt1716 + 64 * (Class3_Sub24_Sub3.anIntArray3494[var5] >> 8); - var7 = -Class82.anInt1152 + 64 * (255 & Class3_Sub24_Sub3.anIntArray3494[var5]); + var7 = -Texture.anInt1152 + 64 * (255 & Class3_Sub24_Sub3.anIntArray3494[var5]); var8 = var3[var5]; if (null != var8) { Class58.method1194(); @@ -3826,7 +3719,7 @@ public class Unsorted { for (; var5 < var4; ++var5) { var6 = -Class131.anInt1716 + 64 * (Class3_Sub24_Sub3.anIntArray3494[var5] >> 8); - var7 = -Class82.anInt1152 + 64 * (255 & Class3_Sub24_Sub3.anIntArray3494[var5]); + var7 = -Texture.anInt1152 + 64 * (255 & Class3_Sub24_Sub3.anIntArray3494[var5]); var8 = var3[var5]; if (var8 == null && Class3_Sub7.anInt2294 < 800) { Class58.method1194(); @@ -3917,12 +3810,12 @@ public class Unsorted { var14 = var17; var16 -= anInt1881; - if (Class3_Sub13_Sub13.anInt3156 > var16) { - var16 = Class3_Sub13_Sub13.anInt3156; + if (TextureOperation20.anInt3156 > var16) { + var16 = TextureOperation20.anInt3156; } - if (var11.width + var16 > PacketParser.aClass11_88.width + Class3_Sub13_Sub13.anInt3156) { - var16 = -var11.width + PacketParser.aClass11_88.width + Class3_Sub13_Sub13.anInt3156; + if (var11.width + var16 > PacketParser.aClass11_88.width + TextureOperation20.anInt3156) { + var16 = -var11.width + PacketParser.aClass11_88.width + TextureOperation20.anInt3156; } var13 = var16; @@ -3970,7 +3863,7 @@ public class Unsorted { Class168.aClass11_2091 = var11; anInt2567 = var14; Class53.anInt865 = var13; - Class3_Sub13_Sub36.method338(var11.height, var11.anInt189 == 1403, var13, var11.width, var14); + TextureOperation36.method338(var11.height, var11.anInt189 == 1403, var13, var11.width, var14); if (HDToolKit.highDetail) { Class22.setClipping(var0, var6, var4, var7); } else { @@ -3984,7 +3877,7 @@ public class Unsorted { continue; } - Class3_Sub8.displayMinimap(var12, (byte) 59, var14, var13, var11); + Minimap.displayMinimap(var12, (byte) 59, var14, var13, var11); if (HDToolKit.highDetail) { Class22.setClipping(var0, var6, var4, var7); } else { @@ -4003,7 +3896,7 @@ public class Unsorted { } var21 -= var11.height / 2; - var23 = 2047 & GraphicDefinition.CAMERA_DIRECTION - -Class3_Sub13_Sub8.anInt3102; + var23 = 2047 & GraphicDefinition.CAMERA_DIRECTION - -TextureOperation9.anInt3102; var20 -= var11.width / 2; var24 = Class51.anIntArray840[var23]; var25 = Class51.anIntArray851[var23]; @@ -4027,13 +3920,13 @@ public class Unsorted { Class3_Sub24_Sub4.method1177(-1, 1L, (byte) -41, TextCore.emptyJagexString, var28, (short) 36, TextCore.HasFaceHere, var29); } - Class3_Sub24_Sub4.method1177(-1, 1L, (byte) -125, TextCore.emptyJagexString, var28, (short) 60, Class3_Sub13_Sub28.aClass94_3353, var29); + Class3_Sub24_Sub4.method1177(-1, 1L, (byte) -125, TextCore.emptyJagexString, var28, (short) 60, TextureOperation32.aClass94_3353, var29); continue; } if (var11.anInt189 == 1339) { if (var11.method855()) { - Class91.drawCompass(var13, var14, var11, var12); + Compass.drawCompass(var13, var14, var11, var12); if (HDToolKit.highDetail) { Class22.setClipping(var0, var6, var4, var7); } else { @@ -4084,7 +3977,7 @@ public class Unsorted { if (ClientCommands.fpsOverlayEnabled) { var20 = var11.width + var13; var21 = 15 + var14; - Class126.plainFont.drawStringRightAnchor(RSString.stringCombiner(new RSString[]{TextCore.aClass94_3196, RSString.stringAnimator(SequenceDefinition.anInt1862)}), var20, var21, 16776960, -1);//Class72.stringAnimator(SequenceDefinition.anInt1862)}), var20, var21, 16776960, -1); + FontType.plainFont.drawStringRightAnchor(RSString.stringCombiner(new RSString[]{TextCore.aClass94_3196, RSString.stringAnimator(SequenceDefinition.anInt1862)}), var20, var21, 16776960, -1);//Class72.stringAnimator(SequenceDefinition.anInt1862)}), var20, var21, 16776960, -1); var21 += 15; Runtime var57 = Runtime.getRuntime(); var23 = (int) ((var57.totalMemory() + -var57.freeMemory()) / 1024L); @@ -4093,7 +3986,7 @@ public class Unsorted { var24 = 16711680; } - Class126.plainFont.drawStringRightAnchor(RSString.stringCombiner(new RSString[]{TextCore.aClass94_4057, RSString.stringAnimator(var23), TextCore.Memoryk}), var20, var21, var24, -1); + FontType.plainFont.drawStringRightAnchor(RSString.stringCombiner(new RSString[]{TextCore.aClass94_4057, RSString.stringAnimator(var23), TextCore.Memoryk}), var20, var21, var24, -1); var21 += 15; if (HDToolKit.highDetail) { var24 = 16776960; @@ -4102,7 +3995,7 @@ public class Unsorted { var24 = 16711680; } - Class126.plainFont.drawStringRightAnchor(RSString.stringCombiner(new RSString[]{TextCore.aClass94_1622, RSString.stringAnimator(var25), TextCore.Memoryk}), var20, var21, var24, -1); + FontType.plainFont.drawStringRightAnchor(RSString.stringCombiner(new RSString[]{TextCore.aClass94_1622, RSString.stringAnimator(var25), TextCore.Memoryk}), var20, var21, var24, -1); var21 += 15; } @@ -4120,7 +4013,7 @@ public class Unsorted { var29 = 10000 * var26 / var25; var28 = var47 * 100 / var25; RSString var55 = RSString.stringCombiner(new RSString[]{TextCore.aClass94_436, Class3_Sub23.method407(0, true, 2, var29), TextCore.aClass94_2498, RSString.stringAnimator(var28), TextCore.aClass94_148}); - TextureOperation.smallFont.drawStringRightAnchor(var55, var20, var21, var24, -1); + FontType.smallFont.drawStringRightAnchor(var55, var20, var21, var24, -1); aBooleanArray3674[var12] = true; Class163_Sub1_Sub1.aBooleanArray4008[var12] = true; continue; @@ -4140,25 +4033,25 @@ public class Unsorted { } var20 = var11.width + var13; var21 = 15 + var14; - Class126.plainFont.drawStringRightAnchor(RSString.parse(HDToolKit.gl.glGetString(7938)), var20, var21, 16776960, 7); + FontType.plainFont.drawStringRightAnchor(RSString.parse(HDToolKit.gl.glGetString(7938)), var20, var21, 16776960, 7); var21 += 15; - Class126.plainFont.drawStringRightAnchor(RSString.parse(vendor), var20, var21, vendorColor, 4); + FontType.plainFont.drawStringRightAnchor(RSString.parse(vendor), var20, var21, vendorColor, 4); var21 += 15; - Class126.plainFont.drawStringRightAnchor(RSString.parse(HDToolKit.gl.glGetString(7937)), var20, var21, 16776960, 7); + FontType.plainFont.drawStringRightAnchor(RSString.parse(HDToolKit.gl.glGetString(7937)), var20, var21, 16776960, 7); var21 += 15; - Class126.plainFont.drawStringRightAnchor(RSString.parse("Oncard Geometry: " + Class31.anInt585), var20, var21, 16776960, 7); + FontType.plainFont.drawStringRightAnchor(RSString.parse("Oncard Geometry: " + Class31.anInt585), var20, var21, 16776960, 7); var21 += 15; - Class126.plainFont.drawStringRightAnchor(RSString.parse("Oncard 2D: " + Class31.memory2D), var20, var21, 16776960, 7); + FontType.plainFont.drawStringRightAnchor(RSString.parse("Oncard 2D: " + Class31.memory2D), var20, var21, 16776960, 7); var21 += 15; - Class126.plainFont.drawStringRightAnchor(RSString.parse("Oncard Texture: " + Class31.anInt580), var20, var21, 16776960, 7); + FontType.plainFont.drawStringRightAnchor(RSString.parse("Oncard Texture: " + Class31.anInt580), var20, var21, 16776960, 7); } else { var20 = var11.width + var13; var21 = 15 + var14; - Class126.plainFont.drawStringRightAnchor(RSString.parse("Java Toolkit"), var20, var21, 16776960, 7); + FontType.plainFont.drawStringRightAnchor(RSString.parse("Java Toolkit"), var20, var21, 16776960, 7); var21 += 15; - Class126.plainFont.drawStringRightAnchor(RSString.parse(System.getProperty("java.vendor")), var20, var21, 16776960, 7); + FontType.plainFont.drawStringRightAnchor(RSString.parse(System.getProperty("java.vendor")), var20, var21, 16776960, 7); var21 += 15; - Class126.plainFont.drawStringRightAnchor(RSString.parse(System.getProperty("java.version")), var20, var21, 16776960, 7); + FontType.plainFont.drawStringRightAnchor(RSString.parse(System.getProperty("java.version")), var20, var21, 16776960, 7); } continue; } @@ -4170,7 +4063,7 @@ public class Unsorted { if (var11.anInt189 == 1406) { ClientErrorException.anInt2115 = var14; AbstractSprite.aClass11_3708 = var11; - Class3_Sub13_Sub23_Sub1.anInt4041 = var13; + TextureOperation18.anInt4041 = var13; continue; } } @@ -4181,7 +4074,7 @@ public class Unsorted { Class114.anIntArray1578[0] = Class3_Sub28_Sub5.anInt3590; Class140_Sub7.aClass94Array2935[0] = TextCore.HasCancel; Class163_Sub2_Sub1.aClass94Array4016[0] = TextCore.emptyJagexString; - Class3_Sub13_Sub7.aShortArray3095[0] = 1005; + TextureOperation27.aShortArray3095[0] = 1005; } if (var16 <= NPCDefinition.anInt1297 && Class38_Sub1.anInt2612 >= var17 && var18 > NPCDefinition.anInt1297 && Class38_Sub1.anInt2612 < var19) { @@ -4209,17 +4102,17 @@ public class Unsorted { method1095(var16, -var11.anInt208 + var14, -var11.anInt247 + var13, var11.aClass11Array262, var18, var11.componentHash, var17, var19, (byte) 52, var12); } - Class3_Sub31 var36 = Class3_Sub13_Sub17.aHashTable_3208.get(var11.componentHash); + Class3_Sub31 var36 = TextureOperation23.aHashTable_3208.get(var11.componentHash); if (var36 != null) { if (var36.anInt2603 == 0 && !Class38_Sub1.aBoolean2615 && NPCDefinition.anInt1297 >= var16 && Class38_Sub1.anInt2612 >= var17 && NPCDefinition.anInt1297 < var18 && Class38_Sub1.anInt2612 < var19 && !ClientCommands.commandQaOpEnabled) { Class140_Sub7.aClass94Array2935[0] = TextCore.HasCancel; menuOptionCount = 1; Class114.anIntArray1578[0] = Class3_Sub28_Sub5.anInt3590; - Class3_Sub13_Sub7.aShortArray3095[0] = 1005; + TextureOperation27.aShortArray3095[0] = 1005; Class163_Sub2_Sub1.aClass94Array4016[0] = TextCore.emptyJagexString; } - Class3_Sub13_Sub1.method171(-101, var36.anInt2602, var16, var18, var13, var12, var19, var17, var14); + TextureOperation12.method171(-101, var36.anInt2602, var16, var18, var13, var12, var19, var17, var14); } if (HDToolKit.highDetail) { @@ -4232,7 +4125,7 @@ public class Unsorted { if (aBooleanArray1712[var12] || Client.rectDebugInt > 1) { if (var11.type == 0 && !var11.usingScripts && var11.anInt252 > var11.height) { - Class3_Sub13_Sub12.method224(var11.anInt208, var11.anInt252, var11.width + var13, var14, var11.height); + TextureOperation24.method224(var11.anInt208, var11.anInt252, var11.width + var13, var14, var11.height); } if (var11.type != 1) { @@ -4295,7 +4188,7 @@ public class Unsorted { var54.method637(var23 + var25, var24 - -var26, 128); if (var5 != -1) { - RSInterface var51 = var3[var5 & '\uffff']; + RSInterface var51 = var3[var5 & 65535]; int var31; int var30; if (HDToolKit.highDetail) { @@ -4369,9 +4262,9 @@ public class Unsorted { Toolkit.JAVA_TOOLKIT.fillRect(var13, var14, var11.width, var11.height, var20, 256 + -(255 & var15)); } } else if (HDToolKit.highDetail) { - Class22.method928(var13, var14, var11.width, var11.height, var20, 256 + -(var15 & 255)); + Class22.method928(var13, var14, var11.width, var11.height, var20, 256 + -(var15 & 0xFF)); } else { - Class74.method1315(var13, var14, var11.width, var11.height, var20, -(var15 & 255) + 256); + Class74.method1315(var13, var14, var11.width, var11.height, var20, -(var15 & 0xFF) + 256); } } else if (var11.aBoolean226) { if (HDToolKit.highDetail) { @@ -4400,11 +4293,11 @@ public class Unsorted { // // if (var15 != 0) { // if (var11.aBoolean226) { -// Toolkit.getActiveToolkit().fillRect(var13, var14, var11.width, var11.height, var20, 256 - (var15 & 255));//Background for mage book +// Toolkit.getActiveToolkit().fillRect(var13, var14, var11.width, var11.height, var20, 256 - (var15 & 0xFF));//Background for mage book // } else if (HDToolKit.highDetail) { -// Class22.method928(var13, var14, var11.width, var11.height, var20, 256 + -(var15 & 255)); +// Class22.method928(var13, var14, var11.width, var11.height, var20, 256 + -(var15 & 0xFF)); // } else { -// Class74.method1315(var13, var14, var11.width, var11.height, var20, -(var15 & 255) + 256); +// Class74.method1315(var13, var14, var11.width, var11.height, var20, -(var15 & 0xFF) + 256); // } // } else if (var11.aBoolean226) { // Toolkit.getActiveToolkit().method934(var13, var14, var11.width, var11.height, var20);//Fill Rectangle for skill hover @@ -4416,7 +4309,7 @@ public class Unsorted { Font var34; if (var11.type == 4) { // TODO RSInterfaceRenderText - var34 = var11.method868(Class3_Sub13_Sub22.nameIconsSpriteArray); + var34 = var11.method868(TextureOperation0.nameIconsSpriteArray); if (var34 != null) { RSString var45 = var11.text; if (Class3_Sub28_Sub12.method609(var11, 97)) { @@ -4447,7 +4340,7 @@ public class Unsorted { } } - if (Class3_Sub13_Sub7.aClass11_3087 == var11) { + if (TextureOperation27.aClass11_3087 == var11) { var21 = var11.anInt218; var45 = TextCore.LoadingPleaseWait; } @@ -4495,7 +4388,7 @@ public class Unsorted { if (var15 == 0) { var27.method649(var13, var28 * var22 + var14, var23, 1); } else { - var27.method646(var13, var14 + var28 * var22, 256 + -(var15 & 255), var23, 1); + var27.method646(var13, var14 + var28 * var22, 256 + -(var15 & 0xFF), var23, 1); } } } else if (var46) { @@ -4503,7 +4396,7 @@ public class Unsorted { if (var15 == 0) { var27.method649(var21 * var28 + var13, var14, 1, var24); } else { - var27.method646(var21 * var28 + var13, var14, -(var15 & 255) + 256, 1, var24); + var27.method646(var21 * var28 + var13, var14, -(var15 & 0xFF) + 256, 1, var24); } } } else { @@ -4604,7 +4497,7 @@ public class Unsorted { var24 = 2047; } - Player var49 = Class3_Sub13_Sub22.players[var24]; + Player var49 = TextureOperation0.players[var24]; SequenceDefinition var56 = var21 == -1 ? null : SequenceDefinition.getAnimationDefinition(var21); if (null != var49 && (-2048 & var11.itemId) == (int) var49.displayName.toLong() << 11) { var38 = var49.class52.method1165(null, -1, null, var56, 0, -1, -126, 0, var11.anInt283, 0); @@ -4637,7 +4530,7 @@ public class Unsorted { HDToolKit.method1846(); HDToolKit.method1831(true); HDToolKit.method1827(false); - Class3_Sub13_Sub33.method324(anInt3625); + TextureOperation29.method324(anInt3625); if (aBoolean47) { Class22.resetClipping(); HDToolKit.method1841(); @@ -4677,7 +4570,7 @@ public class Unsorted { } } else { if (var11.type == 7) { - var34 = var11.method868(Class3_Sub13_Sub22.nameIconsSpriteArray); + var34 = var11.method868(TextureOperation0.nameIconsSpriteArray); if (var34 == null) { if (RSInterface.aBoolean6) { Class20.method909(var11); @@ -4718,11 +4611,11 @@ public class Unsorted { } } - if (var11.type == 8 && Class20.aClass11_439 == var11 && Class3_Sub13_Sub26.anInt3323 == Class75.anInt1109) { + if (var11.type == 8 && Class20.aClass11_439 == var11 && TextureOperation35.anInt3323 == Class75.anInt1109) { var21 = 0; var20 = 0; RSString var43 = var11.text; - Font var35 = Class126.plainFont; + Font var35 = FontType.plainFont; var43 = method1303(var11, var43); RSString var44; @@ -4865,7 +4758,7 @@ public class Unsorted { } if (var5 < 32768) { - var5 = '\u8000'; + var5 = 32768; } if (var5 <= Class75_Sub4.anInt2670) { @@ -4959,7 +4852,7 @@ public class Unsorted { int var9 = Class40.method1040(Class3_Sub28_Sub18.anInt3765, var2, Class101.anInt1425); for (int var10 = var6; var10 <= var7; ++var10) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var10], var8, 3074 + -2974, var9, var1); + TextureOperation18.method282(Class38.anIntArrayArray663[var10], var8, 3074 + -2974, var9, var1); } } catch (RuntimeException var11) { @@ -4981,7 +4874,7 @@ public class Unsorted { anInt3625 = 3; Class25.method957(true); aBoolean3604 = true; - Class3_Sub13_Sub15.aBoolean3184 = true; + TextureOperation17.aBoolean3184 = true; Class128.aBoolean1685 = true; Class3_Sub28_Sub9.anInt3622 = 0; anInt3071 = 0; @@ -4993,7 +4886,7 @@ public class Unsorted { Class140_Sub6.aBoolean2910 = true; TextureOperation.anInt2378 = 0; anInt1137 = 2; - Class3_Sub13_Sub22.aBoolean3275 = true; + TextureOperation0.aBoolean3275 = true; Class106.aBoolean1441 = true; anInt120 = 255; Class25.aBoolean488 = true; @@ -5052,27 +4945,27 @@ public class Unsorted { public static void method565(int var1, int var2) { try { - Class82.anInt1150 = -Class3_Sub13_Sub21.anInt3256 + var1; + Texture.anInt1150 = -TextureOperation37.anInt3256 + var1; - int var3 = -((int) ((float) Class3_Sub28_Sub3.aClass11_3551.width / Class44.aFloat727)) + Class82.anInt1150; - int var4 = Class82.anInt1150 + (int) ((float) Class3_Sub28_Sub3.aClass11_3551.width / Class44.aFloat727); + int var3 = -((int) ((float) Class3_Sub28_Sub3.aClass11_3551.width / Class44.aFloat727)) + Texture.anInt1150; + int var4 = Texture.anInt1150 + (int) ((float) Class3_Sub28_Sub3.aClass11_3551.width / Class44.aFloat727); if (var3 < 0) { - Class82.anInt1150 = (int) ((float) Class3_Sub28_Sub3.aClass11_3551.width / Class44.aFloat727); + Texture.anInt1150 = (int) ((float) Class3_Sub28_Sub3.aClass11_3551.width / Class44.aFloat727); } - Class3_Sub13_Sub30.anInt3362 = Class108.anInt1460 + -1 + anInt65 + -var2; - int var6 = (int) ((float) Class3_Sub28_Sub3.aClass11_3551.height / Class44.aFloat727) + Class3_Sub13_Sub30.anInt3362; - int var5 = Class3_Sub13_Sub30.anInt3362 - (int) ((float) Class3_Sub28_Sub3.aClass11_3551.height / Class44.aFloat727); + TextureOperation13.anInt3362 = Class108.anInt1460 + -1 + anInt65 + -var2; + int var6 = (int) ((float) Class3_Sub28_Sub3.aClass11_3551.height / Class44.aFloat727) + TextureOperation13.anInt3362; + int var5 = TextureOperation13.anInt3362 - (int) ((float) Class3_Sub28_Sub3.aClass11_3551.height / Class44.aFloat727); if (Class23.anInt455 < var4) { - Class82.anInt1150 = Class23.anInt455 + -((int) ((float) Class3_Sub28_Sub3.aClass11_3551.width / Class44.aFloat727)); + Texture.anInt1150 = Class23.anInt455 + -((int) ((float) Class3_Sub28_Sub3.aClass11_3551.width / Class44.aFloat727)); } if (var5 < 0) { - Class3_Sub13_Sub30.anInt3362 = (int) ((float) Class3_Sub28_Sub3.aClass11_3551.height / Class44.aFloat727); + TextureOperation13.anInt3362 = (int) ((float) Class3_Sub28_Sub3.aClass11_3551.height / Class44.aFloat727); } if (var6 > Class108.anInt1460) { - Class3_Sub13_Sub30.anInt3362 = -((int) ((float) Class3_Sub28_Sub3.aClass11_3551.height / Class44.aFloat727)) + Class108.anInt1460; + TextureOperation13.anInt3362 = -((int) ((float) Class3_Sub28_Sub3.aClass11_3551.height / Class44.aFloat727)) + Class108.anInt1460; } } catch (RuntimeException var7) { @@ -5153,8 +5046,8 @@ public class Unsorted { var5 -= NPC.anInt3995; int var9 = Class51.anIntArray840[Class139.anInt1823]; int var10 = Class51.anIntArray851[Class139.anInt1823]; - int var11 = Class51.anIntArray840[Class3_Sub13_Sub25.anInt3315]; - int var12 = Class51.anIntArray851[Class3_Sub13_Sub25.anInt3315]; + int var11 = Class51.anIntArray840[TextureOperation28.anInt3315]; + int var12 = Class51.anIntArray851[TextureOperation28.anInt3315]; int var13 = var5 * var12 + var11 * var2 >> 16; var2 = var2 * var12 + -(var11 * var5) >> 16; var5 = var13; @@ -5162,21 +5055,21 @@ public class Unsorted { if (var6 <= -47) { var2 = var2 * var10 + var8 * var9 >> 16; if (50 > var2) { - Class82.anInt2208 = -1; + Texture.anInt2208 = -1; Class32.anInt590 = -1; } else if (HDToolKit.highDetail) { int var14 = var1 * 512 >> 8; Class32.anInt590 = var14 * var5 / var2 + var0; int var15 = 512 * var7 >> 8; - Class82.anInt2208 = var15 * var13 / var2 + var4; + Texture.anInt2208 = var15 * var13 / var2 + var4; } else { Class32.anInt590 = (var5 << 9) / var2 + var0; - Class82.anInt2208 = (var13 << 9) / var2 + var4; + Texture.anInt2208 = (var13 << 9) / var2 + var4; } } } else { - Class82.anInt2208 = -1; + Texture.anInt2208 = -1; Class32.anInt590 = -1; } } catch (RuntimeException var16) { diff --git a/Client/src/main/java/org/runite/client/WaterShader.java b/Client/src/main/java/org/runite/client/WaterShader.java index 9fe2cbab7..f6afe8bd2 100644 --- a/Client/src/main/java/org/runite/client/WaterShader.java +++ b/Client/src/main/java/org/runite/client/WaterShader.java @@ -148,7 +148,7 @@ final class WaterShader implements ShaderInterface { var2.glLoadIdentity(); var2.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); var2.glRotatef((float)Class140_Sub7.anInt2938 * 360.0F / 2048.0F, 1.0F, 0.0F, 0.0F); - var2.glRotatef((float)Class3_Sub13_Sub8.anInt3103 * 360.0F / 2048.0F, 0.0F, 1.0F, 0.0F); + var2.glRotatef((float) TextureOperation9.anInt3103 * 360.0F / 2048.0F, 0.0F, 1.0F, 0.0F); var2.glTranslatef((float)(-Unsorted.anInt144), (float)(-Unsorted.anInt3695), (float)(-LinkableRSString.anInt2587)); if(aBoolean2191) { this.aFloatArray2190[0] = 0.0010F; diff --git a/Client/src/main/java/org/runite/client/WaterfallShader.java b/Client/src/main/java/org/runite/client/WaterfallShader.java index 0601778f2..fea3a2ebc 100644 --- a/Client/src/main/java/org/runite/client/WaterfallShader.java +++ b/Client/src/main/java/org/runite/client/WaterfallShader.java @@ -111,7 +111,7 @@ final class WaterfallShader implements ShaderInterface { var2.glLoadIdentity(); var2.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); var2.glRotatef((float)Class140_Sub7.anInt2938 * 360.0F / 2048.0F, 1.0F, 0.0F, 0.0F); - var2.glRotatef(360.0F * (float)Class3_Sub13_Sub8.anInt3103 / 2048.0F, 0.0F, 1.0F, 0.0F); + var2.glRotatef(360.0F * (float) TextureOperation9.anInt3103 / 2048.0F, 0.0F, 1.0F, 0.0F); var2.glTranslatef((float)(-Unsorted.anInt144), (float)(-Unsorted.anInt3695), (float)(-LinkableRSString.anInt2587)); var2.glTexGenfv(8192, 9474, this.aFloatArray2174, 0); this.aFloatArray2174[3] = var3 * (float)HDToolKit.anInt1791; @@ -223,7 +223,7 @@ final class WaterfallShader implements ShaderInterface { } for(int var6 = var3; var6 <= var1; ++var6) { - Class3_Sub13_Sub23_Sub1.method282(Class38.anIntArrayArray663[var6], var4, 121, var2, var5); + TextureOperation18.method282(Class38.anIntArrayArray663[var6], var4, 121, var2, var5); } } catch (RuntimeException var7) { diff --git a/Client/src/main/java/org/runite/client/WorldListCountry.java b/Client/src/main/java/org/runite/client/WorldListCountry.java index 4d97b2421..669d31d9b 100644 --- a/Client/src/main/java/org/runite/client/WorldListCountry.java +++ b/Client/src/main/java/org/runite/client/WorldListCountry.java @@ -1,8 +1,8 @@ package org.runite.client; -final class WorldListCountry { +public final class WorldListCountry { - static int localPlane; + public static int localPlane; int flagId; RSString name; } diff --git a/Client/src/main/java/org/runite/client/WorldListEntry.java b/Client/src/main/java/org/runite/client/WorldListEntry.java index 3ab17c523..fa9392935 100644 --- a/Client/src/main/java/org/runite/client/WorldListEntry.java +++ b/Client/src/main/java/org/runite/client/WorldListEntry.java @@ -76,10 +76,10 @@ public final class WorldListEntry extends Class44 { static void buildWorldListInterface() { try { - int var1 = AbstractIndexedSprite.anInt1462; - int var2 = Class3_Sub13_Sub33.anInt3395; - int var4 = Class3_Sub28_Sub1.anInt3537; - int var3 = Class3_Sub28_Sub3.anInt3552; + int var1 = Class21.anInt1462; + int var2 = Class21.anInt3395; + int var4 = Class21.anInt3537; + int var3 = Class21.anInt3552; if (aAbstractSprite_3099 == null || null == aAbstractSprite_1457) { if (CacheIndex.spritesIndex.retrieveSpriteFile(archiveID) && CacheIndex.spritesIndex.retrieveSpriteFile(anInt1400)) { aAbstractSprite_3099 = Unsorted.method562(CacheIndex.spritesIndex, archiveID); @@ -115,7 +115,7 @@ public final class WorldListEntry extends Class44 { aAbstractSprite_1457.method641(-aAbstractSprite_1457.width + (var1 - -var3), var2); } - Class168.bold.method681(RSString.parse(GameConfig.RCM_TITLE), var1 - -3, 14 + var2, anInt3351, -1); + FontType.bold.method681(RSString.parse(GameConfig.RCM_TITLE), var1 - -3, 14 + var2, anInt3351, -1); Toolkit.getActiveToolkit().fillRect(var1, 20 + var2, var3, var4 - 20, InterfaceWidget.anInt3600, -Unsorted.anInt963 + 256); var6 = Unsorted.anInt1709; @@ -180,10 +180,10 @@ public final class WorldListEntry extends Class44 { var9 = Class154.anInt1957; } - Class168.bold.method681(Unsorted.method802(var7), 3 + var1, var8, var9, 0); + FontType.bold.method681(Unsorted.method802(var7), 3 + var1, var8, var9, 0); } - Unsorted.method1282(AbstractIndexedSprite.anInt1462, (byte) 122, Class3_Sub13_Sub33.anInt3395, Class3_Sub28_Sub1.anInt3537, Class3_Sub28_Sub3.anInt3552); + Unsorted.method1282(Class21.anInt1462, Class21.anInt3395, Class21.anInt3537, Class21.anInt3552); } catch (RuntimeException var10) { throw ClientErrorException.clientError(var10, "ij.F(" + ')'); } diff --git a/Client/src/main/java/org/runite/client/WorldMap.java b/Client/src/main/java/org/runite/client/WorldMap.java index 3663425cc..4c78bdd1a 100644 --- a/Client/src/main/java/org/runite/client/WorldMap.java +++ b/Client/src/main/java/org/runite/client/WorldMap.java @@ -29,7 +29,7 @@ final class WorldMap extends Node { return; } - Class3_Sub13_Sub1.method169(); + TextureOperation12.method169(); anInt2737 = 10; } @@ -37,10 +37,10 @@ final class WorldMap extends Node { * This block is dealing with world map zoom */ if (anInt2737 == 10) { - Class3_Sub13_Sub21.anInt3256 = Unsorted.aClass3_Sub28_Sub3_2600.anInt3555 >> 6 << 6; + TextureOperation37.anInt3256 = Unsorted.aClass3_Sub28_Sub3_2600.anInt3555 >> 6 << 6; Unsorted.anInt65 = Unsorted.aClass3_Sub28_Sub3_2600.anInt3562 >> 6 << 6; Class108.anInt1460 = (Unsorted.aClass3_Sub28_Sub3_2600.anInt3549 >> 6 << 6) - Unsorted.anInt65 + 64; - Class23.anInt455 = 64 + (Unsorted.aClass3_Sub28_Sub3_2600.anInt3559 >> 6 << 6) + -Class3_Sub13_Sub21.anInt3256; + Class23.anInt455 = 64 + (Unsorted.aClass3_Sub28_Sub3_2600.anInt3559 >> 6 << 6) + -TextureOperation37.anInt3256; if (GameConfig.WORLD_MAP_DEBUG) System.out.println("World Map Debug: Setting initial zoom level to: " + Unsorted.aClass3_Sub28_Sub3_2600.anInt3563); if (Unsorted.aClass3_Sub28_Sub3_2600.anInt3563 == 37) { //Furthest zoom 37% on interface @@ -65,16 +65,16 @@ final class WorldMap extends Node { /* End Minimap Zoom */ - int var1 = -Class3_Sub13_Sub21.anInt3256 + (Class102.player.anInt2819 >> 7) + Class131.anInt1716; + int var1 = -TextureOperation37.anInt3256 + (Class102.player.anInt2819 >> 7) + Class131.anInt1716; var1 += -5 + (int) (Math.random() * 10.0D); - int var2 = -Class82.anInt1152 + -(Class102.player.anInt2829 >> 7) + Unsorted.anInt65 + -1 + Class108.anInt1460; + int var2 = -Texture.anInt1152 + -(Class102.player.anInt2829 >> 7) + Unsorted.anInt65 + -1 + Class108.anInt1460; var2 += -5 + (int) (Math.random() * 10.0D); if (var1 >= 0 && var1 < Class23.anInt455 && 0 <= var2 && Class108.anInt1460 > var2) { Class3_Sub28_Sub1.anInt3536 = var1; Class3_Sub4.anInt2251 = var2; } else { Class3_Sub4.anInt2251 = Unsorted.anInt65 - Unsorted.aClass3_Sub28_Sub3_2600.anInt3556 * 64 + Class108.anInt1460 + -1; - Class3_Sub28_Sub1.anInt3536 = Unsorted.aClass3_Sub28_Sub3_2600.anInt3558 * 64 + -Class3_Sub13_Sub21.anInt3256; + Class3_Sub28_Sub1.anInt3536 = Unsorted.aClass3_Sub28_Sub3_2600.anInt3558 * 64 + -TextureOperation37.anInt3256; } Class3_Sub5.method117(); @@ -87,7 +87,7 @@ final class WorldMap extends Node { Class44.anIntArrayArrayArray720 = new int[var3][var4][]; RenderAnimationDefinition.aByteArrayArrayArray383 = new byte[var3][var4][]; Class146.anIntArrayArrayArray1903 = new int[var3][var4][]; - Class3_Sub13_Sub33.aByteArrayArrayArray3390 = new byte[var3][var4][]; + TextureOperation29.aByteArrayArrayArray3390 = new byte[var3][var4][]; int var6 = Class158_Sub1.anInt1463 >> 1; CS2Script.aByteArrayArrayArray2452 = new byte[var3][var4][]; Class29.anIntArrayArrayArray558 = new int[var3][var4][]; @@ -111,7 +111,7 @@ final class WorldMap extends Node { } else if (anInt2737 == 40) { if (GameConfig.WORLD_MAP_DEBUG) System.out.println("World Map Debug: World Map Stage 40: String given: " + Unsorted.aClass3_Sub28_Sub3_2600.aClass94_3561.properlyCapitalize().toString()); - Class3_Sub13_Sub34.method328(new DataBuffer(aClass153_3210.method2123(TextCore.worldmapOverlay2, Unsorted.aClass3_Sub28_Sub3_2600.aClass94_3561)));//unsure + TextureOperation25.method328(new DataBuffer(aClass153_3210.method2123(TextCore.worldmapOverlay2, Unsorted.aClass3_Sub28_Sub3_2600.aClass94_3561)));//unsure anInt2737 = 50; Class75_Sub4.method1355(); } else if (anInt2737 == 50) { @@ -278,7 +278,7 @@ final class WorldMap extends Node { if (ClientCommands.fpsOverlayEnabled) { int var10 = -8 + var2 - -var3; int var9 = -5 + (var0 - -var4); - Class126.plainFont.drawStringRightAnchor(RSString.stringCombiner(new RSString[]{TextCore.aClass94_985, RSString.stringAnimator(SequenceDefinition.anInt1862)}), var9, var10, 16776960, -1); + FontType.plainFont.drawStringRightAnchor(RSString.stringCombiner(new RSString[]{TextCore.aClass94_985, RSString.stringAnimator(SequenceDefinition.anInt1862)}), var9, var10, 16776960, -1); Runtime var11 = Runtime.getRuntime(); int var12 = (int) ((var11.totalMemory() - var11.freeMemory()) / 1024L); int var13 = 16776960; @@ -287,7 +287,7 @@ final class WorldMap extends Node { var13 = 16711680; } - Class126.plainFont.drawStringRightAnchor(RSString.stringCombiner(new RSString[]{TextCore.aClass94_1630, RSString.stringAnimator(var12), TextCore.aClass94_3055}), var9, var10, var13, -1); + FontType.plainFont.drawStringRightAnchor(RSString.stringCombiner(new RSString[]{TextCore.aClass94_1630, RSString.stringAnimator(var12), TextCore.aClass94_3055}), var9, var10, var13, -1); } /* * * * * * * */ @@ -302,7 +302,7 @@ final class WorldMap extends Node { Toolkit.getActiveToolkit().method934(-150 + var6, var7 + 2, 3 * anInt2737, 30, 9179409); Toolkit.getActiveToolkit().method934(-150 + var6 + anInt2737 * 3, var7 - -2, 300 + -(3 * anInt2737), 30, 0); - Class168.bold.method699(TextCore.LoadingGeneral, var6, var5 + var7, 16777215, -1); + FontType.bold.method699(TextCore.LoadingGeneral, var6, var5 + var7, 16777215, -1); } } catch (RuntimeException var14) { throw ClientErrorException.clientError(var14, "wa.FA(" + var0 + ',' + 64 + ',' + var2 + ',' + var3 + ',' + var4 + ')'); diff --git a/Client/src/main/java/org/runite/client/drawcalls/Compass.java b/Client/src/main/java/org/runite/client/drawcalls/Compass.java new file mode 100644 index 000000000..0074ca449 --- /dev/null +++ b/Client/src/main/java/org/runite/client/drawcalls/Compass.java @@ -0,0 +1,33 @@ +package org.runite.client.drawcalls; + +import org.runite.client.*; + +public class Compass { + + public static void drawCompass(int var0, int var1, RSInterface var2, int var3) { + try { + if (HDToolKit.highDetail) { + Class22.setClipping(var0, var1, var2.width + var0, var2.height + var1); + } + + if (Class161.anInt2028 >= 3) { + if (HDToolKit.highDetail) { + AbstractSprite var5 = var2.method866(false); + if (null != var5) { + var5.drawAt(var0, var1); + } + } else { + Class74.method1332(var0, var1, var2.anIntArray207, var2.anIntArray291); + } + } 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); + } + + Class163_Sub1_Sub1.aBooleanArray4008[var3] = true; + } catch (RuntimeException var6) { + throw ClientErrorException.clientError(var6, "mj.K(" + var0 + ',' + var1 + ',' + (var2 != null ? "{...}" : "null") + ',' + var3 + ',' + (byte) 59 + ')'); + } + } +} diff --git a/Client/src/main/java/org/runite/client/drawcalls/ContextMenu.java b/Client/src/main/java/org/runite/client/drawcalls/ContextMenu.java new file mode 100644 index 000000000..57d6da1a5 --- /dev/null +++ b/Client/src/main/java/org/runite/client/drawcalls/ContextMenu.java @@ -0,0 +1,44 @@ +package org.runite.client.drawcalls; + +import org.rs09.client.config.GameConfig; +import org.rs09.client.rendering.Toolkit; +import org.runite.client.*; + +public class ContextMenu { + + public static void draw() { + try { + int x = Class21.anInt1462; + int y = Class21.anInt3395; + int width = Class21.anInt3552; + int height = Class21.anInt3537; + int contextMenuColor = 6116423; //Context Menu RGB || 6116423 Classic || Old var5 || ColorCore.getHexColors() + Toolkit.getActiveToolkit().fillRect(1 + x, y + 18, width + -2, -19 + height, GameConfig.RCM_BG_COLOR, GameConfig.RCM_BG_OPACITY); + if (GameConfig.RS3_CONTEXT_STYLE) { + Toolkit.getActiveToolkit().fillRect(1 + x, 2 + y, width + -2, 16, GameConfig.RCM_TITLE_COLOR, GameConfig.RCM_TITLE_OPACITY); + Toolkit.getActiveToolkit().drawRect(1 + x, 1 + y, width + -2, height, GameConfig.RCM_BORDER_COLOR, GameConfig.RCM_BORDER_OPACITY); + } else { + Toolkit.getActiveToolkit().fillRect(1 + x, 2 + y, width + -2, 16, GameConfig.RCM_TITLE_COLOR, GameConfig.RCM_TITLE_OPACITY); + Toolkit.getActiveToolkit().drawRect(1 + x, y + 18, width + -2, -19 + height, GameConfig.RCM_BORDER_COLOR, GameConfig.RCM_BORDER_OPACITY); + } + + FontType.bold.method681(RSString.parse(GameConfig.RCM_TITLE), x - -3, y + 14, contextMenuColor, -1); + int var7 = Unsorted.anInt1709; + int var6 = Class126.anInt1676; + + for (int var8 = 0; var8 < Unsorted.menuOptionCount; ++var8) { + int var9 = (-var8 + -1 + Unsorted.menuOptionCount) * 15 + y - -31; + int var10 = 16777215; + if (var6 > x && x - -width > var6 && -13 + var9 < var7 && 3 + var9 > var7) { + var10 = 16776960; + } + + FontType.bold.method681(Unsorted.method802(var8), x - -3, var9, var10, 0); + } + + Unsorted.method1282(Class21.anInt1462, Class21.anInt3395, Class21.anInt3537, Class21.anInt3552); + } catch (RuntimeException var11) { + throw ClientErrorException.clientError(var11, "lf.A(" + -117 + ')'); + } + } +} diff --git a/Client/src/main/java/org/runite/client/drawcalls/LoadingBox.java b/Client/src/main/java/org/runite/client/drawcalls/LoadingBox.java new file mode 100644 index 000000000..14e0260f4 --- /dev/null +++ b/Client/src/main/java/org/runite/client/drawcalls/LoadingBox.java @@ -0,0 +1,42 @@ +package org.runite.client.drawcalls; + +import org.rs09.client.rendering.Toolkit; +import org.runite.client.*; + +import java.awt.*; + +public class LoadingBox { + + public static void draw(boolean var1, RSString var2) { + try { + byte var3 = 4; + int var4 = var3 + 6; + int var5 = var3 + 6; + int var6 = FontType.plainFont.method680(var2, 250); + int var7 = FontType.plainFont.method684(var2, 250) * 13; + //Used for the top left (please wait...) + Toolkit.getActiveToolkit().method934(var4 - var3, -var3 + var5, var3 + var6 - -var3, var3 + var3 + var7, 0); + Toolkit.getActiveToolkit().drawRect(-var3 + var4, -var3 + var5, var6 + var3 - -var3, var3 + var7 + var3, 16777215, 255); + + FontType.plainFont.method676(var2, var4, var5, var6, var7, 16777215, -1, 1, 1, 0); + + Class21.method1340(var4 + -var3, var6 + (var3 - -var3), -var3 + var5, var3 + var7 + var3); + if (var1) { + if (HDToolKit.highDetail) { + HDToolKit.bufferSwap(); + } else { + try { + Graphics var8 = GameShell.canvas.getGraphics(); + Unsorted.aClass158_3009.method2179(var8); + } catch (Exception var9) { + GameShell.canvas.repaint(); + } + } + } else { + Unsorted.method1282(var4, var5, var7, var6); + } + } catch (RuntimeException var10) { + throw ClientErrorException.clientError(var10, "j.TA(" + ',' + var1 + ',' + (var2 != null ? "{...}" : "null") + ')'); + } + } +} diff --git a/Client/src/main/java/org/runite/client/drawcalls/Minimap.java b/Client/src/main/java/org/runite/client/drawcalls/Minimap.java new file mode 100644 index 000000000..430e3b552 --- /dev/null +++ b/Client/src/main/java/org/runite/client/drawcalls/Minimap.java @@ -0,0 +1,222 @@ +package org.runite.client.drawcalls; + +import org.rs09.client.rendering.Toolkit; +import org.runite.client.*; + +import java.util.Objects; + +public class Minimap { + public static void displayMinimap(int var0, byte var1, int var2, int var3, RSInterface var4) { + try { + Class58.method1194(); + + if(HDToolKit.highDetail) { + Class22.setClipping(var3, var2, var3 + var4.width, var2 + var4.height); + } else { + Class74.setClipping(var3, var2, var3 - -var4.width, var2 + var4.height); + } + + if(2 != Class161.anInt2028 && 5 != Class161.anInt2028 && Class49.aAbstractSprite_812 != null) { + int var19 = TextureOperation9.anInt3102 + GraphicDefinition.CAMERA_DIRECTION & 0x7FF;//Region Rotation (relative to player camera) + int var6 = Class102.player.anInt2819 / 32 + 48;//Minimap X Axis (relative to player) Used as offset + int var7 = -(Class102.player.anInt2829 / 32) + 464;//Minimap Y Axis (relative to player) Used as offset + 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); + } + + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + int var17; + int var16; + if(null != TextureOperation22.aClass131_3421) { + for(int var8 = 0; var8 < TextureOperation22.aClass131_3421.anInt1720; ++var8) { + if(TextureOperation22.aClass131_3421.method1789(var8, var1 ^ 553)) { + var9 = 2 + 4 * (TextureOperation22.aClass131_3421.aShortArray1727[var8] + -Class131.anInt1716) + -(Class102.player.anInt2819 / 32); + var11 = Class51.anIntArray840[var19]; + var12 = Class51.anIntArray851[var19]; + Font var15 = FontType.smallFont; + var11 = var11 * 256 / (256 + Class164_Sub2.anInt3020); + var10 = 2 + 4 * (-Texture.anInt1152 + TextureOperation22.aClass131_3421.aShortArray1718[var8]) - Class102.player.anInt2829 / 32; + var12 = var12 * 256 / (256 + Class164_Sub2.anInt3020); + var14 = -(var9 * var11) + var10 * var12 >> 16; + if(TextureOperation22.aClass131_3421.method1791(var8, var1 + -51) == 1) { + var15 = FontType.plainFont; + } + + if(2 == TextureOperation22.aClass131_3421.method1791(var8, 8)) { + var15 = FontType.bold; + } + + var13 = var11 * var10 - -(var12 * var9) >> 16; + var16 = var15.method680(TextureOperation22.aClass131_3421.aClass94Array1721[var8], 100); + var13 -= var16 / 2; + if(-var4.width <= var13 && var13 <= var4.width && var14 >= -var4.height && var14 <= var4.height) { + var17 = 16777215; + if(TextureOperation22.aClass131_3421.anIntArray1725[var8] != -1) { + var17 = TextureOperation22.aClass131_3421.anIntArray1725[var8]; + } + + if(HDToolKit.highDetail) { + Class22.method936((HDSprite) Objects.requireNonNull(var4.method866(false))); + } else { + Class74.method1314(var4.anIntArray207, var4.anIntArray291); + } + + var15.method693(TextureOperation22.aClass131_3421.aClass94Array1721[var8], var3 + var13 + var4.width / 2, var2 + var4.height / 2 + -var14, var16, 50, var17, 0, 1, 0, 0); + if(HDToolKit.highDetail) { + Class22.method921(); + } else { + Class74.method1310(); + } + } + } + } + } + + for(var9 = 0; MouseListeningClass.anInt1924 > var9; ++var9) { + var10 = -(Class102.player.anInt2819 / 32) + 2 + 4 * Class84.anIntArray1163[var9]; + var11 = -(Class102.player.anInt2829 / 32) + 2 + (Unsorted.anIntArray4050[var9] * 4); + ObjectDefinition var20 = ObjectDefinition.getObjectDefinition(Class3_Sub19.anIntArray3693[var9]); + if(null != var20.ChildrenIds) { + var20 = var20.method1685(var1 + -59); + if(null == var20 || var20.MapIcon == -1) { + continue; + } + } + + Class38_Sub1.minimapIcons(var4, Class140_Sub4.aAbstractSpriteArray2839[var20.MapIcon], var11, var10, var2, var3); + } + + for(var9 = 0; 104 > var9; ++var9) { + for(var10 = 0; var10 < 104; ++var10) { + Class61 var25 = TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var9][var10]; + if(null != var25) { + var12 = 2 + var9 * 4 + -(Class102.player.anInt2819 / 32); + var13 = -(Class102.player.anInt2829 / 32) + 2 + 4 * var10; + Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[0], var13, var12, var2, var3); + } + } + } + + for(var9 = 0; var9 < Class163.localNPCCount; ++var9) { + NPC var21 = NPC.npcs[Class15.localNPCIndexes[var9]]; + if(var21 != null && var21.hasDefinitions()) { + NPCDefinition var22 = var21.definition; + if(null != var22 && null != var22.childNPCs) { + var22 = var22.method1471((byte)-3); + } + + if(var22 != null && var22.aBoolean1285 && var22.aBoolean1270) { + var12 = var21.anInt2819 / 32 - Class102.player.anInt2819 / 32; + var13 = var21.anInt2829 / 32 + -(Class102.player.anInt2829 / 32); + if(var22.anInt1283 == -1) { + Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[1], var13, var12, var2, var3); + } else { + Class38_Sub1.minimapIcons(var4, Class140_Sub4.aAbstractSpriteArray2839[var22.anInt1283], var13, var12, var2, var3); + } + } + } + } + + for(var9 = 0; var9 < Class159.localPlayerCount; ++var9) { + Player var23 = TextureOperation0.players[Class56.localPlayerIndexes[var9]]; + if(null != var23 && var23.hasDefinitions()) { + var12 = var23.anInt2829 / 32 - Class102.player.anInt2829 / 32; + var11 = -(Class102.player.anInt2819 / 32) + var23.anInt2819 / 32; + long var29 = var23.displayName.toLong(); + boolean var28 = false; + + for(var16 = 0; var16 < Class8.anInt104; ++var16) { + if(Class50.aLongArray826[var16] == var29 && 0 != Unsorted.anIntArray882[var16]) { + var28 = true; + break; + } + } + + boolean var31 = false; + + for(var17 = 0; Unsorted.clanSize > var17; ++var17) { + if(var29 == PacketParser.aClass3_Sub19Array3694[var17].linkableKey) { + var31 = true; + break; + } + } + + boolean var32 = false; + if(Class102.player.teamId != 0 && 0 != var23.teamId && var23.teamId == Class102.player.teamId) { + var32 = true; + } + + if(var28) { + Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[3], var12, var11, var2, var3); + } else if(var31) { + Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[5], var12, var11, var2, var3); + } else if (var32) { + Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[4], var12, var11, var2, var3); + } else { + Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[2], var12, var11, var2, var3); + } + } + } + + Class96[] var24 = ClientErrorException.aClass96Array2114; + + for(var10 = 0; var24.length > var10; ++var10) { + Class96 var26 = var24[var10]; + if(null != var26 && var26.anInt1360 != 0 && Class44.anInt719 % 20 < 10) { + if(var26.anInt1360 == 1 && var26.anInt1359 >= 0 && var26.anInt1359 < NPC.npcs.length) { + NPC var27 = NPC.npcs[var26.anInt1359]; + if(null != var27) { + var13 = -(Class102.player.anInt2819 / 32) + var27.anInt2819 / 32; + var14 = var27.anInt2829 / 32 + -(Class102.player.anInt2829 / 32); + Class53.method1171(var26.anInt1351, var2, var3, var13, var14, var4); + } + } + + if(var26.anInt1360 == 2) { + var12 = (-Class131.anInt1716 + var26.anInt1356) * 4 + 2 - Class102.player.anInt2819 / 32; + var13 = -(Class102.player.anInt2829 / 32) + 2 + (-Texture.anInt1152 + var26.anInt1347) * 4; + Class53.method1171(var26.anInt1351, var2, var3, var12, var13, var4); + } + + if(var26.anInt1360 == 10 && var26.anInt1359 >= 0 && TextureOperation0.players.length > var26.anInt1359) { + Player var30 = TextureOperation0.players[var26.anInt1359]; + if(null != var30) { + var14 = var30.anInt2829 / 32 + -(Class102.player.anInt2829 / 32); + var13 = var30.anInt2819 / 32 + -(Class102.player.anInt2819 / 32); + Class53.method1171(var26.anInt1351, var2, var3, var13, var14, var4); + } + } + } + } + + if(Class65.anInt987 != 0) { + var9 = 4 * Class65.anInt987 + (2 - Class102.player.anInt2819 / 32); + var10 = 2 + 4 * Class45.anInt733 - Class102.player.anInt2829 / 32; + Class38_Sub1.minimapIcons(var4, Class45.aAbstractSprite_736, var10, var9, var2, var3); + } + Toolkit.getActiveToolkit().method934(-1 + (var3 - -(var4.width / 2)), -1 + var2 - -(var4.height / 2), 3, 3, 16777215); + + } else if(HDToolKit.highDetail) { + AbstractSprite var5 = var4.method866(false); + if(null != var5) { + var5.drawAt(var3, var2); + } + } else { + Class74.method1332(var3, var2, var4.anIntArray207, var4.anIntArray291); + } + + if(var1 == 59) { + Class163_Sub1_Sub1.aBooleanArray4008[var0] = true; + } + } catch (RuntimeException var18) { + throw ClientErrorException.clientError(var18, "ed.B(" + var0 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + (var4 != null?"{...}":"null") + ')'); + } + } +} diff --git a/Client/src/main/kotlin/org/rs09/client/console/DeveloperConsole.kt b/Client/src/main/kotlin/org/rs09/client/console/DeveloperConsole.kt index 1b37fecfe..95dead74d 100644 --- a/Client/src/main/kotlin/org/rs09/client/console/DeveloperConsole.kt +++ b/Client/src/main/kotlin/org/rs09/client/console/DeveloperConsole.kt @@ -9,7 +9,7 @@ import org.runite.client.* import java.awt.event.KeyEvent import java.text.SimpleDateFormat import java.util.* -import org.runite.client.Class3_Sub13_Sub1 +import org.runite.client.TextureOperation12 // TODO Escape characters in the string rendering - is this something we can do using RSString / the text renders? @@ -18,7 +18,7 @@ object DeveloperConsole { var ENABLE_PACKETS = false private val CONSOLE_FONT - get() = Class126.plainFont + get() = FontType.plainFont private val gameWidth //Offset 5 if in-game offset 20 if on login screen get() = Unsorted.gameWindowWidth @@ -185,11 +185,12 @@ object DeveloperConsole { // println("[$h:$m:$s] TODO! Handle '$str'") if (ENABLE_PACKETS) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(51) - Class3_Sub13_Sub1.outgoingBuffer.writeShort(0) - val index = Class3_Sub13_Sub1.outgoingBuffer.index - Class3_Sub13_Sub1.outgoingBuffer.writeString(DeveloperConsole.str) - Class3_Sub13_Sub1.outgoingBuffer.finishVarshortPacket(Class3_Sub13_Sub1.outgoingBuffer.index - index) + TextureOperation12.outgoingBuffer.putOpcode(51) + TextureOperation12.outgoingBuffer.writeShort(0) + val index = TextureOperation12.outgoingBuffer.index + TextureOperation12.outgoingBuffer.writeString(DeveloperConsole.str) + TextureOperation12.outgoingBuffer.finishVarshortPacket( + TextureOperation12.outgoingBuffer.index - index) } println(str) @@ -384,11 +385,12 @@ object DeveloperConsole { if (str.isEmpty()) return if (ENABLE_PACKETS) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(52) - Class3_Sub13_Sub1.outgoingBuffer.writeShort(0) - val index = Class3_Sub13_Sub1.outgoingBuffer.index - Class3_Sub13_Sub1.outgoingBuffer.writeString(str) - Class3_Sub13_Sub1.outgoingBuffer.finishVarshortPacket(Class3_Sub13_Sub1.outgoingBuffer.index - index) + TextureOperation12.outgoingBuffer.putOpcode(52) + TextureOperation12.outgoingBuffer.writeShort(0) + val index = TextureOperation12.outgoingBuffer.index + TextureOperation12.outgoingBuffer.writeString(str) + TextureOperation12.outgoingBuffer.finishVarshortPacket( + TextureOperation12.outgoingBuffer.index - index) } else if ("enableconsolepackets".startsWith(str, true)) { autocompletions = AutocompletionHints(str, listOf("enableconsolepackets"), 1) } @@ -410,8 +412,8 @@ object DeveloperConsole { @JvmStatic fun sendCommand(command: String) { - Class3_Sub13_Sub1.outgoingBuffer.putOpcode(44) - Class3_Sub13_Sub1.outgoingBuffer.writeByte(command.length + 2) - Class3_Sub13_Sub1.outgoingBuffer.writeString(command) + TextureOperation12.outgoingBuffer.putOpcode(44) + TextureOperation12.outgoingBuffer.writeByte(command.length + 2) + TextureOperation12.outgoingBuffer.writeString(command) } } \ No newline at end of file diff --git a/Client/src/main/kotlin/org/rs09/client/rendering/RenderingUtils.kt b/Client/src/main/kotlin/org/rs09/client/rendering/RenderingUtils.kt index b263b942e..ce9209fc8 100644 --- a/Client/src/main/kotlin/org/rs09/client/rendering/RenderingUtils.kt +++ b/Client/src/main/kotlin/org/rs09/client/rendering/RenderingUtils.kt @@ -50,35 +50,35 @@ object RenderingUtils { } fun drawText(str: String, x: Int, y: Int, rgb: Int, parse: Boolean = false) { - if (parse) Class126.plainFont.method681(RSString.parse(str), x, y, rgb, -1) - else Class126.plainFont.method681(RSString.of(str), x, y, rgb, -1) + if (parse) FontType.plainFont.method681(RSString.parse(str), x, y, rgb, -1) + else FontType.plainFont.method681(RSString.of(str), x, y, rgb, -1) } fun drawText(str: String, x: Int, y: Int, rgb: Int, shadow: Int, parse: Boolean = false){ - if (parse) Class126.plainFont.method681(RSString.parse(str), x, y, rgb, shadow) - else Class126.plainFont.method681(RSString.of(str), x, y, rgb, shadow) + if (parse) FontType.plainFont.method681(RSString.parse(str), x, y, rgb, shadow) + else FontType.plainFont.method681(RSString.of(str), x, y, rgb, shadow) } fun drawText(str: RSString, x: Int, y: Int, rgb: Int) { - Class126.plainFont.method681(str, x, y, rgb, -1) + FontType.plainFont.method681(str, x, y, rgb, -1) } fun drawText(str: RSString, x: Int, y: Int, rgb: Int, shadow: Int) { - Class126.plainFont.method681(str, x, y, rgb, shadow) + FontType.plainFont.method681(str, x, y, rgb, shadow) } fun drawTextSmall(str: String, x: Int, y: Int, rgb: Int, parse: Boolean = false) { - if (parse) TextureOperation.smallFont.method681(RSString.parse(str), x, y, rgb, -1) - else TextureOperation.smallFont.method681(RSString.of(str), x, y, rgb, -1) + if (parse) FontType.smallFont.method681(RSString.parse(str), x, y, rgb, -1) + else FontType.smallFont.method681(RSString.of(str), x, y, rgb, -1) } fun drawTextSmall(str: String, x: Int, y: Int, rgb: Int, shadow: Int, parse: Boolean = false){ - if (parse) TextureOperation.smallFont.method681(RSString.parse(str), x, y, rgb, shadow) - else TextureOperation.smallFont.method681(RSString.of(str), x, y, rgb, shadow) + if (parse) FontType.smallFont.method681(RSString.parse(str), x, y, rgb, shadow) + else FontType.smallFont.method681(RSString.of(str), x, y, rgb, shadow) } fun drawTextSmall(str: RSString, x: Int, y: Int, rgb: Int) { - TextureOperation.smallFont.method681(str, x, y, rgb, -1) + FontType.smallFont.method681(str, x, y, rgb, -1) } fun setClipping(left: Int, top: Int, right: Int, bottom: Int) {