From ff62177237059b122bb7fe59133a1a73002c81a0 Mon Sep 17 00:00:00 2001 From: Woah Date: Wed, 24 Mar 2021 18:58:34 -0400 Subject: [PATCH] More texture stuff Separated out Player + NPC rendering --- .../org/runite/client/AtmosphereParser.java | 2 +- .../org/runite/client/BufferedDataStream.java | 1073 +++++++++++++++++ .../java/org/runite/client/CS2Script.java | 26 +- .../main/java/org/runite/client/Class1.java | 2 +- .../main/java/org/runite/client/Class101.java | 2 +- .../main/java/org/runite/client/Class108.java | 2 +- .../main/java/org/runite/client/Class114.java | 10 +- .../main/java/org/runite/client/Class115.java | 4 +- .../main/java/org/runite/client/Class124.java | 2 +- .../main/java/org/runite/client/Class128.java | 8 +- .../main/java/org/runite/client/Class131.java | 54 +- .../main/java/org/runite/client/Class134.java | 4 +- .../main/java/org/runite/client/Class136.java | 8 +- .../java/org/runite/client/Class140_Sub3.java | 1024 ++++++++-------- .../java/org/runite/client/Class140_Sub4.java | 1043 ++++++++-------- .../java/org/runite/client/Class140_Sub6.java | 4 +- .../main/java/org/runite/client/Class145.java | 28 +- .../main/java/org/runite/client/Class15.java | 2 +- .../java/org/runite/client/Class151_Sub1.java | 32 +- .../java/org/runite/client/Class158_Sub1.java | 4 +- .../main/java/org/runite/client/Class159.java | 6 +- .../java/org/runite/client/Class163_Sub1.java | 4 +- .../org/runite/client/Class163_Sub2_Sub1.java | 4 +- .../java/org/runite/client/Class163_Sub3.java | 137 +-- .../java/org/runite/client/Class164_Sub1.java | 4 +- .../main/java/org/runite/client/Class166.java | 4 +- .../main/java/org/runite/client/Class167.java | 69 +- .../main/java/org/runite/client/Class168.java | 6 +- .../main/java/org/runite/client/Class17.java | 56 +- .../main/java/org/runite/client/Class20.java | 2 +- .../main/java/org/runite/client/Class21.java | 8 +- .../main/java/org/runite/client/Class23.java | 2 +- .../main/java/org/runite/client/Class24.java | 73 +- .../main/java/org/runite/client/Class25.java | 2 +- .../main/java/org/runite/client/Class31.java | 32 +- .../main/java/org/runite/client/Class38.java | 2 +- .../main/java/org/runite/client/Class39.java | 221 ++-- .../java/org/runite/client/Class3_Sub15.java | 1041 ++++++++-------- .../java/org/runite/client/Class3_Sub20.java | 199 ++- .../java/org/runite/client/Class3_Sub21.java | 2 +- .../org/runite/client/Class3_Sub24_Sub2.java | 28 +- .../org/runite/client/Class3_Sub24_Sub3.java | 10 +- .../org/runite/client/Class3_Sub24_Sub4.java | 20 +- .../java/org/runite/client/Class3_Sub25.java | 2 +- .../java/org/runite/client/Class3_Sub26.java | 2 +- .../org/runite/client/Class3_Sub28_Sub3.java | 8 +- .../org/runite/client/Class3_Sub28_Sub5.java | 2 +- .../org/runite/client/Class3_Sub28_Sub8.java | 2 +- .../org/runite/client/Class3_Sub28_Sub9.java | 2 +- .../org/runite/client/Class3_Sub30_Sub1.java | 1072 ---------------- .../java/org/runite/client/Class3_Sub5.java | 6 +- .../java/org/runite/client/Class3_Sub9.java | 2 +- .../main/java/org/runite/client/Class40.java | 4 +- .../main/java/org/runite/client/Class45.java | 208 +--- .../main/java/org/runite/client/Class46.java | 2 +- .../main/java/org/runite/client/Class49.java | 8 +- .../main/java/org/runite/client/Class52.java | 20 +- .../main/java/org/runite/client/Class65.java | 4 +- .../main/java/org/runite/client/Class7.java | 2 +- .../main/java/org/runite/client/Class70.java | 12 +- .../main/java/org/runite/client/Class75.java | 2 +- .../java/org/runite/client/Class75_Sub3.java | 4 +- .../java/org/runite/client/Class75_Sub4.java | 4 +- .../main/java/org/runite/client/Class79.java | 2 +- .../main/java/org/runite/client/Class81.java | 16 +- .../main/java/org/runite/client/Class84.java | 6 +- .../main/java/org/runite/client/Class96.java | 2 +- .../main/java/org/runite/client/Class97.java | 10 +- .../main/java/org/runite/client/Client.java | 62 +- .../org/runite/client/ClientCommands.java | 18 +- .../java/org/runite/client/GameObject.java | 2 +- .../org/runite/client/GraphicDefinition.java | 1 - .../org/runite/client/KeyboardListener.java | 6 +- .../client/{Class61.java => LinkedList.java} | 24 +- .../java/org/runite/client/LoginHandler.java | 136 +-- .../runite/client/MouseListeningClass.java | 4 +- .../src/main/java/org/runite/client/NPC.java | 198 +-- .../java/org/runite/client/NPCDefinition.java | 20 +- .../java/org/runite/client/NPCRendering.java | 326 +++++ .../java/org/runite/client/PacketParser.java | 544 ++++----- .../main/java/org/runite/client/Player.java | 10 +- .../org/runite/client/PlayerRendering.java | 487 ++++++++ .../client/RenderAnimationDefinition.java | 210 ++-- .../org/runite/client/SequenceDefinition.java | 22 +- .../main/java/org/runite/client/Sprites.java | 9 +- .../main/java/org/runite/client/Texture.java | 22 +- .../org/runite/client/TextureOperation.java | 56 +- .../org/runite/client/TextureOperation0.java | 121 +- .../org/runite/client/TextureOperation1.java | 6 +- .../org/runite/client/TextureOperation10.java | 16 +- .../org/runite/client/TextureOperation11.java | 6 +- .../org/runite/client/TextureOperation12.java | 16 +- .../org/runite/client/TextureOperation13.java | 2 +- .../org/runite/client/TextureOperation14.java | 6 +- .../org/runite/client/TextureOperation15.java | 18 +- .../org/runite/client/TextureOperation16.java | 4 +- .../org/runite/client/TextureOperation17.java | 8 +- .../org/runite/client/TextureOperation19.java | 28 +- .../org/runite/client/TextureOperation20.java | 24 +- .../org/runite/client/TextureOperation21.java | 16 +- .../org/runite/client/TextureOperation22.java | 6 +- .../org/runite/client/TextureOperation23.java | 12 +- .../org/runite/client/TextureOperation25.java | 4 +- .../org/runite/client/TextureOperation26.java | 10 +- .../org/runite/client/TextureOperation27.java | 18 +- .../org/runite/client/TextureOperation28.java | 13 +- .../org/runite/client/TextureOperation29.java | 6 +- .../org/runite/client/TextureOperation3.java | 2 +- .../org/runite/client/TextureOperation30.java | 18 +- .../org/runite/client/TextureOperation31.java | 161 +-- .../org/runite/client/TextureOperation32.java | 24 +- .../org/runite/client/TextureOperation33.java | 14 +- .../org/runite/client/TextureOperation34.java | 37 +- .../org/runite/client/TextureOperation35.java | 12 +- .../org/runite/client/TextureOperation36.java | 198 +-- .../org/runite/client/TextureOperation37.java | 20 +- .../org/runite/client/TextureOperation38.java | 12 +- .../org/runite/client/TextureOperation39.java | 8 +- .../org/runite/client/TextureOperation4.java | 14 +- .../org/runite/client/TextureOperation5.java | 8 +- .../org/runite/client/TextureOperation6.java | 6 +- .../org/runite/client/TextureOperation7.java | 14 +- .../org/runite/client/TextureOperation8.java | 16 +- .../org/runite/client/TextureOperation9.java | 16 +- .../main/java/org/runite/client/Unsorted.java | 369 +++--- .../main/java/org/runite/client/WorldMap.java | 36 - .../org/runite/client/drawcalls/Minimap.java | 8 +- .../rs09/client/console/DeveloperConsole.kt | 1 + .../org/rs09/client/net/game/PacketDecoder.kt | 22 +- 129 files changed, 5036 insertions(+), 5147 deletions(-) create mode 100644 Client/src/main/java/org/runite/client/BufferedDataStream.java delete mode 100644 Client/src/main/java/org/runite/client/Class3_Sub30_Sub1.java rename Client/src/main/java/org/runite/client/{Class61.java => LinkedList.java} (84%) create mode 100644 Client/src/main/java/org/runite/client/NPCRendering.java create mode 100644 Client/src/main/java/org/runite/client/PlayerRendering.java diff --git a/Client/src/main/java/org/runite/client/AtmosphereParser.java b/Client/src/main/java/org/runite/client/AtmosphereParser.java index 7d6ed2ad6..33a835355 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(TextureOperation0.nameIconsSpriteArray, null); + var2.method697(Sprites.nameIconsSpriteArray, null); Unsorted.aReferenceCache_1135.put(var2, var1); } return var2; diff --git a/Client/src/main/java/org/runite/client/BufferedDataStream.java b/Client/src/main/java/org/runite/client/BufferedDataStream.java new file mode 100644 index 000000000..622067993 --- /dev/null +++ b/Client/src/main/java/org/runite/client/BufferedDataStream.java @@ -0,0 +1,1073 @@ +package org.runite.client; + +import org.rs09.SystemLogger; + +import java.util.Objects; + +public final class BufferedDataStream extends DataBuffer { + + public static BufferedDataStream incomingBuffer = new BufferedDataStream(); + static RSString[] aClass94Array3802; + static int anInt872; + static int anInt2330 = 0; + static float aFloat3044; + static int anInt4037; + static int anInt1345; + static int anInt1407; + 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, 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]; + static int[] anIntArray3805; + private int headiconsPrayerSpriteArchive6; + + + static void addChatMessage(RSString var0, int type, RSString message, int var3) { + try { + Class3_Sub28_Sub12.sendGameMessage(var3, type, message, null, var0); + } catch (RuntimeException var5) { + throw ClientErrorException.clientError(var5, "i.W(" + (var0 != null ? "{...}" : "null") + ',' + type + ',' + (message != null ? "{...}" : "null") + ',' + var3 + ')'); + } + } + + static void method806(int var1) { + try { + if (var1 >= 0) { + int var2 = Class117.anIntArray1613[var1]; + int var3 = Class27.anIntArray512[var1]; + int var4 = TextureOperation27.aShortArray3095[var1]; + if (var4 >= 2000) { + var4 -= 2000; + } + + long var6 = Unsorted.aLongArray3271[var1]; + int var5 = (int) Unsorted.aLongArray3271[var1]; + Player var8; + if (31 == var4) { + var8 = Unsorted.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; + TextureOperation12.outgoingBuffer.putOpcode(71); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); + } + } + + if (var4 == 46) { + Class163_Sub2_Sub1.method2224(var6, var3, var2); + 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) { + 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; + System.out.println(anInt1473 + ", " + var3 + ", " + var2 + ", " + Class3_Sub28_Sub18.anInt3764 + ", " + Class164.anInt2050 + ", " + var5); + } + + NPC var11; + if (var4 == 19) { + var11 = NPC.npcs[var5]; + if (null != var11) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var11.anIntArray2767[0], 1, 0, 2, var11.anIntArray2755[0], Class102.player.anIntArray2767[0]); + Class70.anInt1053 = Class163_Sub1.anInt2993; + Class36.anInt638 = 2; + Unsorted.anInt2958 = 0; + Unsorted.anInt4062 = Class38_Sub1.anInt2614; + TextureOperation12.outgoingBuffer.putOpcode(30); + TextureOperation12.outgoingBuffer.writeShort(var5); + } + } + + if (17 == var4) { + var11 = NPC.npcs[var5]; + if (var11 != null) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var11.anIntArray2767[0], 1, 0, 2, var11.anIntArray2755[0], Class102.player.anIntArray2767[0]); + Class70.anInt1053 = Class163_Sub1.anInt2993; + Unsorted.anInt2958 = 0; + Class36.anInt638 = 2; + Unsorted.anInt4062 = Class38_Sub1.anInt2614; + TextureOperation12.outgoingBuffer.putOpcode(78); + TextureOperation12.outgoingBuffer.writeShortLE(var5); + } + } + + if (var4 == 44) { + var8 = Unsorted.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; + TextureOperation12.outgoingBuffer.putOpcode(133); + TextureOperation12.outgoingBuffer.writeShortLE(var5); + } + } + + if (var4 == 58) { + 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; + } + + if (var4 == 42) { + Class163_Sub2_Sub1.method2224(var6, var3, var2); + 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) { + TextureOperation4.method264((byte) 122); + } + + if (var4 == 45) { + var11 = NPC.npcs[var5]; + if (var11 != null) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var11.anIntArray2767[0], 1, 0, 2, var11.anIntArray2755[0], Class102.player.anIntArray2767[0]); + Class70.anInt1053 = Class163_Sub1.anInt2993; + Class36.anInt638 = 2; + Unsorted.anInt2958 = 0; + Unsorted.anInt4062 = Class38_Sub1.anInt2614; + TextureOperation12.outgoingBuffer.putOpcode(239); + TextureOperation12.outgoingBuffer.writeIntLE2(anInt872); + TextureOperation12.outgoingBuffer.putShortA(RSInterface.anInt278); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); + } + } + + boolean var14; + if (18 == var4) { + if (Class158.paramGameTypeID == 1) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); + } else { + var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2597 ^ 2599, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); + if (!var14) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); + } + } + + Class70.anInt1053 = Class163_Sub1.anInt2993; + Unsorted.anInt2958 = 0; + Class36.anInt638 = 2; + Unsorted.anInt4062 = Class38_Sub1.anInt2614; + 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); + 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) { + Class36.anInt638 = 2; + Class70.anInt1053 = Class163_Sub1.anInt2993; + Unsorted.anInt4062 = Class38_Sub1.anInt2614; + Unsorted.anInt2958 = 0; + TextureOperation12.outgoingBuffer.putOpcode(92); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); + } + + RSInterface var13; + if (var4 == 1006) { + var13 = Class7.getRSInterface(var3); + 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 { + TextureOperation12.outgoingBuffer.putOpcode(92); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); + } + + anInt2330 = 0; + Unsorted.aClass11_1933 = Class7.getRSInterface(var3); + KeyboardListener.anInt1918 = var2; + } + + if (var4 == 60) { + if (var5 == 0) { + 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, 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])) { + 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); + } + } + } + + if (1007 == var4) { + Unsorted.anInt2958 = 0; + Class36.anInt638 = 2; + Unsorted.anInt4062 = Class38_Sub1.anInt2614; + Class70.anInt1053 = Class163_Sub1.anInt2993; + var11 = NPC.npcs[var5]; + if (var11 != null) { + NPCDefinition var9 = var11.definition; + if (var9.childNPCs != null) { + var9 = var9.method1471((byte) 80); + } + + if (null != var9) { + TextureOperation12.outgoingBuffer.putOpcode(72); + TextureOperation12.outgoingBuffer.writeShort(var9.npcId); + } + } + } + + if (var4 == 47) { + if (MouseWheel.shiftDown) { + + 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 { + TextureOperation12.outgoingBuffer.putOpcode(156); + TextureOperation12.outgoingBuffer.writeShort128LE(var2); + TextureOperation12.outgoingBuffer.putShortA(var5); + TextureOperation12.outgoingBuffer.writeIntLE2(var3); + anInt2330 = 0; + Unsorted.aClass11_1933 = Class7.getRSInterface(var3); + } + KeyboardListener.anInt1918 = var2; + } + + if (var4 == 3) { + 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 = Unsorted.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; + TextureOperation12.outgoingBuffer.putOpcode(4); + TextureOperation12.outgoingBuffer.writeShortLE(var5); + } + } + + if (41 == var4 && TextureOperation27.aClass11_3087 == null) { + Unsorted.method78(var2, var3); + TextureOperation27.aClass11_3087 = AbstractSprite.method638(var3, var2); + Class20.method909(TextureOperation27.aClass11_3087); + } + + if (49 == var4) { + Class163_Sub2_Sub1.method2224(var6, var3, var2); + 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) { + 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; + } + + if (var4 == 14) { + Class163_Sub2_Sub1.method2224(var6, var3, var2); + 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 = Unsorted.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; + TextureOperation12.outgoingBuffer.putOpcode(114); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); + } + } + + if (var4 == 9 || 1003 == var4) { + Unsorted.method66(Class163_Sub2_Sub1.aClass94Array4016[var1], var2, var5, (byte) -19, var3); + } + + if (var4 == 5) { + if (MouseWheel.shiftDown) { + 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 { + TextureOperation12.outgoingBuffer.putOpcode(55); + TextureOperation12.outgoingBuffer.writeShortLE(var5); + TextureOperation12.outgoingBuffer.putShortA(var2); + TextureOperation12.outgoingBuffer.writeIntV1(var3); + anInt2330 = 0; + Unsorted.aClass11_1933 = Class7.getRSInterface(var3); + + } + KeyboardListener.anInt1918 = var2; + } + + if (var4 == 21) { + if (Class158.paramGameTypeID == 1) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2597 + -2595, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); + } else { + var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2597 + -2595, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); + if (!var14) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2597 + -2595, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); + } + } + + Class36.anInt638 = 2; + Class70.anInt1053 = Class163_Sub1.anInt2993; + Unsorted.anInt2958 = 0; + Unsorted.anInt4062 = Class38_Sub1.anInt2614; + TextureOperation12.outgoingBuffer.putOpcode(228); + TextureOperation12.outgoingBuffer.writeShort(var5); + TextureOperation12.outgoingBuffer.writeShortLE(Class131.anInt1716 + var2); + TextureOperation12.outgoingBuffer.writeShort128LE(Texture.anInt1152 + var3); + } + + if (var4 == 4) { + var11 = NPC.npcs[var5]; + if (var11 != null) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var11.anIntArray2767[0], 1, 0, 2, var11.anIntArray2755[0], Class102.player.anIntArray2767[0]); + Class36.anInt638 = 2; + Unsorted.anInt2958 = 0; + Unsorted.anInt4062 = Class38_Sub1.anInt2614; + Class70.anInt1053 = Class163_Sub1.anInt2993; + TextureOperation12.outgoingBuffer.putOpcode(148); + TextureOperation12.outgoingBuffer.putShortA(var5); + } + } + + if (32 == var4) { + var13 = AbstractSprite.method638(var3, var2); + if (null != var13) { + Class25.method958((byte) -126); + Class3_Sub1 var16 = Client.method44(var13); + Class145.method2074(var3, var2, var16.method101(), var16.anInt2202, var13.anInt266, var13.anInt238); + Class164_Sub1.anInt3012 = 0; + Class3_Sub28_Sub9.aClass94_3621 = Class53.method1174(var13, (byte) -94); + if (Class3_Sub28_Sub9.aClass94_3621 == null) { + Class3_Sub28_Sub9.aClass94_3621 = TextCore.aClass94_1915; + } + + if (var13.usingScripts) { + TextCore.aClass94_676 = RSString.stringCombiner(new RSString[]{var13.aClass94_277, ColorCore.ContextColor}); + } else { + TextCore.aClass94_676 = RSString.stringCombiner(new RSString[]{RSString.parse(""), var13.aClass94_243, ColorCore.ContextColor}); + } + } + + } else { + if (29 == var4) { + var8 = Unsorted.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; + TextureOperation12.outgoingBuffer.putOpcode(180); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); + } + } + + if (var4 == 35) { + 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 = Unsorted.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; + TextureOperation12.outgoingBuffer.putOpcode(195); + TextureOperation12.outgoingBuffer.putShortA(RSInterface.anInt278); + TextureOperation12.outgoingBuffer.writeIntLE2(anInt872); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); + } + } + + if (34 == var4) { + if (Class158.paramGameTypeID == 1) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); + } else { + var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2597 ^ 2599, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); + if (!var14) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); + } + } + + Class70.anInt1053 = Class163_Sub1.anInt2993; + Class36.anInt638 = 2; + Unsorted.anInt4062 = Class38_Sub1.anInt2614; + Unsorted.anInt2958 = 0; + TextureOperation12.outgoingBuffer.putOpcode(109); + TextureOperation12.outgoingBuffer.writeShortLE(var3 - -Texture.anInt1152); + TextureOperation12.outgoingBuffer.writeShort(var2 + Class131.anInt1716); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); + } + + if (var4 == 25) { + 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; + } + + if (var4 == 2) { + var11 = NPC.npcs[var5]; + if (var11 != null) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2597 + -2595, var11.anIntArray2767[0], 1, 0, 2, var11.anIntArray2755[0], Class102.player.anIntArray2767[0]); + Unsorted.anInt4062 = Class38_Sub1.anInt2614; + Class36.anInt638 = 2; + Class70.anInt1053 = Class163_Sub1.anInt2993; + Unsorted.anInt2958 = 0; + TextureOperation12.outgoingBuffer.putOpcode(218); + TextureOperation12.outgoingBuffer.writeShortLE(var5); + } + } + + int var12; + if (var4 == 51) { + 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]; + if (ItemDefinition.ram[var12] != var13.anIntArray307[0]) { + ItemDefinition.ram[var12] = var13.anIntArray307[0]; + Class46.method1087(98, var12); + } + } + } + + if (var4 == 26) { + var11 = NPC.npcs[var5]; + if (var11 != null) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var11.anIntArray2767[0], 1, 0, 2, var11.anIntArray2755[0], Class102.player.anIntArray2767[0]); + Class36.anInt638 = 2; + Unsorted.anInt2958 = 0; + Unsorted.anInt4062 = Class38_Sub1.anInt2614; + Class70.anInt1053 = Class163_Sub1.anInt2993; + 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) { + 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]; + ItemDefinition.ram[var12] = -ItemDefinition.ram[var12] + 1; + Class46.method1087(68, var12); + } + } + + if (var4 == 33) { + var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); + if (!var14) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2597 + -2595, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); + } + + Class70.anInt1053 = Class163_Sub1.anInt2993; + Unsorted.anInt2958 = 0; + Unsorted.anInt4062 = Class38_Sub1.anInt2614; + Class36.anInt638 = 2; + 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) { + Unsorted.anInt2958 = 0; + Class70.anInt1053 = Class163_Sub1.anInt2993; + Class36.anInt638 = 2; + Unsorted.anInt4062 = Class38_Sub1.anInt2614; + TextureOperation12.outgoingBuffer.putOpcode(94); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); + } + + if (11 == var4) { + if (var5 == 0) { + CS2Script.anInt2440 = 1; + Unsorted.method589(WorldListCountry.localPlane, var2, var3); + } else if (1 == var5) { + 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); + } + } + + if (8 == var4) { + var13 = Class7.getRSInterface(var3); + boolean var15 = true; + if (0 < Objects.requireNonNull(var13).anInt189) { + var15 = method715(var13); + } + + if (var15) { + TextureOperation12.outgoingBuffer.putOpcode(10); + TextureOperation12.outgoingBuffer.writeInt(var3); + } + } + + if (var4 == 1) { + var8 = Unsorted.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; + 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) { + 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; + } + + if (var4 == 24) { + if (Class158.paramGameTypeID == 1) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2597 + -2595, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); + } else { + var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); + if (!var14) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); + } + } + + Class36.anInt638 = 2; + Unsorted.anInt4062 = Class38_Sub1.anInt2614; + Class70.anInt1053 = Class163_Sub1.anInt2993; + Unsorted.anInt2958 = 0; + 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); + 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) { + 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 = Unsorted.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; + TextureOperation12.outgoingBuffer.putOpcode(175); + TextureOperation12.outgoingBuffer.putShortA(var5); + } + } + + if (var4 == 22) { + + if (MouseWheel.shiftDown) { + 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; + + } else { + + Class25.method958((byte) -86); + var13 = Class7.getRSInterface(var3); + Class3_Sub28_Sub18.anInt3764 = var3; + anInt1473 = var2; + Class164_Sub1.anInt3012 = 1; + Class164.anInt2050 = var5; + Class20.method909(var13); + RenderAnimationDefinition.aClass94_378 = RSString.stringCombiner(new RSString[]{ + ColorCore.ContextColor2, ItemDefinition.getItemDefinition(var5).name, ColorCore.ContextColor + }); + + } + } else { + if (var4 == 50) { + Class163_Sub2_Sub1.method2224(var6, var3, var2); + 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) { + 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 = Unsorted.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; + TextureOperation12.outgoingBuffer.putOpcode(68); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); + } + } + + if (var4 == 43) { + 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; + } + + if (var4 == 39) { + var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); + if (!var14) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); + } + + Unsorted.anInt4062 = Class38_Sub1.anInt2614; + Class70.anInt1053 = Class163_Sub1.anInt2993; + Class36.anInt638 = 2; + Unsorted.anInt2958 = 0; + 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) { + TextureOperation12.outgoingBuffer.putOpcode(82); + TextureOperation12.outgoingBuffer.writeShort(RSInterface.anInt278); + TextureOperation12.outgoingBuffer.writeIntV1(var3); + TextureOperation12.outgoingBuffer.writeInt(anInt872); + TextureOperation12.outgoingBuffer.writeShort128LE(var2); + } + + if (var4 == 36) { + if (var5 == 0) { + 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, Texture.anInt1152 - -var3, WorldListCountry.localPlane); + } else { + TextureOperation12.outgoingBuffer.putOpcode(179); + TextureOperation12.outgoingBuffer.writeShort(var3 + Texture.anInt1152); + TextureOperation12.outgoingBuffer.writeShort(var2 + Class131.anInt1716); + } + } + + if (6 == var4) { + var8 = Unsorted.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; + TextureOperation12.outgoingBuffer.putOpcode(106); + TextureOperation12.outgoingBuffer.writeShort(var5); + } + } + + if (var4 == 20) { + if (1 == Class158.paramGameTypeID) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); + } else { + var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); + if (!var14) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); + } + } + + Unsorted.anInt4062 = Class38_Sub1.anInt2614; + Unsorted.anInt2958 = 0; + Class70.anInt1053 = Class163_Sub1.anInt2993; + Class36.anInt638 = 2; + TextureOperation12.outgoingBuffer.putOpcode(33); + TextureOperation12.outgoingBuffer.writeShort(var5); + TextureOperation12.outgoingBuffer.writeShort(Class131.anInt1716 + var2); + TextureOperation12.outgoingBuffer.writeShortLE(Texture.anInt1152 + var3); + } + + if (var4 == 16) { + var11 = NPC.npcs[var5]; + if (null != var11) { + Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var11.anIntArray2767[0], 1, 0, 2, var11.anIntArray2755[0], Class102.player.anIntArray2767[0]); + Class70.anInt1053 = Class163_Sub1.anInt2993; + Unsorted.anInt2958 = 0; + Unsorted.anInt4062 = Class38_Sub1.anInt2614; + Class36.anInt638 = 2; + TextureOperation12.outgoingBuffer.putOpcode(3); + TextureOperation12.outgoingBuffer.writeShort128LE(var5); + } + } + + if (Class164_Sub1.anInt3012 != 0) { + Class164_Sub1.anInt3012 = 0; + Class20.method909(Class7.getRSInterface(Class3_Sub28_Sub18.anInt3764)); + } + + if (GameObject.aBoolean1837) { + Class25.method958((byte) -36); + } + + if (Unsorted.aClass11_1933 != null && anInt2330 == 0) { + Class20.method909(Unsorted.aClass11_1933); + } + + } + } + } + } catch (RuntimeException var10) { + throw ClientErrorException.clientError(var10, "i.E(" + 2597 + ',' + var1 + ')'); + } + } + + static boolean method715(RSInterface var1) { + try { + if (205 == var1.anInt189) { + Class159.anInt2023 = 250; + return true; + } else { + return false; + } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "ud.B(" + 205 + ',' + "null" + ')'); + } + } + + final void setBitAccess() { + try { + this.headiconsPrayerSpriteArchive6 = this.index * 8; + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "i.R(" + ')'); + } + } + + public BufferedDataStream() { + super(5000); + } + + static int method809(int var0, int var1, int var2, int var3) { + try { + if (TextureOperation14.aBoolean3387) { + var0 = 1000000; + TextureOperation14.aBoolean3387 = false; + } + + AtmosphereParser var5 = AtmosphereParser.aAtmosphereParserArrayArray1581[var3][var1]; + float var7 = ((float) var2 * 0.1F + 0.7F) * var5.aFloat1187; + float var8 = var5.aFloat1190; + int var6 = var5.anInt1177; + int var11 = var5.anInt1184; + int var10 = var5.anInt1175; + if (!Class38.aBoolean661) { + var11 = 0; + } + + 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; + TextureOperation36.aFloat3435 = TextureOperation36.aFloat3424; + TextureOperation9.aFloat3105 = Class30.aFloat578; + Class60.anInt932 = var6; + anInt1971 = Class3_Sub28_Sub12.anInt3652; + anInt1407 = Unsorted.anInt689; + RSInterface.aFloat246 = var9; + Unsorted.anInt72 = 0; + anInt4037 = Unsorted.anInt1950; + anInt1736 = var11; + aFloat3044 = var8; + anInt1345 = var10; + aFloat1475 = Class12.aFloat319; + } + + if (65536 > Unsorted.anInt72) { + Unsorted.anInt72 += 250 * var0; + if (Unsorted.anInt72 >= 65536) { + Unsorted.anInt72 = 65536; + } + + 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 & 65280) + (65280 & anInt1345) * var13) >> 8; + float var14 = (float) (65536 - Unsorted.anInt72) / 65536.0F; + 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 & 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, TextureOperation36.aFloat3424, Class12.aFloat319); + Class92.setFogValues(Class3_Sub28_Sub12.anInt3652, Unsorted.anInt689); + + Class92.setLightPosition((float) Class46.anInt741, (float) TextureOperation1.anInt3274, (float) AtmosphereParser.anInt1191); + Class92.method1504(); + return Class3_Sub28_Sub12.anInt3652; + } catch (RuntimeException var16) { + throw ClientErrorException.clientError(var16, "i.F(" + var0 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + 1 + ')'); + } + } + + static int method810(int var1) { + return 255 & var1; + } + + final void method811(byte var1, int var2, byte[] var3, int var4) { + try { + if (var1 < 16) { + addChatMessage(null, 126, null, -28); + } + + for (int var5 = 0; var5 < var4; ++var5) { + var3[var2 + var5] = (byte) (this.buffer[this.index++] + -this.isaacCipher.nextOpcode()); + } + + } catch (RuntimeException var6) { + throw ClientErrorException.clientError(var6, "i.S(" + var1 + ',' + var2 + ',' + (var3 != null ? "{...}" : "null") + ',' + var4 + ')'); + } + } + + final int getBits(int var2) { + try { + int var3 = this.headiconsPrayerSpriteArchive6 >> 3; + int var4 = 8 + -(7 & this.headiconsPrayerSpriteArchive6); + int var5 = 0; + this.headiconsPrayerSpriteArchive6 += var2; + while (var2 > var4) { + var5 += (anIntArray2709[var4] & this.buffer[var3++]) << -var4 + var2; + var2 -= var4; + var4 = 8; + } + + if (var2 == var4) { + var5 += this.buffer[var3] & anIntArray2709[var4]; + } else { + var5 += this.buffer[var3] >> var4 - var2 & anIntArray2709[var2]; + } + + return var5; + } catch (RuntimeException var6) { + throw ClientErrorException.clientError(var6, "i.C(" + (byte) -11 + ',' + var2 + ')'); + } + } + +// static void method813() { +// try { +// Class3_Sub28_Sub4.aReferenceCache_3572.clearSoftReferences(); +// Class143.aReferenceCache_1874.clearSoftReferences(); +// Class67.aReferenceCache_1013.clearSoftReferences(); +// } catch (RuntimeException var2) { +// throw ClientErrorException.clientError(var2, "i.O(" + 1974 + ')'); +// } +// } + + final void method814(int[] var1) { + try { + this.isaacCipher = new ISAACCipher(var1); + + } catch (RuntimeException var4) { + throw ClientErrorException.clientError(var4, "i.T(" + (var1 != null ? "{...}" : "null") + ',' + false + ')'); + } + } + + final int method815(int var1) { + try { + + return var1 * 8 - this.headiconsPrayerSpriteArchive6; + } catch (RuntimeException var4) { + throw ClientErrorException.clientError(var4, "i.U(" + var1 + ',' + 32666 + ')'); + } + } + + public final void putOpcode(int opcode) { + if (buffer == null || isaacCipher == null) { + SystemLogger.logInfo("Buffer/cipher null. ISAAC likely disabled or not implemented."); + return; + } + this.buffer[this.index++] = (byte) (opcode + this.isaacCipher.nextOpcode()); + } + + public final int getOpcode() { + try { + return 255 & this.buffer[this.index++] - this.isaacCipher.nextOpcode(); + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "i.P(" + 0 + ')'); + } + } + + final void method818() { + try { + this.index = (this.headiconsPrayerSpriteArchive6 + 7) / 8; + + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "i.Q(" + false + ')'); + } + } + + static void method819() { + try { + 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; + RSInterface[] var4 = GameObject.aClass11ArrayArray1834[var2]; + + int var5; + for (var5 = 0; var5 < var4.length; ++var5) { + if (var4[var5] != null) { + var3 = var4[var5].usingScripts; + break; + } + } + + if (!var3) { + var5 = (int) var1.linkableKey; + RSInterface var6 = Class7.getRSInterface(var5); + if (null != var6) { + Class20.method909(var6); + } + } + } + } + + } catch (RuntimeException var7) { + throw ClientErrorException.clientError(var7, "i.A(" + false + ')'); + } + } + +} diff --git a/Client/src/main/java/org/runite/client/CS2Script.java b/Client/src/main/java/org/runite/client/CS2Script.java index 5bf935785..b40d57c75 100644 --- a/Client/src/main/java/org/runite/client/CS2Script.java +++ b/Client/src/main/java/org/runite/client/CS2Script.java @@ -871,12 +871,12 @@ public final class CS2Script extends Linkable { if (opcode < 3200) { if (opcode == 3100) { RSString class94_3 = ItemDefinition.stringsStack[--sStackCounter]; - Class3_Sub30_Sub1.addChatMessage(TextCore.aClass94_2331, 0, class94_3, -1); + BufferedDataStream.addChatMessage(TextCore.aClass94_2331, 0, class94_3, -1); continue; } if (opcode == 3101) { iStackCounter -= 2; - WorldMap.method628(ItemDefinition.intsStack[iStackCounter - -1], ItemDefinition.intsStack[iStackCounter], Class102.player); + PlayerRendering.method628(ItemDefinition.intsStack[iStackCounter - -1], ItemDefinition.intsStack[iStackCounter], Class102.player); continue; } if (opcode == 3103) { @@ -1607,7 +1607,7 @@ public final class CS2Script extends Linkable { iStackCounter -= 2; int k23 = ItemDefinition.intsStack[iStackCounter]; int i55 = ItemDefinition.intsStack[1 + iStackCounter]; - Class3_Sub28_Sub9 class3_sub28_sub9 = Class61.method1210(i55); + Class3_Sub28_Sub9 class3_sub28_sub9 = LinkedList.method1210(i55); if (!class3_sub28_sub9.method585()) ItemDefinition.intsStack[iStackCounter++] = NPCDefinition.getNPCDefinition(k23).method1475(i55, class3_sub28_sub9.anInt3614); else @@ -2395,9 +2395,9 @@ public final class CS2Script extends Linkable { RSString class94_55 = ItemDefinition.stringsStack[1 + sStackCounter]; RSString class94_26 = ItemDefinition.stringsStack[sStackCounter]; if (class94_26.length() > 0) { - if (null == Class3_Sub30_Sub1.aClass94Array3802) - Class3_Sub30_Sub1.aClass94Array3802 = new RSString[TextureOperation19.anIntArray3218[Class158.paramGameTypeID]]; - Class3_Sub30_Sub1.aClass94Array3802[i72] = class94_26; + if (null == BufferedDataStream.aClass94Array3802) + BufferedDataStream.aClass94Array3802 = new RSString[TextureOperation19.anIntArray3218[Class158.paramGameTypeID]]; + BufferedDataStream.aClass94Array3802[i72] = class94_26; } if (class94_55.length() > 0) { if (Unsorted.aClass94Array45 == null) @@ -2585,7 +2585,7 @@ public final class CS2Script extends Linkable { continue; } if (opcode == 6009) { - TextureOperation0.aBoolean3275 = ItemDefinition.intsStack[--iStackCounter] == 1; + Unsorted.aBoolean3275 = ItemDefinition.intsStack[--iStackCounter] == 1; Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; @@ -2768,7 +2768,7 @@ public final class CS2Script extends Linkable { continue; } if (6109 == opcode) { - ItemDefinition.intsStack[iStackCounter++] = TextureOperation0.aBoolean3275 ? 1 : 0; + ItemDefinition.intsStack[iStackCounter++] = Unsorted.aBoolean3275 ? 1 : 0; continue; } if (opcode == 6110) { @@ -3130,7 +3130,7 @@ public final class CS2Script extends Linkable { iStackCounter -= 2; int i38 = ItemDefinition.intsStack[iStackCounter]; int i61 = ItemDefinition.intsStack[iStackCounter - -1]; - Class3_Sub28_Sub9 class3_sub28_sub9_1 = Class61.method1210(i61); + Class3_Sub28_Sub9 class3_sub28_sub9_1 = LinkedList.method1210(i61); if (!class3_sub28_sub9_1.method585()) ItemDefinition.intsStack[iStackCounter++] = StructDefinitionProvider.provide(i38).getInt(i61, class3_sub28_sub9_1.anInt3614); else @@ -3142,7 +3142,7 @@ public final class CS2Script extends Linkable { iStackCounter -= 2; int j61 = ItemDefinition.intsStack[iStackCounter - -1]; int j38 = ItemDefinition.intsStack[iStackCounter]; - Class3_Sub28_Sub9 class3_sub28_sub9_2 = Class61.method1210(j61); + Class3_Sub28_Sub9 class3_sub28_sub9_2 = LinkedList.method1210(j61); if (!class3_sub28_sub9_2.method585()) ItemDefinition.intsStack[iStackCounter++] = ObjectDefinition.getObjectDefinition(j38).method1691(class3_sub28_sub9_2.anInt3614, j61, (byte) 105); else @@ -3214,7 +3214,7 @@ public final class CS2Script extends Linkable { iStackCounter -= 2; int k40 = ItemDefinition.intsStack[iStackCounter]; int i62 = ItemDefinition.intsStack[iStackCounter - -1]; - Class3_Sub28_Sub9 class3_sub28_sub9_3 = Class61.method1210(i62); + Class3_Sub28_Sub9 class3_sub28_sub9_3 = LinkedList.method1210(i62); if (class3_sub28_sub9_3.method585()) ItemDefinition.stringsStack[sStackCounter++] = ItemDefinition.getItemDefinition(k40).method1105(class3_sub28_sub9_3.aClass94_3619, i62); else @@ -3261,7 +3261,7 @@ public final class CS2Script extends Linkable { RSString class94_31 = ItemDefinition.stringsStack[--sStackCounter]; int l62 = ItemDefinition.intsStack[--iStackCounter]; ItemDefinition.stringsStack[sStackCounter++] = RSString.stringCombiner(new RSString[]{ - class94_31, Class61.method1218(l62) + class94_31, LinkedList.method1218(l62) }); continue; } @@ -3971,7 +3971,7 @@ public final class CS2Script extends Linkable { try { Queue var3 = new Queue(); - for (Class3_Sub28_Sub3 var4 = (Class3_Sub28_Sub3) Class134.aClass61_1758.method1222(); var4 != null; var4 = (Class3_Sub28_Sub3) Class134.aClass61_1758.method1221()) { + for (Class3_Sub28_Sub3 var4 = (Class3_Sub28_Sub3) Class134.aLinkedList_1758.method1222(); var4 != null; var4 = (Class3_Sub28_Sub3) Class134.aLinkedList_1758.method1221()) { if (var4.aBoolean3553 && var4.method537(var1, var0)) { var3.offer(var4); } diff --git a/Client/src/main/java/org/runite/client/Class1.java b/Client/src/main/java/org/runite/client/Class1.java index d0a0de987..70fd6b804 100644 --- a/Client/src/main/java/org/runite/client/Class1.java +++ b/Client/src/main/java/org/runite/client/Class1.java @@ -639,7 +639,7 @@ final class Class1 { var10 = 25 * Class3_Sub28_Sub8.anInt3611; } - for (Class3_Sub23 var11 = (Class3_Sub23) Class84.aClass61_1162.method1222(); var11 != null; var11 = (Class3_Sub23) Class84.aClass61_1162.method1221()) { + for (Class3_Sub23 var11 = (Class3_Sub23) Class84.aLinkedList_1162.method1222(); var11 != null; var11 = (Class3_Sub23) Class84.aLinkedList_1162.method1221()) { if (Class8.anInt101 == var11.anInt2532) { int var13 = var4 - -(var11.anInt2539 * var1 / Class108.anInt1460); int var12 = var2 * var11.anInt2531 / Class23.anInt455 + var0; diff --git a/Client/src/main/java/org/runite/client/Class101.java b/Client/src/main/java/org/runite/client/Class101.java index a426305e5..4b1c1272c 100644 --- a/Client/src/main/java/org/runite/client/Class101.java +++ b/Client/src/main/java/org/runite/client/Class101.java @@ -55,7 +55,7 @@ final class Class101 { public static void method1608(byte var0) { try { CacheIndex.npcConfigIndex = null; - Class136.aClass61_1424 = null; + Class136.aLinkedList_1424 = null; aShortArrayArray1429 = null; anIntArray1426 = null; aClass3_Sub24_Sub4_1421 = null; diff --git a/Client/src/main/java/org/runite/client/Class108.java b/Client/src/main/java/org/runite/client/Class108.java index f3ef013ca..58dc2a50f 100644 --- a/Client/src/main/java/org/runite/client/Class108.java +++ b/Client/src/main/java/org/runite/client/Class108.java @@ -84,7 +84,7 @@ final class Class108 { static void method1659() { try { - Class61.aReferenceCache_939.clear(); + LinkedList.aReferenceCache_939.clear(); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "oi.G(" + 16712751 + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class114.java b/Client/src/main/java/org/runite/client/Class114.java index ab3dac1c9..90b72d265 100644 --- a/Client/src/main/java/org/runite/client/Class114.java +++ b/Client/src/main/java/org/runite/client/Class114.java @@ -16,7 +16,7 @@ final class Class114 { private Class3_Sub26[] aClass3_Sub26Array1571; private int[][] anIntArrayArray1573; private int anInt1576 = -1; - private Class61 aClass61_1577 = new Class61(); + private LinkedList aLinkedList_1577 = new LinkedList(); Class114(int var1, int var2, int var3) { @@ -85,8 +85,8 @@ final class Class114 { this.anIntArrayArray1573 = null; this.aClass3_Sub26Array1571 = null; - this.aClass61_1577.method1211(-85); - this.aClass61_1577 = null; + this.aLinkedList_1577.method1211(-85); + this.aLinkedList_1577 = null; } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "pf.A(" + 1127165736 + ')'); } @@ -111,7 +111,7 @@ final class Class114 { var3 = new Class3_Sub26(var2, this.anInt1570); ++this.anInt1570; } else { - Class3_Sub26 var4 = (Class3_Sub26) this.aClass61_1577.method1212(); + Class3_Sub26 var4 = (Class3_Sub26) this.aLinkedList_1577.method1212(); var3 = new Class3_Sub26(var2, Objects.requireNonNull(var4).anInt2555); this.aClass3_Sub26Array1571[var4.anInt2553] = null; var4.unlink(); @@ -122,7 +122,7 @@ final class Class114 { this.aBoolean1580 = false; } - this.aClass61_1577.method1216(var3); + this.aLinkedList_1577.method1216(var3); return this.anIntArrayArray1573[var3.anInt2555]; } } catch (RuntimeException var5) { diff --git a/Client/src/main/java/org/runite/client/Class115.java b/Client/src/main/java/org/runite/client/Class115.java index 89bf6c916..f93451e35 100644 --- a/Client/src/main/java/org/runite/client/Class115.java +++ b/Client/src/main/java/org/runite/client/Class115.java @@ -7,7 +7,7 @@ final class Class115 { try { while (true) { - Class3_Sub5 var1 = (Class3_Sub5) Unsorted.aClass61_2468.method1220(); + Class3_Sub5 var1 = (Class3_Sub5) Unsorted.aLinkedList_2468.method1220(); if (var1 == null) { return; } @@ -19,7 +19,7 @@ final class Class115 { if (Class3_Sub1.localIndex == var3) { var2 = Class102.player; } else { - var2 = TextureOperation0.players[var3]; + var2 = Unsorted.players[var3]; } } else { var3 = var1.anInt2273 - 1; diff --git a/Client/src/main/java/org/runite/client/Class124.java b/Client/src/main/java/org/runite/client/Class124.java index 35ddfd7ff..154932ba2 100644 --- a/Client/src/main/java/org/runite/client/Class124.java +++ b/Client/src/main/java/org/runite/client/Class124.java @@ -39,7 +39,7 @@ final class Class124 { int var3 = var0.readUnsignedByte(); for (int var4 = 0; var3 > var4; ++var4) { - var2.aClass61_3560.method1215(new Class3_Sub21(var0.readUnsignedShort(), var0.readUnsignedShort(), var0.readUnsignedShort(), var0.readUnsignedShort())); + var2.aLinkedList_3560.method1215(new Class3_Sub21(var0.readUnsignedShort(), var0.readUnsignedShort(), var0.readUnsignedShort(), var0.readUnsignedShort())); } var2.method538(); diff --git a/Client/src/main/java/org/runite/client/Class128.java b/Client/src/main/java/org/runite/client/Class128.java index 0b78a3447..91ecb70bf 100644 --- a/Client/src/main/java/org/runite/client/Class128.java +++ b/Client/src/main/java/org/runite/client/Class128.java @@ -30,10 +30,10 @@ final class Class128 { static void method1760(int var0, int var2) { try { if (WorldListCountry.localPlane > 3 || WorldListCountry.localPlane < 0) { - System.err.println("Local plane " + WorldListCountry.localPlane + " is out of bounds - rendering log=" + Arrays.toString(Class163_Sub3.PLAYER_RENDER_LOG) + "!"); + System.err.println("Local plane " + WorldListCountry.localPlane + " is out of bounds - rendering log=" + Arrays.toString(PlayerRendering.PLAYER_RENDER_LOG) + "!"); WorldListCountry.localPlane %= 4; } - Class61 var3 = TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var2][var0]; + LinkedList var3 = Class39.aLinkedListArrayArrayArray3273[WorldListCountry.localPlane][var2][var0]; if (var3 == null) { ObjectDefinition.method1688(WorldListCountry.localPlane, var2, var0); } else { @@ -85,7 +85,7 @@ final class Class128 { static Model method1763(int var1, int var2, int var3, int var4, Model var5, int var6) { try { - Model var9 = (Model) Class61.aReferenceCache_939.get(var3); + Model var9 = (Model) LinkedList.aReferenceCache_939.get(var3); if (var9 == null) { Model_Sub1 var10 = Model_Sub1.method2015(CacheIndex.modelsIndex, var3); if (var10 == null) { @@ -93,7 +93,7 @@ final class Class128 { } var9 = var10.method2008(64, 768, -50, -10, -50); - Class61.aReferenceCache_939.put(var9, var3); + LinkedList.aReferenceCache_939.put(var9, var3); } int var17 = var5.method1884(); diff --git a/Client/src/main/java/org/runite/client/Class131.java b/Client/src/main/java/org/runite/client/Class131.java index 2b8abd47f..7b95436bf 100644 --- a/Client/src/main/java/org/runite/client/Class131.java +++ b/Client/src/main/java/org/runite/client/Class131.java @@ -8,7 +8,7 @@ public final class Class131 { static RSString password = TextCore.emptyJagexString; static RSString username = TextCore.emptyJagexString; static int anInt1719 = -1; - static CacheIndex aClass153_1723; + static CacheIndex skeletonsReferenceIndex; public short[] aShortArray1718; public int anInt1720; public RSString[] aClass94Array1721; @@ -29,58 +29,6 @@ public final class Class131 { } } - static void addLocalPlayers() { - try { - while (true) { - if (GraphicDefinition.incomingBuffer.method815(Unsorted.incomingPacketLength) >= 11) { - int index = GraphicDefinition.incomingBuffer.getBits(11); - if (index != 2047) { - boolean var2 = false; - if (null == TextureOperation0.players[index]) { - TextureOperation0.players[index] = new Player(); - var2 = true; - if (null != Class65.aClass3_Sub30Array986[index]) { - TextureOperation0.players[index].parseAppearance(-54, Class65.aClass3_Sub30Array986[index]); - } - } - - Class56.localPlayerIndexes[Class159.localPlayerCount++] = index; - Player var3 = TextureOperation0.players[index]; - var3.anInt2838 = Class44.anInt719; - int var4 = GraphicDefinition.incomingBuffer.getBits(1); - if (var4 == 1) { - Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = index; - } - - int var5 = GraphicDefinition.incomingBuffer.getBits(5); - int var6 = Class27.anIntArray510[GraphicDefinition.incomingBuffer.getBits(3)]; - if (var5 > 15) { - var5 -= 32; - } - - if (var2) { - var3.anInt2806 = var3.anInt2785 = var6; - } - - int var7 = GraphicDefinition.incomingBuffer.getBits(1); - int var8 = GraphicDefinition.incomingBuffer.getBits(5); - if (var8 > 15) { - var8 -= 32; - } - - var3.method1981(var5 + Class102.player.anIntArray2767[0], var7 == 1, Class102.player.anIntArray2755[0] + var8); - continue; - } - } - - GraphicDefinition.incomingBuffer.method818(); - return; - } - } catch (RuntimeException var9) { - throw ClientErrorException.clientError(var9, "se.D(" + -59 + ')'); - } - } - static int method1788(int var0, int var1, int var2, int var3, boolean var4) { try { if (var4) { diff --git a/Client/src/main/java/org/runite/client/Class134.java b/Client/src/main/java/org/runite/client/Class134.java index 4b92b00c4..4838fa147 100644 --- a/Client/src/main/java/org/runite/client/Class134.java +++ b/Client/src/main/java/org/runite/client/Class134.java @@ -2,7 +2,7 @@ package org.runite.client; final class Class134 { - static Class61 aClass61_1758 = new Class61(); + static LinkedList aLinkedList_1758 = new LinkedList(); static int anInt1759 = 0; static int anInt1761 = -1; static int anInt1762 = 0; @@ -22,7 +22,7 @@ final class Class134 { static void method1809(int var0, long[] var1, int var2, int var3, Object[] var4) { try { if (var2 < 85) { - aClass61_1758 = null; + aLinkedList_1758 = null; } if (var0 > var3) { diff --git a/Client/src/main/java/org/runite/client/Class136.java b/Client/src/main/java/org/runite/client/Class136.java index bbb3c298a..c8daaa718 100644 --- a/Client/src/main/java/org/runite/client/Class136.java +++ b/Client/src/main/java/org/runite/client/Class136.java @@ -4,7 +4,7 @@ import org.rs09.client.data.ReferenceCache; final class Class136 { - static Class61 aClass61_1424 = new Class61(); + static LinkedList aLinkedList_1424 = new LinkedList(); static int anInt1771; static ReferenceCache aReferenceCache_1772 = new ReferenceCache(64); static Class64 aClass64_1778; @@ -56,7 +56,7 @@ final class Class136 { var30.anInt2531 = var18; var30.anInt2539 = var24; var30.anInt2532 = var14.MapIcon; - aClass61_1424.method1215(var30); + aLinkedList_1424.method1215(var30); } else { GameObject.aClass3_Sub28_Sub16_Sub2Array1839[var14.MapIcon].drawAt(var18 + -7, -7 + var24); } @@ -69,7 +69,7 @@ final class Class136 { } } - for (Class3_Sub23 var32 = (Class3_Sub23) aClass61_1424.method1222(); null != var32; var32 = (Class3_Sub23) aClass61_1424.method1221()) { + for (Class3_Sub23 var32 = (Class3_Sub23) aLinkedList_1424.method1222(); null != var32; var32 = (Class3_Sub23) aLinkedList_1424.method1221()) { Class74.method1330(var32.anInt2531, var32.anInt2539, 15, var13); Class74.method1330(var32.anInt2531, var32.anInt2539, 13, var13); Class74.method1330(var32.anInt2531, var32.anInt2539, 11, var13); @@ -77,7 +77,7 @@ final class Class136 { GameObject.aClass3_Sub28_Sub16_Sub2Array1839[var32.anInt2532].drawAt(-7 + var32.anInt2531, -7 + var32.anInt2539); } - aClass61_1424.method1211(-76); + aLinkedList_1424.method1211(-76); } catch (RuntimeException var31) { throw ClientErrorException.clientError(var31, "sm.B(" + var0 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + 0 + ',' + 0 + ',' + 127 + ',' + var8 + ',' + var9 + ',' + var10 + ')'); } 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 9165c723c..87c51810a 100644 --- a/Client/src/main/java/org/runite/client/Class140_Sub3.java +++ b/Client/src/main/java/org/runite/client/Class140_Sub3.java @@ -5,578 +5,508 @@ final class Class140_Sub3 extends GameObject { static LDIndexedSprite aClass109_Sub1_2631 = null; private int anInt2720 = 0; - private boolean aBoolean2721 = false; - private SequenceDefinition aClass142_2722; - private final int anInt2724; - private int anInt2725 = 0; - private int anInt2726; - private boolean aBoolean2728 = true; - private final int objectId; - private final int anInt2730; - private final int anInt2732; - private int anInt2733; - private final int type; - private final int anInt2736; - private LDIndexedSprite aClass109_Sub1_2738 = null; - private Class127_Sub1 aClass127_Sub1_2742; - static volatile int anInt2743 = 0; - static int anInt2745 = 0; - private int anInt2746; - private int anInt2748 = 0; - private int anInt2749; - private int anInt2750 = -1; - private int anInt2752 = -1; + private boolean aBoolean2721 = false; + private SequenceDefinition aClass142_2722; + private final int anInt2724; + private int anInt2725 = 0; + private int anInt2726; + private boolean aBoolean2728 = true; + private final int objectId; + private final int anInt2730; + private final int anInt2732; + private int anInt2733; + private final int type; + private final int anInt2736; + private LDIndexedSprite aClass109_Sub1_2738 = null; + private Class127_Sub1 aClass127_Sub1_2742; + static volatile int anInt2743 = 0; + static int anInt2745 = 0; + private int anInt2746; + private int anInt2748 = 0; + private int anInt2749; + private int anInt2750 = -1; + private int anInt2752 = -1; - static Model method1957(int var0, boolean var1, SequenceDefinition var2, int var3, int var4, int var5, int var6, int var7, Model var8, int var9, int var10, int var11, int var12) { - try { - long var14 = ((long)var4 << 48) + (long)(var7 + (var0 << 16) - -(var12 << 24)) + ((long)var6 << 32); - Model var16 = (Model)Class158_Sub1.aReferenceCache_2982.get(var14); - int var21; - int var23; - int var25; - int var24; - int var28; - if(var16 == null) { - byte var17; - if(1 == var7) { - var17 = 9; - } else if(var7 == 2) { - var17 = 12; - } else if(var7 == 3) { - var17 = 15; - } else if (4 == var7) { - var17 = 18; - } else { - var17 = 21; - } + static Model method1957(int var0, boolean var1, SequenceDefinition var2, int var3, int var4, int var5, int var6, int var7, Model var8, int var9, int var10, int var11, int var12) { + try { + long var14 = ((long) var4 << 48) + (long) (var7 + (var0 << 16) - -(var12 << 24)) + ((long) var6 << 32); + Model var16 = (Model) Class158_Sub1.aReferenceCache_2982.get(var14); + int var21; + int var23; + int var25; + int var24; + int var28; + if (var16 == null) { + byte var17; + if (1 == var7) { + var17 = 9; + } else if (var7 == 2) { + var17 = 12; + } else if (var7 == 3) { + var17 = 15; + } else if (4 == var7) { + var17 = 18; + } else { + var17 = 21; + } - int[] var19 = new int[]{64, 96, 128}; - byte var18 = 3; - Model_Sub1 var20 = new Model_Sub1(1 + var18 * var17, -var17 + var17 * var18 * 2); - var21 = var20.method2014(0, 0); - int[][] var22 = new int[var18][var17]; + int[] var19 = new int[]{64, 96, 128}; + byte var18 = 3; + Model_Sub1 var20 = new Model_Sub1(1 + var18 * var17, -var17 + var17 * var18 * 2); + var21 = var20.method2014(0, 0); + int[][] var22 = new int[var18][var17]; - for(var23 = 0; var18 > var23; ++var23) { - var24 = var19[var23]; - var25 = var19[var23]; + for (var23 = 0; var18 > var23; ++var23) { + var24 = var19[var23]; + var25 = var19[var23]; - for(int var26 = 0; var26 < var17; ++var26) { - int var27 = (var26 << 11) / var17; - int var29 = var5 - -(Class51.anIntArray851[var27] * var25) >> 16; - var28 = var3 + Class51.anIntArray840[var27] * var24 >> 16; - var22[var23][var26] = var20.method2014(var28, var29); - } - } + for (int var26 = 0; var26 < var17; ++var26) { + int var27 = (var26 << 11) / var17; + int var29 = var5 - -(Class51.anIntArray851[var27] * var25) >> 16; + var28 = var3 + Class51.anIntArray840[var27] * var24 >> 16; + var22[var23][var26] = var20.method2014(var28, var29); + } + } - for(var23 = 0; var23 < var18; ++var23) { - var24 = (256 * var23 - -128) / var18; - var25 = 256 + -var24; - byte var38 = (byte)(var12 * var24 + var0 * var25 >> 8); - short var39 = (short)(((var6 & 127) * var25 + (127 & var4) * var24 & 32512) + (var25 * (var6 & 896) + var24 * (var4 & 896) & 229376) + (var24 * (var4 & '\ufc00') + ('\ufc00' & var6) * var25 & 16515072) >> 8); + for (var23 = 0; var23 < var18; ++var23) { + var24 = (256 * var23 - -128) / var18; + var25 = 256 + -var24; + byte var38 = (byte) (var12 * var24 + var0 * var25 >> 8); + short var39 = (short) (((var6 & 127) * var25 + (127 & var4) * var24 & 32512) + (var25 * (var6 & 896) + var24 * (var4 & 896) & 229376) + (var24 * (var4 & '\ufc00') + ('\ufc00' & var6) * var25 & 16515072) >> 8); - for(var28 = 0; var28 < var17; ++var28) { - if(var23 == 0) { - var20.method2005(var21, var22[0][(1 + var28) % var17], var22[0][var28], var39, var38); - } else { - var20.method2005(var22[var23 - 1][var28], var22[var23 + -1][(var28 + 1) % var17], var22[var23][(var28 - -1) % var17], var39, var38); - var20.method2005(var22[-1 + var23][var28], var22[var23][(1 + var28) % var17], var22[var23][var28], var39, var38); - } - } - } - - var16 = var20.method2008(64, 768, -50, -10, -50); - Class158_Sub1.aReferenceCache_2982.put(var16, var14); - } - - int var32 = var7 * 64 + -1; - int var33 = -var32; - int var31 = -var32; - int var34 = var32; - int var35 = var8.method1884(); - Class3_Sub28_Sub5 var40 = null; - var23 = var8.method1883(); - var24 = var8.method1898(); - var25 = var8.method1872(); - if(var2 != null) { - var10 = var2.frames[var10]; - int frame = var10 >> 16; - // System.out.println(var2.animId + " Roar " + (var10 >> 16) + ", " + (var10 & 65535) + ", " + Arrays.toString(var2.frames)); - var40 = Class3_Sub9.method133(frame); //NPC render animating - var10 &= 65535; - } - - var21 = var32; - if(var1) { - if(1664 < var9 || 384 > var9) { - var31 -= 128; - } - - if(var9 > 1152 && var9 < 1920) { - var34 = var32 + 128; - } - - if(640 < var9 && var9 < 1408) { - var21 = var32 + 128; - } - - if(var9 > 128 && var9 < 896) { - var33 -= 128; - } - } - - if(var21 < var25) { - var25 = var21; - } - - if(var33 > var35) { - var35 = var33; - } - - if(var24 < var31) { - var24 = var31; - } - - if(var34 < var23) { - var23 = var34; - } - - if(null == var40) { - var16 = var16.method1882(true, true, true); - var16.resize((var23 + -var35) / 2, 128, (var25 - var24) / 2); - var16.method1897((var35 + var23) / 2, 0, (var24 - -var25) / 2); - } else { - var16 = var16.method1882(!var40.method559(var10), !var40.method561(var10, (byte)115), true); - var16.resize((var23 + -var35) / 2, 128, (var25 + -var24) / 2); - var16.method1897((var35 + var23) / 2, 0, (var24 + var25) / 2); - var16.method1877(var40, var10); - } - - if(var9 != 0) { - var16.method1876(var9); - } - - if(HDToolKit.highDetail) { - Class140_Sub1_Sub1 var36 = (Class140_Sub1_Sub1)var16; - if(var11 != Class121.method1736(WorldListCountry.localPlane, (byte) -49 ^ -50, var3 - -var35, var24 + var5) || var11 != Class121.method1736(WorldListCountry.localPlane, 1, var23 + var3, var5 - -var25)) { - for(var28 = 0; var28 < var36.anInt3823; ++var28) { - var36.anIntArray3845[var28] += -var11 + Class121.method1736(WorldListCountry.localPlane, Unsorted.bitwiseXOR((byte) -49, -50), var36.anIntArray3822[var28] - -var3, var5 + var36.anIntArray3848[var28]); - } - - var36.aClass6_3835.aBoolean98 = false; - var36.aClass121_3839.aBoolean1640 = false; - } - } else { - Class140_Sub1_Sub2 var37 = (Class140_Sub1_Sub2)var16; - if(var11 != Class121.method1736(WorldListCountry.localPlane, 1, var3 - -var35, var5 - -var24) || var11 != Class121.method1736(WorldListCountry.localPlane, 1, var3 + var23, var5 - -var25)) { - for(var28 = 0; var28 < var37.anInt3891; ++var28) { - var37.anIntArray3883[var28] += -var11 + Class121.method1736(WorldListCountry.localPlane, 1, var3 + var37.anIntArray3885[var28], var5 + var37.anIntArray3895[var28]); - } - - var37.aBoolean3897 = false; - } - } - - return var16; - } catch (RuntimeException var30) { - throw ClientErrorException.clientError(var30, "dc.E(" + var0 + ',' + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ',' + var7 + ',' + (var8 != null?"{...}":"null") + ',' + var9 + ',' + var10 + ',' + var11 + ',' + var12 + ',' + (byte) -49 + ')'); - } - } - - final void method1867(int var1, int var2, int var3, int var4, int var5) { - try { - if(HDToolKit.highDetail) { - this.method1962(true); - } else { - this.method1961(var5, var4); - } - - } catch (RuntimeException var7) { - throw ClientErrorException.clientError(var7, "dc.IB(" + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ')'); - } - } - - static void method1959(boolean var3) { - try { - Class3_Sub24_Sub4.anInt3507 = 2; - Unsorted.aBoolean2150 = var3; - Class21.anInt443 = 22050; - } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "dc.D(" + 256 + ',' + 2 + ',' + 22050 + ',' + var3 + ')'); - } - } - - final void animate(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9, int var11, Class127_Sub1 var12) { - try { - GameObject var13 = this.method1963(); - if(null != var13) { - var13.animate(var1, var2, var3, var4, var5, var6, var7, var8, var9, var11, this.aClass127_Sub1_2742); - } - } catch (RuntimeException var14) { - throw ClientErrorException.clientError(var14, "dc.IA(" + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ',' + var7 + ',' + var8 + ',' + var9 + ',' + var11 + ',' + (var12 != null?"{...}":"null") + ')'); - } - } - - final void method1960() { - try { - if(this.aClass109_Sub1_2738 != null) { - Class141.method2047(this.aClass109_Sub1_2738, this.anInt2725, this.anInt2720, this.anInt2748); - } - - this.anInt2750 = -1; - this.anInt2752 = -1; - this.aClass109_Sub1_2738 = null; - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "dc.F(" + -1 + ')'); - } - } - - protected final void finalize() {} - - private void method1961(int var1, int var2) { - try { - if(this.aClass142_2722 != null) { - int var4 = Class44.anInt719 - this.anInt2749; - if(var4 > 100 && this.aClass142_2722.anInt1865 > 0) { - int var5; - for(var5 = this.aClass142_2722.frames.length - this.aClass142_2722.anInt1865; var5 > this.anInt2726 && var4 > this.aClass142_2722.duration[this.anInt2726]; ++this.anInt2726) { - var4 -= this.aClass142_2722.duration[this.anInt2726]; - } - - if(var5 <= this.anInt2726) { - int var6 = 0; - - for(int var7 = var5; var7 < this.aClass142_2722.frames.length; ++var7) { - var6 += this.aClass142_2722.duration[var7]; - } - - var4 %= var6; - } - - this.anInt2733 = 1 + this.anInt2726; - if(this.anInt2733 >= this.aClass142_2722.frames.length) { - this.anInt2733 -= this.aClass142_2722.anInt1865; - if(this.anInt2733 < 0 || this.aClass142_2722.frames.length <= this.anInt2733) { - this.anInt2733 = -1; - } - } - } - - while(this.aClass142_2722.duration[this.anInt2726] < var4) { - Unsorted.method1470(var1, this.aClass142_2722, 183921384, var2, false, this.anInt2726); - var4 -= this.aClass142_2722.duration[this.anInt2726]; - ++this.anInt2726; - if(this.anInt2726 >= this.aClass142_2722.frames.length) { - this.anInt2726 -= this.aClass142_2722.anInt1865; - if(0 > this.anInt2726 || this.anInt2726 >= this.aClass142_2722.frames.length) { - this.aClass142_2722 = null; - break; - } - } - - this.anInt2733 = this.anInt2726 - -1; - if(this.anInt2733 >= this.aClass142_2722.frames.length) { - this.anInt2733 -= this.aClass142_2722.anInt1865; - if(this.anInt2733 < 0 || this.aClass142_2722.frames.length <= this.anInt2733) { - this.anInt2733 = -1; - } - } - } - - this.anInt2746 = var4; - this.anInt2749 = -var4 + Class44.anInt719; - } - - } catch (RuntimeException var8) { - throw ClientErrorException.clientError(var8, "dc.A(" + var1 + ',' + var2 + ',' + -101 + ')'); - } - } - - private GameObject method1962(boolean var1) { - try { - boolean var3 = Class58.anIntArrayArrayArray914 != Class44.anIntArrayArrayArray723; - ObjectDefinition var4 = ObjectDefinition.getObjectDefinition(this.objectId); - int var5 = var4.animationId; - if(null != var4.ChildrenIds) { - var4 = var4.method1685(0); - } - - if(null == var4) { - if(HDToolKit.highDetail && !var3) { - this.method1960(); - } - - return null; - } else { - int var6; - if(Class158.paramGameTypeID != 0 && this.aBoolean2721 && (null == this.aClass142_2722 || var4.animationId != this.aClass142_2722.animId)) { - var6 = var4.animationId; - if(var4.animationId == -1) { - var6 = var5; - } - - if(var6 == -1) { - this.aClass142_2722 = null; - } else { - this.aClass142_2722 = SequenceDefinition.getAnimationDefinition(var6); - } - - if(null != this.aClass142_2722) { - if(var4.aBoolean1492 && -1 != this.aClass142_2722.anInt1865) { - this.anInt2726 = (int)(Math.random() * (double)this.aClass142_2722.frames.length); - this.anInt2749 -= (int)(Math.random() * (double)this.aClass142_2722.duration[this.anInt2726]); - } else { - this.anInt2726 = 0; - this.anInt2749 = Class44.anInt719 + -1; - } - } - } - - var6 = this.anInt2724 & 3; - int var7; - int var8; - if(var6 == 1 || var6 == 3) { - var8 = var4.SizeX; - var7 = var4.SizeY; - } else { - var7 = var4.SizeX; - var8 = var4.SizeY; - } - - int var10 = this.anInt2736 - -(1 + var7 >> 1); - int var9 = (var7 >> 1) + this.anInt2736; - int var11 = (var8 >> 1) + this.anInt2730; - int var12 = (var8 - -1 >> 1) + this.anInt2730; - this.method1961(128 * var11, var9 * 128); - boolean var13 = !var3 && var4.aBoolean1503 && (var4.objectId != this.anInt2750 || (this.anInt2752 != this.anInt2726 || this.aClass142_2722 != null && (this.aClass142_2722.aBoolean1872 || ClientCommands.tweeningEnabled) && this.anInt2733 != this.anInt2726) && Unsorted.anInt1137 >= 2); - if(var1 && !var13) { - return null; - } else { - int[][] var14 = Class44.anIntArrayArrayArray723[this.anInt2732]; - int var15 = var14[var10][var12] + var14[var9][var12] + var14[var9][var11] + var14[var10][var11] >> 2; - int var16 = (var7 << 6) + (this.anInt2736 << 7); - int var17 = (var8 << 6) + (this.anInt2730 << 7); - int[][] var18 = null; - if(var3) { - var18 = Class58.anIntArrayArrayArray914[0]; - } else if (this.anInt2732 < 3) { - var18 = Class44.anIntArrayArrayArray723[1 + this.anInt2732]; - } - - if(HDToolKit.highDetail && var13) { - Class141.method2047(this.aClass109_Sub1_2738, this.anInt2725, this.anInt2720, this.anInt2748); - } - - boolean var19 = null == this.aClass109_Sub1_2738; - Class136 var20; - if(this.aClass142_2722 == null) { - var20 = var4.method1696(this.anInt2724, var16, var14, this.type, var15, var18, false, var19? aClass109_Sub1_2631:this.aClass109_Sub1_2738, (byte)-128, var13, var17); - } else { - var20 = var4.method1697(var17, var16, !var19?this.aClass109_Sub1_2738: aClass109_Sub1_2631, var15, this.aClass142_2722, this.anInt2724, var14, var13, this.anInt2726, -2 ^ -8310, var18, this.anInt2733, this.type, this.anInt2746); - } - - if(null == var20) { - return null; - } else { - if(HDToolKit.highDetail && var13) { - if(var19) { - aClass109_Sub1_2631 = var20.aClass109_Sub1_1770; - } - - int var21 = 0; - if(this.anInt2732 != 0) { - int[][] var22 = Class44.anIntArrayArrayArray723[0]; - var21 = var15 - (var22[var10][var11] + var22[var9][var11] - (-var22[var9][var12] - var22[var10][var12]) >> 2); - } - - LDIndexedSprite var24 = var20.aClass109_Sub1_1770; - if(this.aBoolean2728 && Class141.method2049(var24, var16, var21, var17)) { - this.aBoolean2728 = false; - } - - if(!this.aBoolean2728) { - Class141.method2051(var24, var16, var21, var17); - this.aClass109_Sub1_2738 = var24; - this.anInt2748 = var17; - if(var19) { - aClass109_Sub1_2631 = null; - } - - this.anInt2720 = var21; - this.anInt2725 = var16; - } - - this.anInt2750 = var4.objectId; - this.anInt2752 = this.anInt2726; - } - - return var20.aClass140_1777; - } - } - } - } catch (RuntimeException var23) { - throw ClientErrorException.clientError(var23, "dc.H(" + var1 + ',' + -2 + ')'); - } - } - - final GameObject method1963() { - try { - return this.method1962(false); - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "dc.C(" + 3 + ')'); - } - } - - final int method1871() { - return -32768; - } - - static void renderLocalPlayers() { - try { - int localPlayerAmount = GraphicDefinition.incomingBuffer.getBits(8); - int var2; - if(localPlayerAmount < Class159.localPlayerCount) { - for(var2 = localPlayerAmount; Class159.localPlayerCount > var2; ++var2) { - Class3_Sub7.anIntArray2292[Class139.anInt1829++] = Class56.localPlayerIndexes[var2]; - } - } - - if(Class159.localPlayerCount >= localPlayerAmount) { - Class159.localPlayerCount = 0; - var2 = 0; - - for(; localPlayerAmount > var2; ++var2) { - int var3 = Class56.localPlayerIndexes[var2]; - Player var4 = TextureOperation0.players[var3]; - int update = GraphicDefinition.incomingBuffer.getBits(1); - if(update == 0) { - Class56.localPlayerIndexes[Class159.localPlayerCount++] = var3; - var4.anInt2838 = Class44.anInt719; - } else { - int type = GraphicDefinition.incomingBuffer.getBits(2); - if(type == 0) { - Class56.localPlayerIndexes[Class159.localPlayerCount++] = var3; - var4.anInt2838 = Class44.anInt719; - Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = var3; - } else { - int var7; - int var8; - if(type == 1) { - Class56.localPlayerIndexes[Class159.localPlayerCount++] = var3; - var4.anInt2838 = Class44.anInt719; - var7 = GraphicDefinition.incomingBuffer.getBits(3); - var4.walkStep(1, (byte)46, var7); - var8 = GraphicDefinition.incomingBuffer.getBits(1); - if(var8 == 1) { - Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = var3; - } - } else if (type == 2) { - Class56.localPlayerIndexes[Class159.localPlayerCount++] = var3; - var4.anInt2838 = Class44.anInt719; - if (GraphicDefinition.incomingBuffer.getBits(1) == 1) { - var7 = GraphicDefinition.incomingBuffer.getBits(3); - var4.walkStep(2, (byte) -92, var7); - var8 = GraphicDefinition.incomingBuffer.getBits(3); - var4.walkStep(2, (byte) 88, var8); + for (var28 = 0; var28 < var17; ++var28) { + if (var23 == 0) { + var20.method2005(var21, var22[0][(1 + var28) % var17], var22[0][var28], var39, var38); } else { - var7 = GraphicDefinition.incomingBuffer.getBits(3); - var4.walkStep(0, (byte) 113, var7); + var20.method2005(var22[var23 - 1][var28], var22[var23 + -1][(var28 + 1) % var17], var22[var23][(var28 - -1) % var17], var39, var38); + var20.method2005(var22[-1 + var23][var28], var22[var23][(1 + var28) % var17], var22[var23][var28], var39, var38); + } + } + } + + var16 = var20.method2008(64, 768, -50, -10, -50); + Class158_Sub1.aReferenceCache_2982.put(var16, var14); + } + + int var32 = var7 * 64 + -1; + int var33 = -var32; + int var31 = -var32; + int var34 = var32; + int var35 = var8.method1884(); + Class3_Sub28_Sub5 var40 = null; + var23 = var8.method1883(); + var24 = var8.method1898(); + var25 = var8.method1872(); + if (var2 != null) { + var10 = var2.frames[var10]; + int frame = var10 >> 16; + // System.out.println(var2.animId + " Roar " + (var10 >> 16) + ", " + (var10 & 65535) + ", " + Arrays.toString(var2.frames)); + var40 = Class3_Sub9.method133(frame); //NPC render animating + var10 &= 65535; + } + + var21 = var32; + if (var1) { + if (1664 < var9 || 384 > var9) { + var31 -= 128; + } + + if (var9 > 1152 && var9 < 1920) { + var34 = var32 + 128; + } + + if (640 < var9 && var9 < 1408) { + var21 = var32 + 128; + } + + if (var9 > 128 && var9 < 896) { + var33 -= 128; + } + } + + if (var21 < var25) { + var25 = var21; + } + + if (var33 > var35) { + var35 = var33; + } + + if (var24 < var31) { + var24 = var31; + } + + if (var34 < var23) { + var23 = var34; + } + + if (null == var40) { + var16 = var16.method1882(true, true, true); + var16.resize((var23 + -var35) / 2, 128, (var25 - var24) / 2); + var16.method1897((var35 + var23) / 2, 0, (var24 - -var25) / 2); + } else { + var16 = var16.method1882(!var40.method559(var10), !var40.method561(var10, (byte) 115), true); + var16.resize((var23 + -var35) / 2, 128, (var25 + -var24) / 2); + var16.method1897((var35 + var23) / 2, 0, (var24 + var25) / 2); + var16.method1877(var40, var10); + } + + if (var9 != 0) { + var16.method1876(var9); + } + + if (HDToolKit.highDetail) { + Class140_Sub1_Sub1 var36 = (Class140_Sub1_Sub1) var16; + if (var11 != Class121.method1736(WorldListCountry.localPlane, (byte) -49 ^ -50, var3 - -var35, var24 + var5) || var11 != Class121.method1736(WorldListCountry.localPlane, 1, var23 + var3, var5 - -var25)) { + for (var28 = 0; var28 < var36.anInt3823; ++var28) { + var36.anIntArray3845[var28] += -var11 + Class121.method1736(WorldListCountry.localPlane, Unsorted.bitwiseXOR((byte) -49, -50), var36.anIntArray3822[var28] - -var3, var5 + var36.anIntArray3848[var28]); + } + + var36.aClass6_3835.aBoolean98 = false; + var36.aClass121_3839.aBoolean1640 = false; + } + } else { + Class140_Sub1_Sub2 var37 = (Class140_Sub1_Sub2) var16; + if (var11 != Class121.method1736(WorldListCountry.localPlane, 1, var3 - -var35, var5 - -var24) || var11 != Class121.method1736(WorldListCountry.localPlane, 1, var3 + var23, var5 - -var25)) { + for (var28 = 0; var28 < var37.anInt3891; ++var28) { + var37.anIntArray3883[var28] += -var11 + Class121.method1736(WorldListCountry.localPlane, 1, var3 + var37.anIntArray3885[var28], var5 + var37.anIntArray3895[var28]); + } + + var37.aBoolean3897 = false; + } + } + + return var16; + } catch (RuntimeException var30) { + throw ClientErrorException.clientError(var30, "dc.E(" + var0 + ',' + var1 + ',' + (var2 != null ? "{...}" : "null") + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ',' + var7 + ',' + (var8 != null ? "{...}" : "null") + ',' + var9 + ',' + var10 + ',' + var11 + ',' + var12 + ',' + (byte) -49 + ')'); + } + } + + final void method1867(int var1, int var2, int var3, int var4, int var5) { + try { + if (HDToolKit.highDetail) { + this.method1962(true); + } else { + this.method1961(var5, var4); + } + + } catch (RuntimeException var7) { + throw ClientErrorException.clientError(var7, "dc.IB(" + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ')'); + } + } + + static void method1959(boolean var3) { + try { + Class3_Sub24_Sub4.anInt3507 = 2; + Unsorted.aBoolean2150 = var3; + Class21.anInt443 = 22050; + } catch (RuntimeException var5) { + throw ClientErrorException.clientError(var5, "dc.D(" + 256 + ',' + 2 + ',' + 22050 + ',' + var3 + ')'); + } + } + + final void animate(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9, int var11, Class127_Sub1 var12) { + try { + GameObject var13 = this.method1963(); + if (null != var13) { + var13.animate(var1, var2, var3, var4, var5, var6, var7, var8, var9, var11, this.aClass127_Sub1_2742); + } + } catch (RuntimeException var14) { + throw ClientErrorException.clientError(var14, "dc.IA(" + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ',' + var7 + ',' + var8 + ',' + var9 + ',' + var11 + ',' + (var12 != null ? "{...}" : "null") + ')'); + } + } + + final void method1960() { + try { + if (this.aClass109_Sub1_2738 != null) { + Class141.method2047(this.aClass109_Sub1_2738, this.anInt2725, this.anInt2720, this.anInt2748); + } + + this.anInt2750 = -1; + this.anInt2752 = -1; + this.aClass109_Sub1_2738 = null; + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "dc.F(" + -1 + ')'); + } + } + + protected final void finalize() { + } + + private void method1961(int var1, int var2) { + try { + if (this.aClass142_2722 != null) { + int var4 = Class44.anInt719 - this.anInt2749; + if (var4 > 100 && this.aClass142_2722.anInt1865 > 0) { + int var5; + for (var5 = this.aClass142_2722.frames.length - this.aClass142_2722.anInt1865; var5 > this.anInt2726 && var4 > this.aClass142_2722.duration[this.anInt2726]; ++this.anInt2726) { + var4 -= this.aClass142_2722.duration[this.anInt2726]; + } + + if (var5 <= this.anInt2726) { + int var6 = 0; + + for (int var7 = var5; var7 < this.aClass142_2722.frames.length; ++var7) { + var6 += this.aClass142_2722.duration[var7]; } - var7 = GraphicDefinition.incomingBuffer.getBits(1); - if (1 == var7) { - Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = var3; + var4 %= var6; + } + + this.anInt2733 = 1 + this.anInt2726; + if (this.anInt2733 >= this.aClass142_2722.frames.length) { + this.anInt2733 -= this.aClass142_2722.anInt1865; + if (this.anInt2733 < 0 || this.aClass142_2722.frames.length <= this.anInt2733) { + this.anInt2733 = -1; } - } else if (type == 3) { - Class3_Sub7.anIntArray2292[Class139.anInt1829++] = var3; - } - } - } + } + } + + while (this.aClass142_2722.duration[this.anInt2726] < var4) { + Unsorted.method1470(var1, this.aClass142_2722, 183921384, var2, false, this.anInt2726); + var4 -= this.aClass142_2722.duration[this.anInt2726]; + ++this.anInt2726; + if (this.anInt2726 >= this.aClass142_2722.frames.length) { + this.anInt2726 -= this.aClass142_2722.anInt1865; + if (0 > this.anInt2726 || this.anInt2726 >= this.aClass142_2722.frames.length) { + this.aClass142_2722 = null; + break; + } + } + + this.anInt2733 = this.anInt2726 - -1; + if (this.anInt2733 >= this.aClass142_2722.frames.length) { + this.anInt2733 -= this.aClass142_2722.anInt1865; + if (this.anInt2733 < 0 || this.aClass142_2722.frames.length <= this.anInt2733) { + this.anInt2733 = -1; + } + } + } + + this.anInt2746 = var4; + this.anInt2749 = -var4 + Class44.anInt719; } - } else { - throw new RuntimeException("gppov1"); - } - } catch (RuntimeException var9) { - throw ClientErrorException.clientError(var9, "dc.B(" + false + ')'); - } - } + } catch (RuntimeException var8) { + throw ClientErrorException.clientError(var8, "dc.A(" + var1 + ',' + var2 + ',' + -101 + ')'); + } + } - Class140_Sub3(int objectId, int type, int var3, int var4, int var5, int var6, int animationId, boolean var8, GameObject var9) { - try { - this.anInt2732 = var4; - this.anInt2724 = var3; - this.anInt2736 = var5; - this.type = type; - this.objectId = objectId; - this.anInt2730 = var6; - ObjectDefinition var10; - if(HDToolKit.highDetail && null != var9) { - if(var9 instanceof Class140_Sub3) { - ((Class140_Sub3)var9).method1960(); + private GameObject method1962(boolean var1) { + try { + boolean var3 = Class58.anIntArrayArrayArray914 != Class44.anIntArrayArrayArray723; + ObjectDefinition var4 = ObjectDefinition.getObjectDefinition(this.objectId); + int var5 = var4.animationId; + if (null != var4.ChildrenIds) { + var4 = var4.method1685(0); + } + + if (null == var4) { + if (HDToolKit.highDetail && !var3) { + this.method1960(); + } + + return null; } else { - var10 = ObjectDefinition.getObjectDefinition(this.objectId); - if(var10.ChildrenIds != null) { - var10 = var10.method1685(0); - } + int var6; + if (Class158.paramGameTypeID != 0 && this.aBoolean2721 && (null == this.aClass142_2722 || var4.animationId != this.aClass142_2722.animId)) { + var6 = var4.animationId; + if (var4.animationId == -1) { + var6 = var5; + } - if(null != var10) { - Class8.method840(var10, (byte)-76, 0, this.anInt2724, 0, this.type, this.anInt2736, this.anInt2730, this.anInt2732); - } + if (var6 == -1) { + this.aClass142_2722 = null; + } else { + this.aClass142_2722 = SequenceDefinition.getAnimationDefinition(var6); + } + + if (null != this.aClass142_2722) { + if (var4.aBoolean1492 && -1 != this.aClass142_2722.anInt1865) { + this.anInt2726 = (int) (Math.random() * (double) this.aClass142_2722.frames.length); + this.anInt2749 -= (int) (Math.random() * (double) this.aClass142_2722.duration[this.anInt2726]); + } else { + this.anInt2726 = 0; + this.anInt2749 = Class44.anInt719 + -1; + } + } + } + + var6 = this.anInt2724 & 3; + int var7; + int var8; + if (var6 == 1 || var6 == 3) { + var8 = var4.SizeX; + var7 = var4.SizeY; + } else { + var7 = var4.SizeX; + var8 = var4.SizeY; + } + + int var10 = this.anInt2736 - -(1 + var7 >> 1); + int var9 = (var7 >> 1) + this.anInt2736; + int var11 = (var8 >> 1) + this.anInt2730; + int var12 = (var8 - -1 >> 1) + this.anInt2730; + this.method1961(128 * var11, var9 * 128); + boolean var13 = !var3 && var4.aBoolean1503 && (var4.objectId != this.anInt2750 || (this.anInt2752 != this.anInt2726 || this.aClass142_2722 != null && (this.aClass142_2722.aBoolean1872 || ClientCommands.tweeningEnabled) && this.anInt2733 != this.anInt2726) && Unsorted.anInt1137 >= 2); + if (var1 && !var13) { + return null; + } else { + int[][] var14 = Class44.anIntArrayArrayArray723[this.anInt2732]; + int var15 = var14[var10][var12] + var14[var9][var12] + var14[var9][var11] + var14[var10][var11] >> 2; + int var16 = (var7 << 6) + (this.anInt2736 << 7); + int var17 = (var8 << 6) + (this.anInt2730 << 7); + int[][] var18 = null; + if (var3) { + var18 = Class58.anIntArrayArrayArray914[0]; + } else if (this.anInt2732 < 3) { + var18 = Class44.anIntArrayArrayArray723[1 + this.anInt2732]; + } + + if (HDToolKit.highDetail && var13) { + Class141.method2047(this.aClass109_Sub1_2738, this.anInt2725, this.anInt2720, this.anInt2748); + } + + boolean var19 = null == this.aClass109_Sub1_2738; + Class136 var20; + if (this.aClass142_2722 == null) { + var20 = var4.method1696(this.anInt2724, var16, var14, this.type, var15, var18, false, var19 ? aClass109_Sub1_2631 : this.aClass109_Sub1_2738, (byte) -128, var13, var17); + } else { + var20 = var4.method1697(var17, var16, !var19 ? this.aClass109_Sub1_2738 : aClass109_Sub1_2631, var15, this.aClass142_2722, this.anInt2724, var14, var13, this.anInt2726, -2 ^ -8310, var18, this.anInt2733, this.type, this.anInt2746); + } + + if (null == var20) { + return null; + } else { + if (HDToolKit.highDetail && var13) { + if (var19) { + aClass109_Sub1_2631 = var20.aClass109_Sub1_1770; + } + + int var21 = 0; + if (this.anInt2732 != 0) { + int[][] var22 = Class44.anIntArrayArrayArray723[0]; + var21 = var15 - (var22[var10][var11] + var22[var9][var11] - (-var22[var9][var12] - var22[var10][var12]) >> 2); + } + + LDIndexedSprite var24 = var20.aClass109_Sub1_1770; + if (this.aBoolean2728 && Class141.method2049(var24, var16, var21, var17)) { + this.aBoolean2728 = false; + } + + if (!this.aBoolean2728) { + Class141.method2051(var24, var16, var21, var17); + this.aClass109_Sub1_2738 = var24; + this.anInt2748 = var17; + if (var19) { + aClass109_Sub1_2631 = null; + } + + this.anInt2720 = var21; + this.anInt2725 = var16; + } + + this.anInt2750 = var4.objectId; + this.anInt2752 = this.anInt2726; + } + + return var20.aClass140_1777; + } + } } - } + } catch (RuntimeException var23) { + throw ClientErrorException.clientError(var23, "dc.H(" + var1 + ',' + -2 + ')'); + } + } - if(-1 != animationId) { - this.aClass142_2722 = SequenceDefinition.getAnimationDefinition(animationId); - this.anInt2726 = 0; - if(1 >= this.aClass142_2722.frames.length) { - this.anInt2733 = 0; - } else { - this.anInt2733 = 1; + final GameObject method1963() { + try { + return this.method1962(false); + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "dc.C(" + 3 + ')'); + } + } + + final int method1871() { + return -32768; + } + + Class140_Sub3(int objectId, int type, int var3, int var4, int var5, int var6, int animationId, boolean var8, GameObject var9) { + try { + this.anInt2732 = var4; + this.anInt2724 = var3; + this.anInt2736 = var5; + this.type = type; + this.objectId = objectId; + this.anInt2730 = var6; + ObjectDefinition var10; + if (HDToolKit.highDetail && null != var9) { + if (var9 instanceof Class140_Sub3) { + ((Class140_Sub3) var9).method1960(); + } else { + var10 = ObjectDefinition.getObjectDefinition(this.objectId); + if (var10.ChildrenIds != null) { + var10 = var10.method1685(0); + } + + if (null != var10) { + Class8.method840(var10, (byte) -76, 0, this.anInt2724, 0, this.type, this.anInt2736, this.anInt2730, this.anInt2732); + } + } } - this.anInt2746 = 1; - this.anInt2749 = -1 + Class44.anInt719; - if(this.aClass142_2722.delayType == 0 && null != var9 && var9 instanceof Class140_Sub3) { - Class140_Sub3 var12 = (Class140_Sub3)var9; - if(this.aClass142_2722 == var12.aClass142_2722) { - this.anInt2726 = var12.anInt2726; - this.anInt2749 = var12.anInt2749; - this.anInt2746 = var12.anInt2746; - this.anInt2733 = var12.anInt2733; - return; - } + if (-1 != animationId) { + this.aClass142_2722 = SequenceDefinition.getAnimationDefinition(animationId); + this.anInt2726 = 0; + if (1 >= this.aClass142_2722.frames.length) { + this.anInt2733 = 0; + } else { + this.anInt2733 = 1; + } + + this.anInt2746 = 1; + this.anInt2749 = -1 + Class44.anInt719; + if (this.aClass142_2722.delayType == 0 && null != var9 && var9 instanceof Class140_Sub3) { + Class140_Sub3 var12 = (Class140_Sub3) var9; + if (this.aClass142_2722 == var12.aClass142_2722) { + this.anInt2726 = var12.anInt2726; + this.anInt2749 = var12.anInt2749; + this.anInt2746 = var12.anInt2746; + this.anInt2733 = var12.anInt2733; + return; + } + } + + if (var8 && this.aClass142_2722.anInt1865 != -1) { + this.anInt2726 = (int) (Math.random() * (double) this.aClass142_2722.frames.length); + this.anInt2733 = this.anInt2726 - -1; + if (this.aClass142_2722.frames.length <= this.anInt2733) { + this.anInt2733 -= this.aClass142_2722.anInt1865; + if (this.anInt2733 < 0 || this.aClass142_2722.frames.length <= this.anInt2733) { + this.anInt2733 = -1; + } + } + + this.anInt2746 = 1 - -((int) (Math.random() * (double) this.aClass142_2722.duration[this.anInt2726])); + this.anInt2749 = -this.anInt2746 + Class44.anInt719; + } } - if(var8 && this.aClass142_2722.anInt1865 != -1) { - this.anInt2726 = (int)(Math.random() * (double)this.aClass142_2722.frames.length); - this.anInt2733 = this.anInt2726 - -1; - if(this.aClass142_2722.frames.length <= this.anInt2733) { - this.anInt2733 -= this.aClass142_2722.anInt1865; - if(this.anInt2733 < 0 || this.aClass142_2722.frames.length <= this.anInt2733) { - this.anInt2733 = -1; - } - } - - this.anInt2746 = 1 - -((int)(Math.random() * (double)this.aClass142_2722.duration[this.anInt2726])); - this.anInt2749 = -this.anInt2746 + Class44.anInt719; + if (HDToolKit.highDetail && var9 != null) { + this.method1962(true); } - } - if(HDToolKit.highDetail && var9 != null) { - this.method1962(true); - } - - if(var9 == null) { - var10 = ObjectDefinition.getObjectDefinition(this.objectId); - if(null != var10.ChildrenIds) { - this.aBoolean2721 = true; + if (var9 == null) { + var10 = ObjectDefinition.getObjectDefinition(this.objectId); + if (null != var10.ChildrenIds) { + this.aBoolean2721 = true; + } } - } - } catch (RuntimeException var11) { - throw ClientErrorException.clientError(var11, "dc.(" + objectId + ',' + type + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ',' + animationId + ',' + var8 + ',' + (var9 != null?"{...}":"null") + ')'); - } - } + } catch (RuntimeException var11) { + throw ClientErrorException.clientError(var11, "dc.(" + objectId + ',' + type + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ',' + animationId + ',' + var8 + ',' + (var9 != null ? "{...}" : "null") + ')'); + } + } } 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 90e2d165e..d877cab98 100644 --- a/Client/src/main/java/org/runite/client/Class140_Sub4.java +++ b/Client/src/main/java/org/runite/client/Class140_Sub4.java @@ -4,562 +4,561 @@ import org.rs09.client.data.ReferenceCache; public abstract class Class140_Sub4 extends GameObject { - int textEffect = 0; - private int anInt2754 = 0; - int[] anIntArray2755 = new int[10]; - static int anInt2756; - private int anInt2757 = 0; - int anInt2758 = 0; - int anInt2759; - int anInt2760 = 0; - int anInt2761 = 0; - int anInt2762 = 0; - int renderAnimationId = -1; - int anInt2764 = -1; - private int anInt2766 = 0; - int[] anIntArray2767 = new int[10]; - int[] anIntArray2768 = new int[4]; - boolean aBoolean2769 = false; - int anInt2771 = -1; - int anInt2772 = -1; - int anInt2773 = 0; - int anInt2775; - int anInt2776 = -1; - int anInt2777; - int anInt2778 = 0; - int anInt2779 = 32; - int anInt2780 = 0; - int anInt2781 = -1000; - int anInt2782; - private boolean aBoolean2783 = false; - int anInt2784; - int anInt2785; - int anInt2786 = 0; - private int anInt2787 = 0; - int anInt2788; - int anInt2789 = 0; - int anInt2790; - int anInt2791 = 0; - static ReferenceCache aReferenceCache_2792 = new ReferenceCache(64); - int anInt2793 = -1; - static int[] anIntArray2794 = new int[100]; - byte[] aByteArray2795 = new byte[10]; - Object anObject2796; - int anInt2797 = 0; - int anInt2798; - int anInt2799; - int anInt2800; - Class127_Sub1 aClass127_Sub1_2801; - int anInt2802 = 0; - int anInt2803 = 0; - private int anInt2804 = 0; - int anInt2805 = 0; - int anInt2806; - private boolean aBoolean2807 = false; - int anInt2808 = 0; - Class145[] aClass145Array2809 = new Class145[12]; - boolean aBoolean2810 = false; - int anInt2811 = 0; - int anInt2812; - int anInt2813 = 0; - int textCycle = 100; - int[] anIntArray2815 = new int[4]; - int anInt2816 = 0; - int anInt2817; - int anInt2818; - public int anInt2819; - int anInt2820 = -32768; - int anInt2821 = 0; - private int size = 1; - int anInt2823; - int anInt2824 = 0; - RSString textSpoken = null; - int anInt2826 = -1; - private int anInt2827 = 0; - int anInt2828 = 0; - public int anInt2829; - private int anInt2830 = 0; - int anInt2831; - int anInt2832 = 0; - int anInt2833; - private int anInt2834 = 0; - int anInt2835; - int[] anIntArray2836 = new int[4]; - int textColor = 0; - int anInt2838 = 0; - public static AbstractSprite[] aAbstractSpriteArray2839; - int anInt2840; - int anInt2842 = -1; + int textEffect = 0; + private int anInt2754 = 0; + int[] anIntArray2755 = new int[10]; + static int anInt2756; + private int anInt2757 = 0; + int anInt2758 = 0; + int anInt2759; + int anInt2760 = 0; + int anInt2761 = 0; + int anInt2762 = 0; + int renderAnimationId = -1; + int anInt2764 = -1; + private int anInt2766 = 0; + int[] anIntArray2767 = new int[10]; + int[] anIntArray2768 = new int[4]; + boolean aBoolean2769 = false; + int anInt2771 = -1; + int anInt2772 = -1; + int anInt2773 = 0; + int anInt2775; + int anInt2776 = -1; + int anInt2777; + int anInt2778 = 0; + int anInt2779 = 32; + int anInt2780 = 0; + int anInt2781 = -1000; + int anInt2782; + private boolean aBoolean2783 = false; + int anInt2784; + int anInt2785; + int anInt2786 = 0; + private int anInt2787 = 0; + int anInt2788; + int anInt2789 = 0; + int anInt2790; + int anInt2791 = 0; + static ReferenceCache aReferenceCache_2792 = new ReferenceCache(64); + int anInt2793 = -1; + static int[] anIntArray2794 = new int[100]; + byte[] aByteArray2795 = new byte[10]; + Object anObject2796; + int anInt2797 = 0; + int anInt2798; + int anInt2799; + int anInt2800; + Class127_Sub1 aClass127_Sub1_2801; + int anInt2802 = 0; + int anInt2803 = 0; + private int anInt2804 = 0; + int anInt2805 = 0; + int anInt2806; + private boolean aBoolean2807 = false; + int anInt2808 = 0; + Class145[] aClass145Array2809 = new Class145[12]; + boolean aBoolean2810 = false; + int anInt2811 = 0; + int anInt2812; + int anInt2813 = 0; + int textCycle = 100; + int[] anIntArray2815 = new int[4]; + int anInt2816 = 0; + int anInt2817; + int anInt2818; + public int anInt2819; + int anInt2820 = -32768; + int anInt2821 = 0; + private int size = 1; + int anInt2823; + int anInt2824 = 0; + RSString textSpoken = null; + int anInt2826 = -1; + private int anInt2827 = 0; + int anInt2828 = 0; + public int anInt2829; + private int anInt2830 = 0; + int anInt2831; + int anInt2832 = 0; + int anInt2833; + private int anInt2834 = 0; + int anInt2835; + int[] anIntArray2836 = new int[4]; + int textColor = 0; + int anInt2838 = 0; + public static AbstractSprite[] aAbstractSpriteArray2839; + int anInt2840; + int anInt2842 = -1; - final RenderAnimationDefinition method1965() { - try { - int var2 = this.getRenderAnimationId(); - return (var2 == -1 ?PacketParser.aClass16_84:Class3_Sub10.getRenderAnimationDefinition(var2)); - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "fe.D(" + false + ')'); - } - } + final RenderAnimationDefinition getRenderAnimationType() { + int ID = this.getRenderAnimationId(); + if (ID == -1) { + return PacketParser.aClass16_84; + } else { + return Class3_Sub10.getRenderAnimationDefinition(ID); + } + } - boolean hasDefinitions() { - try { + boolean hasDefinitions() { + try { + return false; + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "fe.L(" + (byte) 17 + ')'); + } + } - return false; - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "fe.L(" + (byte) 17 + ')'); - } - } - - final void method1967(int var2, int var3, int var4, boolean var5) { - try { - if(this.anInt2771 != -1 && SequenceDefinition.getAnimationDefinition(this.anInt2771).priority == 1) { - this.anInt2771 = -1; - } - - if(!var5) { - int var6 = var3 + -this.anIntArray2767[0]; - int var7 = var4 + -this.anIntArray2755[0]; - if(var6 >= -8 && 8 >= var6 && var7 >= -8 && var7 <= 8) { - if(this.anInt2816 < 9) { - ++this.anInt2816; - } - - for(int var8 = this.anInt2816; var8 > 0; --var8) { - this.anIntArray2767[var8] = this.anIntArray2767[-1 + var8]; - this.anIntArray2755[var8] = this.anIntArray2755[var8 + -1]; - this.aByteArray2795[var8] = this.aByteArray2795[var8 - 1]; - } - - this.aByteArray2795[0] = 1; - this.anIntArray2767[0] = var3; - this.anIntArray2755[0] = var4; - return; - } - } - - this.anInt2824 = 0; - this.anIntArray2767[0] = var3; - this.anIntArray2755[0] = var4; - this.anInt2816 = 0; - this.anInt2811 = 0; - this.anInt2829 = 64 * var2 + this.anIntArray2755[0] * 128; - this.anInt2819 = var2 * 64 + 128 * this.anIntArray2767[0]; - - if(HDToolKit.highDetail && Class102.player == this) { - TextureOperation31.method236(); - } - - } catch (RuntimeException var9) { - throw ClientErrorException.clientError(var9, "fe.J(" + -2 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ')'); - } - } - - final void walkStep(int var1, byte var2, int var3) { - try { - int var4 = this.anIntArray2767[0]; - int var5 = this.anIntArray2755[0]; - if(0 == var3) { - --var4; - ++var5; - } - - if(this.anInt2771 != -1 && 1 == SequenceDefinition.getAnimationDefinition(this.anInt2771).priority) { - this.anInt2771 = -1; - } - - if(this.anInt2816 < 9) { - ++this.anInt2816; - } - - int var6; - for(var6 = this.anInt2816; var6 > 0; --var6) { - this.anIntArray2767[var6] = this.anIntArray2767[-1 + var6]; - this.anIntArray2755[var6] = this.anIntArray2755[-1 + var6]; - this.aByteArray2795[var6] = this.aByteArray2795[-1 + var6]; - } - - if(var3 == 1) { - ++var5; - } - - this.aByteArray2795[0] = (byte)var1; - if(2 == var3) { - ++var5; - ++var4; - } - - if(var3 == 3) { - --var4; - } - - if(4 == var3) { - ++var4; - } - - if(5 == var3) { - --var5; - --var4; - } - - if(var3 == 6) { - --var5; - } - - if(var3 == 7) { - --var5; - ++var4; - } - - this.anIntArray2767[0] = var4; - this.anIntArray2755[0] = var5; - } catch (RuntimeException var7) { - throw ClientErrorException.clientError(var7, "fe.E(" + var1 + ',' + var2 + ',' + var3 + ')'); - } - } - - final void method1969(byte var1, Model var2, int var3) { - try { - if(var1 <= 33) { - this.method1971(null, (byte)-26); - } - - Class3_Sub28_Sub9.anInt3623 = 0; - TextureOperation15.anInt3198 = 0; - TextureOperation16.anInt3111 = 0; - RenderAnimationDefinition var4 = this.method1965(); - int var5 = var4.anInt395; - int var6 = var4.anInt381; - if(var5 != 0 && var6 != 0) { - int var7 = Class51.anIntArray840[var3]; - int var8 = Class51.anIntArray851[var3]; - int var9 = -var5 / 2; - int var10 = -var6 / 2; - int var12 = -(var9 * var7) + var10 * var8 >> 16; - int var11 = var7 * var10 - -(var8 * var9) >> 16; - int var13 = Class121.method1736(WorldListCountry.localPlane, 1, var11 + this.anInt2819, this.anInt2829 + var12); - int var14 = var5 / 2; - int var15 = -var6 / 2; - int var16 = var14 * var8 + var15 * var7 >> 16; - int var20 = var6 / 2; - int var17 = var15 * var8 + -(var14 * var7) >> 16; - int var18 = Class121.method1736(WorldListCountry.localPlane, 1, var16 + this.anInt2819, this.anInt2829 - -var17); - int var19 = -var5 / 2; - int var22 = -(var7 * var19) + var20 * var8 >> 16; - int var25 = var6 / 2; - int var24 = var5 / 2; - int var21 = var7 * var20 - -(var8 * var19) >> 16; - int var27 = var25 * var8 - var7 * var24 >> 16; - int var26 = var7 * var25 + var8 * var24 >> 16; - int var23 = Class121.method1736(WorldListCountry.localPlane, 1, this.anInt2819 + var21, var22 + this.anInt2829); - int var29 = var13 < var18 ?var13:var18; - int var28 = Class121.method1736(WorldListCountry.localPlane, 1, var26 + this.anInt2819, var27 + this.anInt2829); - int var30 = var28 > var23?var23:var28; - int var31 = var28 > var18?var18:var28; - int var32 = var23 <= var13?var23:var13; - TextureOperation15.anInt3198 = 2047 & (int)(325.95D * Math.atan2(var29 - var30, var6)); - if(TextureOperation15.anInt3198 != 0) { - var2.method1896(TextureOperation15.anInt3198); + final void method1967(int var2, int var3, int var4, boolean var5) { + try { + if (this.anInt2771 != -1 && SequenceDefinition.getAnimationDefinition(this.anInt2771).priority == 1) { + this.anInt2771 = -1; } - Class3_Sub28_Sub9.anInt3623 = 2047 & (int)(325.95D * Math.atan2(-var31 + var32, var5)); - if(Class3_Sub28_Sub9.anInt3623 != 0) { - var2.method1886(Class3_Sub28_Sub9.anInt3623); + if (!var5) { + int var6 = var3 + -this.anIntArray2767[0]; + int var7 = var4 + -this.anIntArray2755[0]; + if (var6 >= -8 && 8 >= var6 && var7 >= -8 && var7 <= 8) { + if (this.anInt2816 < 9) { + ++this.anInt2816; + } + + for (int var8 = this.anInt2816; var8 > 0; --var8) { + this.anIntArray2767[var8] = this.anIntArray2767[-1 + var8]; + this.anIntArray2755[var8] = this.anIntArray2755[var8 + -1]; + this.aByteArray2795[var8] = this.aByteArray2795[var8 - 1]; + } + + this.aByteArray2795[0] = 1; + this.anIntArray2767[0] = var3; + this.anIntArray2755[0] = var4; + return; + } } - TextureOperation16.anInt3111 = var28 + var13; - if(TextureOperation16.anInt3111 > var23 + var18) { - TextureOperation16.anInt3111 = var23 + var18; + this.anInt2824 = 0; + this.anIntArray2767[0] = var3; + this.anIntArray2755[0] = var4; + this.anInt2816 = 0; + this.anInt2811 = 0; + this.anInt2829 = 64 * var2 + this.anIntArray2755[0] * 128; + this.anInt2819 = var2 * 64 + 128 * this.anIntArray2767[0]; + + if (HDToolKit.highDetail && Class102.player == this) { + TextureOperation31.method236(); } - TextureOperation16.anInt3111 = (TextureOperation16.anInt3111 >> 1) - this.anInt2831; - if(TextureOperation16.anInt3111 != 0) { - var2.method1897(0, TextureOperation16.anInt3111, 0); + } catch (RuntimeException var9) { + throw ClientErrorException.clientError(var9, "fe.J(" + -2 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ')'); + } + } + + final void walkStep(int var1, byte var2, int var3) { + try { + int var4 = this.anIntArray2767[0]; + int var5 = this.anIntArray2755[0]; + if (0 == var3) { + --var4; + ++var5; } - } - } catch (RuntimeException var33) { - throw ClientErrorException.clientError(var33, "fe.M(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); - } - } - - final void method1970(int var1, int var3, int var4) { - try { - for(int var5 = 0; var5 < 4; ++var5) { - if(var3 >= this.anIntArray2768[var5]) { - this.anIntArray2836[var5] = var4; - this.anIntArray2815[var5] = var1; - this.anIntArray2768[var5] = 70 + var3; - return; + if (this.anInt2771 != -1 && 1 == SequenceDefinition.getAnimationDefinition(this.anInt2771).priority) { + this.anInt2771 = -1; } - } - } catch (RuntimeException var6) { - throw ClientErrorException.clientError(var6, "fe.G(" + var1 + ',' + -8 + ',' + var3 + ',' + var4 + ')'); - } - } - - final void method1971(Model var1, byte var2) { - try { - if(var2 > -102) { - this.setSize(1, -96); - } - - RenderAnimationDefinition var3 = this.method1965(); - if(0 != var3.anInt400 || 0 != var3.anInt371) { - int var4 = 0; - int var5 = 0; - if(this.aBoolean2769 && this.anInt2821 != 0) { - var5 = var3.anInt371; - if(this.anInt2821 >= 0) { - var4 = var3.anInt400; - } else { - var4 = -var3.anInt400; - } + if (this.anInt2816 < 9) { + ++this.anInt2816; } int var6; - int var7; - int var8; - int var9; - if(this.anInt2827 != var4) { - this.anInt2827 = var4; - if(this.anInt2754 > 0 && this.anInt2787 < var4) { - var6 = this.anInt2754 * this.anInt2754 / (2 * var3.anInt387); - var7 = -this.anInt2787 + var4; - if(var6 <= var7) { - this.aBoolean2807 = true; - this.anInt2804 = (var4 + this.anInt2787 - var6) / 2; - var8 = var3.anInt370 * var3.anInt370 / (var3.anInt387 * 2); - var9 = -var8 + var4; - if(this.anInt2804 < var9) { - this.anInt2804 = var9; - } - } else { - this.aBoolean2807 = false; - } - } else if(this.anInt2754 < 0 && var4 < this.anInt2787) { - var6 = this.anInt2754 * this.anInt2754 / (var3.anInt387 * 2); - var7 = var4 - this.anInt2787; - if(var7 >= var6) { - this.aBoolean2807 = true; - this.anInt2804 = (this.anInt2787 + var6 - -var4) / 2; - var8 = var3.anInt370 * var3.anInt370 / (2 * var3.anInt387); - var9 = var8 + var4; - if(this.anInt2804 > var9) { - this.anInt2804 = var9; - } - } else { - this.aBoolean2807 = false; - } - } else { - this.aBoolean2807 = false; - } + for (var6 = this.anInt2816; var6 > 0; --var6) { + this.anIntArray2767[var6] = this.anIntArray2767[-1 + var6]; + this.anIntArray2755[var6] = this.anIntArray2755[-1 + var6]; + this.aByteArray2795[var6] = this.aByteArray2795[-1 + var6]; } - if(this.anInt2754 == 0) { - var6 = -this.anInt2787 + this.anInt2827; - if(-var3.anInt387 < var6 && var6 < var3.anInt387) { - this.anInt2787 = this.anInt2827; - } else { - this.aBoolean2807 = true; - var7 = var3.anInt370 * var3.anInt370 / (var3.anInt387 * 2); - this.anInt2804 = (this.anInt2827 + this.anInt2787) / 2; - if(var6 >= 0) { - var8 = -var7 + this.anInt2827; - this.anInt2754 = var3.anInt387; - if(this.anInt2804 < var8) { - this.anInt2804 = var8; - } - } else { - this.anInt2754 = -var3.anInt387; - var8 = var7 + this.anInt2827; - if(var8 < this.anInt2804) { - this.anInt2804 = var8; - } - } - } - } else if (this.anInt2754 > 0) { - if (this.anInt2804 <= this.anInt2787) { - this.aBoolean2807 = false; - } - - if (!this.aBoolean2807) { - this.anInt2754 -= var3.anInt387; - if (this.anInt2754 < 0) { - this.anInt2754 = 0; - } - } else if (var3.anInt370 > this.anInt2754) { - this.anInt2754 += var3.anInt387; - } - } else { - if (this.anInt2787 <= this.anInt2804) { - this.aBoolean2807 = false; - } - - if (this.aBoolean2807) { - if (-var3.anInt370 < this.anInt2754) { - this.anInt2754 -= var3.anInt387; - } - } else { - this.anInt2754 += var3.anInt387; - if (this.anInt2754 > 0) { - this.anInt2754 = 0; - } - } + if (var3 == 1) { + ++var5; } - this.anInt2787 += this.anInt2754; - if(this.anInt2787 != 0) { - var6 = (this.anInt2787 & '\ufff1') >> 5; - var7 = var1.method1871() / 2; - var1.method1897(0, -var7, 0); - var1.method1886(var6); - var1.method1897(0, var7, 0); + this.aByteArray2795[0] = (byte) var1; + if (2 == var3) { + ++var5; + ++var4; } - if(var5 != this.anInt2766) { - this.anInt2766 = var5; - if(this.anInt2830 > 0 && this.anInt2834 < var5) { - var6 = this.anInt2830 * this.anInt2830 / (2 * var3.anInt403); - var7 = -this.anInt2834 + var5; - if(var6 > var7) { - this.aBoolean2783 = false; - } else { - this.anInt2757 = (-var6 + this.anInt2834 + var5) / 2; - this.aBoolean2783 = true; - var8 = var3.anInt399 * var3.anInt399 / (2 * var3.anInt403); - var9 = var5 + -var8; - if(var9 > this.anInt2757) { - this.anInt2757 = var9; - } - } - } else if(this.anInt2830 < 0 && this.anInt2834 > var5) { - var7 = -this.anInt2834 + var5; - var6 = this.anInt2830 * this.anInt2830 / (2 * var3.anInt403); - if(var7 >= var6) { - this.anInt2757 = (var6 + this.anInt2834 - -var5) / 2; - this.aBoolean2783 = true; - var8 = var3.anInt399 * var3.anInt399 / (2 * var3.anInt403); - var9 = var8 + var5; - if(var9 < this.anInt2757) { - this.anInt2757 = var9; - } - } else { - this.aBoolean2783 = false; - } - } else { - this.aBoolean2783 = false; - } + if (var3 == 3) { + --var4; } - if(this.anInt2830 == 0) { - var6 = -this.anInt2834 + this.anInt2766; - if(-var3.anInt403 < var6 && var3.anInt403 > var6) { - this.anInt2834 = this.anInt2766; - } else { - this.anInt2757 = (this.anInt2766 + this.anInt2834) / 2; - this.aBoolean2783 = true; - var7 = var3.anInt399 * var3.anInt399 / (2 * var3.anInt403); - if(var6 < 0) { - this.anInt2830 = -var3.anInt403; - var8 = var7 + this.anInt2766; - if(this.anInt2757 > var8) { - this.anInt2757 = var8; - } - } else { - this.anInt2830 = var3.anInt403; - var8 = -var7 + this.anInt2766; - if(var8 > this.anInt2757) { - this.anInt2757 = var8; - } - } - } - } else if (this.anInt2830 > 0) { - if (this.anInt2757 <= this.anInt2834) { - this.aBoolean2783 = false; - } - - if (this.aBoolean2783) { - if (var3.anInt399 > this.anInt2830) { - this.anInt2830 += var3.anInt403; - } - } else { - this.anInt2830 -= var3.anInt403; - if (0 > this.anInt2830) { - this.anInt2830 = 0; - } - } - } else { - if (this.anInt2757 >= this.anInt2834) { - this.aBoolean2783 = false; - } - - if (this.aBoolean2783) { - if (this.anInt2830 > -var3.anInt399) { - this.anInt2830 -= var3.anInt403; - } - } else { - this.anInt2830 += var3.anInt403; - if (0 < this.anInt2830) { - this.anInt2830 = 0; - } - } + if (4 == var3) { + ++var4; } - this.anInt2834 += this.anInt2830; - if(this.anInt2834 != 0) { - var6 = (this.anInt2834 & '\uffe6') >> 5; - var7 = var1.method1871() / 2; - var1.method1897(0, -var7, 0); - var1.method1896(var6); - var1.method1897(0, var7, 0); + if (5 == var3) { + --var5; + --var4; } - } - } catch (RuntimeException var10) { - throw ClientErrorException.clientError(var10, "fe.A(" + (var1 != null?"{...}":"null") + ',' + var2 + ')'); - } - } + if (var3 == 6) { + --var5; + } - abstract int getRenderAnimationId(); + if (var3 == 7) { + --var5; + ++var4; + } - final void method1973(int var1) { - try { - if(var1 < -75) { - this.anInt2816 = 0; - this.anInt2811 = 0; - } - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "fe.I(" + var1 + ')'); - } - } + this.anIntArray2767[0] = var4; + this.anIntArray2755[0] = var5; + } catch (RuntimeException var7) { + throw ClientErrorException.clientError(var7, "fe.E(" + var1 + ',' + var2 + ',' + var3 + ')'); + } + } - final int method1975(int var1) { - try { - return var1 != 27855?107:(this.anInt2820 != -32768?-this.anInt2820:200); - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "fe.F(" + var1 + ')'); - } - } + final void method1969(byte var1, Model var2, int var3) { + try { + if (var1 <= 33) { + this.method1971(null, (byte) -26); + } - final void setSize(int var1, int var2) { - try { - this.size = var1; - if(var2 != 2) { - this.aBoolean2807 = false; - } + Class3_Sub28_Sub9.anInt3623 = 0; + TextureOperation15.anInt3198 = 0; + TextureOperation16.anInt3111 = 0; + RenderAnimationDefinition var4 = this.getRenderAnimationType(); + int var5 = var4.hill_width; + int var6 = var4.hill_height; + if (var5 != 0 && var6 != 0) { + int var7 = Class51.anIntArray840[var3]; + int var8 = Class51.anIntArray851[var3]; + int var9 = -var5 / 2; + int var10 = -var6 / 2; + int var12 = -(var9 * var7) + var10 * var8 >> 16; + int var11 = var7 * var10 - -(var8 * var9) >> 16; + int var13 = Class121.method1736(WorldListCountry.localPlane, 1, var11 + this.anInt2819, this.anInt2829 + var12); + int var14 = var5 / 2; + int var15 = -var6 / 2; + int var16 = var14 * var8 + var15 * var7 >> 16; + int var20 = var6 / 2; + int var17 = var15 * var8 + -(var14 * var7) >> 16; + int var18 = Class121.method1736(WorldListCountry.localPlane, 1, var16 + this.anInt2819, this.anInt2829 - -var17); + int var19 = -var5 / 2; + int var22 = -(var7 * var19) + var20 * var8 >> 16; + int var25 = var6 / 2; + int var24 = var5 / 2; + int var21 = var7 * var20 - -(var8 * var19) >> 16; + int var27 = var25 * var8 - var7 * var24 >> 16; + int var26 = var7 * var25 + var8 * var24 >> 16; + int var23 = Class121.method1736(WorldListCountry.localPlane, 1, this.anInt2819 + var21, var22 + this.anInt2829); + int var29 = var13 < var18 ? var13 : var18; + int var28 = Class121.method1736(WorldListCountry.localPlane, 1, var26 + this.anInt2819, var27 + this.anInt2829); + int var30 = var28 > var23 ? var23 : var28; + int var31 = var28 > var18 ? var18 : var28; + int var32 = var23 <= var13 ? var23 : var13; + TextureOperation15.anInt3198 = 2047 & (int) (325.95D * Math.atan2(var29 - var30, var6)); + if (TextureOperation15.anInt3198 != 0) { + var2.method1896(TextureOperation15.anInt3198); + } - } catch (RuntimeException var4) { - throw ClientErrorException.clientError(var4, "fe.C(" + var1 + ',' + var2 + ')'); - } - } + Class3_Sub28_Sub9.anInt3623 = 2047 & (int) (325.95D * Math.atan2(-var31 + var32, var5)); + if (Class3_Sub28_Sub9.anInt3623 != 0) { + var2.method1886(Class3_Sub28_Sub9.anInt3623); + } - int getSize() { - try { - return this.size; - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "fe.H(" + (byte) 114 + ')'); - } - } + TextureOperation16.anInt3111 = var28 + var13; + if (TextureOperation16.anInt3111 > var23 + var18) { + TextureOperation16.anInt3111 = var23 + var18; + } + + TextureOperation16.anInt3111 = (TextureOperation16.anInt3111 >> 1) - this.anInt2831; + if (TextureOperation16.anInt3111 != 0) { + var2.method1897(0, TextureOperation16.anInt3111, 0); + } + } + + } catch (RuntimeException var33) { + throw ClientErrorException.clientError(var33, "fe.M(" + var1 + ',' + (var2 != null ? "{...}" : "null") + ',' + var3 + ')'); + } + } + + final void addHit(int type, int damage, int clientClock) { + try { + for (int var5 = 0; var5 < 4; ++var5) { + if (damage >= this.anIntArray2768[var5]) { + this.anIntArray2836[var5] = clientClock; + this.anIntArray2815[var5] = type; + this.anIntArray2768[var5] = 70 + damage; + return; + } + } + + } catch (RuntimeException var6) { + throw ClientErrorException.clientError(var6, "fe.G(" + type + ',' + -8 + ',' + damage + ',' + clientClock + ')'); + } + } + + final void method1971(Model var1, byte var2) { + try { + if (var2 > -102) { + this.setSize(1, -96); + } + + RenderAnimationDefinition var3 = this.getRenderAnimationType(); + if (0 != var3.roll_target_angle || 0 != var3.pitch_target_angle) { + int var4 = 0; + int var5 = 0; + if (this.aBoolean2769 && this.anInt2821 != 0) { + var5 = var3.pitch_target_angle; + if (this.anInt2821 >= 0) { + var4 = var3.roll_target_angle; + } else { + var4 = -var3.roll_target_angle; + } + } + + int var6; + int var7; + int var8; + int var9; + if (this.anInt2827 != var4) { + this.anInt2827 = var4; + if (this.anInt2754 > 0 && this.anInt2787 < var4) { + var6 = this.anInt2754 * this.anInt2754 / (2 * var3.roll_acceleration); + var7 = -this.anInt2787 + var4; + if (var6 <= var7) { + this.aBoolean2807 = true; + this.anInt2804 = (var4 + this.anInt2787 - var6) / 2; + var8 = var3.roll_max_speed * var3.roll_max_speed / (var3.roll_acceleration * 2); + var9 = -var8 + var4; + if (this.anInt2804 < var9) { + this.anInt2804 = var9; + } + } else { + this.aBoolean2807 = false; + } + } else if (this.anInt2754 < 0 && var4 < this.anInt2787) { + var6 = this.anInt2754 * this.anInt2754 / (var3.roll_acceleration * 2); + var7 = var4 - this.anInt2787; + if (var7 >= var6) { + this.aBoolean2807 = true; + this.anInt2804 = (this.anInt2787 + var6 - -var4) / 2; + var8 = var3.roll_max_speed * var3.roll_max_speed / (2 * var3.roll_acceleration); + var9 = var8 + var4; + if (this.anInt2804 > var9) { + this.anInt2804 = var9; + } + } else { + this.aBoolean2807 = false; + } + } else { + this.aBoolean2807 = false; + } + } + + if (this.anInt2754 == 0) { + var6 = -this.anInt2787 + this.anInt2827; + if (-var3.roll_acceleration < var6 && var6 < var3.roll_acceleration) { + this.anInt2787 = this.anInt2827; + } else { + this.aBoolean2807 = true; + var7 = var3.roll_max_speed * var3.roll_max_speed / (var3.roll_acceleration * 2); + this.anInt2804 = (this.anInt2827 + this.anInt2787) / 2; + if (var6 >= 0) { + var8 = -var7 + this.anInt2827; + this.anInt2754 = var3.roll_acceleration; + if (this.anInt2804 < var8) { + this.anInt2804 = var8; + } + } else { + this.anInt2754 = -var3.roll_acceleration; + var8 = var7 + this.anInt2827; + if (var8 < this.anInt2804) { + this.anInt2804 = var8; + } + } + } + } else if (this.anInt2754 > 0) { + if (this.anInt2804 <= this.anInt2787) { + this.aBoolean2807 = false; + } + + if (!this.aBoolean2807) { + this.anInt2754 -= var3.roll_acceleration; + if (this.anInt2754 < 0) { + this.anInt2754 = 0; + } + } else if (var3.roll_max_speed > this.anInt2754) { + this.anInt2754 += var3.roll_acceleration; + } + } else { + if (this.anInt2787 <= this.anInt2804) { + this.aBoolean2807 = false; + } + + if (this.aBoolean2807) { + if (-var3.roll_max_speed < this.anInt2754) { + this.anInt2754 -= var3.roll_acceleration; + } + } else { + this.anInt2754 += var3.roll_acceleration; + if (this.anInt2754 > 0) { + this.anInt2754 = 0; + } + } + } + + this.anInt2787 += this.anInt2754; + if (this.anInt2787 != 0) { + var6 = (this.anInt2787 & '\ufff1') >> 5; + var7 = var1.method1871() / 2; + var1.method1897(0, -var7, 0); + var1.method1886(var6); + var1.method1897(0, var7, 0); + } + + if (var5 != this.anInt2766) { + this.anInt2766 = var5; + if (this.anInt2830 > 0 && this.anInt2834 < var5) { + var6 = this.anInt2830 * this.anInt2830 / (2 * var3.pitch_acceleration); + var7 = -this.anInt2834 + var5; + if (var6 > var7) { + this.aBoolean2783 = false; + } else { + this.anInt2757 = (-var6 + this.anInt2834 + var5) / 2; + this.aBoolean2783 = true; + var8 = var3.pitch_max_speed * var3.pitch_max_speed / (2 * var3.pitch_acceleration); + var9 = var5 + -var8; + if (var9 > this.anInt2757) { + this.anInt2757 = var9; + } + } + } else if (this.anInt2830 < 0 && this.anInt2834 > var5) { + var7 = -this.anInt2834 + var5; + var6 = this.anInt2830 * this.anInt2830 / (2 * var3.pitch_acceleration); + if (var7 >= var6) { + this.anInt2757 = (var6 + this.anInt2834 - -var5) / 2; + this.aBoolean2783 = true; + var8 = var3.pitch_max_speed * var3.pitch_max_speed / (2 * var3.pitch_acceleration); + var9 = var8 + var5; + if (var9 < this.anInt2757) { + this.anInt2757 = var9; + } + } else { + this.aBoolean2783 = false; + } + } else { + this.aBoolean2783 = false; + } + } + + if (this.anInt2830 == 0) { + var6 = -this.anInt2834 + this.anInt2766; + if (-var3.pitch_acceleration < var6 && var3.pitch_acceleration > var6) { + this.anInt2834 = this.anInt2766; + } else { + this.anInt2757 = (this.anInt2766 + this.anInt2834) / 2; + this.aBoolean2783 = true; + var7 = var3.pitch_max_speed * var3.pitch_max_speed / (2 * var3.pitch_acceleration); + if (var6 < 0) { + this.anInt2830 = -var3.pitch_acceleration; + var8 = var7 + this.anInt2766; + if (this.anInt2757 > var8) { + this.anInt2757 = var8; + } + } else { + this.anInt2830 = var3.pitch_acceleration; + var8 = -var7 + this.anInt2766; + if (var8 > this.anInt2757) { + this.anInt2757 = var8; + } + } + } + } else if (this.anInt2830 > 0) { + if (this.anInt2757 <= this.anInt2834) { + this.aBoolean2783 = false; + } + + if (this.aBoolean2783) { + if (var3.pitch_max_speed > this.anInt2830) { + this.anInt2830 += var3.pitch_acceleration; + } + } else { + this.anInt2830 -= var3.pitch_acceleration; + if (0 > this.anInt2830) { + this.anInt2830 = 0; + } + } + } else { + if (this.anInt2757 >= this.anInt2834) { + this.aBoolean2783 = false; + } + + if (this.aBoolean2783) { + if (this.anInt2830 > -var3.pitch_max_speed) { + this.anInt2830 -= var3.pitch_acceleration; + } + } else { + this.anInt2830 += var3.pitch_acceleration; + if (0 < this.anInt2830) { + this.anInt2830 = 0; + } + } + } + + this.anInt2834 += this.anInt2830; + if (this.anInt2834 != 0) { + var6 = (this.anInt2834 & '\uffe6') >> 5; + var7 = var1.method1871() / 2; + var1.method1897(0, -var7, 0); + var1.method1896(var6); + var1.method1897(0, var7, 0); + } + } + + } catch (RuntimeException var10) { + throw ClientErrorException.clientError(var10, "fe.A(" + (var1 != null ? "{...}" : "null") + ',' + var2 + ')'); + } + } + + abstract int getRenderAnimationId(); + + final void method1973(int var1) { + try { + if (var1 < -75) { + this.anInt2816 = 0; + this.anInt2811 = 0; + } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "fe.I(" + var1 + ')'); + } + } + + final int method1975(int var1) { + try { + return var1 != 27855 ? 107 : (this.anInt2820 != -32768 ? -this.anInt2820 : 200); + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "fe.F(" + var1 + ')'); + } + } + + final void setSize(int var1, int var2) { + try { + this.size = var1; + if (var2 != 2) { + this.aBoolean2807 = false; + } + + } catch (RuntimeException var4) { + throw ClientErrorException.clientError(var4, "fe.C(" + var1 + ',' + var2 + ')'); + } + } + + int getSize() { + try { + return this.size; + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "fe.H(" + (byte) 114 + ')'); + } + } } 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 ad7717310..4afed85fd 100644 --- a/Client/src/main/java/org/runite/client/Class140_Sub6.java +++ b/Client/src/main/java/org/runite/client/Class140_Sub6.java @@ -38,7 +38,7 @@ final class Class140_Sub6 extends GameObject { static void method2020(int var0, ObjectDefinition var1, int var3, int var4) { try { - Class3_Sub9 var5 = (Class3_Sub9) Unsorted.aClass61_78.method1222(); + Class3_Sub9 var5 = (Class3_Sub9) Unsorted.aLinkedList_78.method1222(); while(null != var5) { if(var4 == var5.anInt2314 && 128 * var0 == var5.anInt2326 && var5.anInt2308 == 128 * var3 && var5.aClass111_2320.objectId == var1.objectId) { @@ -56,7 +56,7 @@ final class Class140_Sub6 extends GameObject { return; } - var5 = (Class3_Sub9) Unsorted.aClass61_78.method1221(); + var5 = (Class3_Sub9) Unsorted.aLinkedList_78.method1221(); } } catch (RuntimeException var6) { diff --git a/Client/src/main/java/org/runite/client/Class145.java b/Client/src/main/java/org/runite/client/Class145.java index 934205737..a35e661bf 100644 --- a/Client/src/main/java/org/runite/client/Class145.java +++ b/Client/src/main/java/org/runite/client/Class145.java @@ -37,10 +37,10 @@ final class Class145 { } static void method2073(Class3_Sub2 var0, boolean var1) { - Class163_Sub1.aClass61_2990.method1215(var0); + Class163_Sub1.aLinkedList_2990.method1215(var0); while (true) { - Class3_Sub2 var2 = (Class3_Sub2) Class163_Sub1.aClass61_2990.method1220(); + Class3_Sub2 var2 = (Class3_Sub2) Class163_Sub1.aLinkedList_2990.method1220(); if (var2 == null) { return; } @@ -360,28 +360,28 @@ final class Class145 { if (var3 < Class97.anInt1375 && (var14 & 4) != 0) { var35 = var7[var3 + 1][var4]; if (var35 != null && var35.aBoolean2225) { - Class163_Sub1.aClass61_2990.method1215(var35); + Class163_Sub1.aLinkedList_2990.method1215(var35); } } if (var4 < anInt3340 && (var14 & 2) != 0) { var35 = var7[var3][var4 + 1]; if (var35 != null && var35.aBoolean2225) { - Class163_Sub1.aClass61_2990.method1215(var35); + Class163_Sub1.aLinkedList_2990.method1215(var35); } } if (var3 > Class97.anInt1375 && (var14 & 1) != 0) { var35 = var7[var3 - 1][var4]; if (var35 != null && var35.aBoolean2225) { - Class163_Sub1.aClass61_2990.method1215(var35); + Class163_Sub1.aLinkedList_2990.method1215(var35); } } if (var4 > anInt3340 && (var14 & 8) != 0) { var35 = var7[var3][var4 - 1]; if (var35 != null && var35.aBoolean2225) { - Class163_Sub1.aClass61_2990.method1215(var35); + Class163_Sub1.aLinkedList_2990.method1215(var35); } } } @@ -569,9 +569,9 @@ final class Class145 { for (var15 = var32.anInt478; var15 <= var32.anInt481; ++var15) { Class3_Sub2 var37 = var7[var14][var15]; if (var37.anInt2227 != 0) { - Class163_Sub1.aClass61_2990.method1215(var37); + Class163_Sub1.aLinkedList_2990.method1215(var37); } else if ((var14 != var3 || var15 != var4) && var37.aBoolean2225) { - Class163_Sub1.aClass61_2990.method1215(var37); + Class163_Sub1.aLinkedList_2990.method1215(var37); } } } @@ -701,35 +701,35 @@ final class Class145 { if (var5 < Class3_Sub17.anInt2456 - 1) { var33 = Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var5 + 1][var3][var4]; if (var33 != null && var33.aBoolean2225) { - Class163_Sub1.aClass61_2990.method1215(var33); + Class163_Sub1.aLinkedList_2990.method1215(var33); } } if (var3 < Class97.anInt1375) { var33 = var7[var3 + 1][var4]; if (var33 != null && var33.aBoolean2225) { - Class163_Sub1.aClass61_2990.method1215(var33); + Class163_Sub1.aLinkedList_2990.method1215(var33); } } if (var4 < anInt3340) { var33 = var7[var3][var4 + 1]; if (var33 != null && var33.aBoolean2225) { - Class163_Sub1.aClass61_2990.method1215(var33); + Class163_Sub1.aLinkedList_2990.method1215(var33); } } if (var3 > Class97.anInt1375) { var33 = var7[var3 - 1][var4]; if (var33 != null && var33.aBoolean2225) { - Class163_Sub1.aClass61_2990.method1215(var33); + Class163_Sub1.aLinkedList_2990.method1215(var33); } } if (var4 > anInt3340) { var33 = var7[var3][var4 - 1]; if (var33 != null && var33.aBoolean2225) { - Class163_Sub1.aClass61_2990.method1215(var33); + Class163_Sub1.aLinkedList_2990.method1215(var33); } } } @@ -749,7 +749,7 @@ final class Class145 { RSInterface.anInt278 = var1; Unsorted.anInt1038 = var3; - Class3_Sub30_Sub1.anInt872 = var0; + BufferedDataStream.anInt872 = var0; Class164.anInt2051 = var2; GameObject.aBoolean1837 = true; Unsorted.anInt1887 = var4; diff --git a/Client/src/main/java/org/runite/client/Class15.java b/Client/src/main/java/org/runite/client/Class15.java index c8d9d6f7e..ddb0e8092 100644 --- a/Client/src/main/java/org/runite/client/Class15.java +++ b/Client/src/main/java/org/runite/client/Class15.java @@ -254,7 +254,7 @@ public final class Class15 implements Runnable { var10.anInt3056 = 4; var10.aBoolean3065 = false; var10.anInt3060 = 8; - var10.method158(16251); + var10.postDecode(); TextureOperation33.method180(122, 256, 64); for (int var11 = 0; var11 < 256; ++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 787b27bdf..fe417adb3 100644 --- a/Client/src/main/java/org/runite/client/Class151_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class151_Sub1.java @@ -22,10 +22,10 @@ final class Class151_Sub1 extends ResourceProvider { private final CacheResourceWorker cacheResourceWorker; private final int anInt2957; private boolean aBoolean2962; - private final Class61 aClass61_2963 = new Class61(); + private final LinkedList aLinkedList_2963 = new LinkedList(); private int anInt2964 = 0; private boolean aBoolean2965; - private Class61 aClass61_2966; + private LinkedList aLinkedList_2966; private long aLong2967 = 0L; private final boolean aBoolean2968; @@ -34,14 +34,14 @@ final class Class151_Sub1 extends ResourceProvider { try { if (null != this.aClass41_2954) { Linkable var3; - for (var3 = this.aClass61_2963.method1222(); null != var3; var3 = this.aClass61_2963.method1221()) { + for (var3 = this.aLinkedList_2963.method1222(); null != var3; var3 = this.aLinkedList_2963.method1221()) { if ((long) var1 == var3.linkableKey) { return; } } var3 = new Linkable(); var3.linkableKey = var1; - this.aClass61_2963.method1215(var3); + this.aLinkedList_2963.method1215(var3); } } catch (RuntimeException var5) { throw ClientErrorException.clientError(var5, "bg.H(" + var1 + ',' + 127 + ')'); @@ -123,8 +123,8 @@ final class Class151_Sub1 extends ResourceProvider { try { if (this.aClass41_2954 != null) { this.aBoolean2965 = true; - if (this.aClass61_2966 == null) { - this.aClass61_2966 = new Class61(); + if (this.aLinkedList_2966 == null) { + this.aLinkedList_2966 = new LinkedList(); } } @@ -147,7 +147,7 @@ final class Class151_Sub1 extends ResourceProvider { if (null == this.table) { return 0; } else if (this.aBoolean2962) { - Linkable var2 = this.aClass61_2966.method1222(); + Linkable var2 = this.aLinkedList_2966.method1222(); if (null == var2) { return 0; } else { @@ -164,7 +164,7 @@ final class Class151_Sub1 extends ResourceProvider { final void method2107() { try { - if (null != this.aClass61_2966) { + if (null != this.aLinkedList_2966) { if (this.getReferenceTable() == null) { return; } @@ -175,7 +175,7 @@ final class Class151_Sub1 extends ResourceProvider { if (this.aBoolean2962) { var2 = true; - for (var3 = this.aClass61_2966.method1222(); null != var3; var3 = this.aClass61_2966.method1221()) { + for (var3 = this.aLinkedList_2966.method1222(); null != var3; var3 = this.aLinkedList_2966.method1221()) { var4 = (int) var3.linkableKey; if (this.aByteArray2949[var4] == 0) { this.method2109(1, var4, 51); @@ -203,7 +203,7 @@ final class Class151_Sub1 extends ResourceProvider { var2 = false; var3 = new Linkable(); var3.linkableKey = this.anInt2964; - this.aClass61_2966.method1215(var3); + this.aLinkedList_2966.method1215(var3); } } @@ -217,7 +217,7 @@ final class Class151_Sub1 extends ResourceProvider { } else if (this.aBoolean2965) { var2 = true; - for (var3 = this.aClass61_2966.method1222(); var3 != null; var3 = this.aClass61_2966.method1221()) { + for (var3 = this.aLinkedList_2966.method1222(); var3 != null; var3 = this.aLinkedList_2966.method1221()) { var4 = (int) var3.linkableKey; if (this.aByteArray2949[var4] != 1) { this.method2109(2, var4, 96); @@ -246,7 +246,7 @@ final class Class151_Sub1 extends ResourceProvider { if (this.aByteArray2949[this.anInt2964] != 1) { var3 = new Linkable(); var3.linkableKey = this.anInt2964; - this.aClass61_2966.method1215(var3); + this.aLinkedList_2966.method1215(var3); var2 = false; } @@ -259,7 +259,7 @@ final class Class151_Sub1 extends ResourceProvider { this.aBoolean2965 = false; } } else { - this.aClass61_2966 = null; + this.aLinkedList_2966 = null; } } @@ -469,9 +469,9 @@ final class Class151_Sub1 extends ResourceProvider { final void method2110() { try { - if (this.aClass61_2966 != null) { + if (this.aLinkedList_2966 != null) { if (null != this.getReferenceTable()) { - for (Linkable var2 = this.aClass61_2963.method1222(); null != var2; var2 = this.aClass61_2963.method1221()) { + for (Linkable var2 = this.aLinkedList_2963.method1222(); null != var2; var2 = this.aLinkedList_2963.method1221()) { int var3 = (int) var2.linkableKey; if (0 <= var3 && this.table.getArchiveAmount() > var3 && this.table.archiveFileLengths[var3] != 0) { if (this.aByteArray2949[var3] == 0) { @@ -528,7 +528,7 @@ final class Class151_Sub1 extends ResourceProvider { this.aBoolean2962 = false; } else { this.aBoolean2962 = true; - this.aClass61_2966 = new Class61(); + this.aLinkedList_2966 = new LinkedList(); } this.cacheResourceWorker = var5; 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 8d5ca6645..d928785b7 100644 --- a/Client/src/main/java/org/runite/client/Class158_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class158_Sub1.java @@ -519,7 +519,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv Class3_Sub11[] var50; if(var1) { 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); + LinkedList.method1213(var8, var50); } else { 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); @@ -533,7 +533,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv var49[var50.length + var44] = var46[var44]; } - Class61.method1213(var8, var49); + LinkedList.method1213(var8, var49); Class129.method1769(var43, TextureOperation36.aByteArrayArrayArray3430[var8], PacketParser.aByteArrayArrayArray81[var8], Class68.aClass43Array1021, var8, Class68.anInt1032, var40, Unsorted.aByteArrayArrayArray1328[var8], aByteArrayArrayArray1828[var8], Class44.anIntArrayArrayArray723[var8], var38); } } diff --git a/Client/src/main/java/org/runite/client/Class159.java b/Client/src/main/java/org/runite/client/Class159.java index 4276d1c5f..f42a67140 100644 --- a/Client/src/main/java/org/runite/client/Class159.java +++ b/Client/src/main/java/org/runite/client/Class159.java @@ -125,7 +125,7 @@ public final class Class159 { } if (0 <= var10) { - Class3_Sub30_Sub1.anIntArray3805[var10 + var9] = var8 / (1 + var6 * 2); + BufferedDataStream.anIntArray3805[var10 + var9] = var8 / (1 + var6 * 2); } } } @@ -136,11 +136,11 @@ public final class Class159 { for (var9 = -var6; var2 > var9; ++var9) { var10 = var9 * 128; if (var2 > var9 + var6) { - var8 += Class3_Sub30_Sub1.anIntArray3805[var6 * 128 + (var7 - -var10)]; + var8 += BufferedDataStream.anIntArray3805[var6 * 128 + (var7 - -var10)]; } if (0 <= var9 - var6 - 1) { - var8 -= Class3_Sub30_Sub1.anIntArray3805[-((1 + var6) * 128) + (var7 - -var10)]; + var8 -= BufferedDataStream.anIntArray3805[-((1 + var6) * 128) + (var7 - -var10)]; } if (var9 >= 0) { 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 e4c08911e..599711180 100644 --- a/Client/src/main/java/org/runite/client/Class163_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class163_Sub1.java @@ -10,7 +10,7 @@ public class Class163_Sub1 extends Class163 { static long[] aLongArray2986 = new long[32]; static byte[][] aByteArrayArray2987; static int anInt2989 = 0; - static Class61 aClass61_2990 = new Class61(); + static LinkedList aLinkedList_2990 = new LinkedList(); static int anInt2993 = 0; @@ -79,7 +79,7 @@ public class Class163_Sub1 extends Class163 { } if(var7 != -1) { - Class3_Sub30_Sub1.method806(var7); + BufferedDataStream.method806(var7); } Class38_Sub1.aBoolean2615 = false; 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 1f0f087ae..fe6f19e0f 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 @@ -146,14 +146,14 @@ final class Class163_Sub2_Sub1 extends Class163_Sub2 { } } - static void method2226(Class3_Sub30_Sub1 var0, int var1, int var2) { + static void method2226(BufferedDataStream var0, int var1, int var2) { try { if(var2 > -109) { method2226(null, 67, 54); } while(true) { - Class3_Sub8 var3 = (Class3_Sub8)Class3_Sub26.aClass61_2557.method1222(); + Class3_Sub8 var3 = (Class3_Sub8)Class3_Sub26.aLinkedList_2557.method1222(); if(var3 == null) { return; } 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 35314cca3..744850ec3 100644 --- a/Client/src/main/java/org/runite/client/Class163_Sub3.java +++ b/Client/src/main/java/org/runite/client/Class163_Sub3.java @@ -4,100 +4,55 @@ import java.util.Objects; final class Class163_Sub3 extends Class163 { - static int[] anIntArray2999; - static RSString[] aClass94Array3003 = new RSString[100]; - static boolean aBoolean3004 = true; - static byte[][] aByteArrayArray3005; - static int[] anIntArray3007 = new int[]{-1, -1, 1, 1}; + static int[] anIntArray2999; + static RSString[] aClass94Array3003 = new RSString[100]; + static boolean aBoolean3004 = true; + static byte[][] aByteArrayArray3005; + static int[] anIntArray3007 = new int[]{-1, -1, 1, 1}; - static final int[] PLAYER_RENDER_LOG = new int[4]; - - static void renderPlayers() { - try { - Unsorted.maskUpdateCount = 0; - Class139.anInt1829 = 0; - Unsorted.updateLocalPosition(); - PLAYER_RENDER_LOG[0] = GraphicDefinition.incomingBuffer.index; - Class140_Sub3.renderLocalPlayers(); - PLAYER_RENDER_LOG[1] = GraphicDefinition.incomingBuffer.index; - Class131.addLocalPlayers(); - PLAYER_RENDER_LOG[2] = GraphicDefinition.incomingBuffer.index; - Unsorted.parsePlayerMasks(); - PLAYER_RENDER_LOG[3] = GraphicDefinition.incomingBuffer.index; - int var1; - for(var1 = 0; Class139.anInt1829 > var1; ++var1) { - int var2 = Class3_Sub7.anIntArray2292[var1]; - if(Class44.anInt719 != TextureOperation0.players[var2].anInt2838) { - if(0 < TextureOperation0.players[var2].anInt3969) { - Class162.method2203(TextureOperation0.players[var2]); - } + static void method2229(long var0) { + try { + if (var0 != 0) { + if ((100 > Class8.anInt104 || TextureOperation3.disableGEBoxes) && Class8.anInt104 < 200) { + RSString var3 = Objects.requireNonNull(Unsorted.method1052(var0)).longToRSString(); - TextureOperation0.players[var2] = null; + int var4; + for (var4 = 0; Class8.anInt104 > var4; ++var4) { + if (var0 == Class50.aLongArray826[var4]) { + BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{var3, TextCore.HasFriendsAlready}), -1); + return; + } + } + + for (var4 = 0; var4 < Class3_Sub28_Sub5.anInt3591; ++var4) { + if (Class114.ignores[var4] == var0) { + BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{TextCore.HasPleaseRemove, var3, TextCore.HasIgnoreToFriends}), -1); + return; + } + } + + if (var3.equalsString(Class102.player.displayName)) { + BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasOnOwnFriendsList, -1); + } else { + Class70.aClass94Array1046[Class8.anInt104] = var3; + Class50.aLongArray826[Class8.anInt104] = var0; + Unsorted.anIntArray882[Class8.anInt104] = 0; + Unsorted.aClass94Array2566[Class8.anInt104] = TextCore.emptyJagexString; + Class57.anIntArray904[Class8.anInt104] = 0; + Unsorted.aBooleanArray73[Class8.anInt104] = false; + ++Class8.anInt104; + Class110.anInt1472 = PacketParser.anInt3213; + TextureOperation12.outgoingBuffer.putOpcode(120); + TextureOperation12.outgoingBuffer.writeLong(var0); + } + } else { + BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasFriendsListFull, -1); + } } - } - - if(GraphicDefinition.incomingBuffer.index == Unsorted.incomingPacketLength) { - for(var1 = 0; var1 < Class159.localPlayerCount; ++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); - } - } - - } else { - System.err.println("Player rendering packet size mismatch - size log: self=" + PLAYER_RENDER_LOG[0] + ", local=" + PLAYER_RENDER_LOG[1] + ", add global=" + PLAYER_RENDER_LOG[2] + ", masks=" + PLAYER_RENDER_LOG[3] + "."); -// System.err.println("gpp1 pos:" + GraphicDefinition.incomingBuffer.index + " psize:" + Class130.incomingPacketLength); -// throw new RuntimeException("gpp1 pos:" + Class28.incomingBuffer.index + " psize:" + Class130.incomingPacketLength); - } - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "fb.B(" + (byte) -122 + ')'); - } - } - - static void method2229(long var0) { - try { - if(var0 != 0) { - if((100 > Class8.anInt104 || TextureOperation3.disableGEBoxes) && Class8.anInt104 < 200) { - RSString var3 = Objects.requireNonNull(Unsorted.method1052(var0)).longToRSString(); - - int var4; - for(var4 = 0; Class8.anInt104 > var4; ++var4) { - if(var0 == Class50.aLongArray826[var4]) { - Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{var3, TextCore.HasFriendsAlready}), -1); - return; - } - } - - for(var4 = 0; var4 < Class3_Sub28_Sub5.anInt3591; ++var4) { - if(Class114.ignores[var4] == var0) { - Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{TextCore.HasPleaseRemove, var3, TextCore.HasIgnoreToFriends}), -1); - return; - } - } - - if(var3.equalsString(Class102.player.displayName)) { - Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasOnOwnFriendsList, -1); - } else { - Class70.aClass94Array1046[Class8.anInt104] = var3; - Class50.aLongArray826[Class8.anInt104] = var0; - Unsorted.anIntArray882[Class8.anInt104] = 0; - Unsorted.aClass94Array2566[Class8.anInt104] = TextCore.emptyJagexString; - Class57.anIntArray904[Class8.anInt104] = 0; - Unsorted.aBooleanArray73[Class8.anInt104] = false; - ++Class8.anInt104; - Class110.anInt1472 = PacketParser.anInt3213; - TextureOperation12.outgoingBuffer.putOpcode(120); - TextureOperation12.outgoingBuffer.writeLong(var0); - } - } else { - Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasFriendsListFull, -1); - } - } - } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "fb.C(" + var0 + ',' + (byte) -91 + ')'); - } - } + } catch (RuntimeException var5) { + throw ClientErrorException.clientError(var5, "fb.C(" + var0 + ',' + (byte) -91 + ')'); + } + } } 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 7fba505ec..7f6d97b84 100644 --- a/Client/src/main/java/org/runite/client/Class164_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class164_Sub1.java @@ -183,7 +183,7 @@ class Class164_Sub1 extends Class164 { static void method2241(byte var0, boolean var1) { try { Class3_Sub9 var3; - for(var3 = (Class3_Sub9) Unsorted.aClass61_78.method1222(); var3 != null; var3 = (Class3_Sub9) Unsorted.aClass61_78.method1221()) { + for(var3 = (Class3_Sub9) Unsorted.aLinkedList_78.method1222(); var3 != null; var3 = (Class3_Sub9) Unsorted.aLinkedList_78.method1221()) { if(null != var3.aClass3_Sub24_Sub1_2312) { Class3_Sub26.aClass3_Sub24_Sub2_2563.method461(var3.aClass3_Sub24_Sub1_2312); var3.aClass3_Sub24_Sub1_2312 = null; @@ -198,7 +198,7 @@ class Class164_Sub1 extends Class164 { } if(var1) { - for(var3 = (Class3_Sub9) Unsorted.aClass61_1242.method1222(); null != var3; var3 = (Class3_Sub9) Unsorted.aClass61_1242.method1221()) { + for(var3 = (Class3_Sub9) Unsorted.aLinkedList_1242.method1222(); null != var3; var3 = (Class3_Sub9) Unsorted.aLinkedList_1242.method1221()) { if(null != var3.aClass3_Sub24_Sub1_2312) { Class3_Sub26.aClass3_Sub24_Sub2_2563.method461(var3.aClass3_Sub24_Sub1_2312); var3.aClass3_Sub24_Sub1_2312 = null; diff --git a/Client/src/main/java/org/runite/client/Class166.java b/Client/src/main/java/org/runite/client/Class166.java index 1dd173432..e6a208e11 100644 --- a/Client/src/main/java/org/runite/client/Class166.java +++ b/Client/src/main/java/org/runite/client/Class166.java @@ -43,7 +43,7 @@ final class Class166 { boolean var4 = false; for (int var5 = 0; Class159.localPlayerCount > var5; ++var5) { - Player var6 = TextureOperation0.players[Class56.localPlayerIndexes[var5]]; + Player var6 = Unsorted.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]); @@ -68,7 +68,7 @@ final class Class166 { } if (!var4) { - Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{TextCore.HasUnableFind, var3}), -1); + BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{TextCore.HasUnableFind, var3}), -1); } } catch (RuntimeException var7) { diff --git a/Client/src/main/java/org/runite/client/Class167.java b/Client/src/main/java/org/runite/client/Class167.java index d4f99ee74..e79644e50 100644 --- a/Client/src/main/java/org/runite/client/Class167.java +++ b/Client/src/main/java/org/runite/client/Class167.java @@ -6,71 +6,6 @@ public final class Class167 { static int anInt2087 = 0; - static void addLocalNPCs() { - try { - while (true) { - if (GraphicDefinition.incomingBuffer.method815(Unsorted.incomingPacketLength) >= 27) { - int var1 = GraphicDefinition.incomingBuffer.getBits(15); - if (32767 != var1) { - boolean var2 = false; - if (null == NPC.npcs[var1]) { - var2 = true; - NPC.npcs[var1] = new NPC(); - } - - NPC var3 = NPC.npcs[var1]; - Class15.localNPCIndexes[Class163.localNPCCount++] = var1; - var3.anInt2838 = Class44.anInt719; - if (null != var3.definition && var3.definition.method1474()) { - Class3_Sub28_Sub8.method574(var3); - } - - int var4 = GraphicDefinition.incomingBuffer.getBits(1); - int var5 = Class27.anIntArray510[GraphicDefinition.incomingBuffer.getBits(3)]; - if (var2) { - var3.anInt2806 = var3.anInt2785 = var5; - } - - int var6 = GraphicDefinition.incomingBuffer.getBits(1); - if (var6 == 1) { - Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = var1; - } - - int var7 = GraphicDefinition.incomingBuffer.getBits(5); - var3.setDefinitions(NPCDefinition.getNPCDefinition(GraphicDefinition.incomingBuffer.getBits(14))); - if (15 < var7) { - var7 -= 32; - } - - int var8 = GraphicDefinition.incomingBuffer.getBits(5); - if (15 < var8) { - var8 -= 32; - } - - var3.setSize(var3.definition.size, 2); - var3.renderAnimationId = var3.definition.renderAnimationId; - var3.anInt2779 = var3.definition.anInt1274; - if (var3.anInt2779 == 0) { - var3.anInt2785 = 0; - } - - var3.method1967(var3.getSize(), Class102.player.anIntArray2767[0] + var8, var7 + Class102.player.anIntArray2755[0], var4 == 1); - if (var3.definition.method1474()) { - Class70.method1286(var3.anIntArray2755[0], null, 0, var3, var3.anIntArray2767[0], WorldListCountry.localPlane, null); - } - continue; - } - } - - GraphicDefinition.incomingBuffer.method818(); - - return; - } - } catch (RuntimeException var9) { - throw ClientErrorException.clientError(var9, "wj.E(" + 113 + ')'); - } - } - static void method2263(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { Class113 var7 = new Class113(); var7.anInt1553 = var1 / 128; @@ -256,7 +191,7 @@ public final class Class167 { } for (var1 = 0; var1 < 2048; ++var1) { - TextureOperation0.players[var1] = null; + Unsorted.players[var1] = null; Class65.aClass3_Sub30Array986[var1] = null; } @@ -267,7 +202,7 @@ public final class Class167 { for (var1 = 0; 4 > var1; ++var1) { for (int var2 = 0; var2 < 104; ++var2) { for (int var3 = 0; var3 < 104; ++var3) { - TextureOperation0.aClass61ArrayArrayArray3273[var1][var2][var3] = null; + Class39.aLinkedListArrayArrayArray3273[var1][var2][var3] = null; } } } diff --git a/Client/src/main/java/org/runite/client/Class168.java b/Client/src/main/java/org/runite/client/Class168.java index cc14bc2ee..40044e244 100644 --- a/Client/src/main/java/org/runite/client/Class168.java +++ b/Client/src/main/java/org/runite/client/Class168.java @@ -903,9 +903,9 @@ final class Class168 { 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; + long var7 = Unsorted.aLongArray3271[var2]; + Unsorted.aLongArray3271[var2] = Unsorted.aLongArray3271[var2 + 1]; + Unsorted.aLongArray3271[var2 - -1] = var7; } } } diff --git a/Client/src/main/java/org/runite/client/Class17.java b/Client/src/main/java/org/runite/client/Class17.java index 59f22bcc7..8b5287f99 100644 --- a/Client/src/main/java/org/runite/client/Class17.java +++ b/Client/src/main/java/org/runite/client/Class17.java @@ -10,7 +10,7 @@ final class Class17 { static void method904(int var0, Class140_Sub4 var1) { try { if (var1.anInt2779 != 0) { - RenderAnimationDefinition var2 = var1.method1965(); + RenderAnimationDefinition var2 = var1.getRenderAnimationType(); int var4; int var5; if (var1.anInt2772 != -1 && 32768 > var1.anInt2772) { @@ -32,7 +32,7 @@ final class Class17 { var9 = 2047; } - Player var10 = TextureOperation0.players[var9]; + Player var10 = Unsorted.players[var9]; if (null != var10) { var6 = -var10.anInt2829 + var1.anInt2829; var5 = -var10.anInt2819 + var1.anInt2819; @@ -57,7 +57,7 @@ final class Class17 { if (var9 == 0) { var1.anInt2789 = 0; var1.anInt2821 = 0; - } else if (var2.anInt369 == 0) { + } else if (var2.yaw_acceleration == 0) { ++var1.anInt2789; boolean var11; if (var9 > 1024) { @@ -68,11 +68,11 @@ final class Class17 { var11 = false; } - if (var1.anInt2764 == var2.anInt368 && (25 < var1.anInt2789 || var11)) { - if (var2.anInt367 == -1) { - var1.anInt2764 = var2.anInt382; + if (var1.anInt2764 == var2.stand_animation && (25 < var1.anInt2789 || var11)) { + if (var2.standing_ccw_turn == -1) { + var1.anInt2764 = var2.walk_animation; } else { - var1.anInt2764 = var2.anInt367; + var1.anInt2764 = var2.standing_ccw_turn; } } } else { @@ -83,22 +83,22 @@ final class Class17 { var1.anInt2785 = var1.anInt2806; } - if (var2.anInt368 == var1.anInt2764 && (25 < var1.anInt2789 || var11)) { - if (-1 == var2.anInt407) { - var1.anInt2764 = var2.anInt382; + if (var2.stand_animation == var1.anInt2764 && (25 < var1.anInt2789 || var11)) { + if (-1 == var2.standing_cw_turn) { + var1.anInt2764 = var2.walk_animation; } else { - var1.anInt2764 = var2.anInt407; + var1.anInt2764 = var2.standing_cw_turn; } } } var1.anInt2785 &= 2047; } else { - if (var1.anInt2764 == var2.anInt368 && 25 < var1.anInt2789) { - if (var2.anInt407 == -1) { - var1.anInt2764 = var2.anInt382; + if (var1.anInt2764 == var2.stand_animation && 25 < var1.anInt2789) { + if (var2.standing_cw_turn == -1) { + var1.anInt2764 = var2.walk_animation; } else { - var1.anInt2764 = var2.anInt407; + var1.anInt2764 = var2.standing_cw_turn; } } @@ -107,12 +107,12 @@ final class Class17 { var1.anInt2791 = 0; var1.anInt2808 = var4; var5 = -var1.anInt2780 + var4 & 65535; - var6 = var1.anInt2821 * var1.anInt2821 / (var2.anInt369 * 2); + var6 = var1.anInt2821 * var1.anInt2821 / (var2.yaw_acceleration * 2); int var7; if (var1.anInt2821 > 0 && var6 <= var5 && -var6 + var5 < 32768) { var1.anInt2803 = var5 / 2; var1.aBoolean2769 = true; - var7 = var2.anInt357 * var2.anInt357 / (var2.anInt369 * 2); + var7 = var2.yaw_max_speed * var2.yaw_max_speed / (var2.yaw_acceleration * 2); if (32767 < var7) { var7 = 32767; } @@ -123,7 +123,7 @@ final class Class17 { } 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); + var7 = var2.yaw_max_speed * var2.yaw_max_speed / (var2.yaw_acceleration * 2); if (var7 > 32767) { var7 = 32767; } @@ -138,24 +138,24 @@ final class Class17 { if (var1.anInt2821 == 0) { var5 = -var1.anInt2780 + var1.anInt2808 & 65535; - if (var5 < var2.anInt369) { + if (var5 < var2.yaw_acceleration) { var1.anInt2780 = var1.anInt2808; } else { var1.anInt2791 = 0; - var6 = var2.anInt357 * var2.anInt357 / (2 * var2.anInt369); + var6 = var2.yaw_max_speed * var2.yaw_max_speed / (2 * var2.yaw_acceleration); var1.aBoolean2769 = true; if (32767 < var6) { var6 = 32767; } if (var5 >= 32768) { - var1.anInt2821 = -var2.anInt369; + var1.anInt2821 = -var2.yaw_acceleration; var1.anInt2803 = (65536 - var5) / 2; if (var1.anInt2803 > var6) { var1.anInt2803 = 65536 - (var5 + var6); } } else { - var1.anInt2821 = var2.anInt369; + var1.anInt2821 = var2.yaw_acceleration; var1.anInt2803 = var5 / 2; if (var1.anInt2803 > var6) { var1.anInt2803 = -var6 + var5; @@ -168,12 +168,12 @@ final class Class17 { } if (!var1.aBoolean2769) { - var1.anInt2821 += var2.anInt369; + var1.anInt2821 += var2.yaw_acceleration; if (0 < var1.anInt2821) { var1.anInt2821 = 0; } - } else if (var1.anInt2821 > -var2.anInt357) { - var1.anInt2821 -= var2.anInt369; + } else if (var1.anInt2821 > -var2.yaw_max_speed) { + var1.anInt2821 -= var2.yaw_acceleration; } } else { if (var1.anInt2791 >= var1.anInt2803) { @@ -181,12 +181,12 @@ final class Class17 { } if (!var1.aBoolean2769) { - var1.anInt2821 -= var2.anInt369; + var1.anInt2821 -= var2.yaw_acceleration; if (var1.anInt2821 < 0) { var1.anInt2821 = 0; } - } else if (var1.anInt2821 < var2.anInt357) { - var1.anInt2821 += var2.anInt369; + } else if (var1.anInt2821 < var2.yaw_max_speed) { + var1.anInt2821 += var2.yaw_acceleration; } } diff --git a/Client/src/main/java/org/runite/client/Class20.java b/Client/src/main/java/org/runite/client/Class20.java index 0db815778..4d11722e2 100644 --- a/Client/src/main/java/org/runite/client/Class20.java +++ b/Client/src/main/java/org/runite/client/Class20.java @@ -70,7 +70,7 @@ final class Class20 { GameObject var13 = null; GameObject var14 = null; if (0 == var4) { - Class70 var15 = Class61.method1209(var3, var2, var1); + Class70 var15 = LinkedList.method1209(var3, var2, var1); if (null != var15) { var13 = var15.aClass140_1049; var14 = var15.aClass140_1052; diff --git a/Client/src/main/java/org/runite/client/Class21.java b/Client/src/main/java/org/runite/client/Class21.java index 81ecc7493..d0e4a52fa 100644 --- a/Client/src/main/java/org/runite/client/Class21.java +++ b/Client/src/main/java/org/runite/client/Class21.java @@ -26,14 +26,14 @@ public final class Class21 { Class161.anInt2028 = 0; Class38_Sub1.anInt2617 = 0; Class24.anInt469 = -1; - GraphicDefinition.incomingBuffer.index = 0; + BufferedDataStream.incomingBuffer.index = 0; AbstractSprite.anInt3699 = 0; Unsorted.incomingOpcode = -1; int var1; - for (var1 = 0; TextureOperation0.players.length > var1; ++var1) { - if (null != TextureOperation0.players[var1]) { - TextureOperation0.players[var1].anInt2772 = -1; + for (var1 = 0; Unsorted.players.length > var1; ++var1) { + if (null != Unsorted.players[var1]) { + Unsorted.players[var1].anInt2772 = -1; } } diff --git a/Client/src/main/java/org/runite/client/Class23.java b/Client/src/main/java/org/runite/client/Class23.java index 3c263f438..7a8a446cd 100644 --- a/Client/src/main/java/org/runite/client/Class23.java +++ b/Client/src/main/java/org/runite/client/Class23.java @@ -31,7 +31,7 @@ public final class Class23 { var1.writeByte(Class25.aBoolean488 ? 1 : 0); var1.writeByte(!RSInterface.aBoolean236 ? 0 : 1); var1.writeByte(!WorldListEntry.aBoolean2623 ? 0 : 1); - var1.writeByte(TextureOperation0.aBoolean3275 ? 1 : 0); + var1.writeByte(Unsorted.aBoolean3275 ? 1 : 0); var1.writeByte(!Class140_Sub6.aBoolean2910 ? 0 : 1); var1.writeByte(Unsorted.anInt1137); var1.writeByte(!Class106.aBoolean1441 ? 0 : 1); diff --git a/Client/src/main/java/org/runite/client/Class24.java b/Client/src/main/java/org/runite/client/Class24.java index a50367de7..94b935c45 100644 --- a/Client/src/main/java/org/runite/client/Class24.java +++ b/Client/src/main/java/org/runite/client/Class24.java @@ -83,77 +83,6 @@ public final class Class24 { } } - static void renderLocalNPCs() { - try { - GraphicDefinition.incomingBuffer.setBitAccess(); - int var1 = GraphicDefinition.incomingBuffer.getBits(8); - int var2; - if (var1 < Class163.localNPCCount) { - for (var2 = var1; var2 < Class163.localNPCCount; ++var2) { - Class3_Sub7.anIntArray2292[Class139.anInt1829++] = Class15.localNPCIndexes[var2]; - } - } - - if (Class163.localNPCCount < var1) { - throw new RuntimeException("gnpov1"); - } else { - Class163.localNPCCount = 0; - - for (var2 = 0; var1 > var2; ++var2) { - int var3 = Class15.localNPCIndexes[var2]; - NPC var4 = NPC.npcs[var3]; - int var5 = GraphicDefinition.incomingBuffer.getBits(1); - if (0 == var5) { - Class15.localNPCIndexes[Class163.localNPCCount++] = var3; - var4.anInt2838 = Class44.anInt719; - } else { - int var6 = GraphicDefinition.incomingBuffer.getBits(2); - if (var6 == 0) { - Class15.localNPCIndexes[Class163.localNPCCount++] = var3; - var4.anInt2838 = Class44.anInt719; - Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = var3; - } else { - int var7; - int var8; - if (1 == var6) { - Class15.localNPCIndexes[Class163.localNPCCount++] = var3; - var4.anInt2838 = Class44.anInt719; - var7 = GraphicDefinition.incomingBuffer.getBits(3); - var4.walkStep(1, (byte) 32, var7); - var8 = GraphicDefinition.incomingBuffer.getBits(1); - if (1 == var8) { - Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = var3; - } - } else if (var6 == 2) { - Class15.localNPCIndexes[Class163.localNPCCount++] = var3; - var4.anInt2838 = Class44.anInt719; - if (GraphicDefinition.incomingBuffer.getBits(1) == 1) { - var7 = GraphicDefinition.incomingBuffer.getBits(3); - var4.walkStep(2, (byte) -122, var7); - var8 = GraphicDefinition.incomingBuffer.getBits(3); - var4.walkStep(2, (byte) 85, var8); - } else { - var7 = GraphicDefinition.incomingBuffer.getBits(3); - var4.walkStep(0, (byte) -80, var7); - } - - var7 = GraphicDefinition.incomingBuffer.getBits(1); - if (var7 == 1) { - Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = var3; - } - } else if (var6 == 3) { - Class3_Sub7.anIntArray2292[Class139.anInt1829++] = var3; - } - } - } - } - - } - } catch (RuntimeException var9) { - throw ClientErrorException.clientError(var9, "dm.E(" + (byte) -11 + ')'); - } - } - static void method949(int var0, int var2, int var3, int var4) { try { int var6 = 0; @@ -198,7 +127,7 @@ public final class Class24 { 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(TextureOperation0.nameIconsSpriteArray); + Font var7 = var0.method868(Sprites.nameIconsSpriteArray); if (null == var7) { var7 = FontType.bold; } diff --git a/Client/src/main/java/org/runite/client/Class25.java b/Client/src/main/java/org/runite/client/Class25.java index d7c4bf24d..dacd09986 100644 --- a/Client/src/main/java/org/runite/client/Class25.java +++ b/Client/src/main/java/org/runite/client/Class25.java @@ -96,7 +96,7 @@ final class Class25 { static void method958(byte var0) { try { if (GameObject.aBoolean1837) { - RSInterface var1 = AbstractSprite.method638(Class3_Sub30_Sub1.anInt872, RSInterface.anInt278); + RSInterface var1 = AbstractSprite.method638(BufferedDataStream.anInt872, RSInterface.anInt278); if (null != var1 && var1.anObjectArray303 != null) { CS2Script var3 = new CS2Script(); var3.arguments = var1.anObjectArray303; diff --git a/Client/src/main/java/org/runite/client/Class31.java b/Client/src/main/java/org/runite/client/Class31.java index 0b6146a34..91775ecf7 100644 --- a/Client/src/main/java/org/runite/client/Class31.java +++ b/Client/src/main/java/org/runite/client/Class31.java @@ -8,10 +8,10 @@ import javax.media.opengl.GL; final class Class31 { - private static final Class61 aClass61_581 = new Class61(); - private static final Class61 aClass61_586 = new Class61(); - private static final Class61 aClass61_587 = new Class61(); - private static final Class61 aClass61_588 = new Class61(); + private static final LinkedList A_LINKED_LIST___581 = new LinkedList(); + private static final LinkedList A_LINKED_LIST___586 = new LinkedList(); + private static final LinkedList A_LINKED_LIST___587 = new LinkedList(); + private static final LinkedList A_LINKED_LIST___588 = new LinkedList(); private static final int[] anIntArray589 = new int[1000]; static int anInt580 = 0; static int anInt582 = 0; @@ -23,7 +23,7 @@ final class Class31 { if (var2 == anInt582) { LinkableInt var3 = new LinkableInt(var1); var3.linkableKey = var0; - aClass61_587.method1215(var3); + A_LINKED_LIST___587.method1215(var3); } } @@ -31,16 +31,16 @@ final class Class31 { if (var1 == anInt582) { LinkableInt var2 = new LinkableInt(); var2.linkableKey = var0; - aClass61_588.method1215(var2); + A_LINKED_LIST___588.method1215(var2); } } static synchronized void method988() { ++anInt582; - aClass61_581.method1211(-110); - aClass61_586.method1211(-88); - aClass61_587.method1211(-123); - aClass61_588.method1211(-115); + A_LINKED_LIST___581.method1211(-110); + A_LINKED_LIST___586.method1211(-88); + A_LINKED_LIST___587.method1211(-123); + A_LINKED_LIST___588.method1211(-115); anInt585 = 0; memory2D = 0; anInt580 = 0; @@ -50,7 +50,7 @@ final class Class31 { if (var2 == anInt582) { LinkableInt var3 = new LinkableInt(var1); var3.linkableKey = var0; - aClass61_581.method1215(var3); + A_LINKED_LIST___581.method1215(var3); } } @@ -59,7 +59,7 @@ final class Class31 { int var1 = 0; while (true) { - LinkableInt var2 = (LinkableInt) aClass61_581.method1220(); + LinkableInt var2 = (LinkableInt) A_LINKED_LIST___581.method1220(); if (var2 == null) { if (var1 > 0) { var0.glDeleteBuffersARB(var1, anIntArray589, 0); @@ -67,17 +67,17 @@ final class Class31 { } while (true) { - var2 = (LinkableInt) aClass61_586.method1220(); + var2 = (LinkableInt) A_LINKED_LIST___586.method1220(); if (var2 == null) { while (true) { - var2 = (LinkableInt) aClass61_587.method1220(); + var2 = (LinkableInt) A_LINKED_LIST___587.method1220(); if (var2 == null) { if (var1 > 0) { var0.glDeleteTextures(var1, anIntArray589, 0); } while (true) { - var2 = (LinkableInt) aClass61_588.method1220(); + var2 = (LinkableInt) A_LINKED_LIST___588.method1220(); if (var2 == null) { if (anInt585 + memory2D + anInt580 > 100663296 && TimeUtils.time() > aLong583 + 60000L) { System.gc(); @@ -123,7 +123,7 @@ final class Class31 { if (var2 == anInt582) { LinkableInt var3 = new LinkableInt(var1); var3.linkableKey = var0; - aClass61_586.method1215(var3); + A_LINKED_LIST___586.method1215(var3); } } diff --git a/Client/src/main/java/org/runite/client/Class38.java b/Client/src/main/java/org/runite/client/Class38.java index 48920e8db..e8ac4bbde 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 = TextureOperation0.players[var2]; + Player var3 = Unsorted.players[var2]; if (var3 != null) { Unsorted.method68(var3.getSize(), var3); } diff --git a/Client/src/main/java/org/runite/client/Class39.java b/Client/src/main/java/org/runite/client/Class39.java index a0163a990..aaae204bd 100644 --- a/Client/src/main/java/org/runite/client/Class39.java +++ b/Client/src/main/java/org/runite/client/Class39.java @@ -11,6 +11,7 @@ import java.util.Map; public final class Class39 { + public static LinkedList[][][] aLinkedListArrayArrayArray3273 = new LinkedList[4][104][104]; static int anInt670 = 0; static int[][] regionXteaKeys; static int currentChunkY; @@ -28,19 +29,19 @@ public final class Class39 { int var10; int var11; if (LinkableRSString.isDynamicSceneGraph) { - sceneX = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); - var3 = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); - plane = GraphicDefinition.incomingBuffer.readUnsigned128Byte(); - var5 = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); - GraphicDefinition.incomingBuffer.setBitAccess(); + sceneX = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); + var3 = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); + plane = BufferedDataStream.incomingBuffer.readUnsigned128Byte(); + var5 = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); + BufferedDataStream.incomingBuffer.setBitAccess(); int var18; for (var6 = 0; var6 < 4; ++var6) { for (var7 = 0; var7 < 13; ++var7) { for (var18 = 0; 13 > var18; ++var18) { - var9 = GraphicDefinition.incomingBuffer.getBits(1); + var9 = BufferedDataStream.incomingBuffer.getBits(1); if (var9 == 1) { - ObjectDefinition.anIntArrayArrayArray1497[var6][var7][var18] = GraphicDefinition.incomingBuffer.getBits(26); + ObjectDefinition.anIntArrayArrayArray1497[var6][var7][var18] = BufferedDataStream.incomingBuffer.getBits(26); } else { ObjectDefinition.anIntArrayArrayArray1497[var6][var7][var18] = -1; } @@ -48,18 +49,18 @@ public final class Class39 { } } - GraphicDefinition.incomingBuffer.method818(); - var6 = (-GraphicDefinition.incomingBuffer.index + Unsorted.incomingPacketLength) / 16; + BufferedDataStream.incomingBuffer.method818(); + var6 = (-BufferedDataStream.incomingBuffer.index + Unsorted.incomingPacketLength) / 16; regionXteaKeys = new int[var6][4]; System.out.println(var6); for (var7 = 0; var6 > var7; ++var7) { for (var18 = 0; var18 < 4; ++var18) { - regionXteaKeys[var7][var18] = GraphicDefinition.incomingBuffer.readIntV2(); + regionXteaKeys[var7][var18] = BufferedDataStream.incomingBuffer.readIntV2(); } } - var7 = GraphicDefinition.incomingBuffer.readUnsignedShort(); + var7 = BufferedDataStream.incomingBuffer.readUnsignedShort(); Class3_Sub28_Sub5.anIntArray3587 = new int[var6]; Class101.anIntArray1426 = new int[var6]; Client.anIntArray2200 = new int[var6]; @@ -108,20 +109,20 @@ public final class Class39 { // plane, regY, regX, sceneY, .....sceneX Unsorted.method1301(plane, var7, var3, var5, false, sceneX); } else { - sceneX = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - var3 = (Unsorted.incomingPacketLength - GraphicDefinition.incomingBuffer.index) / 16; + sceneX = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + var3 = (Unsorted.incomingPacketLength - BufferedDataStream.incomingBuffer.index) / 16; regionXteaKeys = new int[var3][4]; for (plane = 0; var3 > plane; ++plane) { for (var5 = 0; var5 < 4; ++var5) { - regionXteaKeys[plane][var5] = GraphicDefinition.incomingBuffer.readIntV2(); + regionXteaKeys[plane][var5] = BufferedDataStream.incomingBuffer.readIntV2(); } } - plane = GraphicDefinition.incomingBuffer.readUnsigned128Byte(); - var5 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var6 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - var7 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); + plane = BufferedDataStream.incomingBuffer.readUnsigned128Byte(); + var5 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var6 = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + var7 = BufferedDataStream.incomingBuffer.readUnsignedShort128(); Class3_Sub24_Sub3.anIntArray3494 = new int[var3]; Class164_Sub2.aByteArrayArray3027 = new byte[var3][]; TextureOperation35.aByteArrayArray3335 = null; @@ -277,11 +278,11 @@ public final class Class39 { int var6; int var7; if (Unsorted.incomingOpcode == 195) { - var1 = GraphicDefinition.incomingBuffer.readUnsignedNegativeByte(); + var1 = BufferedDataStream.incomingBuffer.readUnsignedNegativeByte(); var3 = var1 & 3; var2 = var1 >> 2; var4 = Class75.anIntArray1107[var2]; - var5 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var5 = BufferedDataStream.incomingBuffer.readUnsignedByte(); var6 = ((125 & var5) >> 4) + Class65.currentChunkX; var7 = (7 & var5) + currentChunkY; if (0 <= var6 && var7 >= 0 && var6 < 104 && 104 > var7) { @@ -289,20 +290,20 @@ public final class Class39 { } } else if (Unsorted.incomingOpcode == 33) { - var1 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - var2 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var1 = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); + var2 = BufferedDataStream.incomingBuffer.readUnsignedByte(); var4 = (7 & var2) + currentChunkY; var3 = ((120 & var2) >> 4) + Class65.currentChunkX; - var5 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); + var5 = BufferedDataStream.incomingBuffer.readUnsignedShort128(); if (var3 >= 0 && var4 >= 0 && 104 > var3 && var4 < 104) { Class140_Sub7 var31 = new Class140_Sub7(); var31.anInt2930 = var5; var31.anInt2936 = var1; - if (TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4] == null) { - TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4] = new Class61(); + if (aLinkedListArrayArrayArray3273[WorldListCountry.localPlane][var3][var4] == null) { + aLinkedListArrayArrayArray3273[WorldListCountry.localPlane][var3][var4] = new LinkedList(); } - TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4].method1215(new WorldMap(var31)); + aLinkedListArrayArrayArray3273[WorldListCountry.localPlane][var3][var4].method1215(new WorldMap(var31)); Class128.method1760(var4, var3); } @@ -315,23 +316,23 @@ public final class Class39 { int var35; Class140_Sub6 var36; if (Unsorted.incomingOpcode == 121) { - var1 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var1 = BufferedDataStream.incomingBuffer.readUnsignedByte(); var2 = 2 * Class65.currentChunkX + (15 & var1 >> 4); var3 = (15 & var1) + 2 * currentChunkY; - var4 = var2 - -GraphicDefinition.incomingBuffer.readSignedByte(); - var5 = GraphicDefinition.incomingBuffer.readSignedByte() + var3; - var6 = GraphicDefinition.incomingBuffer.readSignedShort(); - var7 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var8 = GraphicDefinition.incomingBuffer.readUnsignedByte() * 4; - var28 = GraphicDefinition.incomingBuffer.readUnsignedByte() * 4; - var10 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var11 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var35 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var4 = var2 - -BufferedDataStream.incomingBuffer.readSignedByte(); + var5 = BufferedDataStream.incomingBuffer.readSignedByte() + var3; + var6 = BufferedDataStream.incomingBuffer.readSignedShort(); + var7 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var8 = BufferedDataStream.incomingBuffer.readUnsignedByte() * 4; + var28 = BufferedDataStream.incomingBuffer.readUnsignedByte() * 4; + var10 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var11 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var35 = BufferedDataStream.incomingBuffer.readUnsignedByte(); if (var35 == 255) { var35 = -1; } - var13 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var13 = BufferedDataStream.incomingBuffer.readUnsignedByte(); if (0 <= var2 && 0 <= var3 && 208 > var2 && 208 > var3 && var4 >= 0 && 0 <= var5 && var4 < 208 && var5 < 208 && var7 != 65535) { var5 *= 64; var4 = 64 * var4; @@ -339,45 +340,45 @@ public final class Class39 { 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); - TextureOperation13.aClass61_3364.method1215(new Class3_Sub28_Sub19(var36)); + TextureOperation13.aLinkedList_3364.method1215(new Class3_Sub28_Sub19(var36)); } } else if (Unsorted.incomingOpcode == 17) { - var1 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var1 = BufferedDataStream.incomingBuffer.readUnsignedByte(); var2 = Class65.currentChunkX + (var1 >> 4 & 7); var3 = currentChunkY - -(var1 & 7); - var4 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var5 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - var6 = GraphicDefinition.incomingBuffer.readUnsignedShort(); + var4 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var5 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + var6 = BufferedDataStream.incomingBuffer.readUnsignedShort(); if (var2 >= 0 && var3 >= 0 && var2 < 104 && var3 < 104) { 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); - TextureOperation17.aClass61_3177.method1215(new Class3_Sub28_Sub2(var32)); + TextureOperation17.aLinkedList_3177.method1215(new Class3_Sub28_Sub2(var32)); } } else if (Unsorted.incomingOpcode == 179) { - var1 = GraphicDefinition.incomingBuffer.readUnsignedByte128(); + var1 = BufferedDataStream.incomingBuffer.readUnsignedByte128(); var2 = var1 >> 2; var3 = 3 & var1; var4 = Class75.anIntArray1107[var2]; - var5 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var5 = BufferedDataStream.incomingBuffer.readUnsignedByte(); var6 = Class65.currentChunkX - -((var5 & 125) >> 4); var7 = (7 & var5) + currentChunkY; - var8 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); + var8 = BufferedDataStream.incomingBuffer.readUnsignedShort128(); if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { Unsorted.method881(WorldListCountry.localPlane, var7, -91, var3, var6, -1, var8, var4, var2, 0); } } else if (Unsorted.incomingOpcode == 20) { - var1 = GraphicDefinition.incomingBuffer.readUnsigned128Byte(); + var1 = BufferedDataStream.incomingBuffer.readUnsigned128Byte(); var2 = ((var1 & 125) >> 4) + Class65.currentChunkX; var3 = currentChunkY + (7 & var1); - var4 = GraphicDefinition.incomingBuffer.readUnsigned128Byte(); + var4 = BufferedDataStream.incomingBuffer.readUnsigned128Byte(); var5 = var4 >> 2; var6 = 3 & var4; var7 = Class75.anIntArray1107[var5]; - var8 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); + var8 = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); if (65535 == var8) { var8 = -1; } @@ -386,34 +387,34 @@ public final class Class39 { } else { int var14; if (202 == Unsorted.incomingOpcode) { - var1 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var1 = BufferedDataStream.incomingBuffer.readUnsignedByte(); var2 = var1 >> 2; var3 = var1 & 3; - var4 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var4 = BufferedDataStream.incomingBuffer.readUnsignedByte(); var5 = (var4 >> 4 & 7) + Class65.currentChunkX; var6 = (7 & var4) + currentChunkY; - byte var25 = GraphicDefinition.incomingBuffer.readSignedByte128(); - byte var30 = GraphicDefinition.incomingBuffer.readSignedByte128(); - byte var9 = GraphicDefinition.incomingBuffer.readSigned128Byte(); - var10 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - var11 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - byte var12 = GraphicDefinition.incomingBuffer.readSignedByte(); - var13 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var14 = GraphicDefinition.incomingBuffer.readSignedShortLE128(); + byte var25 = BufferedDataStream.incomingBuffer.readSignedByte128(); + byte var30 = BufferedDataStream.incomingBuffer.readSignedByte128(); + byte var9 = BufferedDataStream.incomingBuffer.readSigned128Byte(); + var10 = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + var11 = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); + byte var12 = BufferedDataStream.incomingBuffer.readSignedByte(); + var13 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var14 = BufferedDataStream.incomingBuffer.readSignedShortLE128(); if (!HDToolKit.highDetail) { TextureOperation39.method280(var12, var13, var14, var11, var6, var9, var3, var25, var5, var2, var30, var10); } } if (Unsorted.incomingOpcode == 14) { - var1 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var1 = BufferedDataStream.incomingBuffer.readUnsignedByte(); var3 = currentChunkY + (var1 & 7); var2 = ((var1 & 119) >> 4) + Class65.currentChunkX; - var4 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var5 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var6 = GraphicDefinition.incomingBuffer.readUnsignedShort(); + var4 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var5 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var6 = BufferedDataStream.incomingBuffer.readUnsignedShort(); if (0 <= var2 && var3 >= 0 && var2 < 104 && var3 < 104) { - Class61 var29 = TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var2][var3]; + LinkedList var29 = aLinkedListArrayArrayArray3273[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; @@ -428,39 +429,39 @@ public final class Class39 { } } else if (135 == Unsorted.incomingOpcode) { - var1 = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); - var2 = GraphicDefinition.incomingBuffer.readUnsignedNegativeByte(); + var1 = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); + var2 = BufferedDataStream.incomingBuffer.readUnsignedNegativeByte(); var4 = currentChunkY + (7 & var2); var3 = (7 & var2 >> 4) + Class65.currentChunkX; - var5 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - var6 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); + var5 = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); + var6 = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); if (0 <= var3 && var4 >= 0 && var3 < 104 && var4 < 104 && Class3_Sub1.localIndex != var1) { Class140_Sub7 var27 = new Class140_Sub7(); var27.anInt2930 = var5; var27.anInt2936 = var6; - if (null == TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4]) { - TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4] = new Class61(); + if (null == aLinkedListArrayArrayArray3273[WorldListCountry.localPlane][var3][var4]) { + aLinkedListArrayArrayArray3273[WorldListCountry.localPlane][var3][var4] = new LinkedList(); } - TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var3][var4].method1215(new WorldMap(var27)); + aLinkedListArrayArrayArray3273[WorldListCountry.localPlane][var3][var4].method1215(new WorldMap(var27)); Class128.method1760(var4, var3); } } else if (var0 <= -67) { if (16 == Unsorted.incomingOpcode) { - var1 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var1 = BufferedDataStream.incomingBuffer.readUnsignedByte(); var2 = Class65.currentChunkX - -(var1 >> 4 & 7); var3 = (var1 & 7) + currentChunkY; - var4 = var2 + GraphicDefinition.incomingBuffer.readSignedByte(); - var5 = GraphicDefinition.incomingBuffer.readSignedByte() + var3; - var6 = GraphicDefinition.incomingBuffer.readSignedShort(); - var7 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var8 = 4 * GraphicDefinition.incomingBuffer.readUnsignedByte(); - var28 = GraphicDefinition.incomingBuffer.readUnsignedByte() * 4; - var10 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var11 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var35 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - var13 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var4 = var2 + BufferedDataStream.incomingBuffer.readSignedByte(); + var5 = BufferedDataStream.incomingBuffer.readSignedByte() + var3; + var6 = BufferedDataStream.incomingBuffer.readSignedShort(); + var7 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var8 = 4 * BufferedDataStream.incomingBuffer.readUnsignedByte(); + var28 = BufferedDataStream.incomingBuffer.readUnsignedByte() * 4; + var10 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var11 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var35 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + var13 = BufferedDataStream.incomingBuffer.readUnsignedByte(); if (255 == var35) { var35 = -1; } @@ -472,24 +473,24 @@ 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); - TextureOperation13.aClass61_3364.method1215(new Class3_Sub28_Sub19(var36)); + TextureOperation13.aLinkedList_3364.method1215(new Class3_Sub28_Sub19(var36)); } } else if (Unsorted.incomingOpcode == 104) { - var1 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var1 = BufferedDataStream.incomingBuffer.readUnsignedByte(); var3 = 2 * currentChunkY + (var1 & 15); var2 = 2 * Class65.currentChunkX - -(var1 >> 4 & 15); - var4 = GraphicDefinition.incomingBuffer.readSignedByte() + var2; - var5 = GraphicDefinition.incomingBuffer.readSignedByte() + var3; - var6 = GraphicDefinition.incomingBuffer.readSignedShort(); - var7 = GraphicDefinition.incomingBuffer.readSignedShort(); - var8 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var28 = GraphicDefinition.incomingBuffer.readSignedByte(); - var10 = 4 * GraphicDefinition.incomingBuffer.readUnsignedByte(); - var11 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var35 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var13 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - var14 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var4 = BufferedDataStream.incomingBuffer.readSignedByte() + var2; + var5 = BufferedDataStream.incomingBuffer.readSignedByte() + var3; + var6 = BufferedDataStream.incomingBuffer.readSignedShort(); + var7 = BufferedDataStream.incomingBuffer.readSignedShort(); + var8 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var28 = BufferedDataStream.incomingBuffer.readSignedByte(); + var10 = 4 * BufferedDataStream.incomingBuffer.readUnsignedByte(); + var11 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var35 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var13 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + var14 = BufferedDataStream.incomingBuffer.readUnsignedByte(); if (255 == var13) { var13 = -1; } @@ -516,16 +517,16 @@ public final class Class39 { if (Class3_Sub1.localIndex == var18) { var16 = Class102.player; } else { - var16 = TextureOperation0.players[var18]; + var16 = Unsorted.players[var18]; } } if (var16 != null) { - RenderAnimationDefinition var38 = ((Class140_Sub4) var16).method1965(); - if (var38.anIntArrayArray359 != null && null != var38.anIntArrayArray359[var15]) { - var18 = var38.anIntArrayArray359[var15][0]; - var28 -= var38.anIntArrayArray359[var15][1]; - int var19 = var38.anIntArrayArray359[var15][2]; + RenderAnimationDefinition var38 = ((Class140_Sub4) var16).getRenderAnimationType(); + if (var38.equipment_transforms != null && null != var38.equipment_transforms[var15]) { + var18 = var38.equipment_transforms[var15][0]; + var28 -= var38.equipment_transforms[var15][1]; + int var19 = var38.equipment_transforms[var15][2]; int var20 = Class51.anIntArray840[((Class140_Sub4) var16).anInt2785]; int var21 = Class51.anIntArray851[((Class140_Sub4) var16).anInt2785]; int var22 = var18 * var21 + var19 * var20 >> 16; @@ -538,21 +539,21 @@ 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); - TextureOperation13.aClass61_3364.method1215(new Class3_Sub28_Sub19(var37)); + TextureOperation13.aLinkedList_3364.method1215(new Class3_Sub28_Sub19(var37)); } } else if (97 == Unsorted.incomingOpcode) { - var1 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var1 = BufferedDataStream.incomingBuffer.readUnsignedByte(); var2 = Class65.currentChunkX + (7 & var1 >> 4); var3 = currentChunkY + (var1 & 7); - var4 = GraphicDefinition.incomingBuffer.readUnsignedShort(); + var4 = BufferedDataStream.incomingBuffer.readUnsignedShort(); if (var4 == 65535) { var4 = -1; } - var5 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var5 = BufferedDataStream.incomingBuffer.readUnsignedByte(); var6 = (242 & var5) >> 4; - var8 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var8 = BufferedDataStream.incomingBuffer.readUnsignedByte(); var7 = 7 & var5; if (var2 >= 0 && var3 >= 0 && var2 < 104 && var3 < 104) { var28 = 1 + var6; @@ -567,12 +568,12 @@ public final class Class39 { } } else if (Unsorted.incomingOpcode == 240) { - var1 = GraphicDefinition.incomingBuffer.readUnsigned128Byte(); + var1 = BufferedDataStream.incomingBuffer.readUnsigned128Byte(); var3 = currentChunkY + (var1 & 7); var2 = ((113 & var1) >> 4) + Class65.currentChunkX; - var4 = GraphicDefinition.incomingBuffer.readUnsignedShort(); + var4 = BufferedDataStream.incomingBuffer.readUnsignedShort(); if (var2 >= 0 && var3 >= 0 && 104 > var2 && 104 > var3) { - Class61 var24 = TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var2][var3]; + LinkedList var24 = aLinkedListArrayArrayArray3273[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 +583,7 @@ public final class Class39 { } if (var24.method1222() == null) { - TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var2][var3] = null; + aLinkedListArrayArrayArray3273[WorldListCountry.localPlane][var2][var3] = null; } Class128.method1760(var3, var2); 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 66298a8b9..ffdd2041f 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub15.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub15.java @@ -1,586 +1,587 @@ package org.runite.client; import org.rs09.client.Linkable; -import org.rs09.client.net.Connection; import org.rs09.client.data.ReferenceCache; +import org.rs09.client.net.Connection; public final class Class3_Sub15 extends Linkable { - static int anInt2421 = -1; - byte[] aByteArray2422; - private int[] anIntArray2423; - int anInt2424; - byte[] aByteArray2425; - static int anInt2426; - static boolean aBoolean2427 = false; - static ReferenceCache aReferenceCache_2428 = new ReferenceCache(50); - public static Connection activeConnection; - byte[] aByteArray2430; - Class3_Sub12_Sub1[] aClass3_Sub12_Sub1Array2431; - static boolean aBoolean2433 = false; - short[] aShortArray2434; - Class166[] aClass166Array2435; + static int anInt2421 = -1; + byte[] aByteArray2422; + private int[] anIntArray2423; + int anInt2424; + byte[] aByteArray2425; + static int anInt2426; + static boolean aBoolean2427 = false; + static ReferenceCache aReferenceCache_2428 = new ReferenceCache(50); + public static Connection activeConnection; + byte[] aByteArray2430; + Class3_Sub12_Sub1[] aClass3_Sub12_Sub1Array2431; + static boolean aBoolean2433 = false; + short[] aShortArray2434; + Class166[] aClass166Array2435; - final void method369() { - try { - this.anIntArray2423 = null; - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "jk.A(" + (byte) -124 + ')'); - } - } + final void method369() { + try { + this.anIntArray2423 = null; + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "jk.A(" + (byte) -124 + ')'); + } + } - static void method370() { - try { - //int var1 = -125 / ((0 - var0) / 59); - RenderAnimationDefinition.aReferenceCache_1955.clear(); - } catch (RuntimeException var2) { - throw ClientErrorException.clientError(var2, "jk.B(" + (byte) -73 + ')'); - } - } + static void method370() { + try { + //int var1 = -125 / ((0 - var0) / 59); + RenderAnimationDefinition.aReferenceCache_1955.clear(); + } catch (RuntimeException var2) { + throw ClientErrorException.clientError(var2, "jk.B(" + (byte) -73 + ')'); + } + } - static Class3_Sub28_Sub3 method371(RSString var1) { - try { + static Class3_Sub28_Sub3 method371(RSString var1) { + try { - for(Class3_Sub28_Sub3 var2 = (Class3_Sub28_Sub3)Class134.aClass61_1758.method1222(); var2 != null; var2 = (Class3_Sub28_Sub3)Class134.aClass61_1758.method1221()) { - if(var2.aClass94_3561.equalsString(var1)) { - return var2; - } - } - - return null; - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "jk.C(" + 2 + ',' + (var1 != null?"{...}":"null") + ')'); - } - } - - final boolean method373(int[] var2, Class83 var3, byte[] var4) { - try { - int var6 = 0; - Class3_Sub12_Sub1 var7 = null; - boolean var5 = true; - - for(int var8 = 0; var8 < 128; ++var8) { - if(null == var4 || var4[var8] != 0) { - int var9 = this.anIntArray2423[var8]; - if(var9 != 0) { - if(var6 != var9) { - var6 = var9--; - if((var9 & 1) == 0) { - var7 = var3.method1413(var9 >> 2, var2); - } else { - var7 = var3.method1416(var9 >> 2, var2); - } - - if(var7 == null) { - var5 = false; - } - } - - if(null != var7) { - this.aClass3_Sub12_Sub1Array2431[var8] = var7; - this.anIntArray2423[var8] = 0; - } - } - } - } - - return var5; - } catch (RuntimeException var10) { - throw ClientErrorException.clientError(var10, "jk.E(" + 17904 + ',' + (var2 != null?"{...}":"null") + ',' + (var3 != null?"{...}":"null") + ',' + (var4 != null?"{...}":"null") + ')'); - } - } - - static void method374(int var0, boolean var1, byte[] var2, int var3, Class91[] var5) { - try { - DataBuffer var6 = new DataBuffer(var2); - int objectId = -1; - - while(var6.buffer.length > 0) { - int var8 = var6.method773(); - if(0 == var8) { - - return; + for (Class3_Sub28_Sub3 var2 = (Class3_Sub28_Sub3) Class134.aLinkedList_1758.method1222(); var2 != null; var2 = (Class3_Sub28_Sub3) Class134.aLinkedList_1758.method1221()) { + if (var2.aClass94_3561.equalsString(var1)) { + return var2; + } } - objectId += var8; - int data = 0; + return null; + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "jk.C(" + 2 + ',' + (var1 != null ? "{...}" : "null") + ')'); + } + } - while(true) { - int var10 = var6.getSmart(); - if(var10 == 0) { - break; - } + final boolean method373(int[] var2, Class83 var3, byte[] var4) { + try { + int var6 = 0; + Class3_Sub12_Sub1 var7 = null; + boolean var5 = true; - data += var10 - 1; - int var11 = data & 63; - int var13 = data >> 12; - int var12 = data >> 6 & 63; - int var14 = var6.readUnsignedByte(); - int var15 = var14 >> 2; - int var16 = var14 & 3; - int var17 = var0 + var12; - int var18 = var11 + var3; - if(var17 > 0 && var18 > 0 && var17 < 103 && var18 < 103) { - Class91 var19 = null; - if(!var1) { - int var20 = var13; - if((2 & Unsorted.aByteArrayArrayArray113[1][var17][var18]) == 2) { - var20 = var13 - 1; - } + for (int var8 = 0; var8 < 128; ++var8) { + if (null == var4 || var4[var8] != 0) { + int var9 = this.anIntArray2423[var8]; + if (var9 != 0) { + if (var6 != var9) { + var6 = var9--; + if ((var9 & 1) == 0) { + var7 = var3.method1413(var9 >> 2, var2); + } else { + var7 = var3.method1416(var9 >> 2, var2); + } - if(0 <= (var20 %= 4)) { - var19 = var5[var20]; - } - } + if (var7 == null) { + var5 = false; + } + } - Class110.method1683(var13 % 4, !var1, var13, var1, var19, objectId, var15, var17, var18, var16); - } - } - } - } catch (RuntimeException var21) { - throw ClientErrorException.clientError(var21, "jk.F(" + var0 + ',' + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ',' + 0 + ',' + (var5 != null?"{...}":"null") + ')'); - } - } - - public Class3_Sub15() {} - - Class3_Sub15(byte[] var1) { - try { - this.aShortArray2434 = new short[128]; - this.aByteArray2430 = new byte[128]; - this.aClass3_Sub12_Sub1Array2431 = new Class3_Sub12_Sub1[128]; - this.aByteArray2422 = new byte[128]; - this.aClass166Array2435 = new Class166[128]; - this.anIntArray2423 = new int[128]; - int var3 = 0; - this.aByteArray2425 = new byte[128]; - - DataBuffer var2; - for(var2 = new DataBuffer(var1); var2.buffer[var3 + var2.index] != 0; ++var3) { - } - - byte[] var4 = new byte[var3]; - - int var5; - for(var5 = 0; var3 > var5; ++var5) { - var4[var5] = var2.readSignedByte(); - } - - ++var2.index; - ++var3; - var5 = var2.index; - var2.index += var3; - - int var6; - for(var6 = 0; 0 != var2.buffer[var2.index + var6]; ++var6) { - } - - byte[] var7 = new byte[var6]; - - int var8; - for(var8 = 0; var6 > var8; ++var8) { - var7[var8] = var2.readSignedByte(); - } - - ++var2.index; - ++var6; - int var9 = 0; - var8 = var2.index; - - for(var2.index += var6; var2.buffer[var9 + var2.index] != 0; ++var9) { - } - - byte[] var10 = new byte[var9]; - - for(int var11 = 0; var9 > var11; ++var11) { - var10[var11] = var2.readSignedByte(); - } - - ++var2.index; - ++var9; - byte[] var37 = new byte[var9]; - int var12; - int var14; - if(var9 <= 1) { - var12 = var9; - } else { - var12 = 2; - var37[1] = 1; - int var13 = 1; - - for(var14 = 2; var14 < var9; ++var14) { - int var15 = var2.readUnsignedByte(); - if(0 == var15) { - var13 = var12++; - } else { - if(var15 <= var13) { - --var15; - } - - var13 = var15; - } - - var37[var14] = (byte)var13; - } - } - - Class166[] var38 = new Class166[var12]; - - Class166 var41; - for(var14 = 0; var14 < var38.length; ++var14) { - var41 = var38[var14] = new Class166(); - int var16 = var2.readUnsignedByte(); - if(0 < var16) { - var41.aByteArray2064 = new byte[2 * var16]; + if (null != var7) { + this.aClass3_Sub12_Sub1Array2431[var8] = var7; + this.anIntArray2423[var8] = 0; + } + } + } } - var16 = var2.readUnsignedByte(); - if(var16 > 0) { - var41.aByteArray2076 = new byte[var16 * 2 + 2]; - var41.aByteArray2076[1] = 64; + return var5; + } catch (RuntimeException var10) { + throw ClientErrorException.clientError(var10, "jk.E(" + 17904 + ',' + (var2 != null ? "{...}" : "null") + ',' + (var3 != null ? "{...}" : "null") + ',' + (var4 != null ? "{...}" : "null") + ')'); + } + } + + static void method374(int var0, boolean var1, byte[] var2, int var3, Class91[] var5) { + try { + DataBuffer var6 = new DataBuffer(var2); + int objectId = -1; + + while (var6.buffer.length > 0) { + int var8 = var6.method773(); + if (0 == var8) { + + return; + } + + objectId += var8; + int data = 0; + + while (true) { + int var10 = var6.getSmart(); + if (var10 == 0) { + break; + } + + data += var10 - 1; + int var11 = data & 63; + int var13 = data >> 12; + int var12 = data >> 6 & 63; + int var14 = var6.readUnsignedByte(); + int var15 = var14 >> 2; + int var16 = var14 & 3; + int var17 = var0 + var12; + int var18 = var11 + var3; + if (var17 > 0 && var18 > 0 && var17 < 103 && var18 < 103) { + Class91 var19 = null; + if (!var1) { + int var20 = var13; + if ((2 & Unsorted.aByteArrayArrayArray113[1][var17][var18]) == 2) { + var20 = var13 - 1; + } + + if (0 <= (var20 %= 4)) { + var19 = var5[var20]; + } + } + + Class110.method1683(var13 % 4, !var1, var13, var1, var19, objectId, var15, var17, var18, var16); + } + } } - } + } catch (RuntimeException var21) { + throw ClientErrorException.clientError(var21, "jk.F(" + var0 + ',' + var1 + ',' + (var2 != null ? "{...}" : "null") + ',' + var3 + ',' + 0 + ',' + (var5 != null ? "{...}" : "null") + ')'); + } + } - var14 = var2.readUnsignedByte(); - byte[] var40 = var14 > 0 ?new byte[var14 * 2]:null; - var14 = var2.readUnsignedByte(); - byte[] var39 = var14 > 0 ?new byte[var14 * 2]:null; + public Class3_Sub15() { + } - int var17; - for(var17 = 0; var2.buffer[var17 + var2.index] != 0; ++var17) { - } + Class3_Sub15(byte[] var1) { + try { + this.aShortArray2434 = new short[128]; + this.aByteArray2430 = new byte[128]; + this.aClass3_Sub12_Sub1Array2431 = new Class3_Sub12_Sub1[128]; + this.aByteArray2422 = new byte[128]; + this.aClass166Array2435 = new Class166[128]; + this.anIntArray2423 = new int[128]; + int var3 = 0; + this.aByteArray2425 = new byte[128]; - byte[] var18 = new byte[var17]; - - int var19; - for(var19 = 0; var19 < var17; ++var19) { - var18[var19] = var2.readSignedByte(); - } - - ++var2.index; - ++var17; - var19 = 0; - - int var20; - for(var20 = 0; var20 < 128; ++var20) { - var19 += var2.readUnsignedByte(); - this.aShortArray2434[var20] = (short)var19; - } - - var19 = 0; - - for(var20 = 0; var20 < 128; ++var20) { - var19 += var2.readUnsignedByte(); - this.aShortArray2434[var20] = (short)(this.aShortArray2434[var20] + (var19 << 8)); - } - - var20 = 0; - int var21 = 0; - int var22 = 0; - - int var23; - for(var23 = 0; var23 < 128; ++var23) { - if(var20 == 0) { - if(var21 < var18.length) { - var20 = var18[var21++]; - } else { - var20 = -1; - } - - var22 = var2.method741(); + DataBuffer var2; + for (var2 = new DataBuffer(var1); var2.buffer[var3 + var2.index] != 0; ++var3) { } - this.aShortArray2434[var23] = (short)(this.aShortArray2434[var23] + Unsorted.bitwiseAnd(32768, -1 + var22 << 14)); - this.anIntArray2423[var23] = var22; - --var20; - } + byte[] var4 = new byte[var3]; - var20 = 0; - var23 = 0; - var21 = 0; - - int var24; - for(var24 = 0; var24 < 128; ++var24) { - if(this.anIntArray2423[var24] != 0) { - if(var20 == 0) { - var23 = var2.buffer[var5++] + -1; - if(var4.length > var21) { - var20 = var4[var21++]; - } else { - var20 = -1; - } - } - - --var20; - this.aByteArray2425[var24] = (byte)var23; - } - } - - var20 = 0; - var21 = 0; - var24 = 0; - - for(int var25 = 0; var25 < 128; ++var25) { - if(this.anIntArray2423[var25] != 0) { - if(0 == var20) { - var24 = var2.buffer[var8++] - -16 << 2; - if(var7.length > var21) { - var20 = var7[var21++]; - } else { - var20 = -1; - } - } - - --var20; - this.aByteArray2422[var25] = (byte)var24; - } - } - - var21 = 0; - var20 = 0; - Class166 var43 = null; - - int var26; - for(var26 = 0; var26 < 128; ++var26) { - if(this.anIntArray2423[var26] != 0) { - if(var20 == 0) { - var43 = var38[var37[var21]]; - if(var21 >= var10.length) { - var20 = -1; - } else { - var20 = var10[var21++]; - } - } - - this.aClass166Array2435[var26] = var43; - --var20; - } - } - - var20 = 0; - var21 = 0; - var26 = 0; - - int var27; - for(var27 = 0; var27 < 128; ++var27) { - if(var20 == 0) { - if(var18.length > var21) { - var20 = var18[var21++]; - } else { - var20 = -1; - } - - if(this.anIntArray2423[var27] > 0) { - var26 = var2.readUnsignedByte() + 1; - } + int var5; + for (var5 = 0; var3 > var5; ++var5) { + var4[var5] = var2.readSignedByte(); } - --var20; - this.aByteArray2430[var27] = (byte)var26; - } + ++var2.index; + ++var3; + var5 = var2.index; + var2.index += var3; - this.anInt2424 = var2.readUnsignedByte() + 1; - - int var29; - Class166 var28; - for(var27 = 0; var27 < var12; ++var27) { - var28 = var38[var27]; - if(var28.aByteArray2064 != null) { - for(var29 = 1; var29 < var28.aByteArray2064.length; var29 += 2) { - var28.aByteArray2064[var29] = var2.readSignedByte(); - } + int var6; + for (var6 = 0; 0 != var2.buffer[var2.index + var6]; ++var6) { } - if(var28.aByteArray2076 != null) { - for(var29 = 3; var29 < var28.aByteArray2076.length + -2; var29 += 2) { - var28.aByteArray2076[var29] = var2.readSignedByte(); - } - } - } + byte[] var7 = new byte[var6]; - if(null != var40) { - for(var27 = 1; var40.length > var27; var27 += 2) { - var40[var27] = var2.readSignedByte(); - } - } - - if(null != var39) { - for(var27 = 1; var27 < var39.length; var27 += 2) { - var39[var27] = var2.readSignedByte(); - } - } - - for(var27 = 0; var27 < var12; ++var27) { - var28 = var38[var27]; - if(null != var28.aByteArray2076) { - var19 = 0; - - for(var29 = 2; var28.aByteArray2076.length > var29; var29 += 2) { - var19 -= -1 + -var2.readUnsignedByte(); - var28.aByteArray2076[var29] = (byte)var19; - } - } - } - - for(var27 = 0; var12 > var27; ++var27) { - var28 = var38[var27]; - if(null != var28.aByteArray2064) { - var19 = 0; - - for(var29 = 2; var28.aByteArray2064.length > var29; var29 += 2) { - var19 = var19 - -1 - -var2.readUnsignedByte(); - var28.aByteArray2064[var29] = (byte)var19; - } - } - } - - byte var30; - int var34; - int var32; - int var33; - int var44; - byte var48; - if(null != var40) { - var19 = var2.readUnsignedByte(); - var40[0] = (byte)var19; - - for(var27 = 2; var40.length > var27; var27 += 2) { - var19 = 1 + (var19 - -var2.readUnsignedByte()); - var40[var27] = (byte)var19; + int var8; + for (var8 = 0; var6 > var8; ++var8) { + var7[var8] = var2.readSignedByte(); } - var48 = var40[0]; - byte var46 = var40[1]; + ++var2.index; + ++var6; + int var9 = 0; + var8 = var2.index; - for(var29 = 0; var29 < var48; ++var29) { - this.aByteArray2430[var29] = (byte)(32 + var46 * this.aByteArray2430[var29] >> 6); + for (var2.index += var6; var2.buffer[var9 + var2.index] != 0; ++var9) { } - for(var29 = 2; var29 < var40.length; var48 = var30) { - var30 = var40[var29]; - byte var31 = var40[1 + var29]; - var29 += 2; - var32 = (var30 - var48) * var46 + (var30 - var48) / 2; + byte[] var10 = new byte[var9]; - for(var33 = var48; var30 > var33; ++var33) { - var34 = TextureOperation14.method319(var32, -125, -var48 + var30); - var32 += var31 + -var46; - this.aByteArray2430[var33] = (byte)(var34 * this.aByteArray2430[var33] - -32 >> 6); - } - - var46 = var31; + for (int var11 = 0; var9 > var11; ++var11) { + var10[var11] = var2.readSignedByte(); } - for(var44 = var48; var44 < 128; ++var44) { - this.aByteArray2430[var44] = (byte)(32 + this.aByteArray2430[var44] * var46 >> 6); - } - } + ++var2.index; + ++var9; + byte[] var37 = new byte[var9]; + int var12; + int var14; + if (var9 <= 1) { + var12 = var9; + } else { + var12 = 2; + var37[1] = 1; + int var13 = 1; - if(null != var39) { - var19 = var2.readUnsignedByte(); - var39[0] = (byte)var19; + for (var14 = 2; var14 < var9; ++var14) { + int var15 = var2.readUnsignedByte(); + if (0 == var15) { + var13 = var12++; + } else { + if (var15 <= var13) { + --var15; + } - for(var27 = 2; var27 < var39.length; var27 += 2) { - var19 = 1 + (var19 - -var2.readUnsignedByte()); - var39[var27] = (byte)var19; + var13 = var15; + } + + var37[var14] = (byte) var13; + } } - var48 = var39[0]; - int var47 = var39[1] << 1; + Class166[] var38 = new Class166[var12]; - for(var29 = 0; var29 < var48; ++var29) { - var44 = var47 + (255 & this.aByteArray2422[var29]); - if(var44 < 0) { - var44 = 0; - } + Class166 var41; + for (var14 = 0; var14 < var38.length; ++var14) { + var41 = var38[var14] = new Class166(); + int var16 = var2.readUnsignedByte(); + if (0 < var16) { + var41.aByteArray2064 = new byte[2 * var16]; + } - if(128 < var44) { - var44 = 128; - } - - this.aByteArray2422[var29] = (byte)var44; + var16 = var2.readUnsignedByte(); + if (var16 > 0) { + var41.aByteArray2076 = new byte[var16 * 2 + 2]; + var41.aByteArray2076[1] = 64; + } } - int var45; - for(var29 = 2; var39.length > var29; var47 = var45) { - var30 = var39[var29]; - var32 = (-var48 + var30) * var47 - -((var30 - var48) / 2); - var45 = var39[1 + var29] << 1; - var29 += 2; + var14 = var2.readUnsignedByte(); + byte[] var40 = var14 > 0 ? new byte[var14 * 2] : null; + var14 = var2.readUnsignedByte(); + byte[] var39 = var14 > 0 ? new byte[var14 * 2] : null; - for(var33 = var48; var30 > var33; ++var33) { - var34 = TextureOperation14.method319(var32, -116, -var48 + var30); - var32 += -var47 + var45; - int var35 = var34 + (this.aByteArray2422[var33] & 0xFF); - if(var35 < 0) { - var35 = 0; - } - - if(var35 > 128) { - var35 = 128; - } - - this.aByteArray2422[var33] = (byte)var35; - } - - var48 = var30; + int var17; + for (var17 = 0; var2.buffer[var17 + var2.index] != 0; ++var17) { } - for(var44 = var48; var44 < 128; ++var44) { - var45 = (255 & this.aByteArray2422[var44]) + var47; - if(var45 < 0) { - var45 = 0; - } + byte[] var18 = new byte[var17]; - if(128 < var45) { - var45 = 128; - } - - this.aByteArray2422[var44] = (byte)var45; - } - } - - for(var27 = 0; var12 > var27; ++var27) { - var38[var27].anInt2078 = var2.readUnsignedByte(); - } - - for(var27 = 0; var27 < var12; ++var27) { - var28 = var38[var27]; - if(null != var28.aByteArray2064) { - var28.anInt2067 = var2.readUnsignedByte(); + int var19; + for (var19 = 0; var19 < var17; ++var19) { + var18[var19] = var2.readSignedByte(); } - if(null != var28.aByteArray2076) { - var28.anInt2071 = var2.readUnsignedByte(); + ++var2.index; + ++var17; + var19 = 0; + + int var20; + for (var20 = 0; var20 < 128; ++var20) { + var19 += var2.readUnsignedByte(); + this.aShortArray2434[var20] = (short) var19; } - if(var28.anInt2078 > 0) { - var28.anInt2063 = var2.readUnsignedByte(); + var19 = 0; + + for (var20 = 0; var20 < 128; ++var20) { + var19 += var2.readUnsignedByte(); + this.aShortArray2434[var20] = (short) (this.aShortArray2434[var20] + (var19 << 8)); } - } - for(var27 = 0; var12 > var27; ++var27) { - var38[var27].anInt2077 = var2.readUnsignedByte(); - } + var20 = 0; + int var21 = 0; + int var22 = 0; - for(var27 = 0; var12 > var27; ++var27) { - var28 = var38[var27]; - if(var28.anInt2077 > 0) { - var28.anInt2066 = var2.readUnsignedByte(); + int var23; + for (var23 = 0; var23 < 128; ++var23) { + if (var20 == 0) { + if (var21 < var18.length) { + var20 = var18[var21++]; + } else { + var20 = -1; + } + + var22 = var2.method741(); + } + + this.aShortArray2434[var23] = (short) (this.aShortArray2434[var23] + Unsorted.bitwiseAnd(32768, -1 + var22 << 14)); + this.anIntArray2423[var23] = var22; + --var20; } - } - for(var27 = 0; var27 < var12; ++var27) { - var28 = var38[var27]; - if(var28.anInt2066 > 0) { - var28.anInt2069 = var2.readUnsignedByte(); + var20 = 0; + var23 = 0; + var21 = 0; + + int var24; + for (var24 = 0; var24 < 128; ++var24) { + if (this.anIntArray2423[var24] != 0) { + if (var20 == 0) { + var23 = var2.buffer[var5++] + -1; + if (var4.length > var21) { + var20 = var4[var21++]; + } else { + var20 = -1; + } + } + + --var20; + this.aByteArray2425[var24] = (byte) var23; + } } - } - } catch (RuntimeException var36) { - throw ClientErrorException.clientError(var36, "jk.(" + (var1 != null?"{...}":"null") + ')'); - } - } + var20 = 0; + var21 = 0; + var24 = 0; + + for (int var25 = 0; var25 < 128; ++var25) { + if (this.anIntArray2423[var25] != 0) { + if (0 == var20) { + var24 = var2.buffer[var8++] - -16 << 2; + if (var7.length > var21) { + var20 = var7[var21++]; + } else { + var20 = -1; + } + } + + --var20; + this.aByteArray2422[var25] = (byte) var24; + } + } + + var21 = 0; + var20 = 0; + Class166 var43 = null; + + int var26; + for (var26 = 0; var26 < 128; ++var26) { + if (this.anIntArray2423[var26] != 0) { + if (var20 == 0) { + var43 = var38[var37[var21]]; + if (var21 >= var10.length) { + var20 = -1; + } else { + var20 = var10[var21++]; + } + } + + this.aClass166Array2435[var26] = var43; + --var20; + } + } + + var20 = 0; + var21 = 0; + var26 = 0; + + int var27; + for (var27 = 0; var27 < 128; ++var27) { + if (var20 == 0) { + if (var18.length > var21) { + var20 = var18[var21++]; + } else { + var20 = -1; + } + + if (this.anIntArray2423[var27] > 0) { + var26 = var2.readUnsignedByte() + 1; + } + } + + --var20; + this.aByteArray2430[var27] = (byte) var26; + } + + this.anInt2424 = var2.readUnsignedByte() + 1; + + int var29; + Class166 var28; + for (var27 = 0; var27 < var12; ++var27) { + var28 = var38[var27]; + if (var28.aByteArray2064 != null) { + for (var29 = 1; var29 < var28.aByteArray2064.length; var29 += 2) { + var28.aByteArray2064[var29] = var2.readSignedByte(); + } + } + + if (var28.aByteArray2076 != null) { + for (var29 = 3; var29 < var28.aByteArray2076.length + -2; var29 += 2) { + var28.aByteArray2076[var29] = var2.readSignedByte(); + } + } + } + + if (null != var40) { + for (var27 = 1; var40.length > var27; var27 += 2) { + var40[var27] = var2.readSignedByte(); + } + } + + if (null != var39) { + for (var27 = 1; var27 < var39.length; var27 += 2) { + var39[var27] = var2.readSignedByte(); + } + } + + for (var27 = 0; var27 < var12; ++var27) { + var28 = var38[var27]; + if (null != var28.aByteArray2076) { + var19 = 0; + + for (var29 = 2; var28.aByteArray2076.length > var29; var29 += 2) { + var19 -= -1 + -var2.readUnsignedByte(); + var28.aByteArray2076[var29] = (byte) var19; + } + } + } + + for (var27 = 0; var12 > var27; ++var27) { + var28 = var38[var27]; + if (null != var28.aByteArray2064) { + var19 = 0; + + for (var29 = 2; var28.aByteArray2064.length > var29; var29 += 2) { + var19 = var19 - -1 - -var2.readUnsignedByte(); + var28.aByteArray2064[var29] = (byte) var19; + } + } + } + + byte var30; + int var34; + int var32; + int var33; + int var44; + byte var48; + if (null != var40) { + var19 = var2.readUnsignedByte(); + var40[0] = (byte) var19; + + for (var27 = 2; var40.length > var27; var27 += 2) { + var19 = 1 + (var19 - -var2.readUnsignedByte()); + var40[var27] = (byte) var19; + } + + var48 = var40[0]; + byte var46 = var40[1]; + + for (var29 = 0; var29 < var48; ++var29) { + this.aByteArray2430[var29] = (byte) (32 + var46 * this.aByteArray2430[var29] >> 6); + } + + for (var29 = 2; var29 < var40.length; var48 = var30) { + var30 = var40[var29]; + byte var31 = var40[1 + var29]; + var29 += 2; + var32 = (var30 - var48) * var46 + (var30 - var48) / 2; + + for (var33 = var48; var30 > var33; ++var33) { + var34 = TextureOperation14.method319(var32, -125, -var48 + var30); + var32 += var31 + -var46; + this.aByteArray2430[var33] = (byte) (var34 * this.aByteArray2430[var33] - -32 >> 6); + } + + var46 = var31; + } + + for (var44 = var48; var44 < 128; ++var44) { + this.aByteArray2430[var44] = (byte) (32 + this.aByteArray2430[var44] * var46 >> 6); + } + } + + if (null != var39) { + var19 = var2.readUnsignedByte(); + var39[0] = (byte) var19; + + for (var27 = 2; var27 < var39.length; var27 += 2) { + var19 = 1 + (var19 - -var2.readUnsignedByte()); + var39[var27] = (byte) var19; + } + + var48 = var39[0]; + int var47 = var39[1] << 1; + + for (var29 = 0; var29 < var48; ++var29) { + var44 = var47 + (255 & this.aByteArray2422[var29]); + if (var44 < 0) { + var44 = 0; + } + + if (128 < var44) { + var44 = 128; + } + + this.aByteArray2422[var29] = (byte) var44; + } + + int var45; + for (var29 = 2; var39.length > var29; var47 = var45) { + var30 = var39[var29]; + var32 = (-var48 + var30) * var47 - -((var30 - var48) / 2); + var45 = var39[1 + var29] << 1; + var29 += 2; + + for (var33 = var48; var30 > var33; ++var33) { + var34 = TextureOperation14.method319(var32, -116, -var48 + var30); + var32 += -var47 + var45; + int var35 = var34 + (this.aByteArray2422[var33] & 0xFF); + if (var35 < 0) { + var35 = 0; + } + + if (var35 > 128) { + var35 = 128; + } + + this.aByteArray2422[var33] = (byte) var35; + } + + var48 = var30; + } + + for (var44 = var48; var44 < 128; ++var44) { + var45 = (255 & this.aByteArray2422[var44]) + var47; + if (var45 < 0) { + var45 = 0; + } + + if (128 < var45) { + var45 = 128; + } + + this.aByteArray2422[var44] = (byte) var45; + } + } + + for (var27 = 0; var12 > var27; ++var27) { + var38[var27].anInt2078 = var2.readUnsignedByte(); + } + + for (var27 = 0; var27 < var12; ++var27) { + var28 = var38[var27]; + if (null != var28.aByteArray2064) { + var28.anInt2067 = var2.readUnsignedByte(); + } + + if (null != var28.aByteArray2076) { + var28.anInt2071 = var2.readUnsignedByte(); + } + + if (var28.anInt2078 > 0) { + var28.anInt2063 = var2.readUnsignedByte(); + } + } + + for (var27 = 0; var12 > var27; ++var27) { + var38[var27].anInt2077 = var2.readUnsignedByte(); + } + + for (var27 = 0; var12 > var27; ++var27) { + var28 = var38[var27]; + if (var28.anInt2077 > 0) { + var28.anInt2066 = var2.readUnsignedByte(); + } + } + + for (var27 = 0; var27 < var12; ++var27) { + var28 = var38[var27]; + if (var28.anInt2066 > 0) { + var28.anInt2069 = var2.readUnsignedByte(); + } + } + + } catch (RuntimeException var36) { + throw ClientErrorException.clientError(var36, "jk.(" + (var1 != null ? "{...}" : "null") + ')'); + } + } } 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 18f415fa5..743a2955d 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub20.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub20.java @@ -5,121 +5,120 @@ import org.rs09.client.data.NodeCache; final class Class3_Sub20 extends Linkable { - static int[] anIntArray2480 = new int[25]; + static int[] anIntArray2480 = new int[25]; static RSString aClass94_3220; static NodeCache aClass47_3801 = new NodeCache(4); int anInt2483; - static int wlPacketIndex = 0; - static int paramLanguage = 0; - static int anInt2487; - static int anInt2488 = 0; - int anInt2489; + static int wlPacketIndex = 0; + static int paramLanguage = 0; + static int anInt2487; + static int anInt2488 = 0; + int anInt2489; - static void method388(byte var0) { - try { - //int var1 = 44 / ((-2 - var0) / 52); - if(aClass94_3220 != null) { - Class3_Sub10.method138(aClass94_3220); - aClass94_3220 = null; - } + static void method388(byte var0) { + try { + //int var1 = 44 / ((-2 - var0) / 52); + if (aClass94_3220 != null) { + Class3_Sub10.method138(aClass94_3220); + aClass94_3220 = null; + } - } catch (RuntimeException var2) { - throw ClientErrorException.clientError(var2, "lb.A(" + var0 + ')'); - } - } - - static void method389() { - try { - Class32.method995(); - Class49.aAbstractSprite_812 = null; - Class58.anInt909 = -1; - TextureOperation13.method313((byte)55); - aClass47_3801.clear(); - ObjectDefinition.aClass136_1413 = new Class136(); - ((Class102)Class51.anInterface2_838).method1618(); - Class68.anInt1032 = 0; - Class68.aClass43Array1021 = new Class43[255]; - Class140_Sub1_Sub1.method1929(); - Class141.method2043(); - Class65.method1240(); - Unsorted.method1250(17, false); - TextureOperation23.method247((byte)51); + } catch (RuntimeException var2) { + throw ClientErrorException.clientError(var2, "lb.A(" + var0 + ')'); + } + } - for(int var1 = 0; 2048 > var1; ++var1) { - Player var2 = TextureOperation0.players[var1]; - if(null != var2) { - var2.anObject2796 = null; - } - } + static void method389() { + try { + Class32.method995(); + Class49.aAbstractSprite_812 = null; + Class58.anInt909 = -1; + TextureOperation13.method313((byte) 55); + aClass47_3801.clear(); + ObjectDefinition.aClass136_1413 = new Class136(); + ((Class102) Class51.anInterface2_838).method1618(); + Class68.anInt1032 = 0; + Class68.aClass43Array1021 = new Class43[255]; + Class140_Sub1_Sub1.method1929(); + Class141.method2043(); + Class65.method1240(); + Unsorted.method1250(17, false); + TextureOperation23.method247((byte) 51); - if(HDToolKit.highDetail) { - Class141.method2041(); - Class127_Sub1.method1755(); - } + for (int var1 = 0; 2048 > var1; ++var1) { + Player var2 = Unsorted.players[var1]; + if (null != var2) { + var2.anObject2796 = null; + } + } - Class3_Sub28_Sub9.method581(CacheIndex.fontsIndex, CacheIndex.spritesIndex); - Sprites.method887(CacheIndex.spritesIndex); - Class3_Sub26.aAbstractSprite_2560 = null; - WorldListEntry.aAbstractSprite_3099 = null; - Class50.aAbstractSprite_824 = null; - WorldListEntry.aAbstractSprite_1339 = null; - WorldListEntry.aAbstractSprite_1457 = null; - if(Class143.gameStage == 5) { - Class108.method1656(CacheIndex.spritesIndex, (byte)-60); - } + if (HDToolKit.highDetail) { + Class141.method2041(); + Class127_Sub1.method1755(); + } - if(10 == Class143.gameStage) { - TextureOperation1.method219(false); - } + Class3_Sub28_Sub9.method581(CacheIndex.fontsIndex, CacheIndex.spritesIndex); + Sprites.method887(CacheIndex.spritesIndex); + Class3_Sub26.aAbstractSprite_2560 = null; + WorldListEntry.aAbstractSprite_3099 = null; + Class50.aAbstractSprite_824 = null; + WorldListEntry.aAbstractSprite_1339 = null; + WorldListEntry.aAbstractSprite_1457 = null; + if (Class143.gameStage == 5) { + Class108.method1656(CacheIndex.spritesIndex, (byte) -60); + } - if(Class143.gameStage == 30) { - Class117.method1719(25); - } + if (10 == Class143.gameStage) { + TextureOperation1.method219(false); + } - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "lb.C(" + false + ')'); - } - } + if (Class143.gameStage == 30) { + Class117.method1719(25); + } - static void method390(boolean var0, int var1, int var2, int var3, byte var4, int var5, int var6) { - try { - Unsorted.anInt3631 = var3; - 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) + -TextureOperation25.anInt3414; - } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "lb.C(" + false + ')'); + } + } - // int var7 = 76 % ((-79 - var4) / 35); - Class133.anInt1753 = 2; - } catch (RuntimeException var8) { - throw ClientErrorException.clientError(var8, "lb.D(" + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ')'); - } - } + static void method390(boolean var0, int var1, int var2, int var3, byte var4, int var5, int var6) { + try { + Unsorted.anInt3631 = var3; + 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) + -TextureOperation25.anInt3414; + } - Class3_Sub20(int var1, int var2) { - try { - this.anInt2483 = var2; - this.anInt2489 = var1; - } catch (RuntimeException var4) { - throw ClientErrorException.clientError(var4, "lb.(" + var1 + ',' + var2 + ')'); - } - } + // int var7 = 76 % ((-79 - var4) / 35); + Class133.anInt1753 = 2; + } catch (RuntimeException var8) { + throw ClientErrorException.clientError(var8, "lb.D(" + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ')'); + } + } - static void method392(CacheIndex var0, CacheIndex var1, CacheIndex var3) { - try { - SequenceDefinition.aClass153_1860 = var1; - // int var4 = -110 / ((-7 - var2) / 43); - Class7.aClass153_2160 = var0; - Class131.aClass153_1723 = var3; - } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "lb.E(" + (var0 != null?"{...}":"null") + ',' + (var1 != null?"{...}":"null") + ',' + -77 + ',' + (var3 != null?"{...}":"null") + ')'); - } - } + Class3_Sub20(int var1, int var2) { + try { + this.anInt2483 = var2; + this.anInt2489 = var1; + } catch (RuntimeException var4) { + throw ClientErrorException.clientError(var4, "lb.(" + var1 + ',' + var2 + ')'); + } + } + + static void method392(CacheIndex skinsIndex, CacheIndex animationIndex, CacheIndex skeletonsIndex) { + try { + Class7.skinsReferenceIndex = skinsIndex; + SequenceDefinition.animationReferenceIndex = animationIndex; + Class131.skeletonsReferenceIndex = skeletonsIndex; + } catch (RuntimeException var5) { + throw ClientErrorException.clientError(var5, "lb.E(" + (skinsIndex != null ? "{...}" : "null") + ',' + (animationIndex != null ? "{...}" : "null") + ',' + -77 + ',' + (skeletonsIndex != null ? "{...}" : "null") + ')'); + } + } } 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 74ed9e12c..3e863faf4 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub21.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub21.java @@ -89,7 +89,7 @@ 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(TextureOperation0.aBoolean3275) { + if(Unsorted.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 { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub2.java b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub2.java index 7eaf68b77..eba35c101 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub2.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub2.java @@ -6,8 +6,8 @@ import java.util.Objects; final class Class3_Sub24_Sub2 extends Class3_Sub24 { - private final Class61 aClass61_3485 = new Class61(); - private final Class61 aClass61_3486 = new Class61(); + private final LinkedList aLinkedList_3485 = new LinkedList(); + private final LinkedList aLinkedList_3486 = new LinkedList(); private int anInt3487 = 0; private int anInt3488 = -1; @@ -30,8 +30,8 @@ final class Class3_Sub24_Sub2 extends Class3_Sub24 { private void method456(Class3_Sub3 var1) { var1.unlink(); var1.method106(); - Linkable var2 = this.aClass61_3486.aClass3_940.next; - if(var2 == this.aClass61_3486.aClass3_940) { + Linkable var2 = this.aLinkedList_3486.aClass3_940.next; + if(var2 == this.aLinkedList_3486.aClass3_940) { this.anInt3488 = -1; } else { this.anInt3488 = ((Class3_Sub3)var2).anInt2247; @@ -40,7 +40,7 @@ final class Class3_Sub24_Sub2 extends Class3_Sub24 { } final synchronized void method457(Class3_Sub24 var1) { - this.aClass61_3485.method1216(var1); + this.aLinkedList_3485.method1216(var1); } final synchronized void method413(int[] var1, int var2, int var3) { @@ -62,7 +62,7 @@ final class Class3_Sub24_Sub2 extends Class3_Sub24 { var3 -= var4; this.anInt3487 += var4; this.method458(); - Class3_Sub3 var5 = (Class3_Sub3)this.aClass61_3486.method1222(); + Class3_Sub3 var5 = (Class3_Sub3)this.aLinkedList_3486.method1222(); synchronized(Objects.requireNonNull(var5)) { int var7 = var5.method105(this); if(var7 < 0) { @@ -79,7 +79,7 @@ final class Class3_Sub24_Sub2 extends Class3_Sub24 { private void method458() { if(this.anInt3487 > 0) { - for(Class3_Sub3 var1 = (Class3_Sub3)this.aClass61_3486.method1222(); var1 != null; var1 = (Class3_Sub3)this.aClass61_3486.method1221()) { + for(Class3_Sub3 var1 = (Class3_Sub3)this.aLinkedList_3486.method1222(); var1 != null; var1 = (Class3_Sub3)this.aLinkedList_3486.method1221()) { var1.anInt2247 -= this.anInt3487; } @@ -90,18 +90,18 @@ final class Class3_Sub24_Sub2 extends Class3_Sub24 { } final Class3_Sub24 method411() { - return (Class3_Sub24)this.aClass61_3485.method1222(); + return (Class3_Sub24)this.aLinkedList_3485.method1222(); } private void method459(int var1) { - for(Class3_Sub24 var2 = (Class3_Sub24)this.aClass61_3485.method1222(); var2 != null; var2 = (Class3_Sub24)this.aClass61_3485.method1221()) { + for(Class3_Sub24 var2 = (Class3_Sub24)this.aLinkedList_3485.method1222(); var2 != null; var2 = (Class3_Sub24)this.aLinkedList_3485.method1221()) { var2.method415(var1); } } private void method460(int[] var1, int var2, int var3) { - for(Class3_Sub24 var4 = (Class3_Sub24)this.aClass61_3485.method1222(); var4 != null; var4 = (Class3_Sub24)this.aClass61_3485.method1221()) { + for(Class3_Sub24 var4 = (Class3_Sub24)this.aLinkedList_3485.method1222(); var4 != null; var4 = (Class3_Sub24)this.aLinkedList_3485.method1221()) { var4.method410(var1, var2, var3); } @@ -133,7 +133,7 @@ final class Class3_Sub24_Sub2 extends Class3_Sub24 { var1 -= var2; this.anInt3487 += var2; this.method458(); - Class3_Sub3 var3 = (Class3_Sub3)this.aClass61_3486.method1222(); + Class3_Sub3 var3 = (Class3_Sub3)this.aLinkedList_3486.method1222(); synchronized(Objects.requireNonNull(var3)) { int var5 = var3.method105(this); if(var5 < 0) { @@ -149,16 +149,16 @@ final class Class3_Sub24_Sub2 extends Class3_Sub24 { } final Class3_Sub24 method414() { - return (Class3_Sub24)this.aClass61_3485.method1221(); + return (Class3_Sub24)this.aLinkedList_3485.method1221(); } private void method462(Linkable var1, Class3_Sub3 var2) { - while(var1 != this.aClass61_3486.aClass3_940 && ((Class3_Sub3)var1).anInt2247 <= var2.anInt2247) { + while(var1 != this.aLinkedList_3486.aClass3_940 && ((Class3_Sub3)var1).anInt2247 <= var2.anInt2247) { var1 = var1.next; } method1662(var2, var1); - this.anInt3488 = ((Class3_Sub3)this.aClass61_3486.aClass3_940.next).anInt2247; + this.anInt3488 = ((Class3_Sub3)this.aLinkedList_3486.aClass3_940.next).anInt2247; } } 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 d40829785..214c04b87 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 @@ -4,7 +4,7 @@ import java.util.Objects; final class Class3_Sub24_Sub3 extends Class3_Sub24 { - Class61 aClass61_3489 = new Class61(); + LinkedList aLinkedList_3489 = new LinkedList(); static CacheIndex aClass153_3490; static int[] anIntArray3491 = new int[]{0, -1, 0, 1}; static int maxClientMemory = 64; @@ -17,7 +17,7 @@ final class Class3_Sub24_Sub3 extends Class3_Sub24 { try { Class3_Sub22 var1; do { - var1 = (Class3_Sub22)this.aClass61_3489.method1221(); + var1 = (Class3_Sub22)this.aLinkedList_3489.method1221(); if(null == var1) { return null; } @@ -31,7 +31,7 @@ final class Class3_Sub24_Sub3 extends Class3_Sub24 { final Class3_Sub24 method411() { try { - Class3_Sub22 var1 = (Class3_Sub22)this.aClass61_3489.method1222(); + Class3_Sub22 var1 = (Class3_Sub22)this.aLinkedList_3489.method1222(); return null != var1?(null != var1.aClass3_Sub24_Sub1_2507?var1.aClass3_Sub24_Sub1_2507:this.method414()):null; } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "te.Q()"); @@ -110,7 +110,7 @@ final class Class3_Sub24_Sub3 extends Class3_Sub24 { try { this.aClass3_Sub24_Sub2_3495.method415(var1); - for(Class3_Sub22 var3 = (Class3_Sub22)this.aClass61_3489.method1222(); var3 != null; var3 = (Class3_Sub22)this.aClass61_3489.method1221()) { + for(Class3_Sub22 var3 = (Class3_Sub22)this.aLinkedList_3489.method1222(); var3 != null; var3 = (Class3_Sub22)this.aLinkedList_3489.method1221()) { if(this.aClass3_Sub24_Sub4_3493.method504(var3, 121)) { int var2 = var1; @@ -140,7 +140,7 @@ final class Class3_Sub24_Sub3 extends Class3_Sub24 { try { this.aClass3_Sub24_Sub2_3495.method413(var1, var2, var3); - for(Class3_Sub22 var6 = (Class3_Sub22)this.aClass61_3489.method1222(); var6 != null; var6 = (Class3_Sub22)this.aClass61_3489.method1221()) { + for(Class3_Sub22 var6 = (Class3_Sub22)this.aLinkedList_3489.method1222(); var6 != null; var6 = (Class3_Sub22)this.aLinkedList_3489.method1221()) { if(this.aClass3_Sub24_Sub4_3493.method504(var6, 126)) { int var5 = var3; int var4 = var2; 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 b0f82a7e3..80ccfb5cc 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 @@ -51,7 +51,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { Class163_Sub2_Sub1.aClass94Array4016[Unsorted.menuOptionCount] = var4; Class114.anIntArray1578[Unsorted.menuOptionCount] = var0 == -1 ?Class3_Sub28_Sub5.anInt3590:var0; TextureOperation27.aShortArray3095[Unsorted.menuOptionCount] = var6; - TextureOperation0.aLongArray3271[Unsorted.menuOptionCount] = var1; + Unsorted.aLongArray3271[Unsorted.menuOptionCount] = var1; Class117.anIntArray1613[Unsorted.menuOptionCount] = var5; Class27.anIntArray512[Unsorted.menuOptionCount] = var8; ++Unsorted.menuOptionCount; @@ -213,11 +213,11 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { Class3_Sub1 var9 = Client.method44(var3); ItemDefinition var10 = ItemDefinition.getItemDefinition(var3.itemAmounts[var15] + -1); if(1 == Class164_Sub1.anInt3012 && var9.method99()) { - if(var3.componentHash != Class3_Sub28_Sub18.anInt3764 || var15 != Class3_Sub30_Sub1.anInt1473) { + if(var3.componentHash != Class3_Sub28_Sub18.anInt3764 || var15 != BufferedDataStream.anInt1473) { method1177(-1, var10.itemId, (byte)-91, RSString.stringCombiner(new RSString[]{RenderAnimationDefinition.aClass94_378, ColorCore.BankItemColor, var10.name}), var15, (short)40, TextCore.HasUse, var3.componentHash); } } else if(GameObject.aBoolean1837 && var9.method99()) { - Class3_Sub28_Sub9 var18 = Unsorted.anInt1038 != -1 ?Class61.method1210(Unsorted.anInt1038):null; + Class3_Sub28_Sub9 var18 = Unsorted.anInt1038 != -1 ? LinkedList.method1210(Unsorted.anInt1038):null; if(0 != (16 & Class164.anInt2051) && (var18 == null || var18.anInt3614 != var10.method1115(var18.anInt3614, 103, Unsorted.anInt1038))) { method1177(Unsorted.anInt1887, var10.itemId, (byte)-89, RSString.stringCombiner(new RSString[]{TextCore.aClass94_676, ColorCore.BankItemColor, var10.name}), var15, (short)3, Class3_Sub28_Sub9.aClass94_3621, var3.componentHash); } @@ -407,7 +407,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { private void method481(byte var1, int var2) { try { - for(Class3_Sub22 var4 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aClass61_3489.method1222(); null != var4; var4 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aClass61_3489.method1221()) { + for(Class3_Sub22 var4 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aLinkedList_3489.method1222(); null != var4; var4 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aLinkedList_3489.method1221()) { if(var2 < 0 || var4.anInt2514 == var2) { if(null != var4.aClass3_Sub24_Sub1_2507) { var4.aClass3_Sub24_Sub1_2507.method417(Class21.anInt443 / 100); @@ -485,7 +485,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { try { this.method493((byte)-123, var4, 64, var2); if((2 & this.anIntArray3518[var2]) != 0) { - for(Class3_Sub22 var5 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aClass61_3489.method1212(); var5 != null; var5 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aClass61_3489.method1219(98)) { + for(Class3_Sub22 var5 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aLinkedList_3489.method1212(); var5 != null; var5 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aLinkedList_3489.method1219(98)) { if(var5.anInt2514 == var2 && var5.anInt2506 < 0) { this.aClass3_Sub22ArrayArray3512[var2][var5.anInt2520] = null; this.aClass3_Sub22ArrayArray3512[var2][var4] = var5; @@ -539,7 +539,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { this.aClass3_Sub22ArrayArray3513[var2][var7.anInt2517] = var7; } - this.aClass3_Sub24_Sub3_3527.aClass61_3489.method1215(var7); + this.aClass3_Sub24_Sub3_3527.aLinkedList_3489.method1215(var7); this.aClass3_Sub22ArrayArray3512[var2][var4] = var7; } } @@ -748,7 +748,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { private void method489(int var1, int var2) { try { - for(Class3_Sub22 var3 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aClass61_3489.method1222(); var3 != null; var3 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aClass61_3489.method1221()) { + for(Class3_Sub22 var3 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aLinkedList_3489.method1222(); var3 != null; var3 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aLinkedList_3489.method1221()) { if((var2 < 0 || var3.anInt2514 == var2) && var3.anInt2506 < 0) { this.aClass3_Sub22ArrayArray3512[var3.anInt2514][var3.anInt2520] = null; var3.anInt2506 = 0; @@ -928,7 +928,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { if((2 & this.anIntArray3518[var4]) == 0) { var5.anInt2506 = 0; } else { - for(Class3_Sub22 var6 = (Class3_Sub22) Objects.requireNonNull(this.aClass3_Sub24_Sub3_3527).aClass61_3489.method1222(); null != var6; var6 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aClass61_3489.method1221()) { + for(Class3_Sub22 var6 = (Class3_Sub22) Objects.requireNonNull(this.aClass3_Sub24_Sub3_3527).aLinkedList_3489.method1222(); null != var6; var6 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aLinkedList_3489.method1221()) { if(var5.anInt2514 == var6.anInt2514 && var6.anInt2506 < 0 && var6 != var5) { var5.anInt2506 = 0; break; @@ -1059,7 +1059,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { private void method497(int var1, int var2) { try { if(0 != (4 & this.anIntArray3518[var1])) { - for(Class3_Sub22 var4 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aClass61_3489.method1222(); null != var4; var4 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aClass61_3489.method1221()) { + for(Class3_Sub22 var4 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aLinkedList_3489.method1222(); null != var4; var4 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aLinkedList_3489.method1221()) { if(var1 == var4.anInt2514) { var4.anInt2516 = 0; } @@ -1160,7 +1160,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { private void method502(int var1, int var2) { try { if(var2 != ~(this.anIntArray3518[var1] & 2)) { - for(Class3_Sub22 var3 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aClass61_3489.method1222(); var3 != null; var3 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aClass61_3489.method1221()) { + for(Class3_Sub22 var3 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aLinkedList_3489.method1222(); var3 != null; var3 = (Class3_Sub22)this.aClass3_Sub24_Sub3_3527.aLinkedList_3489.method1221()) { if(var3.anInt2514 == var1 && this.aClass3_Sub22ArrayArray3512[var1][var3.anInt2520] == null && var3.anInt2506 < 0) { var3.anInt2506 = 0; } 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 a8d6603c2..6af82808e 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub25.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub25.java @@ -20,7 +20,7 @@ final class Class3_Sub25 extends Linkable { 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(TextureOperation27.aShortArray3095, 1 + var1, TextureOperation27.aShortArray3095, var1, Unsorted.menuOptionCount + -var1); - ArrayUtils.arraycopy(TextureOperation0.aLongArray3271, 1 + var1, TextureOperation0.aLongArray3271, var1, -var1 + Unsorted.menuOptionCount); + ArrayUtils.arraycopy(Unsorted.aLongArray3271, 1 + var1, Unsorted.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_Sub26.java b/Client/src/main/java/org/runite/client/Class3_Sub26.java index 8f9a5f216..2c7e2c76e 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub26.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub26.java @@ -8,7 +8,7 @@ final class Class3_Sub26 extends Linkable { static int paramAffid = 0; int anInt2555; static int anInt2556 = 0; - static Class61 aClass61_2557 = new Class61(); + static LinkedList aLinkedList_2557 = new LinkedList(); static int[] anIntArray2559 = new int[]{0, 1, 2, 3, 4, 5, 6, 14}; static AbstractSprite aAbstractSprite_2560; static int anInt2561 = -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 3e48512c5..44f29a557 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 @@ -14,7 +14,7 @@ final class Class3_Sub28_Sub3 extends Node { static int anInt3557 = 0; int anInt3558; int anInt3559 = 0; - Class61 aClass61_3560; + LinkedList aLinkedList_3560; RSString aClass94_3561; int anInt3562 = 12800; int anInt3563; @@ -24,7 +24,7 @@ final class Class3_Sub28_Sub3 extends Node { final boolean method537(int var1, int var3) { try { if(var3 >= this.anInt3555 && var3 <= this.anInt3559 && var1 >= this.anInt3562 && var1 <= this.anInt3549) { - for(Class3_Sub21 var4 = (Class3_Sub21)this.aClass61_3560.method1222(); var4 != null; var4 = (Class3_Sub21)this.aClass61_3560.method1221()) { + for(Class3_Sub21 var4 = (Class3_Sub21)this.aLinkedList_3560.method1222(); var4 != null; var4 = (Class3_Sub21)this.aLinkedList_3560.method1221()) { if(var4.method393(var1, var3)) { return true; } @@ -45,7 +45,7 @@ final class Class3_Sub28_Sub3 extends Node { this.anInt3549 = 0; this.anInt3555 = 12800; - for(Class3_Sub21 var2 = (Class3_Sub21)this.aClass61_3560.method1222(); null != var2; var2 = (Class3_Sub21)this.aClass61_3560.method1221()) { + for(Class3_Sub21 var2 = (Class3_Sub21)this.aLinkedList_3560.method1222(); null != var2; var2 = (Class3_Sub21)this.aLinkedList_3560.method1221()) { if(this.anInt3562 > var2.anInt2494) { this.anInt3562 = var2.anInt2494; } @@ -162,7 +162,7 @@ final class Class3_Sub28_Sub3 extends Node { this.anInt3563 = 0; } - this.aClass61_3560 = new Class61(); + this.aLinkedList_3560 = new LinkedList(); } catch (RuntimeException var9) { throw ClientErrorException.clientError(var9, "bn.(" + (var1 != null?"{...}":"null") + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ',' + var7 + ')'); } 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 83378bae8..c2e25912d 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 @@ -243,7 +243,7 @@ final class Class3_Sub28_Sub5 extends Node { //Animation header Class3_Sub28_Sub5(CacheIndex cacheIndex0, CacheIndex var2, int frame) { try { - Class61 var5 = new Class61(); + LinkedList var5 = new LinkedList(); int size = cacheIndex0.getFileAmount(frame); this.animations = new AnimationHeader[size]; int[] fileIds = cacheIndex0.getFileIds(frame); diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub8.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub8.java index 8f0f18f3e..794b2d3bd 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub8.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub8.java @@ -18,7 +18,7 @@ final class Class3_Sub28_Sub8 extends Node { static void method574(NPC var0) { try { - for(Class3_Sub9 var2 = (Class3_Sub9) Unsorted.aClass61_1242.method1222(); var2 != null; var2 = (Class3_Sub9) Unsorted.aClass61_1242.method1221()) { + for(Class3_Sub9 var2 = (Class3_Sub9) Unsorted.aLinkedList_1242.method1222(); var2 != null; var2 = (Class3_Sub9) Unsorted.aLinkedList_1242.method1221()) { if(var0 == var2.aClass140_Sub4_Sub2_2324) { if(var2.aClass3_Sub24_Sub1_2312 != null) { Class3_Sub26.aClass3_Sub24_Sub2_2563.method461(var2.aClass3_Sub24_Sub1_2312); 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 24d915f8a..655693af2 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,7 +23,7 @@ final class Class3_Sub28_Sub9 extends Node { byte[] var2 = Class163_Sub1.aByteArrayArray2987[0]; Object var3; - if(TextureOperation0.aBooleanArray3272[0]) { + if(Class45.aBooleanArray3272[0]) { byte[] var4 = Class163_Sub3.aByteArrayArray3005[0]; int[] var5 = new int[var1]; 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 deleted file mode 100644 index c929653e5..000000000 --- a/Client/src/main/java/org/runite/client/Class3_Sub30_Sub1.java +++ /dev/null @@ -1,1072 +0,0 @@ -package org.runite.client; - -import org.rs09.SystemLogger; - -import java.util.Objects; - -public final class Class3_Sub30_Sub1 extends DataBuffer { - - static RSString[] aClass94Array3802; - static int anInt872; - static int anInt2330 = 0; - static float aFloat3044; - static int anInt4037; - static int anInt1345; - static int anInt1407; - 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, 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]; - static int[] anIntArray3805; - private int headiconsPrayerSpriteArchive6; - - - static void addChatMessage(RSString var0, int type, RSString message, int var3) { - try { - Class3_Sub28_Sub12.sendGameMessage(var3, type, message, null, var0); - } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "i.W(" + (var0 != null?"{...}":"null") + ',' + type + ',' + (message != null?"{...}":"null") + ',' + var3 + ')'); - } - } - - static void method806(int var1) { - try { - if(var1 >= 0) { - int var2 = Class117.anIntArray1613[var1]; - int var3 = Class27.anIntArray512[var1]; - int var4 = TextureOperation27.aShortArray3095[var1]; - if(var4 >= 2000) { - var4 -= 2000; - } - - long var6 = TextureOperation0.aLongArray3271[var1]; - int var5 = (int) TextureOperation0.aLongArray3271[var1]; - Player var8; - if(31 == var4) { - 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; - TextureOperation12.outgoingBuffer.putOpcode(71); - TextureOperation12.outgoingBuffer.writeShort128LE(var5); - } - } - - if(var4 == 46) { - Class163_Sub2_Sub1.method2224(var6, var3, var2); - 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) { - 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; - System.out.println(anInt1473 + ", " + var3 + ", " + var2 + ", " + Class3_Sub28_Sub18.anInt3764 + ", " + Class164.anInt2050 + ", " + var5); - } - - NPC var11; - if(var4 == 19) { - var11 = NPC.npcs[var5]; - if(null != var11) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var11.anIntArray2767[0], 1, 0, 2, var11.anIntArray2755[0], Class102.player.anIntArray2767[0]); - Class70.anInt1053 = Class163_Sub1.anInt2993; - Class36.anInt638 = 2; - Unsorted.anInt2958 = 0; - Unsorted.anInt4062 = Class38_Sub1.anInt2614; - TextureOperation12.outgoingBuffer.putOpcode(30); - TextureOperation12.outgoingBuffer.writeShort(var5); - } - } - - if(17 == var4) { - var11 = NPC.npcs[var5]; - if(var11 != null) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var11.anIntArray2767[0], 1, 0, 2, var11.anIntArray2755[0], Class102.player.anIntArray2767[0]); - Class70.anInt1053 = Class163_Sub1.anInt2993; - Unsorted.anInt2958 = 0; - Class36.anInt638 = 2; - Unsorted.anInt4062 = Class38_Sub1.anInt2614; - TextureOperation12.outgoingBuffer.putOpcode(78); - TextureOperation12.outgoingBuffer.writeShortLE(var5); - } - } - - if(var4 == 44) { - 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; - TextureOperation12.outgoingBuffer.putOpcode(133); - TextureOperation12.outgoingBuffer.writeShortLE(var5); - } - } - - if(var4 == 58) { - 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; - } - - if(var4 == 42) { - Class163_Sub2_Sub1.method2224(var6, var3, var2); - 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) { - TextureOperation4.method264((byte)122); - } - - if(var4 == 45) { - var11 = NPC.npcs[var5]; - if(var11 != null) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var11.anIntArray2767[0], 1, 0, 2, var11.anIntArray2755[0], Class102.player.anIntArray2767[0]); - Class70.anInt1053 = Class163_Sub1.anInt2993; - Class36.anInt638 = 2; - Unsorted.anInt2958 = 0; - Unsorted.anInt4062 = Class38_Sub1.anInt2614; - TextureOperation12.outgoingBuffer.putOpcode(239); - TextureOperation12.outgoingBuffer.writeIntLE2(anInt872); - TextureOperation12.outgoingBuffer.putShortA(RSInterface.anInt278); - TextureOperation12.outgoingBuffer.writeShort128LE(var5); - } - } - - boolean var14; - if(18 == var4) { - if(Class158.paramGameTypeID == 1) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); - } else { - var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2597 ^ 2599, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); - if(!var14) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); - } - } - - Class70.anInt1053 = Class163_Sub1.anInt2993; - Unsorted.anInt2958 = 0; - Class36.anInt638 = 2; - Unsorted.anInt4062 = Class38_Sub1.anInt2614; - 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); - 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) { - Class36.anInt638 = 2; - Class70.anInt1053 = Class163_Sub1.anInt2993; - Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Unsorted.anInt2958 = 0; - TextureOperation12.outgoingBuffer.putOpcode(92); - TextureOperation12.outgoingBuffer.writeShort128LE(var5); - } - - RSInterface var13; - if(var4 == 1006) { - var13 = Class7.getRSInterface(var3); - 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 { - TextureOperation12.outgoingBuffer.putOpcode(92); - TextureOperation12.outgoingBuffer.writeShort128LE(var5); - } - - anInt2330 = 0; - Unsorted.aClass11_1933 = Class7.getRSInterface(var3); - KeyboardListener.anInt1918 = var2; - } - - if(var4 == 60) { - if(var5 == 0) { - 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, 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])) { - 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); - } - } - } - - if(1007 == var4) { - Unsorted.anInt2958 = 0; - Class36.anInt638 = 2; - Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Class70.anInt1053 = Class163_Sub1.anInt2993; - var11 = NPC.npcs[var5]; - if(var11 != null) { - NPCDefinition var9 = var11.definition; - if(var9.childNPCs != null) { - var9 = var9.method1471((byte)80); - } - - if(null != var9) { - TextureOperation12.outgoingBuffer.putOpcode(72); - TextureOperation12.outgoingBuffer.writeShort(var9.npcId); - } - } - } - - if(var4 == 47) { - if (MouseWheel.shiftDown) { - - 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 { - TextureOperation12.outgoingBuffer.putOpcode(156); - TextureOperation12.outgoingBuffer.writeShort128LE(var2); - TextureOperation12.outgoingBuffer.putShortA(var5); - TextureOperation12.outgoingBuffer.writeIntLE2(var3); - anInt2330 = 0; - Unsorted.aClass11_1933 = Class7.getRSInterface(var3); - } - KeyboardListener.anInt1918 = var2; - } - - if(var4 == 3) { - 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 = 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; - TextureOperation12.outgoingBuffer.putOpcode(4); - TextureOperation12.outgoingBuffer.writeShortLE(var5); - } - } - - if(41 == var4 && TextureOperation27.aClass11_3087 == null) { - Unsorted.method78(var2, var3); - TextureOperation27.aClass11_3087 = AbstractSprite.method638(var3, var2); - Class20.method909(TextureOperation27.aClass11_3087); - } - - if(49 == var4) { - Class163_Sub2_Sub1.method2224(var6, var3, var2); - 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) { - 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; - } - - if(var4 == 14) { - Class163_Sub2_Sub1.method2224(var6, var3, var2); - 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 = 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; - TextureOperation12.outgoingBuffer.putOpcode(114); - TextureOperation12.outgoingBuffer.writeShort128LE(var5); - } - } - - if(var4 == 9 || 1003 == var4) { - Unsorted.method66(Class163_Sub2_Sub1.aClass94Array4016[var1], var2, var5, (byte)-19, var3); - } - - if(var4 == 5) { - if (MouseWheel.shiftDown) { - 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 { - TextureOperation12.outgoingBuffer.putOpcode(55); - TextureOperation12.outgoingBuffer.writeShortLE(var5); - TextureOperation12.outgoingBuffer.putShortA(var2); - TextureOperation12.outgoingBuffer.writeIntV1(var3); - anInt2330 = 0; - Unsorted.aClass11_1933 = Class7.getRSInterface(var3); - - } - KeyboardListener.anInt1918 = var2; - } - - if(var4 == 21) { - if(Class158.paramGameTypeID == 1) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2597 + -2595, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); - } else { - var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2597 + -2595, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); - if(!var14) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2597 + -2595, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); - } - } - - Class36.anInt638 = 2; - Class70.anInt1053 = Class163_Sub1.anInt2993; - Unsorted.anInt2958 = 0; - Unsorted.anInt4062 = Class38_Sub1.anInt2614; - TextureOperation12.outgoingBuffer.putOpcode(228); - TextureOperation12.outgoingBuffer.writeShort(var5); - TextureOperation12.outgoingBuffer.writeShortLE(Class131.anInt1716 + var2); - TextureOperation12.outgoingBuffer.writeShort128LE(Texture.anInt1152 + var3); - } - - if(var4 == 4) { - var11 = NPC.npcs[var5]; - if(var11 != null) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var11.anIntArray2767[0], 1, 0, 2, var11.anIntArray2755[0], Class102.player.anIntArray2767[0]); - Class36.anInt638 = 2; - Unsorted.anInt2958 = 0; - Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Class70.anInt1053 = Class163_Sub1.anInt2993; - TextureOperation12.outgoingBuffer.putOpcode(148); - TextureOperation12.outgoingBuffer.putShortA(var5); - } - } - - if(32 == var4) { - var13 = AbstractSprite.method638(var3, var2); - if(null != var13) { - Class25.method958((byte)-126); - Class3_Sub1 var16 = Client.method44(var13); - Class145.method2074(var3, var2, var16.method101(), var16.anInt2202, var13.anInt266, var13.anInt238); - Class164_Sub1.anInt3012 = 0; - Class3_Sub28_Sub9.aClass94_3621 = Class53.method1174(var13, (byte)-94); - if(Class3_Sub28_Sub9.aClass94_3621 == null) { - Class3_Sub28_Sub9.aClass94_3621 = TextCore.aClass94_1915; - } - - if(var13.usingScripts) { - TextCore.aClass94_676 = RSString.stringCombiner(new RSString[]{var13.aClass94_277, ColorCore.ContextColor }); - } else { - TextCore.aClass94_676 = RSString.stringCombiner(new RSString[]{RSString.parse(""), var13.aClass94_243, ColorCore.ContextColor }); - } - } - - } else { - if(29 == var4) { - 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; - TextureOperation12.outgoingBuffer.putOpcode(180); - TextureOperation12.outgoingBuffer.writeShort128LE(var5); - } - } - - if(var4 == 35) { - 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 = 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; - TextureOperation12.outgoingBuffer.putOpcode(195); - TextureOperation12.outgoingBuffer.putShortA(RSInterface.anInt278); - TextureOperation12.outgoingBuffer.writeIntLE2(anInt872); - TextureOperation12.outgoingBuffer.writeShort128LE(var5); - } - } - - if(34 == var4) { - if(Class158.paramGameTypeID == 1) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); - } else { - var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2597 ^ 2599, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); - if(!var14) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); - } - } - - Class70.anInt1053 = Class163_Sub1.anInt2993; - Class36.anInt638 = 2; - Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Unsorted.anInt2958 = 0; - TextureOperation12.outgoingBuffer.putOpcode(109); - TextureOperation12.outgoingBuffer.writeShortLE(var3 - -Texture.anInt1152); - TextureOperation12.outgoingBuffer.writeShort(var2 + Class131.anInt1716); - TextureOperation12.outgoingBuffer.writeShort128LE(var5); - } - - if(var4 == 25) { - 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; - } - - if(var4 == 2) { - var11 = NPC.npcs[var5]; - if(var11 != null) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2597 + -2595, var11.anIntArray2767[0], 1, 0, 2, var11.anIntArray2755[0], Class102.player.anIntArray2767[0]); - Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Class36.anInt638 = 2; - Class70.anInt1053 = Class163_Sub1.anInt2993; - Unsorted.anInt2958 = 0; - TextureOperation12.outgoingBuffer.putOpcode(218); - TextureOperation12.outgoingBuffer.writeShortLE(var5); - } - } - - int var12; - if(var4 == 51) { - 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]; - if(ItemDefinition.ram[var12] != var13.anIntArray307[0]) { - ItemDefinition.ram[var12] = var13.anIntArray307[0]; - Class46.method1087(98, var12); - } - } - } - - if(var4 == 26) { - var11 = NPC.npcs[var5]; - if(var11 != null) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var11.anIntArray2767[0], 1, 0, 2, var11.anIntArray2755[0], Class102.player.anIntArray2767[0]); - Class36.anInt638 = 2; - Unsorted.anInt2958 = 0; - Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Class70.anInt1053 = Class163_Sub1.anInt2993; - 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) { - 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]; - ItemDefinition.ram[var12] = -ItemDefinition.ram[var12] + 1; - Class46.method1087(68, var12); - } - } - - if(var4 == 33) { - var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); - if(!var14) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2597 + -2595, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); - } - - Class70.anInt1053 = Class163_Sub1.anInt2993; - Unsorted.anInt2958 = 0; - Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Class36.anInt638 = 2; - 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) { - Unsorted.anInt2958 = 0; - Class70.anInt1053 = Class163_Sub1.anInt2993; - Class36.anInt638 = 2; - Unsorted.anInt4062 = Class38_Sub1.anInt2614; - TextureOperation12.outgoingBuffer.putOpcode(94); - TextureOperation12.outgoingBuffer.writeShort128LE(var5); - } - - if(11 == var4) { - if(var5 == 0) { - CS2Script.anInt2440 = 1; - Unsorted.method589(WorldListCountry.localPlane, var2, var3); - } else if (1 == var5) { - 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); - } - } - - if(8 == var4) { - var13 = Class7.getRSInterface(var3); - boolean var15 = true; - if(0 < Objects.requireNonNull(var13).anInt189) { - var15 = method715(var13); - } - - if(var15) { - TextureOperation12.outgoingBuffer.putOpcode(10); - TextureOperation12.outgoingBuffer.writeInt(var3); - } - } - - if(var4 == 1) { - 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; - 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) { - 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; - } - - if(var4 == 24) { - if(Class158.paramGameTypeID == 1) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2597 + -2595, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); - } else { - var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); - if(!var14) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); - } - } - - Class36.anInt638 = 2; - Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Class70.anInt1053 = Class163_Sub1.anInt2993; - Unsorted.anInt2958 = 0; - 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); - 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) { - 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 = 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; - TextureOperation12.outgoingBuffer.putOpcode(175); - TextureOperation12.outgoingBuffer.putShortA(var5); - } - } - - if(var4 == 22) { - - if (MouseWheel.shiftDown) { - 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; - - } else { - - Class25.method958((byte)-86); - var13 = Class7.getRSInterface(var3); - Class3_Sub28_Sub18.anInt3764 = var3; - anInt1473 = var2; - Class164_Sub1.anInt3012 = 1; - Class164.anInt2050 = var5; - Class20.method909(var13); - RenderAnimationDefinition.aClass94_378 = RSString.stringCombiner(new RSString[]{ - ColorCore.ContextColor2, ItemDefinition.getItemDefinition(var5).name, ColorCore.ContextColor - }); - - } - } else { - if(var4 == 50) { - Class163_Sub2_Sub1.method2224(var6, var3, var2); - 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) { - 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 = 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; - TextureOperation12.outgoingBuffer.putOpcode(68); - TextureOperation12.outgoingBuffer.writeShort128LE(var5); - } - } - - if(var4 == 43) { - 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; - } - - if(var4 == 39) { - var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); - if(!var14) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); - } - - Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Class70.anInt1053 = Class163_Sub1.anInt2993; - Class36.anInt638 = 2; - Unsorted.anInt2958 = 0; - 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) { - TextureOperation12.outgoingBuffer.putOpcode(82); - TextureOperation12.outgoingBuffer.writeShort(RSInterface.anInt278); - TextureOperation12.outgoingBuffer.writeIntV1(var3); - TextureOperation12.outgoingBuffer.writeInt(anInt872); - TextureOperation12.outgoingBuffer.writeShort128LE(var2); - } - - if(var4 == 36) { - if(var5 == 0) { - 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, Texture.anInt1152 - -var3, WorldListCountry.localPlane); - } else { - TextureOperation12.outgoingBuffer.putOpcode(179); - TextureOperation12.outgoingBuffer.writeShort(var3 + Texture.anInt1152); - TextureOperation12.outgoingBuffer.writeShort(var2 + Class131.anInt1716); - } - } - - if(6 == var4) { - 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; - TextureOperation12.outgoingBuffer.putOpcode(106); - TextureOperation12.outgoingBuffer.writeShort(var5); - } - } - - if(var4 == 20) { - if(1 == Class158.paramGameTypeID) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); - } else { - var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); - if(!var14) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); - } - } - - Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Unsorted.anInt2958 = 0; - Class70.anInt1053 = Class163_Sub1.anInt2993; - Class36.anInt638 = 2; - TextureOperation12.outgoingBuffer.putOpcode(33); - TextureOperation12.outgoingBuffer.writeShort(var5); - TextureOperation12.outgoingBuffer.writeShort(Class131.anInt1716 + var2); - TextureOperation12.outgoingBuffer.writeShortLE(Texture.anInt1152 + var3); - } - - if(var4 == 16) { - var11 = NPC.npcs[var5]; - if(null != var11) { - Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var11.anIntArray2767[0], 1, 0, 2, var11.anIntArray2755[0], Class102.player.anIntArray2767[0]); - Class70.anInt1053 = Class163_Sub1.anInt2993; - Unsorted.anInt2958 = 0; - Unsorted.anInt4062 = Class38_Sub1.anInt2614; - Class36.anInt638 = 2; - TextureOperation12.outgoingBuffer.putOpcode(3); - TextureOperation12.outgoingBuffer.writeShort128LE(var5); - } - } - - if(Class164_Sub1.anInt3012 != 0) { - Class164_Sub1.anInt3012 = 0; - Class20.method909(Class7.getRSInterface(Class3_Sub28_Sub18.anInt3764)); - } - - if(GameObject.aBoolean1837) { - Class25.method958((byte)-36); - } - - if(Unsorted.aClass11_1933 != null && anInt2330 == 0) { - Class20.method909(Unsorted.aClass11_1933); - } - - } - } - } - } catch (RuntimeException var10) { - throw ClientErrorException.clientError(var10, "i.E(" + 2597 + ',' + var1 + ')'); - } - } - - static boolean method715(RSInterface var1) { - try { - if(205 == var1.anInt189) { - Class159.anInt2023 = 250; - return true; - } else { - return false; - } - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "ud.B(" + 205 + ',' + "null" + ')'); - } - } - - final void setBitAccess() { - try { - this.headiconsPrayerSpriteArchive6 = this.index * 8; - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "i.R(" + ')'); - } - } - - public Class3_Sub30_Sub1() { - super(5000); - } - - static int method809(int var0, int var1, int var2, int var3) { - try { - if(TextureOperation14.aBoolean3387) { - var0 = 1000000; - TextureOperation14.aBoolean3387 = false; - } - - AtmosphereParser var5 = AtmosphereParser.aAtmosphereParserArrayArray1581[var3][var1]; - float var7 = ((float)var2 * 0.1F + 0.7F) * var5.aFloat1187; - float var8 = var5.aFloat1190; - int var6 = var5.anInt1177; - int var11 = var5.anInt1184; - int var10 = var5.anInt1175; - if(!Class38.aBoolean661) { - var11 = 0; - } - - 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; - TextureOperation36.aFloat3435 = TextureOperation36.aFloat3424; - TextureOperation9.aFloat3105 = Class30.aFloat578; - Class60.anInt932 = var6; - anInt1971 = Class3_Sub28_Sub12.anInt3652; - anInt1407 = Unsorted.anInt689; - RSInterface.aFloat246 = var9; - Unsorted.anInt72 = 0; - anInt4037 = Unsorted.anInt1950; - anInt1736 = var11; - aFloat3044 = var8; - anInt1345 = var10; - aFloat1475 = Class12.aFloat319; - } - - if(65536 > Unsorted.anInt72) { - Unsorted.anInt72 += 250 * var0; - if(Unsorted.anInt72 >= 65536) { - Unsorted.anInt72 = 65536; - } - - 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 & 65280) + (65280 & anInt1345) * var13) >> 8; - float var14 = (float)(65536 - Unsorted.anInt72) / 65536.0F; - 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 & 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, TextureOperation36.aFloat3424, Class12.aFloat319); - Class92.setFogValues(Class3_Sub28_Sub12.anInt3652, Unsorted.anInt689); - - Class92.setLightPosition((float)Class46.anInt741, (float) TextureOperation1.anInt3274, (float) AtmosphereParser.anInt1191); - Class92.method1504(); - return Class3_Sub28_Sub12.anInt3652; - } catch (RuntimeException var16) { - throw ClientErrorException.clientError(var16, "i.F(" + var0 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + 1 + ')'); - } - } - - static int method810(int var1) { - return 255 & var1; - } - - final void method811(byte var1, int var2, byte[] var3, int var4) { - try { - if(var1 < 16) { - addChatMessage(null, 126, null, -28); - } - - for(int var5 = 0; var5 < var4; ++var5) { - var3[var2 + var5] = (byte)(this.buffer[this.index++] + -this.isaacCipher.nextOpcode()); - } - - } catch (RuntimeException var6) { - throw ClientErrorException.clientError(var6, "i.S(" + var1 + ',' + var2 + ',' + (var3 != null?"{...}":"null") + ',' + var4 + ')'); - } - } - - final int getBits(int var2) { - try { - int var3 = this.headiconsPrayerSpriteArchive6 >> 3; - int var4 = 8 + -(7 & this.headiconsPrayerSpriteArchive6); - int var5 = 0; - this.headiconsPrayerSpriteArchive6 += var2; - while(var2 > var4) { - var5 += (anIntArray2709[var4] & this.buffer[var3++]) << -var4 + var2; - var2 -= var4; - var4 = 8; - } - - if(var2 == var4) { - var5 += this.buffer[var3] & anIntArray2709[var4]; - } else { - var5 += this.buffer[var3] >> var4 - var2 & anIntArray2709[var2]; - } - - return var5; - } catch (RuntimeException var6) { - throw ClientErrorException.clientError(var6, "i.C(" + (byte) -11 + ',' + var2 + ')'); - } - } - -// static void method813() { -// try { -// Class3_Sub28_Sub4.aReferenceCache_3572.clearSoftReferences(); -// Class143.aReferenceCache_1874.clearSoftReferences(); -// Class67.aReferenceCache_1013.clearSoftReferences(); -// } catch (RuntimeException var2) { -// throw ClientErrorException.clientError(var2, "i.O(" + 1974 + ')'); -// } -// } - - final void method814(int[] var1) { - try { - this.isaacCipher = new ISAACCipher(var1); - - } catch (RuntimeException var4) { - throw ClientErrorException.clientError(var4, "i.T(" + (var1 != null?"{...}":"null") + ',' + false + ')'); - } - } - - final int method815(int var1) { - try { - - return var1 * 8 - this.headiconsPrayerSpriteArchive6; - } catch (RuntimeException var4) { - throw ClientErrorException.clientError(var4, "i.U(" + var1 + ',' + 32666 + ')'); - } - } - - public final void putOpcode(int opcode) { - if (buffer == null || isaacCipher == null) { - SystemLogger.logInfo("Buffer/cipher null. ISAAC likely disabled or not implemented."); - return; - } - this.buffer[this.index++] = (byte)(opcode + this.isaacCipher.nextOpcode()); - } - - public final int getOpcode() { - try { - return 255 & this.buffer[this.index++] - this.isaacCipher.nextOpcode(); - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "i.P(" + 0 + ')'); - } - } - - final void method818() { - try { - this.index = (this.headiconsPrayerSpriteArchive6 + 7) / 8; - - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "i.Q(" + false + ')'); - } - } - - static void method819() { - try { - 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; - RSInterface[] var4 = GameObject.aClass11ArrayArray1834[var2]; - - int var5; - for(var5 = 0; var5 < var4.length; ++var5) { - if(var4[var5] != null) { - var3 = var4[var5].usingScripts; - break; - } - } - - if(!var3) { - var5 = (int)var1.linkableKey; - RSInterface var6 = Class7.getRSInterface(var5); - if(null != var6) { - Class20.method909(var6); - } - } - } - } - - } catch (RuntimeException var7) { - throw ClientErrorException.clientError(var7, "i.A(" + false + ')'); - } - } - -} 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 83cc57794..bbd094c1a 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub5.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub5.java @@ -222,7 +222,7 @@ final class Class3_Sub5 extends Linkable { if (var0) { var4 = Class102.player; } else { - var4 = TextureOperation0.players[Class56.localPlayerIndexes[var3]]; + var4 = Unsorted.players[Class56.localPlayerIndexes[var3]]; } if (null != var4 && var4.hasDefinitions()) { @@ -273,12 +273,12 @@ final class Class3_Sub5 extends Linkable { var4 = Class102.player; var16 = 8791798054912L; } else { - var4 = TextureOperation0.players[Class56.localPlayerIndexes[var3]]; + var4 = Unsorted.players[Class56.localPlayerIndexes[var3]]; var16 = (long) Class56.localPlayerIndexes[var3] << 32; } if (var4 != null && var4.hasDefinitions()) { - var4.aBoolean3968 = (RSInterface.aBoolean236 && Class159.localPlayerCount > 200 || 50 < Class159.localPlayerCount) && !var0 && var4.anInt2764 == var4.method1965().anInt368; + var4.aBoolean3968 = (RSInterface.aBoolean236 && Class159.localPlayerCount > 200 || 50 < Class159.localPlayerCount) && !var0 && var4.anInt2764 == var4.getRenderAnimationType().stand_animation; var7 = var4.getSize(); if (var7 == 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 9af1222a3..f7d2756d7 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub9.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub9.java @@ -29,7 +29,7 @@ final class Class3_Sub9 extends Linkable { try { Class3_Sub28_Sub5 var2 = (Class3_Sub28_Sub5)Class159.aReferenceCache_2016.get(var0); if(var2 == null) { - var2 = Unsorted.method1089(Class131.aClass153_1723, Class7.aClass153_2160, var0); + var2 = Unsorted.method1089(Class131.skeletonsReferenceIndex, Class7.skinsReferenceIndex, var0); if(null != var2) { Class159.aReferenceCache_2016.put(var2, var0); } diff --git a/Client/src/main/java/org/runite/client/Class40.java b/Client/src/main/java/org/runite/client/Class40.java index d2d224806..13afb8280 100644 --- a/Client/src/main/java/org/runite/client/Class40.java +++ b/Client/src/main/java/org/runite/client/Class40.java @@ -356,9 +356,9 @@ final class Class40 { static void method318() { try { - Class3_Sub4 var1 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1222(); + Class3_Sub4 var1 = (Class3_Sub4) TextureOperation26.aLinkedList_3075.method1222(); - for (; null != var1; var1 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1221()) { + for (; null != var1; var1 = (Class3_Sub4) TextureOperation26.aLinkedList_3075.method1221()) { if (var1.anInt2259 == -1) { var1.anInt2261 = 0; Class132.method1798(56, var1); diff --git a/Client/src/main/java/org/runite/client/Class45.java b/Client/src/main/java/org/runite/client/Class45.java index f8341df73..00279d3ec 100644 --- a/Client/src/main/java/org/runite/client/Class45.java +++ b/Client/src/main/java/org/runite/client/Class45.java @@ -1,7 +1,5 @@ package org.runite.client; -import java.util.Objects; - public final class Class45 { static int[] anIntArray729 = new int[4096]; @@ -9,209 +7,9 @@ public final class Class45 { public static int anInt733 = 0; static int anInt734 = 0; public static AbstractSprite aAbstractSprite_736; - static DataBuffer aClass3_Sub30_2030 = new DataBuffer(new byte[5000]); + static boolean[] aBooleanArray3272; - static void parsePlayerMask(int var0, int var1, Player var3) { - try { - int var4; - int chatIcon; - int var7; - //Ordinal: 0 Chat - if (0 != (var0 & 128)) { - var4 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - chatIcon = GraphicDefinition.incomingBuffer.readUnsignedByte(); - int var6 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - var7 = GraphicDefinition.incomingBuffer.index; - 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 || TextureOperation31.aBoolean3166)) { - var11 = true; - } else { - for (int var12 = 0; var12 < Class3_Sub28_Sub5.anInt3591; ++var12) { - if (Class114.ignores[var12] == var9) { - var11 = true; - break; - } - } - } - } - - if (!var11 && 0 == PacketParser.inTutorialIsland) { - aClass3_Sub30_2030.index = 0; - GraphicDefinition.incomingBuffer.readBytesReverse(var6, aClass3_Sub30_2030.buffer); - aClass3_Sub30_2030.index = 0; - int var13 = -1; - RSString message; - if (var8) { - Class10 var14 = Class155.method2156(aClass3_Sub30_2030); - var4 &= 32767; - var13 = var14.anInt149; - message = var14.aClass3_Sub28_Sub4_151.method555(aClass3_Sub30_2030); - } else { - message = Font.method686(Objects.requireNonNull(Class32.method992(aClass3_Sub30_2030).properlyCapitalize())); - } - - var3.textSpoken = message.trim(1); - var3.textEffect = var4 & 0xFF; - var3.textCycle = 150; - var3.textColor = var4 >> 8; - if (chatIcon >= 2) { - Class3_Sub28_Sub12.sendGameMessage(var13, var8 ? 17 : 1, message, null, RSString.stringCombiner(new RSString[]{RSString.parse(""), var3.getName()})); - } else if (chatIcon == 1) { - Class3_Sub28_Sub12.sendGameMessage(var13, var8 ? 17 : 1, message, null, RSString.stringCombiner(new RSString[]{TextCore.aClass94_592, var3.getName()})); - } else { - Class3_Sub28_Sub12.sendGameMessage(var13, var8 ? 17 : 2, message, null, var3.getName()); - } - } - } - GraphicDefinition.incomingBuffer.index = var7 + var6; - } - - //Ordinal: 1 Hit - if ((var0 & 1) != 0) { - var4 = GraphicDefinition.incomingBuffer.getSmart(); - chatIcon = GraphicDefinition.incomingBuffer.readUnsignedByte128(); - var3.method1970(chatIcon, Class44.anInt719, var4); - var3.anInt2781 = 300 + Class44.anInt719; - var3.anInt2775 = GraphicDefinition.incomingBuffer.readUnsigned128Byte(); - } - - //Ordinal: 2 Animation - if ((var0 & 8) != 0) { - var4 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - if (var4 == 65535) { - var4 = -1; - } - - chatIcon = GraphicDefinition.incomingBuffer.readUnsignedByte(); - WorldMap.method628(chatIcon, var4, var3); - } - - //Ordinal: 3 Appearance - if (0 != (4 & var0)) { - var4 = GraphicDefinition.incomingBuffer.readUnsignedByte128(); - byte[] var16 = new byte[var4]; - DataBuffer var19 = new DataBuffer(var16); - GraphicDefinition.incomingBuffer.readBytes(var16, var4); - Class65.aClass3_Sub30Array986[var1] = var19; - var3.parseAppearance(-15, var19); - } - - //Ordinal: 4 Face entity - if ((2 & var0) != 0) { - var3.anInt2772 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - if (var3.anInt2772 == 65535) { - var3.anInt2772 = -1; - } - } - - //Ordinal: 5 Force movement - if ((1024 & var0) != 0) { - var3.anInt2784 = GraphicDefinition.incomingBuffer.readUnsignedNegativeByte(); - var3.anInt2835 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - var3.anInt2823 = GraphicDefinition.incomingBuffer.readUnsignedByte128(); - var3.anInt2798 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - var3.anInt2800 = GraphicDefinition.incomingBuffer.readUnsignedShortLE() + Class44.anInt719; - var3.anInt2790 = GraphicDefinition.incomingBuffer.readUnsignedShortLE() - -Class44.anInt719; - var3.anInt2840 = GraphicDefinition.incomingBuffer.readUnsignedNegativeByte(); - var3.anInt2816 = 1; - var3.anInt2811 = 0; - } - - //Ordinal: 6 Force chat - if ((var0 & 32) != 0) { - var3.textSpoken = GraphicDefinition.incomingBuffer.readString(); - if (var3.textSpoken.charAt(0, (byte) -45) == 126) { - var3.textSpoken = var3.textSpoken.substring(1); - Class3_Sub30_Sub1.addChatMessage(var3.getName(), 2, var3.textSpoken, (byte) -79 ^ 78); - } else if (var3 == Class102.player) { - Class3_Sub30_Sub1.addChatMessage(var3.getName(), 2, var3.textSpoken, (byte) -79 + 78); - } - - var3.textEffect = 0; - var3.textColor = 0; - var3.textCycle = 150; - } - - //Ordinal: 7 Hit 2 - if ((var0 & 512) != 0) { - var4 = GraphicDefinition.incomingBuffer.getSmart(); - chatIcon = GraphicDefinition.incomingBuffer.readUnsigned128Byte(); - var3.method1970(chatIcon, Class44.anInt719, var4); - } - - //Ordinal: 8 - if ((2048 & var0) != 0) { - var4 = GraphicDefinition.incomingBuffer.readUnsignedNegativeByte(); - int[] var18 = new int[var4]; - int[] var17 = new int[var4]; - int[] var20 = new int[var4]; - - for (int var22 = 0; var22 < var4; ++var22) { - int var23 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - if (65535 == var23) { - var23 = -1; - } - - var18[var22] = var23; - var17[var22] = GraphicDefinition.incomingBuffer.readUnsignedByte128(); - var20[var22] = GraphicDefinition.incomingBuffer.readUnsignedShort(); - } - - Class75_Sub1.method1342(var17, var18, var3, var20); - } - - //Ordinal: 9 Graphic - if ((256 & var0) != 0) { - var4 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - if (var4 == 65535) { - var4 = -1; - } - - chatIcon = GraphicDefinition.incomingBuffer.readIntV2(); - boolean var21 = true; - if (var4 != -1 && var3.anInt2842 != -1 && SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, var4).anInt542).forcedPriority < SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, var3.anInt2842).anInt542).forcedPriority) { - var21 = false; - } - - if (var21) { - var3.anInt2759 = (chatIcon & 65535) + Class44.anInt719; - var3.anInt2761 = 0; - var3.anInt2805 = 0; - var3.anInt2842 = var4; - if (Class44.anInt719 < var3.anInt2759) { - var3.anInt2805 = -1; - } - - var3.anInt2799 = chatIcon >> 16; - var3.anInt2826 = 1; - if (var3.anInt2842 != -1 && Class44.anInt719 == var3.anInt2759) { - var7 = GraphicDefinition.getGraphicDefinition((byte) 42, var3.anInt2842).anInt542; - if (var7 != -1) { - SequenceDefinition var24 = SequenceDefinition.getAnimationDefinition(var7); - if (var24.frames != null) { - Unsorted.method1470(var3.anInt2829, var24, 183921384, var3.anInt2819, var3 == Class102.player, 0); - } - } - } - } - } - - //Ordinal: 10 Face location - if ((var0 & 64) != 0) { - var3.anInt2786 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var3.anInt2762 = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); - } - - } catch (RuntimeException var15) { - throw ClientErrorException.clientError(var15, "gk.A(" + var0 + ',' + var1 + ',' + (byte) -79 + ',' + (var3 != null ? "{...}" : "null") + ')'); - } - } - static void method1082(byte[] var0, int var1) { try { DataBuffer var2 = new DataBuffer(var0); @@ -220,7 +18,7 @@ public final class Class45 { Unsorted.anIntArray3076 = new int[Class95.anInt1338]; Class140_Sub7.anIntArray2931 = new int[Class95.anInt1338]; Class164.anIntArray2048 = new int[Class95.anInt1338]; - TextureOperation0.aBooleanArray3272 = new boolean[Class95.anInt1338]; + 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][]; @@ -298,7 +96,7 @@ public final class Class45 { } } - TextureOperation0.aBooleanArray3272[var4] = var10; + 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 ddd1aa4f0..43e5f83d5 100644 --- a/Client/src/main/java/org/runite/client/Class46.java +++ b/Client/src/main/java/org/runite/client/Class46.java @@ -11,7 +11,7 @@ final class Class46 { static void method1087(int var0, int var1) { try { - Class3_Sub30_Sub1.method819(); + BufferedDataStream.method819(); 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 b48436e75..87c9c89a6 100644 --- a/Client/src/main/java/org/runite/client/Class49.java +++ b/Client/src/main/java/org/runite/client/Class49.java @@ -85,7 +85,7 @@ public final class Class49 { } } - static byte[] method1123(int var0, int var1) { + static byte[] method1123(int var1) { try { Class3_Sub28_Sub8 var2 = (Class3_Sub28_Sub8) Class25.aClass47_480.get(var1); if (null == var2) { @@ -109,9 +109,9 @@ public final class Class49 { Class25.aClass47_480.put(var1, var2); } - return var0 != 16711935 ? null : var2.aByteArray3612; + return var2.aByteArray3612; } catch (RuntimeException var9) { - throw ClientErrorException.clientError(var9, "ha.B(" + var0 + ',' + var1 + ')'); + throw ClientErrorException.clientError(var9, "ha.B(" + var1 + ')'); } } @@ -280,7 +280,7 @@ public final class Class49 { } } - Class61.method1214(Class106.anInt1446, Class102.player.anInt2819, Class102.player.anInt2829, WorldListCountry.localPlane); + LinkedList.method1214(Class106.anInt1446, Class102.player.anInt2819, Class102.player.anInt2829, WorldListCountry.localPlane); Class106.anInt1446 = 0; } } catch (RuntimeException var3) { diff --git a/Client/src/main/java/org/runite/client/Class52.java b/Client/src/main/java/org/runite/client/Class52.java index eac15480c..ec578f2f8 100644 --- a/Client/src/main/java/org/runite/client/Class52.java +++ b/Client/src/main/java/org/runite/client/Class52.java @@ -593,17 +593,17 @@ final class Class52 { var40 = Class3_Sub10.getRenderAnimationDefinition(this.renderAnim); } - if (var40 != null && null != var40.anIntArrayArray359) { - for (var20 = 0; var20 < var40.anIntArrayArray359.length; ++var20) { - if (null != var40.anIntArrayArray359[var20] && null != var39[var20]) { - var45 = var40.anIntArrayArray359[var20][0]; - var22 = var40.anIntArrayArray359[var20][1]; - var23 = var40.anIntArrayArray359[var20][2]; - var25 = var40.anIntArrayArray359[var20][4]; - var24 = var40.anIntArrayArray359[var20][3]; - frame = var40.anIntArrayArray359[var20][5]; + if (var40 != null && null != var40.equipment_transforms) { + for (var20 = 0; var20 < var40.equipment_transforms.length; ++var20) { + if (null != var40.equipment_transforms[var20] && null != var39[var20]) { + var45 = var40.equipment_transforms[var20][0]; + var22 = var40.equipment_transforms[var20][1]; + var23 = var40.equipment_transforms[var20][2]; + var25 = var40.equipment_transforms[var20][4]; + var24 = var40.equipment_transforms[var20][3]; + frame = var40.equipment_transforms[var20][5]; if (null == this.anIntArrayArray863) { - this.anIntArrayArray863 = new int[var40.anIntArrayArray359.length][]; + this.anIntArrayArray863 = new int[var40.equipment_transforms.length][]; } if (this.anIntArrayArray863[var20] == null) { diff --git a/Client/src/main/java/org/runite/client/Class65.java b/Client/src/main/java/org/runite/client/Class65.java index d4134270b..8cf5fb1b5 100644 --- a/Client/src/main/java/org/runite/client/Class65.java +++ b/Client/src/main/java/org/runite/client/Class65.java @@ -5,7 +5,7 @@ import org.rs09.client.util.ArrayUtils; public final class Class65 { - static Class61 aClass61_983 = new Class61(); + static LinkedList aLinkedList_983 = new LinkedList(); static DataBuffer[] aClass3_Sub30Array986 = new DataBuffer[2048]; public static int anInt987 = 0; static int currentChunkX; @@ -164,7 +164,7 @@ public final class Class65 { FontType.plainFont = null; Class75_Sub3.aAbstractSpriteArray2656 = null; aAbstractSpriteArray1825 = null; - TextureOperation0.nameIconsSpriteArray = null; + Sprites.nameIconsSpriteArray = null; Class157.aClass3_Sub28_Sub17_Sub1_2000 = null; Sprites.aClass3_Sub28_Sub16_Sub2Array2140 = null; Class140_Sub4.aAbstractSpriteArray2839 = null; diff --git a/Client/src/main/java/org/runite/client/Class7.java b/Client/src/main/java/org/runite/client/Class7.java index bc0e55012..e03e96fc7 100644 --- a/Client/src/main/java/org/runite/client/Class7.java +++ b/Client/src/main/java/org/runite/client/Class7.java @@ -6,7 +6,7 @@ import org.rs09.client.filestore.resources.configs.enums.EnumDefinitionProvider; public final class Class7 implements Interface4 { public static int anInt2166 = 0; - static CacheIndex aClass153_2160; + static CacheIndex skinsReferenceIndex; static int anInt2161 = -1; static int anInt2162; static short[] aShortArray2167 = new short[]{(short) 30, (short) 6, (short) 31, (short) 29, (short) 10, (short) 44, (short) 37, (short) 57}; diff --git a/Client/src/main/java/org/runite/client/Class70.java b/Client/src/main/java/org/runite/client/Class70.java index f7c441b8a..9e4b596f1 100644 --- a/Client/src/main/java/org/runite/client/Class70.java +++ b/Client/src/main/java/org/runite/client/Class70.java @@ -64,7 +64,7 @@ final class Class70 { var8.anInt2316 = var8.anInt2310 - -((int) (Math.random() * (double) (-var8.anInt2310 + var8.anInt2325))); } - Unsorted.aClass61_78.method1215(var8); + Unsorted.aLinkedList_78.method1215(var8); } else if (null != var4) { var8.aClass140_Sub4_Sub2_2324 = var4; NPCDefinition var12 = var4.definition; @@ -80,7 +80,7 @@ final class Class70 { var8.anInt2328 = 128 * var12.anInt1291; } - Unsorted.aClass61_1242.method1215(var8); + Unsorted.aLinkedList_1242.method1215(var8); } else if (null != var7) { var8.aClass140_Sub4_Sub1_2327 = var7; var8.anInt2321 = (var7.getSize() + var5) * 128; @@ -120,11 +120,11 @@ final class Class70 { } int var3 = var2.anInt1293; - RenderAnimationDefinition var4 = var0.method1965(); - if (var0.anInt2764 == var4.anInt368) { + RenderAnimationDefinition var4 = var0.getRenderAnimationType(); + if (var0.anInt2764 == var4.stand_animation) { var3 = var2.anInt1262; - } else if (var4.anInt393 != var0.anInt2764 && var4.anInt386 != var0.anInt2764 && var0.anInt2764 != var4.anInt375 && var0.anInt2764 != var4.anInt373) { - if (var0.anInt2764 == var4.anInt398 || var0.anInt2764 == var4.anInt372 || var4.anInt379 == var0.anInt2764 || var4.anInt406 == var0.anInt2764) { + } else if (var4.run_anim != var0.anInt2764 && var4.run_follow_full_turn_anim != var0.anInt2764 && var0.anInt2764 != var4.run_follow_cw_turn_anim && var0.anInt2764 != var4.run_follow_ccw_turn_anim) { + if (var0.anInt2764 == var4.slow_walk_anim || var0.anInt2764 == var4.slow_walk_follow_full_turn_anim || var4.slow_walk_follow_cw_turn_anim == var0.anInt2764 || var4.slow_walk_follow_ccw_turn_anim == var0.anInt2764) { var3 = var2.anInt1290; } } else { diff --git a/Client/src/main/java/org/runite/client/Class75.java b/Client/src/main/java/org/runite/client/Class75.java index 9313d63a7..5dea73ec2 100644 --- a/Client/src/main/java/org/runite/client/Class75.java +++ b/Client/src/main/java/org/runite/client/Class75.java @@ -51,7 +51,7 @@ abstract class Class75 { static void method1339(RSString var0) { try { - for (Class3_Sub28_Sub3 var2 = (Class3_Sub28_Sub3) Class134.aClass61_1758.method1222(); var2 != null; var2 = (Class3_Sub28_Sub3) Class134.aClass61_1758.method1221()) { + for (Class3_Sub28_Sub3 var2 = (Class3_Sub28_Sub3) Class134.aLinkedList_1758.method1222(); var2 != null; var2 = (Class3_Sub28_Sub3) Class134.aLinkedList_1758.method1221()) { if (var2.aClass94_3561.equalsString(var0)) { Unsorted.aClass3_Sub28_Sub3_2600 = var2; return; 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 957fd3ac8..b6005b052 100644 --- a/Client/src/main/java/org/runite/client/Class75_Sub3.java +++ b/Client/src/main/java/org/runite/client/Class75_Sub3.java @@ -59,7 +59,7 @@ final class Class75_Sub3 extends Class75 { Class114.aReferenceCache_1569.sweep(50); Class3_Sub15.aReferenceCache_2428.sweep(50); Unsorted.aReferenceCache_743.sweep(50); - Class61.aReferenceCache_939.sweep(5); + LinkedList.aReferenceCache_939.sweep(5); Class158_Sub1.aReferenceCache_2982.sweep(5); TextureOperation1.aReferenceCache_3130.sweep(5); Unsorted.aReferenceCache_1135.sweep(5); @@ -112,7 +112,7 @@ 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(TextureOperation0.aBooleanArray3272[var2]) { + if(Class45.aBooleanArray3272[var2]) { int[] var6 = new int[var3]; byte[] var5 = Class163_Sub3.aByteArrayArray3005[var2]; 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 b13450a41..e05482412 100644 --- a/Client/src/main/java/org/runite/client/Class75_Sub4.java +++ b/Client/src/main/java/org/runite/client/Class75_Sub4.java @@ -97,12 +97,12 @@ public final class Class75_Sub4 extends Class75 { WorldMap.aClass153_3210 = var2; GameObject.aClass3_Sub28_Sub16_Sub2Array1839 = var0; Class3_Sub24_Sub4.aBooleanArray3503 = new boolean[GameObject.aClass3_Sub28_Sub16_Sub2Array1839.length]; - Class134.aClass61_1758.method1211(-68); + Class134.aLinkedList_1758.method1211(-68); int var3 = WorldMap.aClass153_3210.getArchiveForName(TextCore.aClass94_2304); int[] var4 = WorldMap.aClass153_3210.getFileIds(var3); for(int var5 = 0; var5 < Objects.requireNonNull(var4).length; ++var5) { - Class134.aClass61_1758.method1215(Class124.method1747(new DataBuffer(WorldMap.aClass153_3210.getFile(var3, var4[var5])))); + Class134.aLinkedList_1758.method1215(Class124.method1747(new DataBuffer(WorldMap.aClass153_3210.getFile(var3, var4[var5])))); } } catch (RuntimeException var6) { diff --git a/Client/src/main/java/org/runite/client/Class79.java b/Client/src/main/java/org/runite/client/Class79.java index d9a8aef56..1cc5a1c3b 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; - TextureOperation0.aBoolean3275 = var0.readUnsignedByte() == 1; + Unsorted.aBoolean3275 = var0.readUnsignedByte() == 1; Class140_Sub6.aBoolean2910 = 1 == var0.readUnsignedByte(); Unsorted.anInt1137 = var0.readUnsignedByte(); if (2 < Unsorted.anInt1137) { diff --git a/Client/src/main/java/org/runite/client/Class81.java b/Client/src/main/java/org/runite/client/Class81.java index 93870d408..015e71773 100644 --- a/Client/src/main/java/org/runite/client/Class81.java +++ b/Client/src/main/java/org/runite/client/Class81.java @@ -48,11 +48,11 @@ final class Class81 { try { int var2 = var1.anInt3963; - RenderAnimationDefinition var3 = var1.method1965(); - if (var1.anInt2764 == var3.anInt368) { + RenderAnimationDefinition var3 = var1.getRenderAnimationType(); + if (var1.anInt2764 == var3.stand_animation) { var2 = var1.anInt3952; - } else if (var3.anInt393 != var1.anInt2764 && var1.anInt2764 != var3.anInt386 && var1.anInt2764 != var3.anInt375 && var3.anInt373 != var1.anInt2764) { - if (var3.anInt398 == var1.anInt2764 || var3.anInt372 == var1.anInt2764 || var1.anInt2764 == var3.anInt379 || var3.anInt406 == var1.anInt2764) { + } else if (var3.run_anim != var1.anInt2764 && var1.anInt2764 != var3.run_follow_full_turn_anim && var1.anInt2764 != var3.run_follow_cw_turn_anim && var3.run_follow_ccw_turn_anim != var1.anInt2764) { + if (var3.slow_walk_anim == var1.anInt2764 || var3.slow_walk_follow_full_turn_anim == var1.anInt2764 || var1.anInt2764 == var3.slow_walk_follow_cw_turn_anim || var3.slow_walk_follow_ccw_turn_anim == var1.anInt2764) { var2 = var1.anInt3966; } } else { @@ -74,20 +74,20 @@ final class Class81 { int var5; for (var5 = 0; var5 < Class3_Sub28_Sub5.anInt3591; ++var5) { if (Class114.ignores[var5] == var1) { - Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{var4, TextCore.HasIgnoreAlready}), -1); + BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{var4, TextCore.HasIgnoreAlready}), -1); return; } } for (var5 = 0; Class8.anInt104 > var5; ++var5) { if (var1 == Class50.aLongArray826[var5]) { - Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{TextCore.HasPleaseRemove, var4, TextCore.HasFriendsToIgnore}), -1); + BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{TextCore.HasPleaseRemove, var4, TextCore.HasFriendsToIgnore}), -1); return; } } if (var4.equalsString(Class102.player.displayName)) { - Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasOnOwnIgnoreList, -1); + BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasOnOwnIgnoreList, -1); } else { Class114.ignores[Class3_Sub28_Sub5.anInt3591] = var1; TextureOperation7.aClass94Array3341[Class3_Sub28_Sub5.anInt3591++] = Unsorted.method1052(var1); @@ -96,7 +96,7 @@ final class Class81 { TextureOperation12.outgoingBuffer.writeLong(var1); } } else { - Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasIgnoreListFull, -1); + BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasIgnoreListFull, -1); } } } catch (RuntimeException var6) { diff --git a/Client/src/main/java/org/runite/client/Class84.java b/Client/src/main/java/org/runite/client/Class84.java index aca197218..16221f58f 100644 --- a/Client/src/main/java/org/runite/client/Class84.java +++ b/Client/src/main/java/org/runite/client/Class84.java @@ -3,7 +3,7 @@ package org.runite.client; public final class Class84 { static int[][] anIntArrayArray1160 = new int[104][104]; - static Class61 aClass61_1162 = new Class61(); + static LinkedList aLinkedList_1162 = new LinkedList(); public static int[] anIntArray1163 = new int[1000]; static int anInt1164 = 0; static Class3_Sub28_Sub16_Sub2 aClass3_Sub28_Sub16_Sub2_1381; @@ -56,7 +56,7 @@ public final class Class84 { Class161.anIntArray2026 = new int[32768]; Unsorted.anIntArray49 = new int[32768]; TextureOperation30.method215((byte) -89, null); - Class3_Sub30_Sub1.anIntArray3805 = new int[32768]; + BufferedDataStream.anIntArray3805 = new int[32768]; Class159.anIntArray1681 = new int[32768]; aClass3_Sub28_Sub16_Sub2_1381 = new Class3_Sub28_Sub16_Sub2(128, 254); } catch (RuntimeException var13) { @@ -80,7 +80,7 @@ public final class Class84 { static int method1421() { try { - 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)); + 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) + ((Unsorted.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/Class96.java b/Client/src/main/java/org/runite/client/Class96.java index 05a9b5a0d..83a755fc4 100644 --- a/Client/src/main/java/org/runite/client/Class96.java +++ b/Client/src/main/java/org/runite/client/Class96.java @@ -86,7 +86,7 @@ public final class Class96 { var16.anInt2532 = var3.MapIcon; var16.anInt2531 = var9; var16.anInt2539 = var10; - Class84.aClass61_1162.method1215(var16); + Class84.aLinkedList_1162.method1215(var16); } } } diff --git a/Client/src/main/java/org/runite/client/Class97.java b/Client/src/main/java/org/runite/client/Class97.java index 25e91688c..40af4adc3 100644 --- a/Client/src/main/java/org/runite/client/Class97.java +++ b/Client/src/main/java/org/runite/client/Class97.java @@ -32,7 +32,7 @@ public final class Class97 { boolean aBoolean1379 = false; private int[][][] anIntArrayArrayArray1362; private int anInt1365 = -1; - private Class61 aClass61_1366 = new Class61(); + private LinkedList aLinkedList_1366 = new LinkedList(); private int anInt1368 = 0; private Class3_Sub20[] aClass3_Sub20Array1371; @@ -105,8 +105,8 @@ public final class Class97 { this.aClass3_Sub20Array1371 = null; this.anIntArrayArrayArray1362 = null; - this.aClass61_1366.method1211(-118); - this.aClass61_1366 = null; + this.aLinkedList_1366.method1211(-118); + this.aLinkedList_1366 = null; } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "nd.E(" + (byte) -22 + ')'); } @@ -130,7 +130,7 @@ public final class Class97 { var4 = new Class3_Sub20(var2, this.anInt1368); ++this.anInt1368; } else { - Class3_Sub20 var5 = (Class3_Sub20) this.aClass61_1366.method1212(); + Class3_Sub20 var5 = (Class3_Sub20) this.aLinkedList_1366.method1212(); var4 = new Class3_Sub20(var2, Objects.requireNonNull(var5).anInt2483); this.aClass3_Sub20Array1371[var5.anInt2489] = null; var5.unlink(); @@ -141,7 +141,7 @@ public final class Class97 { this.aBoolean1379 = false; } - this.aClass61_1366.method1216(var4); + this.aLinkedList_1366.method1216(var4); return this.anIntArrayArrayArray1362[var4.anInt2483]; } } catch (RuntimeException var6) { diff --git a/Client/src/main/java/org/runite/client/Client.java b/Client/src/main/java/org/runite/client/Client.java index 29075f61c..463beca2c 100644 --- a/Client/src/main/java/org/runite/client/Client.java +++ b/Client/src/main/java/org/runite/client/Client.java @@ -47,7 +47,7 @@ public final class Client extends GameShell { static Class3_Sub24_Sub4 aClass3_Sub24_Sub4_1193; static long aLong1310 = 0L; static int anInt1354 = 0; - static Class61 aClass61_1471 = new Class61(); + static LinkedList aLinkedList_1471 = new LinkedList(); static Class30 aClass30_1572; static int[] anIntArray3780 = new int[32]; static boolean paramAdvertisementSuppressed = false; @@ -263,7 +263,7 @@ public final class Client extends GameShell { } if (inter.aBoolean219 && Class126.anInt1676 >= var12 && Unsorted.anInt1709 >= var13 && Class126.anInt1676 < var14 && Unsorted.anInt1709 < var15) { - for (CS2Script var27 = (CS2Script) aClass61_1471.method1222(); var27 != null; var27 = (CS2Script) aClass61_1471.method1221()) { + for (CS2Script var27 = (CS2Script) aLinkedList_1471.method1222(); var27 != null; var27 = (CS2Script) aLinkedList_1471.method1221()) { if (var27.aBoolean2446) { var27.unlink(); var27.aClass11_2449.aBoolean163 = false; @@ -341,7 +341,7 @@ public final class Client extends GameShell { var30.aClass11_2449 = inter; var30.scrollbarScrollAmount = Class29.anInt561; var30.arguments = inter.anObjectArray183; - aClass61_1471.method1215(var30); + aLinkedList_1471.method1215(var30); } if (Class56.aClass11_886 != null || Class67.aClass11_1017 != null || Class38_Sub1.aBoolean2615 || inter.anInt189 != 1400 && Class3_Sub19.anInt2475 > 0) { @@ -429,7 +429,7 @@ public final class Client extends GameShell { var30.worldSelectCursorPositionX = Class163_Sub1.anInt2993 - var10; var30.scrollbarScrollAmount = Class38_Sub1.anInt2614 - var11; var30.arguments = inter.anObjectArray165; - aClass61_1471.method1215(var30); + aLinkedList_1471.method1215(var30); } } @@ -440,7 +440,7 @@ public final class Client extends GameShell { var30.worldSelectCursorPositionX = Class126.anInt1676 - var10; var30.scrollbarScrollAmount = Unsorted.anInt1709 - var11; var30.arguments = inter.anObjectArray170; - aClass61_1471.method1215(var30); + aLinkedList_1471.method1215(var30); } if (inter.aBoolean188 && !var25) { @@ -452,7 +452,7 @@ public final class Client extends GameShell { var30.worldSelectCursorPositionX = Class126.anInt1676 - var10; var30.scrollbarScrollAmount = Unsorted.anInt1709 - var11; var30.arguments = inter.anObjectArray239; - Class65.aClass61_983.method1215(var30); + Class65.aLinkedList_983.method1215(var30); } } @@ -463,7 +463,7 @@ public final class Client extends GameShell { var30.worldSelectCursorPositionX = Class126.anInt1676 - var10; var30.scrollbarScrollAmount = Unsorted.anInt1709 - var11; var30.arguments = inter.anObjectArray180; - aClass61_1471.method1215(var30); + aLinkedList_1471.method1215(var30); } if (!inter.aBoolean163 && var26) { @@ -475,7 +475,7 @@ public final class Client extends GameShell { var30.worldSelectCursorPositionX = Class126.anInt1676 - var10; var30.scrollbarScrollAmount = Unsorted.anInt1709 - var11; var30.arguments = inter.anObjectArray248; - aClass61_1471.method1215(var30); + aLinkedList_1471.method1215(var30); } } @@ -486,7 +486,7 @@ public final class Client extends GameShell { var30.worldSelectCursorPositionX = Class126.anInt1676 - var10; var30.scrollbarScrollAmount = Unsorted.anInt1709 - var11; var30.arguments = inter.anObjectArray276; - aClass61_1471.method1215(var30); + aLinkedList_1471.method1215(var30); } if (inter.aBoolean163 && !var26) { @@ -498,7 +498,7 @@ public final class Client extends GameShell { var30.worldSelectCursorPositionX = Class126.anInt1676 - var10; var30.scrollbarScrollAmount = Unsorted.anInt1709 - var11; var30.arguments = inter.anObjectArray281; - Class65.aClass61_983.method1215(var30); + Class65.aLinkedList_983.method1215(var30); } } @@ -506,7 +506,7 @@ public final class Client extends GameShell { var30 = new CS2Script(); var30.aClass11_2449 = inter; var30.arguments = inter.anObjectArray269; - PacketParser.aClass61_82.method1215(var30); + PacketParser.aLinkedList_82.method1215(var30); } CS2Script var22; @@ -521,7 +521,7 @@ public final class Client extends GameShell { var22 = new CS2Script(); var22.aClass11_2449 = inter; var22.arguments = inter.anObjectArray161; - aClass61_1471.method1215(var22); + aLinkedList_1471.method1215(var22); break label531; } } @@ -530,7 +530,7 @@ public final class Client extends GameShell { var30 = new CS2Script(); var30.aClass11_2449 = inter; var30.arguments = inter.anObjectArray161; - aClass61_1471.method1215(var30); + aLinkedList_1471.method1215(var30); } inter.anInt284 = PacketParser.anInt87; @@ -547,7 +547,7 @@ public final class Client extends GameShell { var22 = new CS2Script(); var22.aClass11_2449 = inter; var22.arguments = inter.anObjectArray221; - aClass61_1471.method1215(var22); + aLinkedList_1471.method1215(var22); break label512; } } @@ -556,7 +556,7 @@ public final class Client extends GameShell { var30 = new CS2Script(); var30.aClass11_2449 = inter; var30.arguments = inter.anObjectArray221; - aClass61_1471.method1215(var30); + aLinkedList_1471.method1215(var30); } inter.anInt242 = anInt2317; @@ -573,7 +573,7 @@ public final class Client extends GameShell { var22 = new CS2Script(); var22.aClass11_2449 = inter; var22.arguments = inter.anObjectArray282; - aClass61_1471.method1215(var22); + aLinkedList_1471.method1215(var22); break label493; } } @@ -582,7 +582,7 @@ public final class Client extends GameShell { var30 = new CS2Script(); var30.aClass11_2449 = inter; var30.arguments = inter.anObjectArray282; - aClass61_1471.method1215(var30); + aLinkedList_1471.method1215(var30); } inter.anInt213 = Class36.anInt641; @@ -599,7 +599,7 @@ public final class Client extends GameShell { var22 = new CS2Script(); var22.aClass11_2449 = inter; var22.arguments = inter.anObjectArray174; - aClass61_1471.method1215(var22); + aLinkedList_1471.method1215(var22); break label474; } } @@ -608,7 +608,7 @@ public final class Client extends GameShell { var30 = new CS2Script(); var30.aClass11_2449 = inter; var30.arguments = inter.anObjectArray174; - aClass61_1471.method1215(var30); + aLinkedList_1471.method1215(var30); } inter.anInt255 = Unsorted.anInt944; @@ -625,7 +625,7 @@ public final class Client extends GameShell { var22 = new CS2Script(); var22.aClass11_2449 = inter; var22.arguments = inter.anObjectArray158; - aClass61_1471.method1215(var22); + aLinkedList_1471.method1215(var22); break label455; } } @@ -634,7 +634,7 @@ public final class Client extends GameShell { var30 = new CS2Script(); var30.aClass11_2449 = inter; var30.arguments = inter.anObjectArray158; - aClass61_1471.method1215(var30); + aLinkedList_1471.method1215(var30); } inter.anInt311 = Class49.anInt815; @@ -644,35 +644,35 @@ public final class Client extends GameShell { var30 = new CS2Script(); var30.aClass11_2449 = inter; var30.arguments = inter.anObjectArray256; - aClass61_1471.method1215(var30); + aLinkedList_1471.method1215(var30); } if (Class110.anInt1472 > inter.anInt234 && inter.anObjectArray156 != null) { var30 = new CS2Script(); var30.aClass11_2449 = inter; var30.arguments = inter.anObjectArray156; - aClass61_1471.method1215(var30); + aLinkedList_1471.method1215(var30); } if (Class167.anInt2087 > inter.anInt234 && inter.anObjectArray313 != null) { var30 = new CS2Script(); var30.aClass11_2449 = inter; var30.arguments = inter.anObjectArray313; - aClass61_1471.method1215(var30); + aLinkedList_1471.method1215(var30); } if (Class121.anInt1642 > inter.anInt234 && inter.anObjectArray268 != null) { var30 = new CS2Script(); var30.aClass11_2449 = inter; var30.arguments = inter.anObjectArray268; - aClass61_1471.method1215(var30); + aLinkedList_1471.method1215(var30); } if (Class140_Sub6.anInt2905 > inter.anInt234 && inter.anObjectArray315 != null) { var30 = new CS2Script(); var30.aClass11_2449 = inter; var30.arguments = inter.anObjectArray315; - aClass61_1471.method1215(var30); + aLinkedList_1471.method1215(var30); } inter.anInt234 = PacketParser.anInt3213; @@ -683,7 +683,7 @@ public final class Client extends GameShell { var31.inputTextCode = Class133.inputTextCodeArray[var19]; var31.anInt2443 = Class120.anIntArray1638[var19]; var31.arguments = inter.anObjectArray220; - aClass61_1471.method1215(var31); + aLinkedList_1471.method1215(var31); } } @@ -691,7 +691,7 @@ public final class Client extends GameShell { var30 = new CS2Script(); var30.aClass11_2449 = inter; var30.arguments = inter.anObjectArray217; - aClass61_1471.method1215(var30); + aLinkedList_1471.method1215(var30); } } } @@ -1219,15 +1219,15 @@ public final class Client extends GameShell { } while (true) { - CS2Script var11 = (CS2Script) PacketParser.aClass61_82.method1220(); + CS2Script var11 = (CS2Script) PacketParser.aLinkedList_82.method1220(); RSInterface var12; RSInterface var13; if (var11 == null) { while (true) { - var11 = (CS2Script) Class65.aClass61_983.method1220(); + var11 = (CS2Script) Class65.aLinkedList_983.method1220(); if (null == var11) { while (true) { - var11 = (CS2Script) aClass61_1471.method1220(); + var11 = (CS2Script) aLinkedList_1471.method1220(); if (null == var11) { if (Class56.aClass11_886 != null) { PacketParser.method829(); diff --git a/Client/src/main/java/org/runite/client/ClientCommands.java b/Client/src/main/java/org/runite/client/ClientCommands.java index 36f45454c..005fe35a6 100644 --- a/Client/src/main/java/org/runite/client/ClientCommands.java +++ b/Client/src/main/java/org/runite/client/ClientCommands.java @@ -33,7 +33,7 @@ public class ClientCommands { runtime = Runtime.getRuntime(); var3 = (int) ((runtime.totalMemory() - runtime.freeMemory()) / 1024L); - Class3_Sub30_Sub1.addChatMessage(null, 0, RSString.stringCombiner(new RSString[]{TextCore.memoryEquals, RSString.stringAnimator(var3), TextCore.Memoryk}), -1); + BufferedDataStream.addChatMessage(null, 0, RSString.stringCombiner(new RSString[]{TextCore.memoryEquals, RSString.stringAnimator(var3), TextCore.Memoryk}), -1); } int var4; @@ -46,7 +46,7 @@ public class ClientCommands { runtime = Runtime.getRuntime(); var3 = (int) ((runtime.totalMemory() + -runtime.freeMemory()) / 1024L); - Class3_Sub30_Sub1.addChatMessage(null, 0, RSString.stringCombiner(new RSString[]{TextCore.memoryBeforeCleanup, RSString.stringAnimator(var3), TextCore.Memoryk}), -1); + BufferedDataStream.addChatMessage(null, 0, RSString.stringCombiner(new RSString[]{TextCore.memoryBeforeCleanup, RSString.stringAnimator(var3), TextCore.Memoryk}), -1); Class3_Sub1.method90(1); clearClientCacheMemory(); @@ -55,11 +55,11 @@ public class ClientCommands { } var3 = (int) ((runtime.totalMemory() + -runtime.freeMemory()) / 1024L); - Class3_Sub30_Sub1.addChatMessage(null, 0, RSString.stringCombiner(new RSString[]{TextCore.aClass94_2033, RSString.stringAnimator(var3), TextCore.Memoryk}), -1); + BufferedDataStream.addChatMessage(null, 0, RSString.stringCombiner(new RSString[]{TextCore.aClass94_2033, RSString.stringAnimator(var3), TextCore.Memoryk}), -1); } if (command.equalsStringIgnoreCase(TextCore.COMMAND_PC_CACHE_SIZE)) { - Class3_Sub30_Sub1.addChatMessage(null, 0, RSString.stringCombiner(new RSString[]{TextCore.aClass94_442, RSString.stringAnimator(Unsorted.method1727((byte) 123))}), -1); + BufferedDataStream.addChatMessage(null, 0, RSString.stringCombiner(new RSString[]{TextCore.aClass94_442, RSString.stringAnimator(Unsorted.method1727((byte) 123))}), -1); } if (HDToolKit.highDetail && command.equalsStringIgnoreCase(TextCore.COMMAND_GRAPHICS_CARD_MEMORY)) { @@ -127,7 +127,7 @@ public class ClientCommands { if (command.equalsStringIgnoreCase(TextCore.TOGGLE_FK)) { boolean on = !modernHotkeys; modernHotkeys = true; - Class3_Sub30_Sub1.addChatMessage(null, 0, RSString.parse("Modern hotkeys mode toggled " + (on ? "on." : "off.")), -1); + BufferedDataStream.addChatMessage(null, 0, RSString.parse("Modern hotkeys mode toggled " + (on ? "on." : "off.")), -1); } if (command.equalsStringIgnoreCase(TextCore.COMMAND_LOWRES_GRAPHICS)) { @@ -172,7 +172,7 @@ public class ClientCommands { if (command.startsWith(TextCore.COMMAND_RECT_DEBUG)) { Client.rectDebugInt = command.substring(12).trim(1).parseInt(); - Class3_Sub30_Sub1.addChatMessage(null, 0, RSString.stringCombiner(new RSString[]{TextCore.rectDebugEquals, RSString.stringAnimator(Client.rectDebugInt)}), -1); + BufferedDataStream.addChatMessage(null, 0, RSString.stringCombiner(new RSString[]{TextCore.rectDebugEquals, RSString.stringAnimator(Client.rectDebugInt)}), -1); } if (command.equalsStringIgnoreCase(TextCore.COMMAND_QA_OP_TEST)) { @@ -182,10 +182,10 @@ public class ClientCommands { if (command.equalsStringIgnoreCase(TextCore.COMMAND_TWEENING)) { if (tweeningEnabled) { tweeningEnabled = false; - Class3_Sub30_Sub1.addChatMessage(null, 0, TextCore.forcedTweeningDisabled, -1); + BufferedDataStream.addChatMessage(null, 0, TextCore.forcedTweeningDisabled, -1); } else { tweeningEnabled = true; - Class3_Sub30_Sub1.addChatMessage(null, 0, TextCore.forcedTweeningEnabled, -1); + BufferedDataStream.addChatMessage(null, 0, TextCore.forcedTweeningEnabled, -1); } } @@ -233,7 +233,7 @@ public class ClientCommands { Class114.aReferenceCache_1569.clearSoftReferences();//Class3_Sub28_Sub6.h(); Class3_Sub15.aReferenceCache_2428.clearSoftReferences();//Class3_Sub28_Sub6.h(); Unsorted.aReferenceCache_743.clearSoftReferences();//Class3_Sub28_Sub6.h(); - Class61.aReferenceCache_939.clearSoftReferences();//Class107.method1650(); + LinkedList.aReferenceCache_939.clearSoftReferences();//Class107.method1650(); Class158_Sub1.aReferenceCache_2982.clearSoftReferences();//MouseListeningClass.method2089(); TextureOperation1.aReferenceCache_3130.clearSoftReferences(); Unsorted.aReferenceCache_1135.clearSoftReferences(); diff --git a/Client/src/main/java/org/runite/client/GameObject.java b/Client/src/main/java/org/runite/client/GameObject.java index 4230436fe..5c6924f3c 100644 --- a/Client/src/main/java/org/runite/client/GameObject.java +++ b/Client/src/main/java/org/runite/client/GameObject.java @@ -14,7 +14,7 @@ abstract class GameObject { if (Class70.aDouble1050 != var0) { for (int var3 = 0; 256 > var3; ++var3) { int var4 = (int) (255.0D * Math.pow((double) var3 / 255.0D, var0)); - Class3_Sub30_Sub1.anIntArray3804[var3] = var4 > 255 ? 255 : var4; + BufferedDataStream.anIntArray3804[var3] = var4 > 255 ? 255 : var4; } Class70.aDouble1050 = var0; diff --git a/Client/src/main/java/org/runite/client/GraphicDefinition.java b/Client/src/main/java/org/runite/client/GraphicDefinition.java index 56cb06b48..8d318c4a1 100644 --- a/Client/src/main/java/org/runite/client/GraphicDefinition.java +++ b/Client/src/main/java/org/runite/client/GraphicDefinition.java @@ -5,7 +5,6 @@ public final class GraphicDefinition { static int anInt529; private int anInt530 = 128; public static int CAMERA_DIRECTION = 0; - public static Class3_Sub30_Sub1 incomingBuffer = new Class3_Sub30_Sub1(); private short[] aShortArray533; private short[] aShortArray534; private short[] aShortArray535; diff --git a/Client/src/main/java/org/runite/client/KeyboardListener.java b/Client/src/main/java/org/runite/client/KeyboardListener.java index d121e8436..e55333073 100644 --- a/Client/src/main/java/org/runite/client/KeyboardListener.java +++ b/Client/src/main/java/org/runite/client/KeyboardListener.java @@ -170,17 +170,17 @@ final class KeyboardListener implements KeyListener, FocusListener { if(var1.isAltDown()){ if(var1.getKeyChar()=='n'){ GameConfig.NPC_DEBUG_ENABLED = !GameConfig.NPC_DEBUG_ENABLED; - Class3_Sub30_Sub1.addChatMessage(TextCore.clientDebugNotifier, 0, RSString.parse("NPC debug context " + (GameConfig.NPC_DEBUG_ENABLED ? "enabled." : "disabled.")), -1); + BufferedDataStream.addChatMessage(TextCore.clientDebugNotifier, 0, RSString.parse("NPC debug context " + (GameConfig.NPC_DEBUG_ENABLED ? "enabled." : "disabled.")), -1); return; } if(var1.getKeyChar()=='o'){ GameConfig.OBJECT_DEBUG_ENABLED = !GameConfig.OBJECT_DEBUG_ENABLED; - Class3_Sub30_Sub1.addChatMessage(TextCore.clientDebugNotifier, 0, RSString.parse("Object debug context " + (GameConfig.OBJECT_DEBUG_ENABLED ? "enabled." : "disabled.")), -1); + BufferedDataStream.addChatMessage(TextCore.clientDebugNotifier, 0, RSString.parse("Object debug context " + (GameConfig.OBJECT_DEBUG_ENABLED ? "enabled." : "disabled.")), -1); return; } if(var1.getKeyChar()=='i'){ GameConfig.ITEM_DEBUG_ENABLED = !GameConfig.ITEM_DEBUG_ENABLED; - Class3_Sub30_Sub1.addChatMessage(TextCore.clientDebugNotifier, 0, RSString.parse("Item debug context " + (GameConfig.ITEM_DEBUG_ENABLED ? "enabled." : "disabled.")), -1); + BufferedDataStream.addChatMessage(TextCore.clientDebugNotifier, 0, RSString.parse("Item debug context " + (GameConfig.ITEM_DEBUG_ENABLED ? "enabled." : "disabled.")), -1); return; } return; diff --git a/Client/src/main/java/org/runite/client/Class61.java b/Client/src/main/java/org/runite/client/LinkedList.java similarity index 84% rename from Client/src/main/java/org/runite/client/Class61.java rename to Client/src/main/java/org/runite/client/LinkedList.java index 3a76b440c..76a1f0c6d 100644 --- a/Client/src/main/java/org/runite/client/Class61.java +++ b/Client/src/main/java/org/runite/client/LinkedList.java @@ -3,14 +3,14 @@ package org.runite.client; import org.rs09.client.Linkable; import org.rs09.client.data.ReferenceCache; -public final class Class61 { +public final class LinkedList { static ReferenceCache aReferenceCache_939 = new ReferenceCache(4); Linkable aClass3_940 = new Linkable(); private Linkable aClass3_941; - public Class61() { + public LinkedList() { try { this.aClass3_940.previous = this.aClass3_940; this.aClass3_940.next = this.aClass3_940; @@ -56,20 +56,20 @@ public final class Class61 { static void method1214(int var0, int var1, int var2, int var3) { try { Class3_Sub9 var5; - for (var5 = (Class3_Sub9) Unsorted.aClass61_78.method1222(); var5 != null; var5 = (Class3_Sub9) Unsorted.aClass61_78.method1221()) { + for (var5 = (Class3_Sub9) Unsorted.aLinkedList_78.method1222(); var5 != null; var5 = (Class3_Sub9) Unsorted.aLinkedList_78.method1221()) { Unsorted.method606(var1, var5, var3, var0, var2, 126); } byte var6; RenderAnimationDefinition var7; int var8; - for (var5 = (Class3_Sub9) Unsorted.aClass61_1242.method1222(); var5 != null; var5 = (Class3_Sub9) Unsorted.aClass61_1242.method1221()) { + for (var5 = (Class3_Sub9) Unsorted.aLinkedList_1242.method1222(); var5 != null; var5 = (Class3_Sub9) Unsorted.aLinkedList_1242.method1221()) { var6 = 1; - var7 = var5.aClass140_Sub4_Sub2_2324.method1965(); - if (var5.aClass140_Sub4_Sub2_2324.anInt2764 == var7.anInt368) { + var7 = var5.aClass140_Sub4_Sub2_2324.getRenderAnimationType(); + if (var5.aClass140_Sub4_Sub2_2324.anInt2764 == var7.stand_animation) { var6 = 0; - } else if (var5.aClass140_Sub4_Sub2_2324.anInt2764 != var7.anInt393 && var5.aClass140_Sub4_Sub2_2324.anInt2764 != var7.anInt386 && var5.aClass140_Sub4_Sub2_2324.anInt2764 != var7.anInt375 && var5.aClass140_Sub4_Sub2_2324.anInt2764 != var7.anInt373) { - if (var7.anInt398 == var5.aClass140_Sub4_Sub2_2324.anInt2764 || var7.anInt372 == var5.aClass140_Sub4_Sub2_2324.anInt2764 || var5.aClass140_Sub4_Sub2_2324.anInt2764 == var7.anInt379 || var5.aClass140_Sub4_Sub2_2324.anInt2764 == var7.anInt406) { + } else if (var5.aClass140_Sub4_Sub2_2324.anInt2764 != var7.run_anim && var5.aClass140_Sub4_Sub2_2324.anInt2764 != var7.run_follow_full_turn_anim && var5.aClass140_Sub4_Sub2_2324.anInt2764 != var7.run_follow_cw_turn_anim && var5.aClass140_Sub4_Sub2_2324.anInt2764 != var7.run_follow_ccw_turn_anim) { + if (var7.slow_walk_anim == var5.aClass140_Sub4_Sub2_2324.anInt2764 || var7.slow_walk_follow_full_turn_anim == var5.aClass140_Sub4_Sub2_2324.anInt2764 || var5.aClass140_Sub4_Sub2_2324.anInt2764 == var7.slow_walk_follow_cw_turn_anim || var5.aClass140_Sub4_Sub2_2324.anInt2764 == var7.slow_walk_follow_ccw_turn_anim) { var6 = 3; } } else { @@ -99,11 +99,11 @@ public final class Class61 { for (var5 = (Class3_Sub9) Unsorted.aHashTable_4046.first(); var5 != null; var5 = (Class3_Sub9) Unsorted.aHashTable_4046.next()) { var6 = 1; - var7 = var5.aClass140_Sub4_Sub1_2327.method1965(); - if (var5.aClass140_Sub4_Sub1_2327.anInt2764 == var7.anInt368) { + var7 = var5.aClass140_Sub4_Sub1_2327.getRenderAnimationType(); + if (var5.aClass140_Sub4_Sub1_2327.anInt2764 == var7.stand_animation) { var6 = 0; - } else if (var5.aClass140_Sub4_Sub1_2327.anInt2764 != var7.anInt393 && var5.aClass140_Sub4_Sub1_2327.anInt2764 != var7.anInt386 && var7.anInt375 != var5.aClass140_Sub4_Sub1_2327.anInt2764 && var7.anInt373 != var5.aClass140_Sub4_Sub1_2327.anInt2764) { - if (var7.anInt398 == var5.aClass140_Sub4_Sub1_2327.anInt2764 || var5.aClass140_Sub4_Sub1_2327.anInt2764 == var7.anInt372 || var7.anInt379 == var5.aClass140_Sub4_Sub1_2327.anInt2764 || var7.anInt406 == var5.aClass140_Sub4_Sub1_2327.anInt2764) { + } else if (var5.aClass140_Sub4_Sub1_2327.anInt2764 != var7.run_anim && var5.aClass140_Sub4_Sub1_2327.anInt2764 != var7.run_follow_full_turn_anim && var7.run_follow_cw_turn_anim != var5.aClass140_Sub4_Sub1_2327.anInt2764 && var7.run_follow_ccw_turn_anim != var5.aClass140_Sub4_Sub1_2327.anInt2764) { + if (var7.slow_walk_anim == var5.aClass140_Sub4_Sub1_2327.anInt2764 || var5.aClass140_Sub4_Sub1_2327.anInt2764 == var7.slow_walk_follow_full_turn_anim || var7.slow_walk_follow_cw_turn_anim == var5.aClass140_Sub4_Sub1_2327.anInt2764 || var7.slow_walk_follow_ccw_turn_anim == var5.aClass140_Sub4_Sub1_2327.anInt2764) { var6 = 3; } } else { diff --git a/Client/src/main/java/org/runite/client/LoginHandler.java b/Client/src/main/java/org/runite/client/LoginHandler.java index 396900e70..d3f205240 100644 --- a/Client/src/main/java/org/runite/client/LoginHandler.java +++ b/Client/src/main/java/org/runite/client/LoginHandler.java @@ -96,9 +96,9 @@ public class LoginHandler { return; } - Class3_Sub15.activeConnection.readBytes(GraphicDefinition.incomingBuffer.buffer, 0, 8); - GraphicDefinition.incomingBuffer.index = 0; - isaacServerKey = GraphicDefinition.incomingBuffer.readLong(); + Class3_Sub15.activeConnection.readBytes(BufferedDataStream.incomingBuffer.buffer, 0, 8); + BufferedDataStream.incomingBuffer.index = 0; + isaacServerKey = BufferedDataStream.incomingBuffer.readLong(); int[] var9 = new int[4]; TextureOperation12.outgoingBuffer.index = 0; var9[2] = (int) (isaacServerKey >> 32); @@ -114,66 +114,66 @@ public class LoginHandler { TextureOperation12.outgoingBuffer.writeString(Class131.password); TextureOperation12.method229(); TextureOperation12.outgoingBuffer.rsaEncrypt(TextureOperation10.EXPONENT, TextureOperation31.MODULUS); - Unsorted.aClass3_Sub30_Sub1_2942.index = 0; + Unsorted.aBufferedDataStream_2942.index = 0; if (40 == Class143.gameStage) { - Unsorted.aClass3_Sub30_Sub1_2942.writeByte(18); + Unsorted.aBufferedDataStream_2942.writeByte(18); } else { - Unsorted.aClass3_Sub30_Sub1_2942.writeByte(16); + Unsorted.aBufferedDataStream_2942.writeByte(16); } - 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); - Unsorted.aClass3_Sub30_Sub1_2942.writeByte(1); - Unsorted.aClass3_Sub30_Sub1_2942.writeByte(Class83.getWindowType()); - Unsorted.aClass3_Sub30_Sub1_2942.writeShort(Class23.canvasWidth); - Unsorted.aClass3_Sub30_Sub1_2942.writeShort(Class140_Sub7.canvasHeight); - Unsorted.aClass3_Sub30_Sub1_2942.writeByte(Unsorted.anInt3671); - Class81.putRandomDataFile(Unsorted.aClass3_Sub30_Sub1_2942, true); - Unsorted.aClass3_Sub30_Sub1_2942.writeString(Class163_Sub2.paramSettings); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(Class3_Sub26.paramAffid); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(Class84.method1421()); + Unsorted.aBufferedDataStream_2942.writeShort(TextureOperation12.outgoingBuffer.index + 163 - -TextureOperation29.method326((byte) 111, Class163_Sub2.paramSettings)); + Unsorted.aBufferedDataStream_2942.writeInt(GameConfig.CLIENT_BUILD); + Unsorted.aBufferedDataStream_2942.writeByte(Class7.anInt2161); + Unsorted.aBufferedDataStream_2942.writeByte(!Client.paramAdvertisementSuppressed ? 0 : 1); + Unsorted.aBufferedDataStream_2942.writeByte(1); + Unsorted.aBufferedDataStream_2942.writeByte(Class83.getWindowType()); + Unsorted.aBufferedDataStream_2942.writeShort(Class23.canvasWidth); + Unsorted.aBufferedDataStream_2942.writeShort(Class140_Sub7.canvasHeight); + Unsorted.aBufferedDataStream_2942.writeByte(Unsorted.anInt3671); + Class81.putRandomDataFile(Unsorted.aBufferedDataStream_2942, true); + Unsorted.aBufferedDataStream_2942.writeString(Class163_Sub2.paramSettings); + Unsorted.aBufferedDataStream_2942.writeInt(Class3_Sub26.paramAffid); + Unsorted.aBufferedDataStream_2942.writeInt(Class84.method1421()); CS2Script.aBoolean2705 = true; - Unsorted.aClass3_Sub30_Sub1_2942.writeShort(Class113.interfacePacketCounter); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.skeletonsIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.skinsIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.configurationsIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.interfacesIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.soundFXIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.landscapesIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.musicIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.modelsIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.spritesIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.texturesIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.huffmanEncodingIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.music2Index.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.interfaceScriptsIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.fontsIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.soundFX2Index.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.soundFX3Index.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.objectConfigIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.clientscriptMaskIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.npcConfigIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.itemConfigIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.animationIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.graphicFXIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.clientScriptConfigIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.worldmapIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.quickchatMessagesIndex.getReferenceTableCrc()); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(CacheIndex.quickchatMenusIndex.getReferenceTableCrc()); - 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(TextureOperation12.outgoingBuffer.buffer, TextureOperation12.outgoingBuffer.index); - Class3_Sub15.activeConnection.sendBytes(Unsorted.aClass3_Sub30_Sub1_2942.buffer, Unsorted.aClass3_Sub30_Sub1_2942.index); + Unsorted.aBufferedDataStream_2942.writeShort(Class113.interfacePacketCounter); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.skeletonsIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.skinsIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.configurationsIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.interfacesIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.soundFXIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.landscapesIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.musicIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.modelsIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.spritesIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.texturesIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.huffmanEncodingIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.music2Index.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.interfaceScriptsIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.fontsIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.soundFX2Index.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.soundFX3Index.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.objectConfigIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.clientscriptMaskIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.npcConfigIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.itemConfigIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.animationIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.graphicFXIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.clientScriptConfigIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.worldmapIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.quickchatMessagesIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.quickchatMenusIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.materialsIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.particlesConfigIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.libIndex.getReferenceTableCrc()); + Unsorted.aBufferedDataStream_2942.putBytes(TextureOperation12.outgoingBuffer.buffer, TextureOperation12.outgoingBuffer.index); + Class3_Sub15.activeConnection.sendBytes(Unsorted.aBufferedDataStream_2942.buffer, Unsorted.aBufferedDataStream_2942.index); TextureOperation12.outgoingBuffer.method814(var9); for (int var2 = 0; var2 < 4; ++var2) { var9[var2] += 50; } - GraphicDefinition.incomingBuffer.method814(var9); + BufferedDataStream.incomingBuffer.method814(var9); loginStage = 4; } @@ -260,19 +260,19 @@ public class LoginHandler { return; } - Class3_Sub15.activeConnection.readBytes(GraphicDefinition.incomingBuffer.buffer, 0, 14); - GraphicDefinition.incomingBuffer.index = 0; - Player.rights = GraphicDefinition.incomingBuffer.readUnsignedByte(); + Class3_Sub15.activeConnection.readBytes(BufferedDataStream.incomingBuffer.buffer, 0, 14); + BufferedDataStream.incomingBuffer.index = 0; + Player.rights = BufferedDataStream.incomingBuffer.readUnsignedByte(); ClientLoader.setModPanelVisible(Player.rights == 2); - CS2Script.anInt3775 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - Class3_Sub15.aBoolean2433 = GraphicDefinition.incomingBuffer.readUnsignedByte() == 1; - Class121.aBoolean1641 = 1 == GraphicDefinition.incomingBuffer.readUnsignedByte(); - Unsorted.aBoolean4063 = GraphicDefinition.incomingBuffer.readUnsignedByte() == 1; - TextureOperation31.aBoolean3166 = 1 == GraphicDefinition.incomingBuffer.readUnsignedByte(); - Unsorted.aBoolean29 = GraphicDefinition.incomingBuffer.readUnsignedByte() == 1; - Class3_Sub1.localIndex = GraphicDefinition.incomingBuffer.readUnsignedShort(); - TextureOperation3.disableGEBoxes = GraphicDefinition.incomingBuffer.readUnsignedByte() == 1; - Unsorted.isMember = GraphicDefinition.incomingBuffer.readUnsignedByte() == 1; + CS2Script.anInt3775 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + Class3_Sub15.aBoolean2433 = BufferedDataStream.incomingBuffer.readUnsignedByte() == 1; + Class121.aBoolean1641 = 1 == BufferedDataStream.incomingBuffer.readUnsignedByte(); + Unsorted.aBoolean4063 = BufferedDataStream.incomingBuffer.readUnsignedByte() == 1; + TextureOperation31.aBoolean3166 = 1 == BufferedDataStream.incomingBuffer.readUnsignedByte(); + Unsorted.aBoolean29 = BufferedDataStream.incomingBuffer.readUnsignedByte() == 1; + Class3_Sub1.localIndex = BufferedDataStream.incomingBuffer.readUnsignedShort(); + TextureOperation3.disableGEBoxes = BufferedDataStream.incomingBuffer.readUnsignedByte() == 1; + Unsorted.isMember = BufferedDataStream.incomingBuffer.readUnsignedByte() == 1; Class113.method1702(Unsorted.isMember); Class8.method845(Unsorted.isMember); if (!Client.paramAdvertisementSuppressed) { @@ -289,9 +289,9 @@ public class LoginHandler { } } - Unsorted.incomingOpcode = GraphicDefinition.incomingBuffer.getOpcode(); + Unsorted.incomingOpcode = BufferedDataStream.incomingBuffer.getOpcode(); dynamic = Unsorted.incomingOpcode == 214; - Unsorted.incomingPacketLength = GraphicDefinition.incomingBuffer.readUnsignedShort(); + Unsorted.incomingPacketLength = BufferedDataStream.incomingBuffer.readUnsignedShort(); loginStage = 9; } @@ -300,8 +300,8 @@ public class LoginHandler { return; } - GraphicDefinition.incomingBuffer.index = 0; - Class3_Sub15.activeConnection.readBytes(GraphicDefinition.incomingBuffer.buffer, 0, Unsorted.incomingPacketLength); + BufferedDataStream.incomingBuffer.index = 0; + Class3_Sub15.activeConnection.readBytes(BufferedDataStream.incomingBuffer.buffer, 0, Unsorted.incomingPacketLength); Client.messageToDisplay = 2; loginStage = 0; SequenceDefinition.resetAll(); diff --git a/Client/src/main/java/org/runite/client/MouseListeningClass.java b/Client/src/main/java/org/runite/client/MouseListeningClass.java index 6cc46d1ac..355cd6c75 100644 --- a/Client/src/main/java/org/runite/client/MouseListeningClass.java +++ b/Client/src/main/java/org/runite/client/MouseListeningClass.java @@ -29,8 +29,8 @@ public final class MouseListeningClass implements MouseListener, MouseMotionList static void method2087() { try { - Class3_Sub4 var1 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1222(); - for (; var1 != null; var1 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1221()) { + Class3_Sub4 var1 = (Class3_Sub4) TextureOperation26.aLinkedList_3075.method1222(); + for (; var1 != null; var1 = (Class3_Sub4) TextureOperation26.aLinkedList_3075.method1221()) { if (var1.anInt2259 > 0) { var1.anInt2259 -= 1; } diff --git a/Client/src/main/java/org/runite/client/NPC.java b/Client/src/main/java/org/runite/client/NPC.java index 6dbdd30dc..499f304c5 100644 --- a/Client/src/main/java/org/runite/client/NPC.java +++ b/Client/src/main/java/org/runite/client/NPC.java @@ -31,143 +31,6 @@ public final class NPC extends Class140_Sub4 { } } - static void renderNPCMasks(int var0) { - try { - int i; - for (i = 0; Unsorted.maskUpdateCount > i; ++i) { - int mask = Class21.maskUpdateIndexes[i]; - NPC npc = npcs[mask]; - int var4 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - if ((var4 & 8) != 0) { - var4 += GraphicDefinition.incomingBuffer.readUnsignedByte() << 8; - } - - int var5; - int var6; - //Ordinal: 0 Hit - if ((64 & var4) != 0) { - var5 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - var6 = GraphicDefinition.incomingBuffer.readUnsignedNegativeByte(); - npc.method1970(var6, Class44.anInt719, var5); - npc.anInt2781 = 300 + Class44.anInt719; - npc.anInt2775 = GraphicDefinition.incomingBuffer.readUnsigned128Byte(); - } - - //Ordinal: 1 Hit 2 - if ((var4 & 2) != 0) { - var5 = GraphicDefinition.incomingBuffer.readUnsignedNegativeByte(); - var6 = GraphicDefinition.incomingBuffer.readUnsigned128Byte(); - npc.method1970(var6, Class44.anInt719, var5); - } - - //Ordinal: 2 Animation - if ((var4 & 16) != 0) { - var5 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var6 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - if (65535 == var5) { - var5 = -1; - } - - Unsorted.method1772(var6, var5, 39, npc); - } - - //Ordinal: 3 Face entity - if ((var4 & 4) != 0) { - npc.anInt2772 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - if (npc.anInt2772 == 65535) { - npc.anInt2772 = -1; - } - } - - //Ordinal: 4 Graphic - if (0 != (var4 & 128)) { - var5 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - if (var5 == 65535) { - var5 = -1; - } - - var6 = GraphicDefinition.incomingBuffer.readIntLE(); - boolean var7 = true; - if (var5 != -1 && npc.anInt2842 != -1 && SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, var5).anInt542).forcedPriority < SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, npc.anInt2842).anInt542).forcedPriority) { - var7 = false; - } - - if (var7) { - npc.anInt2842 = var5; - npc.anInt2759 = (65535 & var6) + Class44.anInt719; - npc.anInt2761 = 0; - npc.anInt2805 = 0; - npc.anInt2799 = var6 >> 16; - npc.anInt2826 = 1; - if (npc.anInt2759 > Class44.anInt719) { - npc.anInt2805 = -1; - } - - if (npc.anInt2842 != -1 && Class44.anInt719 == npc.anInt2759) { - int var8 = GraphicDefinition.getGraphicDefinition((byte) 42, npc.anInt2842).anInt542; - if (var8 != -1) { - SequenceDefinition var9 = SequenceDefinition.getAnimationDefinition(var8); - if (var9.frames != null) { - Unsorted.method1470(npc.anInt2829, var9, 183921384, npc.anInt2819, false, 0); - } - } - } - } - } - - //Ordinal: 5 Transform - if ((1 & var4) != 0) { - if (npc.definition.method1474()) { - Class3_Sub28_Sub8.method574(npc); - } - - npc.setDefinitions(NPCDefinition.getNPCDefinition(GraphicDefinition.incomingBuffer.readUnsignedShortLE())); - npc.setSize(npc.definition.size, 2); - npc.renderAnimationId = npc.definition.renderAnimationId; - if (npc.definition.method1474()) { - Class70.method1286(npc.anIntArray2755[0], null, 0, npc, npc.anIntArray2767[0], WorldListCountry.localPlane, null); - } - } - - //Ordinal: 6 Force chat - if ((var4 & 32) != 0) { - npc.textSpoken = GraphicDefinition.incomingBuffer.readString(); - npc.textCycle = 100; - } - - //Ordinal: 7 - if ((256 & var4) != 0) { - var5 = GraphicDefinition.incomingBuffer.readUnsignedNegativeByte(); - int[] var12 = new int[var5]; - int[] var13 = new int[var5]; - int[] var14 = new int[var5]; - - for (int var15 = 0; var5 > var15; ++var15) { - int var10 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - if (var10 == 65535) { - var10 = -1; - } - - var12[var15] = var10; - var13[var15] = GraphicDefinition.incomingBuffer.readUnsigned128Byte(); - var14[var15] = GraphicDefinition.incomingBuffer.readUnsignedShort(); - } - - TextureOperation0.method273(var14, npc, var13, var12); - } - - //Ordinal: 8 Face location - if ((var4 & 512) != 0) { - npc.anInt2786 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - npc.anInt2762 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - } - } - - } catch (RuntimeException var11) { - throw ClientErrorException.clientError(var11, "ta.M(" + var0 + ')'); - } - } - static byte[] method1985(Object var1, boolean var2) { try { if (var1 == null) { @@ -241,6 +104,65 @@ public final class NPC extends Class140_Sub4 { } } + static void method273(int[] var0, NPC var2, int[] var3, int[] var4) { + try { + int var5 = 0; + while(var5 < var4.length) { + int var6 = var4[var5]; + int var7 = var0[var5]; + int var8 = var3[var5]; + + for(int var9 = 0; var7 != 0 && var9 < var2.aClass145Array2809.length; ++var9) { + if((1 & var7) != 0) { + if(var6 == -1) { + var2.aClass145Array2809[var9] = null; + } else { + SequenceDefinition var10 = SequenceDefinition.getAnimationDefinition(var6); + Class145 var12 = var2.aClass145Array2809[var9]; + int var11 = var10.delayType; + if(null != var12) { + if(var12.animationId != var6) { + if(SequenceDefinition.getAnimationDefinition(var12.animationId).forcedPriority <= var10.forcedPriority) { + var12 = var2.aClass145Array2809[var9] = null; + } + } else if(var11 == 0) { + var12 = var2.aClass145Array2809[var9] = null; + } else if(var11 == 1) { + var12.anInt1893 = 0; + var12.anInt1894 = 0; + var12.anInt1891 = 1; + var12.anInt1897 = 0; + var12.anInt1900 = var8; + Unsorted.method1470(var2.anInt2829, var10, 183921384, var2.anInt2819, false, 0); + } else if(var11 == 2) { + var12.anInt1894 = 0; + } + } + + if(null == var12) { + var12 = var2.aClass145Array2809[var9] = new Class145(); + var12.anInt1891 = 1; + var12.anInt1897 = 0; + var12.anInt1900 = var8; + var12.animationId = var6; + var12.anInt1894 = 0; + var12.anInt1893 = 0; + Unsorted.method1470(var2.anInt2829, var10, 183921384, var2.anInt2819, false, 0); + } + } + } + + var7 >>>= 1; + } + + ++var5; + } + + } catch (RuntimeException var13) { + throw ClientErrorException.clientError(var13, "mi.B(" + (var0 != null?"{...}":"null") + ',' + (byte) 92 + ',' + (var2 != null?"{...}":"null") + ',' + (var3 != null?"{...}":"null") + ',' + (var4 != null?"{...}":"null") + ')'); + } + } + protected final void finalize() { } @@ -256,7 +178,7 @@ public final class NPC extends Class140_Sub4 { try { if (this.definition != null) { SequenceDefinition var13 = this.anInt2771 != -1 && this.anInt2828 == 0 ? SequenceDefinition.getAnimationDefinition(this.anInt2771) : null; - SequenceDefinition var14 = -1 != this.anInt2764 && (this.method1965().anInt368 != this.anInt2764 || var13 == null) ? SequenceDefinition.getAnimationDefinition(this.anInt2764) : null; + SequenceDefinition var14 = -1 != this.anInt2764 && (this.getRenderAnimationType().stand_animation != this.anInt2764 || var13 == null) ? SequenceDefinition.getAnimationDefinition(this.anInt2764) : null; Model var15 = this.definition.method1476(this.aClass145Array2809, this.anInt2793, (byte) -116, this.anInt2813, this.anInt2776, this.anInt2760, this.anInt2832, var14, this.anInt2802, var13); if (var15 != null) { this.anInt2820 = var15.method1871(); diff --git a/Client/src/main/java/org/runite/client/NPCDefinition.java b/Client/src/main/java/org/runite/client/NPCDefinition.java index dd6356ead..8e04e2b09 100644 --- a/Client/src/main/java/org/runite/client/NPCDefinition.java +++ b/Client/src/main/java/org/runite/client/NPCDefinition.java @@ -218,17 +218,17 @@ public final class NPCDefinition { render = Class3_Sub10.getRenderAnimationDefinition(this.renderAnimationId); } - if(render != null && null != render.anIntArrayArray359) { - for(var16 = 0; var16 < render.anIntArrayArray359.length; ++var16) { - if(render.anIntArrayArray359[var16] != null && var14.length > var16 && var14[var16] != null) { - var19 = render.anIntArrayArray359[var16][2]; - var20 = render.anIntArrayArray359[var16][3]; - var21 = render.anIntArrayArray359[var16][4]; - var18 = render.anIntArrayArray359[var16][1]; - var22 = render.anIntArrayArray359[var16][5]; - var17 = render.anIntArrayArray359[var16][0]; + if(render != null && null != render.equipment_transforms) { + for(var16 = 0; var16 < render.equipment_transforms.length; ++var16) { + if(render.equipment_transforms[var16] != null && var14.length > var16 && var14[var16] != null) { + var19 = render.equipment_transforms[var16][2]; + var20 = render.equipment_transforms[var16][3]; + var21 = render.equipment_transforms[var16][4]; + var18 = render.equipment_transforms[var16][1]; + var22 = render.equipment_transforms[var16][5]; + var17 = render.equipment_transforms[var16][0]; if(this.anIntArrayArray1258 == null) { - this.anIntArrayArray1258 = new int[render.anIntArrayArray359.length][]; + this.anIntArrayArray1258 = new int[render.equipment_transforms.length][]; } if(null == this.anIntArrayArray1258[var16]) { diff --git a/Client/src/main/java/org/runite/client/NPCRendering.java b/Client/src/main/java/org/runite/client/NPCRendering.java new file mode 100644 index 000000000..2394b65fc --- /dev/null +++ b/Client/src/main/java/org/runite/client/NPCRendering.java @@ -0,0 +1,326 @@ +package org.runite.client; + +public final class NPCRendering { + + + static final int[] NPC_RENDER_LOG = new int[3]; + + static void renderNPCs(int var0) { + try { + Unsorted.maskUpdateCount = 0; + Class139.anInt1829 = 0; + renderLocalNPCs(); + NPC_RENDER_LOG[0] = BufferedDataStream.incomingBuffer.index; + addLocalNPCs(); + NPC_RENDER_LOG[1] = BufferedDataStream.incomingBuffer.index; + renderNPCMasks(); + NPC_RENDER_LOG[2] = BufferedDataStream.incomingBuffer.index; + + int var1; + for(var1 = 0; Class139.anInt1829 > var1; ++var1) { + int var2 = Class3_Sub7.anIntArray2292[var1]; + if(Class44.anInt719 != NPC.npcs[var2].anInt2838) { + if(NPC.npcs[var2].definition.method1474()) { + Class3_Sub28_Sub8.method574(NPC.npcs[var2]); + } + + NPC.npcs[var2].setDefinitions(null); + NPC.npcs[var2] = null; + } + } + + if(var0 != 8169) { + renderNPCs(96); + } + + if(Unsorted.incomingPacketLength == BufferedDataStream.incomingBuffer.index) { + for(var1 = 0; var1 < Class163.localNPCCount; ++var1) { + if(null == NPC.npcs[Class15.localNPCIndexes[var1]]) { + // System.err.println("gnp2 pos:" + var1 + " size:" + Class163.anInt2046); + System.err.println("Local NPC was null - index: " + Class15.localNPCIndexes[var1] + ", list index: " + var1 + ", list size: " + Class163.localNPCCount); + } + } + + } else { + System.err.println("NPC rendering packet size mismatch - size log: local=" + NPC_RENDER_LOG[0] + ", add global=" + NPC_RENDER_LOG[1] + ", masks=" + NPC_RENDER_LOG[2] + "."); + // System.err.println("gnp1 pos:" + GraphicDefinition.incomingBuffer.index + " psize:" + Class130.incomingPacketLength); + // throw new RuntimeException("gnp1 pos:" + Class28.incomingBuffer.index + " psize:" + Class130.incomingPacketLength); + } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "gm.B(" + var0 + ')'); + } + } + + static void renderLocalNPCs() { + try { + BufferedDataStream.incomingBuffer.setBitAccess(); + int var1 = BufferedDataStream.incomingBuffer.getBits(8); + int var2; + if (var1 < Class163.localNPCCount) { + for (var2 = var1; var2 < Class163.localNPCCount; ++var2) { + Class3_Sub7.anIntArray2292[Class139.anInt1829++] = Class15.localNPCIndexes[var2]; + } + } + + if (Class163.localNPCCount < var1) { + throw new RuntimeException("gnpov1"); + } else { + Class163.localNPCCount = 0; + + for (var2 = 0; var1 > var2; ++var2) { + int var3 = Class15.localNPCIndexes[var2]; + NPC var4 = NPC.npcs[var3]; + int var5 = BufferedDataStream.incomingBuffer.getBits(1); + if (0 == var5) { + Class15.localNPCIndexes[Class163.localNPCCount++] = var3; + var4.anInt2838 = Class44.anInt719; + } else { + int var6 = BufferedDataStream.incomingBuffer.getBits(2); + if (var6 == 0) { + Class15.localNPCIndexes[Class163.localNPCCount++] = var3; + var4.anInt2838 = Class44.anInt719; + Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = var3; + } else { + int var7; + int var8; + if (1 == var6) { + Class15.localNPCIndexes[Class163.localNPCCount++] = var3; + var4.anInt2838 = Class44.anInt719; + var7 = BufferedDataStream.incomingBuffer.getBits(3); + var4.walkStep(1, (byte) 32, var7); + var8 = BufferedDataStream.incomingBuffer.getBits(1); + if (1 == var8) { + Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = var3; + } + } else if (var6 == 2) { + Class15.localNPCIndexes[Class163.localNPCCount++] = var3; + var4.anInt2838 = Class44.anInt719; + if (BufferedDataStream.incomingBuffer.getBits(1) == 1) { + var7 = BufferedDataStream.incomingBuffer.getBits(3); + var4.walkStep(2, (byte) -122, var7); + var8 = BufferedDataStream.incomingBuffer.getBits(3); + var4.walkStep(2, (byte) 85, var8); + } else { + var7 = BufferedDataStream.incomingBuffer.getBits(3); + var4.walkStep(0, (byte) -80, var7); + } + + var7 = BufferedDataStream.incomingBuffer.getBits(1); + if (var7 == 1) { + Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = var3; + } + } else if (var6 == 3) { + Class3_Sub7.anIntArray2292[Class139.anInt1829++] = var3; + } + } + } + } + + } + } catch (RuntimeException var9) { + throw ClientErrorException.clientError(var9, "dm.E(" + (byte) -11 + ')'); + } + } + + static void addLocalNPCs() { + try { + while (true) { + if (BufferedDataStream.incomingBuffer.method815(Unsorted.incomingPacketLength) >= 27) { + int var1 = BufferedDataStream.incomingBuffer.getBits(15); + if (32767 != var1) { + boolean var2 = false; + if (null == NPC.npcs[var1]) { + var2 = true; + NPC.npcs[var1] = new NPC(); + } + + NPC var3 = NPC.npcs[var1]; + Class15.localNPCIndexes[Class163.localNPCCount++] = var1; + var3.anInt2838 = Class44.anInt719; + if (null != var3.definition && var3.definition.method1474()) { + Class3_Sub28_Sub8.method574(var3); + } + + int var4 = BufferedDataStream.incomingBuffer.getBits(1); + int var5 = Class27.anIntArray510[BufferedDataStream.incomingBuffer.getBits(3)]; + if (var2) { + var3.anInt2806 = var3.anInt2785 = var5; + } + + int var6 = BufferedDataStream.incomingBuffer.getBits(1); + if (var6 == 1) { + Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = var1; + } + + int var7 = BufferedDataStream.incomingBuffer.getBits(5); + var3.setDefinitions(NPCDefinition.getNPCDefinition(BufferedDataStream.incomingBuffer.getBits(14))); + if (15 < var7) { + var7 -= 32; + } + + int var8 = BufferedDataStream.incomingBuffer.getBits(5); + if (15 < var8) { + var8 -= 32; + } + + var3.setSize(var3.definition.size, 2); + var3.renderAnimationId = var3.definition.renderAnimationId; + var3.anInt2779 = var3.definition.anInt1274; + if (var3.anInt2779 == 0) { + var3.anInt2785 = 0; + } + + var3.method1967(var3.getSize(), Class102.player.anIntArray2767[0] + var8, var7 + Class102.player.anIntArray2755[0], var4 == 1); + if (var3.definition.method1474()) { + Class70.method1286(var3.anIntArray2755[0], null, 0, var3, var3.anIntArray2767[0], WorldListCountry.localPlane, null); + } + continue; + } + } + + BufferedDataStream.incomingBuffer.method818(); + + return; + } + } catch (RuntimeException var9) { + throw ClientErrorException.clientError(var9, "wj.E(" + 113 + ')'); + } + } + + static void renderNPCMasks() { + try { + int i; + for (i = 0; Unsorted.maskUpdateCount > i; ++i) { + int mask = Class21.maskUpdateIndexes[i]; + NPC npc = NPC.npcs[mask]; + int var4 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + if ((var4 & 8) != 0) { + var4 += BufferedDataStream.incomingBuffer.readUnsignedByte() << 8; + } + + int var5; + int var6; + //Ordinal: 0 Hit + if ((64 & var4) != 0) { + var5 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + var6 = BufferedDataStream.incomingBuffer.readUnsignedNegativeByte(); + npc.addHit(var6, Class44.anInt719, var5); + npc.anInt2781 = 300 + Class44.anInt719; + npc.anInt2775 = BufferedDataStream.incomingBuffer.readUnsigned128Byte(); + } + + //Ordinal: 1 Hit 2 + if ((var4 & 2) != 0) { + var5 = BufferedDataStream.incomingBuffer.readUnsignedNegativeByte(); + var6 = BufferedDataStream.incomingBuffer.readUnsigned128Byte(); + npc.addHit(var6, Class44.anInt719, var5); + } + + //Ordinal: 2 Animation + if ((var4 & 16) != 0) { + var5 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var6 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + if (65535 == var5) { + var5 = -1; + } + + Unsorted.method1772(var6, var5, 39, npc); + } + + //Ordinal: 3 Face entity + if ((var4 & 4) != 0) { + npc.anInt2772 = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + if (npc.anInt2772 == 65535) { + npc.anInt2772 = -1; + } + } + + //Ordinal: 4 Graphic + if (0 != (var4 & 128)) { + var5 = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + if (var5 == 65535) { + var5 = -1; + } + + var6 = BufferedDataStream.incomingBuffer.readIntLE(); + boolean var7 = true; + if (var5 != -1 && npc.anInt2842 != -1 && SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, var5).anInt542).forcedPriority < SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, npc.anInt2842).anInt542).forcedPriority) { + var7 = false; + } + + if (var7) { + npc.anInt2842 = var5; + npc.anInt2759 = (65535 & var6) + Class44.anInt719; + npc.anInt2761 = 0; + npc.anInt2805 = 0; + npc.anInt2799 = var6 >> 16; + npc.anInt2826 = 1; + if (npc.anInt2759 > Class44.anInt719) { + npc.anInt2805 = -1; + } + + if (npc.anInt2842 != -1 && Class44.anInt719 == npc.anInt2759) { + int var8 = GraphicDefinition.getGraphicDefinition((byte) 42, npc.anInt2842).anInt542; + if (var8 != -1) { + SequenceDefinition var9 = SequenceDefinition.getAnimationDefinition(var8); + if (var9.frames != null) { + Unsorted.method1470(npc.anInt2829, var9, 183921384, npc.anInt2819, false, 0); + } + } + } + } + } + + //Ordinal: 5 Transform + if ((1 & var4) != 0) { + if (npc.definition.method1474()) { + Class3_Sub28_Sub8.method574(npc); + } + + npc.setDefinitions(NPCDefinition.getNPCDefinition(BufferedDataStream.incomingBuffer.readUnsignedShortLE())); + npc.setSize(npc.definition.size, 2); + npc.renderAnimationId = npc.definition.renderAnimationId; + if (npc.definition.method1474()) { + Class70.method1286(npc.anIntArray2755[0], null, 0, npc, npc.anIntArray2767[0], WorldListCountry.localPlane, null); + } + } + + //Ordinal: 6 Force chat + if ((var4 & 32) != 0) { + npc.textSpoken = BufferedDataStream.incomingBuffer.readString(); + npc.textCycle = 100; + } + + //Ordinal: 7 + if ((256 & var4) != 0) { + var5 = BufferedDataStream.incomingBuffer.readUnsignedNegativeByte(); + int[] var12 = new int[var5]; + int[] var13 = new int[var5]; + int[] var14 = new int[var5]; + + for (int var15 = 0; var5 > var15; ++var15) { + int var10 = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); + if (var10 == 65535) { + var10 = -1; + } + + var12[var15] = var10; + var13[var15] = BufferedDataStream.incomingBuffer.readUnsigned128Byte(); + var14[var15] = BufferedDataStream.incomingBuffer.readUnsignedShort(); + } + + NPC.method273(var14, npc, var13, var12); + } + + //Ordinal: 8 Face location + if ((var4 & 512) != 0) { + npc.anInt2786 = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + npc.anInt2762 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + } + } + + } catch (RuntimeException var11) { + throw ClientErrorException.clientError(var11, "ta.M(" + ')'); + } + } +} diff --git a/Client/src/main/java/org/runite/client/PacketParser.java b/Client/src/main/java/org/runite/client/PacketParser.java index c700b9154..8a99be516 100644 --- a/Client/src/main/java/org/runite/client/PacketParser.java +++ b/Client/src/main/java/org/runite/client/PacketParser.java @@ -11,7 +11,7 @@ public final class PacketParser { static int anInt80 = 0; static byte[][][] aByteArrayArrayArray81; - static Class61 aClass61_82 = new Class61(); + static LinkedList aLinkedList_82 = new LinkedList(); static short aShort83 = 32767; static RenderAnimationDefinition aClass16_84 = new RenderAnimationDefinition(); static int anInt86 = 0; @@ -75,8 +75,8 @@ public final class PacketParser { public static boolean parseIncomingPackets() { int nodeModelId; if (60 == Unsorted.incomingOpcode) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - byte var69 = GraphicDefinition.incomingBuffer.readSignedNegativeByte(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + byte var69 = BufferedDataStream.incomingBuffer.readSignedNegativeByte(); TextureOperation39.method281(var69, nodeModelId); Unsorted.incomingOpcode = -1; return true; @@ -84,18 +84,18 @@ public final class PacketParser { int counter; RSString playerName; if (Unsorted.incomingOpcode == 115) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); - playerName = GraphicDefinition.incomingBuffer.readString(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); + playerName = BufferedDataStream.incomingBuffer.readString(); Object[] var71 = new Object[playerName.length() - -1]; for (counter = playerName.length() + -1; counter >= 0; --counter) { if (115 == playerName.charAt(counter, (byte) -45)) { - var71[1 + counter] = GraphicDefinition.incomingBuffer.readString(); + var71[1 + counter] = BufferedDataStream.incomingBuffer.readString(); } else { - var71[1 + counter] = GraphicDefinition.incomingBuffer.readInt(); + var71[1 + counter] = BufferedDataStream.incomingBuffer.readInt(); } } - var71[0] = GraphicDefinition.incomingBuffer.readInt(); + var71[0] = BufferedDataStream.incomingBuffer.readInt(); Class146.updateInterfacePacketCounter(nodeModelId); CS2Script var66 = new CS2Script(); var66.arguments = var71; @@ -109,7 +109,7 @@ public final class PacketParser { int var30; RSString var41; if (Unsorted.incomingOpcode == 70) { - RSString message = GraphicDefinition.incomingBuffer.readString(); + RSString message = BufferedDataStream.incomingBuffer.readString(); if (message.endsWith(TextCore.HasTradeRequest)) { playerName = message.substring(0, message.indexOf(TextCore.char_colon, 65), 0); nameAsLong = playerName.toLong(); @@ -123,7 +123,7 @@ public final class PacketParser { } if (!isIgnored && inTutorialIsland == 0) { - Class3_Sub30_Sub1.addChatMessage(playerName, 4, TextCore.HasWishToTrade, (byte) -83 + 82); + BufferedDataStream.addChatMessage(playerName, 4, TextCore.HasWishToTrade, (byte) -83 + 82); } } else if (message.endsWith(TextCore.cmdChalReq)) { playerName = message.substring(0, message.indexOf(TextCore.char_colon, 75), 0); @@ -139,7 +139,7 @@ public final class PacketParser { if (!isIgnored && inTutorialIsland == 0) { var41 = message.substring(1 + message.indexOf(TextCore.char_colon, 101), message.length() + -9, (byte) -83 ^ -83); - Class3_Sub30_Sub1.addChatMessage(playerName, 8, var41, (byte) -83 ^ 82); + BufferedDataStream.addChatMessage(playerName, 8, var41, (byte) -83 ^ 82); } } else if (message.endsWith(TextCore.HasAssistRequest)) { isIgnored = false; @@ -154,20 +154,20 @@ public final class PacketParser { } if (!isIgnored && inTutorialIsland == 0) { - Class3_Sub30_Sub1.addChatMessage(playerName, 10, TextCore.emptyJagexString, -1); + BufferedDataStream.addChatMessage(playerName, 10, TextCore.emptyJagexString, -1); } } else if (message.endsWith(TextCore.HasClan)) { playerName = message.substring(0, message.indexOf(TextCore.HasClan, (byte) -83 ^ -50), 0); - Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 11, playerName, -1); + BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 11, playerName, -1); } else if (message.endsWith(TextCore.HasTrade)) { playerName = message.substring(0, message.indexOf(TextCore.HasTrade, 102), 0); if (0 == inTutorialIsland) { - Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 12, playerName, -1); + BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 12, playerName, -1); } } else if (message.endsWith(TextCore.HasAssist)) { playerName = message.substring(0, message.indexOf(TextCore.HasAssist, 121), 0); if (inTutorialIsland == 0) { - Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 13, playerName, -1); + BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 13, playerName, -1); } } else if (message.endsWith(TextCore.HasDuelStake)) { isIgnored = false; @@ -182,7 +182,7 @@ public final class PacketParser { } if (!isIgnored && inTutorialIsland == 0) { - Class3_Sub30_Sub1.addChatMessage(playerName, 14, TextCore.emptyJagexString, -1); + BufferedDataStream.addChatMessage(playerName, 14, TextCore.emptyJagexString, -1); } } else if (message.endsWith(TextCore.HasDuelFriend)) { playerName = message.substring(0, message.indexOf(TextCore.char_colon, 118), 0); @@ -197,7 +197,7 @@ public final class PacketParser { } if (!isIgnored && 0 == inTutorialIsland) { - Class3_Sub30_Sub1.addChatMessage(playerName, 15, TextCore.emptyJagexString, -1); + BufferedDataStream.addChatMessage(playerName, 15, TextCore.emptyJagexString, -1); } } else if (message.endsWith(TextCore.HasClanRequest)) { playerName = message.substring(0, message.indexOf(TextCore.char_colon, (byte) -83 + 138), 0); @@ -212,7 +212,7 @@ public final class PacketParser { } if (!isIgnored && inTutorialIsland == 0) { - Class3_Sub30_Sub1.addChatMessage(playerName, 16, TextCore.emptyJagexString, -1); + BufferedDataStream.addChatMessage(playerName, 16, TextCore.emptyJagexString, -1); } } else if (message.endsWith(TextCore.HasAllyReq)) { playerName = message.substring(0, message.indexOf(TextCore.char_colon, (byte) -83 + 189), (byte) -83 + 83); @@ -228,10 +228,10 @@ public final class PacketParser { if (!isIgnored && inTutorialIsland == 0) { var41 = message.substring(1 + message.indexOf(TextCore.char_colon, 92), message.length() - 9, (byte) -83 ^ -83); - Class3_Sub30_Sub1.addChatMessage(playerName, 21, var41, -1); + BufferedDataStream.addChatMessage(playerName, 21, var41, -1); } } else { - Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, message, (byte) -83 + 82); + BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, message, (byte) -83 + 82); } Unsorted.incomingOpcode = -1; @@ -240,9 +240,9 @@ public final class PacketParser { int var19; RSString var58; if (Unsorted.incomingOpcode == 123) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - var58 = GraphicDefinition.incomingBuffer.readString(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + var58 = BufferedDataStream.incomingBuffer.readString(); Class146.updateInterfacePacketCounter(var19); InterfaceWidget.setWidgetText(var58, nodeModelId); @@ -250,11 +250,11 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 230) { - Class39.currentChunkY = GraphicDefinition.incomingBuffer.readUnsignedByte128(); - Class65.currentChunkX = GraphicDefinition.incomingBuffer.readUnsigned128Byte(); + Class39.currentChunkY = BufferedDataStream.incomingBuffer.readUnsignedByte128(); + Class65.currentChunkX = BufferedDataStream.incomingBuffer.readUnsigned128Byte(); - while (GraphicDefinition.incomingBuffer.index < Unsorted.incomingPacketLength) { - Unsorted.incomingOpcode = GraphicDefinition.incomingBuffer.readUnsignedByte(); + while (BufferedDataStream.incomingBuffer.index < Unsorted.incomingPacketLength) { + Unsorted.incomingOpcode = BufferedDataStream.incomingBuffer.readUnsignedByte(); Class39.parseChunkPacket((byte) -82); } @@ -267,9 +267,9 @@ public final class PacketParser { } else { int modelId; if (Unsorted.incomingOpcode == 220) { - nodeModelId = GraphicDefinition.incomingBuffer.readIntV2(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); + nodeModelId = BufferedDataStream.incomingBuffer.readIntV2(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); Class146.updateInterfacePacketCounter(modelId); TextureOperation29.method327(var19, nodeModelId); @@ -282,14 +282,14 @@ public final class PacketParser { long var29; long var36; if (81 == Unsorted.incomingOpcode) { - var2 = GraphicDefinition.incomingBuffer.readLong(); - GraphicDefinition.incomingBuffer.readSignedByte(); - nameAsLong = GraphicDefinition.incomingBuffer.readLong(); - var29 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var36 = GraphicDefinition.incomingBuffer.readMedium(); - clanChatIcon = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var2 = BufferedDataStream.incomingBuffer.readLong(); + BufferedDataStream.incomingBuffer.readSignedByte(); + nameAsLong = BufferedDataStream.incomingBuffer.readLong(); + var29 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var36 = BufferedDataStream.incomingBuffer.readMedium(); + clanChatIcon = BufferedDataStream.incomingBuffer.readUnsignedByte(); boolean var63 = false; - var11 = GraphicDefinition.incomingBuffer.readUnsignedShort(); + var11 = BufferedDataStream.incomingBuffer.readUnsignedShort(); long var55 = (var29 << 32) + var36; int var54 = 0; @@ -319,7 +319,7 @@ public final class PacketParser { if (!var63 && 0 == inTutorialIsland) { Class163_Sub2_Sub1.aLongArray4017[MouseListeningClass.anInt1921] = var55; MouseListeningClass.anInt1921 = (1 + MouseListeningClass.anInt1921) % 100; - RSString var61 = LinkableRSString.method733(var11).method555(GraphicDefinition.incomingBuffer); + RSString var61 = LinkableRSString.method733(var11).method555(BufferedDataStream.incomingBuffer); if (clanChatIcon == 2 || 3 == clanChatIcon) { Class3_Sub28_Sub12.sendGameMessage(var11, 20, var61, Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), RSString.stringCombiner(new RSString[]{TextCore.aClass94_444, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()})); } else if (clanChatIcon == 1) { @@ -337,7 +337,7 @@ public final class PacketParser { boolean var32; if (Unsorted.incomingOpcode == 55) { Class167.anInt2087 = anInt3213; - var2 = GraphicDefinition.incomingBuffer.readLong(); + var2 = BufferedDataStream.incomingBuffer.readLong(); if (var2 == 0) { Class161.aClass94_2035 = null; Unsorted.incomingOpcode = -1; @@ -346,22 +346,22 @@ public final class PacketParser { Unsorted.clanSize = 0; return true; } else { - nameAsLong = GraphicDefinition.incomingBuffer.readLong(); + nameAsLong = BufferedDataStream.incomingBuffer.readLong(); RSInterface.aClass94_251 = Unsorted.method1052(nameAsLong); Class161.aClass94_2035 = Unsorted.method1052(var2); - Player.aByte3953 = GraphicDefinition.incomingBuffer.readSignedByte(); - var6 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + Player.aByte3953 = BufferedDataStream.incomingBuffer.readSignedByte(); + var6 = BufferedDataStream.incomingBuffer.readUnsignedByte(); if (255 != var6) { Unsorted.clanSize = var6; Class3_Sub19[] var7 = new Class3_Sub19[100]; for (chatIcon = 0; chatIcon < Unsorted.clanSize; ++chatIcon) { var7[chatIcon] = new Class3_Sub19(); - var7[chatIcon].linkableKey = GraphicDefinition.incomingBuffer.readLong(); + var7[chatIcon].linkableKey = BufferedDataStream.incomingBuffer.readLong(); var7[chatIcon].aClass94_2476 = Unsorted.method1052(var7[chatIcon].linkableKey); - var7[chatIcon].anInt2478 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var7[chatIcon].aByte2472 = GraphicDefinition.incomingBuffer.readSignedByte(); - var7[chatIcon].aClass94_2473 = GraphicDefinition.incomingBuffer.readString(); + var7[chatIcon].anInt2478 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var7[chatIcon].aByte2472 = BufferedDataStream.incomingBuffer.readSignedByte(); + var7[chatIcon].aClass94_2473 = BufferedDataStream.incomingBuffer.readString(); if (var7[chatIcon].linkableKey == aLong3202) { Class91.aByte1308 = var7[chatIcon].aByte2472; } @@ -393,40 +393,40 @@ public final class PacketParser { return true; } } else if (Unsorted.incomingOpcode == 164) { - nodeModelId = GraphicDefinition.incomingBuffer.readIntV1(); + nodeModelId = BufferedDataStream.incomingBuffer.readIntV1(); Class136.aClass64_1778 = Class38.signlink.method1449((byte) -83 ^ -82, nodeModelId); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 225) { - Class163_Sub3.renderPlayers(); + PlayerRendering.renderPlayers(); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 48) { //UNUSED BY SERVER - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); - playerName = GraphicDefinition.incomingBuffer.readString(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); + playerName = BufferedDataStream.incomingBuffer.readString(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); Class146.updateInterfacePacketCounter(nodeModelId); InterfaceWidget.setWidgetText(playerName, modelId); Unsorted.incomingOpcode = -1; return true; } else if (232 == Unsorted.incomingOpcode) { - CS2Script.anInt3101 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - Class24.anInt467 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - Class45.anInt734 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + CS2Script.anInt3101 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + Class24.anInt467 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + Class45.anInt734 = BufferedDataStream.incomingBuffer.readUnsignedByte(); Unsorted.incomingOpcode = -1; return true; } else { RSString var56; if (Unsorted.incomingOpcode == 44) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); if (nodeModelId == 65535) { nodeModelId = -1; } - var19 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedByte(); - var56 = GraphicDefinition.incomingBuffer.readString(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedByte(); + var56 = BufferedDataStream.incomingBuffer.readString(); if (1 <= modelId && modelId <= 8) { if (var56.equalsStringIgnoreCase(TextCore.HasNull)) { var56 = null; @@ -440,24 +440,24 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 226) { - nodeModelId = GraphicDefinition.incomingBuffer.readInt(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); + nodeModelId = BufferedDataStream.incomingBuffer.readInt(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedShort128(); TextureOperation39.method281(nodeModelId, var19); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 21) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedNegativeByte(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - modelId = GraphicDefinition.incomingBuffer.readIntLE(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedNegativeByte(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + modelId = BufferedDataStream.incomingBuffer.readIntLE(); Class146.updateInterfacePacketCounter(var19); TextureOperation4.method260(modelId, nodeModelId); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 145) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedByte128(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedByte128(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); Class146.updateInterfacePacketCounter(modelId); if (var19 == 2) { Class7.method834(); @@ -474,47 +474,47 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 69) { //UNUSED BY SERVER - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); - var19 = GraphicDefinition.incomingBuffer.readInt(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShort128(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); + var19 = BufferedDataStream.incomingBuffer.readInt(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShort128(); Class146.updateInterfacePacketCounter(nodeModelId); TextureOperation19.method255(modelId, var19, 1); Unsorted.incomingOpcode = -1; return true; } else if (141 == Unsorted.incomingOpcode) { //UNUSED BY SERVER - var2 = GraphicDefinition.incomingBuffer.readLong(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var56 = LinkableRSString.method733(modelId).method555(GraphicDefinition.incomingBuffer); + var2 = BufferedDataStream.incomingBuffer.readLong(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var56 = LinkableRSString.method733(modelId).method555(BufferedDataStream.incomingBuffer); Class3_Sub28_Sub12.sendGameMessage(modelId, 19, var56, null, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 169) { //UNUSED BY SERVER - Class162.method2204(GraphicDefinition.incomingBuffer); + Class162.method2204(BufferedDataStream.incomingBuffer); Unsorted.incomingOpcode = -1; return true; } else if (89 == Unsorted.incomingOpcode) { //UNUSED BY SERVER TextureOperation6.method176(-117); - Class3_Sub30_Sub1.method819(); + BufferedDataStream.method819(); Class36.anInt641 += 32; Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 125) {//camera rotation - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedByte(); - counter = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var6 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - var30 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedByte(); + counter = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var6 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + var30 = BufferedDataStream.incomingBuffer.readUnsignedByte(); Class146.updateInterfacePacketCounter(nodeModelId); Class164_Sub1.method2238(counter, modelId, var6, var19, var30); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 36) { - nodeModelId = GraphicDefinition.incomingBuffer.readIntV2(); - var19 = GraphicDefinition.incomingBuffer.readSignedShortLE(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShort128(); + nodeModelId = BufferedDataStream.incomingBuffer.readIntV2(); + var19 = BufferedDataStream.incomingBuffer.readSignedShortLE(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShort128(); Class146.updateInterfacePacketCounter(modelId); Class131.method1790(nodeModelId, var19); @@ -524,15 +524,15 @@ public final class PacketParser { Class3_Sub1 var38; Class3_Sub1 var47; if (Unsorted.incomingOpcode == 9) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); - var19 = GraphicDefinition.incomingBuffer.readIntLE(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - counter = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); + var19 = BufferedDataStream.incomingBuffer.readIntLE(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + counter = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); if (counter == 65535) { counter = -1; } - var6 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); + var6 = BufferedDataStream.incomingBuffer.readUnsignedShort128(); if (var6 == 65535) { var6 = -1; } @@ -558,10 +558,10 @@ public final class PacketParser { } else { int var33; if (Unsorted.incomingOpcode == 56) { //UNUSED - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - modelId = GraphicDefinition.incomingBuffer.readIntV1(); - counter = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); + modelId = BufferedDataStream.incomingBuffer.readIntV1(); + counter = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); if (modelId >> 30 == 0) { SequenceDefinition var53; if (modelId >> 29 != 0) { @@ -601,7 +601,7 @@ public final class PacketParser { if (var6 == Class3_Sub1.localIndex) { var60 = Class102.player; } else { - var60 = TextureOperation0.players[var6]; + var60 = Unsorted.players[var6]; } if (null != var60) { @@ -642,27 +642,27 @@ public final class PacketParser { 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); - TextureOperation17.aClass61_3177.method1215(new Class3_Sub28_Sub2(var50)); + TextureOperation17.aLinkedList_3177.method1215(new Class3_Sub28_Sub2(var50)); } } Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 207) { //UNUSED - nodeModelId = GraphicDefinition.incomingBuffer.readIntV2(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); - counter = GraphicDefinition.incomingBuffer.readUnsignedShort128(); + nodeModelId = BufferedDataStream.incomingBuffer.readIntV2(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); + counter = BufferedDataStream.incomingBuffer.readUnsignedShort128(); Class146.updateInterfacePacketCounter(var19); Class114.method1708(counter + (modelId << 16), nodeModelId); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 38) { - Class3_Sub30_Sub1.method819(); - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedByte128();//Level - var19 = GraphicDefinition.incomingBuffer.readIntV1();//Skillxp - modelId = GraphicDefinition.incomingBuffer.readUnsignedByte();//Skill ID + BufferedDataStream.method819(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedByte128();//Level + var19 = BufferedDataStream.incomingBuffer.readIntV1();//Skillxp + modelId = BufferedDataStream.incomingBuffer.readUnsignedByte();//Skill ID int gain = var19 - XPGainDraw.getLastXp()[modelId]; XPGainDraw.addGain(gain,modelId); XPGainDraw.getLastXp()[modelId] = var19; @@ -699,8 +699,8 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 149) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var19 = GraphicDefinition.incomingBuffer.readInt(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var19 = BufferedDataStream.incomingBuffer.readInt(); Class146.updateInterfacePacketCounter(nodeModelId); Class3_Sub31 var67 = TextureOperation23.aHashTable_3208.get(var19); if (null != var67) { @@ -716,9 +716,9 @@ public final class PacketParser { return true; } else if (Unsorted.incomingOpcode == 187) { //set camera - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); Class146.updateInterfacePacketCounter(var19); GraphicDefinition.CAMERA_DIRECTION = nodeModelId; Unsorted.anInt2309 = modelId; @@ -732,30 +732,30 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 132) { //UNUSED - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); - counter = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); - var6 = GraphicDefinition.incomingBuffer.readInt(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); + counter = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); + var6 = BufferedDataStream.incomingBuffer.readInt(); Class146.updateInterfacePacketCounter(var19); Unsorted.method2143((byte) -124, modelId, var6, counter, nodeModelId); Unsorted.incomingOpcode = -1; return true; } else if (112 == Unsorted.incomingOpcode) { - Class65.currentChunkX = GraphicDefinition.incomingBuffer.readUnsignedByte(); - Class39.currentChunkY = GraphicDefinition.incomingBuffer.readUnsignedNegativeByte(); + Class65.currentChunkX = BufferedDataStream.incomingBuffer.readUnsignedByte(); + Class39.currentChunkY = BufferedDataStream.incomingBuffer.readUnsignedNegativeByte(); for (nodeModelId = Class65.currentChunkX; nodeModelId < 8 + Class65.currentChunkX; ++nodeModelId) { for (var19 = Class39.currentChunkY; 8 + Class39.currentChunkY > var19; ++var19) { - if (null != TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][nodeModelId][var19]) { - TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][nodeModelId][var19] = null; + if (null != Class39.aLinkedListArrayArrayArray3273[WorldListCountry.localPlane][nodeModelId][var19]) { + Class39.aLinkedListArrayArrayArray3273[WorldListCountry.localPlane][nodeModelId][var19] = null; Class128.method1760(var19, nodeModelId); } } } - for (Class3_Sub4 var68 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1222(); null != var68; var68 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1221()) { + for (Class3_Sub4 var68 = (Class3_Sub4) TextureOperation26.aLinkedList_3075.method1222(); null != var68; var68 = (Class3_Sub4) TextureOperation26.aLinkedList_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; } @@ -764,7 +764,7 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 144) { - nodeModelId = GraphicDefinition.incomingBuffer.readIntV2(); + nodeModelId = BufferedDataStream.incomingBuffer.readIntV2(); RSInterface var65 = Class7.getRSInterface(nodeModelId); for (modelId = 0; Objects.requireNonNull(var65).itemAmounts.length > modelId; ++modelId) { @@ -776,9 +776,9 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 130) { - nodeModelId = GraphicDefinition.incomingBuffer.readIntLE(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShort128(); + nodeModelId = BufferedDataStream.incomingBuffer.readIntLE(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShort128(); if (modelId == 65535) { modelId = -1; } @@ -789,13 +789,13 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 192) { - Class161.anInt2028 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + Class161.anInt2028 = BufferedDataStream.incomingBuffer.readUnsignedByte(); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 13) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsigned128Byte(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedByte128(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedByte(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsigned128Byte(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedByte128(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedByte(); WorldListCountry.localPlane = var19 >> 1; Class102.player.method1981(nodeModelId, (var19 & 1) == 1, modelId); Unsorted.incomingOpcode = -1; @@ -805,9 +805,9 @@ public final class PacketParser { RSString var57; RSString var64; if (Unsorted.incomingOpcode == 62) { - var2 = GraphicDefinition.incomingBuffer.readLong(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); - counter = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var2 = BufferedDataStream.incomingBuffer.readLong(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); + counter = BufferedDataStream.incomingBuffer.readUnsignedByte(); isIgnored = true; if (var2 < 0L) { var2 &= Long.MAX_VALUE; @@ -816,7 +816,7 @@ public final class PacketParser { var41 = TextCore.emptyJagexString; if (modelId > 0) { - var41 = GraphicDefinition.incomingBuffer.readString(); + var41 = BufferedDataStream.incomingBuffer.readString(); } RSString var46 = Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString(); @@ -826,11 +826,11 @@ public final class PacketParser { if (Unsorted.anIntArray882[var33] != modelId) { Unsorted.anIntArray882[var33] = modelId; if (0 < modelId) { - Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 5, RSString.stringCombiner(new RSString[]{var46, TextCore.HasLoggedIn}), -1); + BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 5, RSString.stringCombiner(new RSString[]{var46, TextCore.HasLoggedIn}), -1); } if (modelId == 0) { - Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 5, RSString.stringCombiner(new RSString[]{var46, TextCore.HasLoggedOut}), -1); + BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 5, RSString.stringCombiner(new RSString[]{var46, TextCore.HasLoggedOut}), -1); } } @@ -895,7 +895,7 @@ public final class PacketParser { if (0 == Unsorted.incomingPacketLength) { TextureOperation32.aClass94_3353 = TextCore.HasWalkHere; } else { - TextureOperation32.aClass94_3353 = GraphicDefinition.incomingBuffer.readString(); + TextureOperation32.aClass94_3353 = BufferedDataStream.incomingBuffer.readString(); } Unsorted.incomingOpcode = -1; @@ -912,23 +912,23 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 154) {//camera position - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedByte(); - counter = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var6 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - var30 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedByte(); + counter = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var6 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + var30 = BufferedDataStream.incomingBuffer.readUnsignedByte(); Class146.updateInterfacePacketCounter(nodeModelId); Class3_Sub20.method390(true, var6, counter, var30, (byte) -124, modelId, var19); Unsorted.incomingOpcode = -1; return true; } else if (247 == Unsorted.incomingOpcode) { //UNUSED - var2 = GraphicDefinition.incomingBuffer.readLong(); - nameAsLong = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var29 = GraphicDefinition.incomingBuffer.readMedium(); - chatIcon = GraphicDefinition.incomingBuffer.readUnsignedByte(); - var33 = GraphicDefinition.incomingBuffer.readUnsignedShort(); + var2 = BufferedDataStream.incomingBuffer.readLong(); + nameAsLong = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var29 = BufferedDataStream.incomingBuffer.readMedium(); + chatIcon = BufferedDataStream.incomingBuffer.readUnsignedByte(); + var33 = BufferedDataStream.incomingBuffer.readUnsignedShort(); boolean var49 = false; long var51 = (nameAsLong << 32) - -var29; int var59 = 0; @@ -959,7 +959,7 @@ public final class PacketParser { if (!var49 && inTutorialIsland == 0) { Class163_Sub2_Sub1.aLongArray4017[MouseListeningClass.anInt1921] = var51; MouseListeningClass.anInt1921 = (1 + MouseListeningClass.anInt1921) % 100; - var64 = LinkableRSString.method733(var33).method555(GraphicDefinition.incomingBuffer); + var64 = LinkableRSString.method733(var33).method555(BufferedDataStream.incomingBuffer); if (chatIcon == 2) { Class3_Sub28_Sub12.sendGameMessage(var33, 18, var64, null, RSString.stringCombiner(new RSString[]{TextCore.aClass94_444, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()})); } else if (1 == chatIcon) { @@ -974,9 +974,9 @@ public final class PacketParser { } else { Class3_Sub31 var26; if (Unsorted.incomingOpcode == 176) { //IMISED - nodeModelId = GraphicDefinition.incomingBuffer.readIntV1(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - modelId = GraphicDefinition.incomingBuffer.readIntV1(); + nodeModelId = BufferedDataStream.incomingBuffer.readIntV1(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + modelId = BufferedDataStream.incomingBuffer.readIntV1(); Class146.updateInterfacePacketCounter(var19); Class3_Sub31 var23 = TextureOperation23.aHashTable_3208.get(nodeModelId); var26 = TextureOperation23.aHashTable_3208.get(modelId); @@ -1007,12 +1007,12 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 27) { //UNUSED - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedByte(); - counter = GraphicDefinition.incomingBuffer.readUnsignedByte(); - var6 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - var30 = GraphicDefinition.incomingBuffer.readUnsignedShort(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedByte(); + counter = BufferedDataStream.incomingBuffer.readUnsignedByte(); + var6 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + var30 = BufferedDataStream.incomingBuffer.readUnsignedShort(); Class146.updateInterfacePacketCounter(nodeModelId); WaterfallShader.aBooleanArray2169[var19] = true; TextureOperation14.anIntArray3383[var19] = modelId; @@ -1023,35 +1023,35 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 2) { - nodeModelId = GraphicDefinition.incomingBuffer.readIntV1(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); + nodeModelId = BufferedDataStream.incomingBuffer.readIntV1(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); Class146.updateInterfacePacketCounter(var19); Class79.method1385(modelId, nodeModelId); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 85) { - Class38_Sub1.anInt2617 = GraphicDefinition.incomingBuffer.readUnsignedShort() * 30; + Class38_Sub1.anInt2617 = BufferedDataStream.incomingBuffer.readUnsignedShort() * 30; Unsorted.incomingOpcode = -1; Class140_Sub6.anInt2905 = anInt3213; return true; } else if (Unsorted.incomingOpcode == 114) { - TextureOperation3.method305(Class38.signlink, GraphicDefinition.incomingBuffer, Unsorted.incomingPacketLength); + TextureOperation3.method305(Class38.signlink, BufferedDataStream.incomingBuffer, Unsorted.incomingPacketLength); Unsorted.incomingOpcode = -1; return true; } else if (65 == Unsorted.incomingOpcode) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedNegativeByte(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedNegativeByte(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); Class146.updateInterfacePacketCounter(nodeModelId); TextureOperation19.method255(modelId, var19, (byte) -83 ^ -84); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 234) { - Class3_Sub30_Sub1.method819(); - Unsorted.anInt136 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + BufferedDataStream.method819(); + Unsorted.anInt136 = BufferedDataStream.incomingBuffer.readUnsignedByte(); Class140_Sub6.anInt2905 = anInt3213; Unsorted.incomingOpcode = -1; return true; @@ -1063,15 +1063,15 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 191) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); Class3_Sub28_Sub1.method532(nodeModelId); Class3_Sub28_Sub4.anIntArray3565[Unsorted.bitwiseAnd(31, Unsorted.anInt944++)] = Unsorted.bitwiseAnd(nodeModelId, 32767); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 102) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - var19 = GraphicDefinition.incomingBuffer.readUnsigned128Byte(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); + var19 = BufferedDataStream.incomingBuffer.readUnsigned128Byte(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); NPC var39 = NPC.npcs[nodeModelId]; if (null != var39) { Unsorted.method1772(var19, modelId, 39, var39); @@ -1080,15 +1080,15 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 159) { - Class3_Sub30_Sub1.method819(); - MouseListeningClass.anInt1925 = GraphicDefinition.incomingBuffer.readSignedShort(); + BufferedDataStream.method819(); + MouseListeningClass.anInt1925 = BufferedDataStream.incomingBuffer.readSignedShort(); Class140_Sub6.anInt2905 = anInt3213; Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 71) { - var2 = GraphicDefinition.incomingBuffer.readLong(); - var58 = Font.method686(Objects.requireNonNull(Class32.method992(GraphicDefinition.incomingBuffer).properlyCapitalize())); - Class3_Sub30_Sub1.addChatMessage(Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString(), 6, var58, (byte) -83 ^ 82); + var2 = BufferedDataStream.incomingBuffer.readLong(); + var58 = Font.method686(Objects.requireNonNull(Class32.method992(BufferedDataStream.incomingBuffer).properlyCapitalize())); + BufferedDataStream.addChatMessage(Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString(), 6, var58, (byte) -83 ^ 82); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 42) { @@ -1097,7 +1097,7 @@ public final class PacketParser { } byte[] var22 = new byte[Unsorted.incomingPacketLength]; - GraphicDefinition.incomingBuffer.method811((byte) 30, 0, var22, Unsorted.incomingPacketLength); + BufferedDataStream.incomingBuffer.method811((byte) 30, 0, var22, Unsorted.incomingPacketLength); 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); @@ -1110,27 +1110,27 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 111) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - var19 = GraphicDefinition.incomingBuffer.readIntV2(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); - counter = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - var6 = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + var19 = BufferedDataStream.incomingBuffer.readIntV2(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); + counter = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); + var6 = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); Class146.updateInterfacePacketCounter(nodeModelId); method256(modelId, 7, var19, counter << 16 | var6); Unsorted.incomingOpcode = -1; return true; } else if (37 == Unsorted.incomingOpcode) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedByte128(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedByte128(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); Class163.method2209((byte) -122, nodeModelId, var19); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 155) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedByte(); - var19 = GraphicDefinition.incomingBuffer.readIntV2(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - counter = GraphicDefinition.incomingBuffer.readUnsignedShort(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedByte(); + var19 = BufferedDataStream.incomingBuffer.readIntV2(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + counter = BufferedDataStream.incomingBuffer.readUnsignedShort(); Class146.updateInterfacePacketCounter(modelId); var26 = TextureOperation23.aHashTable_3208.get(var19); if (null != var26) { @@ -1142,9 +1142,9 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 131) { - for (nodeModelId = 0; nodeModelId < TextureOperation0.players.length; ++nodeModelId) { - if (TextureOperation0.players[nodeModelId] != null) { - TextureOperation0.players[nodeModelId].anInt2771 = -1; + for (nodeModelId = 0; nodeModelId < Unsorted.players.length; ++nodeModelId) { + if (Unsorted.players[nodeModelId] != null) { + Unsorted.players[nodeModelId].anInt2771 = -1; } } @@ -1157,15 +1157,15 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 217) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedByte(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedByte(); Class96 var48 = new Class96(); var19 = nodeModelId >> 6; var48.anInt1360 = nodeModelId & 63; - var48.anInt1351 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var48.anInt1351 = BufferedDataStream.incomingBuffer.readUnsignedByte(); if (var48.anInt1351 >= 0 && Class166.aAbstractSpriteArray2072.length > var48.anInt1351) { if (var48.anInt1360 == 1 || 10 == var48.anInt1360) { - var48.anInt1359 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - GraphicDefinition.incomingBuffer.index += 3; + var48.anInt1359 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + BufferedDataStream.incomingBuffer.index += 3; } else if (var48.anInt1360 >= 2 && 6 >= var48.anInt1360) { if (var48.anInt1360 == 2) { var48.anInt1346 = 64; @@ -1193,12 +1193,12 @@ public final class PacketParser { } var48.anInt1360 = 2; - var48.anInt1356 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var48.anInt1347 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var48.anInt1353 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var48.anInt1356 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var48.anInt1347 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var48.anInt1353 = BufferedDataStream.incomingBuffer.readUnsignedByte(); } - var48.anInt1355 = GraphicDefinition.incomingBuffer.readUnsignedShort(); + var48.anInt1355 = BufferedDataStream.incomingBuffer.readUnsignedShort(); if (var48.anInt1355 == 65535) { var48.anInt1355 = -1; } @@ -1212,7 +1212,7 @@ public final class PacketParser { Class3_Sub28_Sub5.anInt3591 = Unsorted.incomingPacketLength / 8; for (nodeModelId = 0; Class3_Sub28_Sub5.anInt3591 > nodeModelId; ++nodeModelId) { - Class114.ignores[nodeModelId] = GraphicDefinition.incomingBuffer.readLong(); + Class114.ignores[nodeModelId] = BufferedDataStream.incomingBuffer.readLong(); TextureOperation7.aClass94Array3341[nodeModelId] = Unsorted.method1052(Class114.ignores[nodeModelId]); } @@ -1220,27 +1220,27 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 32) { - TextureOperation31.renderNPCs(8169); + NPCRendering.renderNPCs(8169); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 119) { //Reposition child? - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - var19 = GraphicDefinition.incomingBuffer.readIntLE(); - modelId = GraphicDefinition.incomingBuffer.readSignedShort(); - counter = GraphicDefinition.incomingBuffer.readSignedShort128(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + var19 = BufferedDataStream.incomingBuffer.readIntLE(); + modelId = BufferedDataStream.incomingBuffer.readSignedShort(); + counter = BufferedDataStream.incomingBuffer.readSignedShort128(); Class146.updateInterfacePacketCounter(nodeModelId); Class168.method2271(modelId, var19, counter); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 235) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsigned128Byte(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsigned128Byte(); var19 = nodeModelId >> 2; modelId = 3 & nodeModelId; counter = Class75.anIntArray1107[var19]; - var6 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var30 = GraphicDefinition.incomingBuffer.readInt(); + var6 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var30 = BufferedDataStream.incomingBuffer.readInt(); if (65535 == var6) { var6 = -1; } @@ -1254,10 +1254,10 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 0) { - var2 = GraphicDefinition.incomingBuffer.readLong(); - nameAsLong = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var29 = GraphicDefinition.incomingBuffer.readMedium(); - chatIcon = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var2 = BufferedDataStream.incomingBuffer.readLong(); + nameAsLong = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var29 = BufferedDataStream.incomingBuffer.readMedium(); + chatIcon = BufferedDataStream.incomingBuffer.readUnsignedByte(); boolean var42 = false; long var35 = var29 + (nameAsLong << 32); var12 = 0; @@ -1290,26 +1290,26 @@ public final class PacketParser { if (!var42 && inTutorialIsland == 0) { Class163_Sub2_Sub1.aLongArray4017[MouseListeningClass.anInt1921] = var35; MouseListeningClass.anInt1921 = (MouseListeningClass.anInt1921 - -1) % 100; - RSString var52 = Font.method686(Objects.requireNonNull(Class32.method992(GraphicDefinition.incomingBuffer).properlyCapitalize())); + RSString var52 = Font.method686(Objects.requireNonNull(Class32.method992(BufferedDataStream.incomingBuffer).properlyCapitalize())); if (chatIcon == 2 || chatIcon == 3) { - Class3_Sub30_Sub1.addChatMessage(RSString.stringCombiner(new RSString[]{TextCore.aClass94_444, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), 7, var52, -1); + BufferedDataStream.addChatMessage(RSString.stringCombiner(new RSString[]{TextCore.aClass94_444, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), 7, var52, -1); } else if (chatIcon == 1) { - Class3_Sub30_Sub1.addChatMessage(RSString.stringCombiner(new RSString[]{RSString.parse(""), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), 7, var52, -1); + BufferedDataStream.addChatMessage(RSString.stringCombiner(new RSString[]{RSString.parse(""), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), 7, var52, -1); } else { - Class3_Sub30_Sub1.addChatMessage(RSString.stringCombiner(new RSString[]{RSString.parse(""), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), 7, var52, -1); + BufferedDataStream.addChatMessage(RSString.stringCombiner(new RSString[]{RSString.parse(""), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), 7, var52, -1); } } Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 54) {//cc messahe - var2 = GraphicDefinition.incomingBuffer.readLong(); - GraphicDefinition.incomingBuffer.readSignedByte(); - nameAsLong = GraphicDefinition.incomingBuffer.readLong(); - var29 = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var36 = GraphicDefinition.incomingBuffer.readMedium(); + var2 = BufferedDataStream.incomingBuffer.readLong(); + BufferedDataStream.incomingBuffer.readSignedByte(); + nameAsLong = BufferedDataStream.incomingBuffer.readLong(); + var29 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var36 = BufferedDataStream.incomingBuffer.readMedium(); long var44 = (var29 << 32) + var36; - clanChatIcon = GraphicDefinition.incomingBuffer.readUnsignedByte(); + clanChatIcon = BufferedDataStream.incomingBuffer.readUnsignedByte(); boolean var13 = false; int var14 = 0; @@ -1342,7 +1342,7 @@ public final class PacketParser { if (!var13 && 0 == inTutorialIsland) { Class163_Sub2_Sub1.aLongArray4017[MouseListeningClass.anInt1921] = var44; MouseListeningClass.anInt1921 = (MouseListeningClass.anInt1921 + 1) % 100; - var57 = Font.method686(Objects.requireNonNull(Class32.method992(GraphicDefinition.incomingBuffer).properlyCapitalize())); + var57 = Font.method686(Objects.requireNonNull(Class32.method992(BufferedDataStream.incomingBuffer).properlyCapitalize())); if (clanChatIcon == 2 || clanChatIcon == 3) { 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) { @@ -1362,19 +1362,19 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 172) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedByte(); if (nodeModelId == 65535) { nodeModelId = -1; } - modelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); TextureOperation26.method199(var19, nodeModelId, modelId); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 66) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); - var19 = GraphicDefinition.incomingBuffer.readIntV1(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); + var19 = BufferedDataStream.incomingBuffer.readIntV1(); Class146.updateInterfacePacketCounter(nodeModelId); modelId = 0; if (Class102.player.class52 != null) { @@ -1386,25 +1386,25 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 171) { - nodeModelId = GraphicDefinition.incomingBuffer.readIntV2(); - playerName = GraphicDefinition.incomingBuffer.readString(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShort128(); + nodeModelId = BufferedDataStream.incomingBuffer.readIntV2(); + playerName = BufferedDataStream.incomingBuffer.readString(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShort128(); Class146.updateInterfacePacketCounter(modelId); Unsorted.method566(playerName, nodeModelId); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 84) { - nodeModelId = GraphicDefinition.incomingBuffer.readIntLE(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); + nodeModelId = BufferedDataStream.incomingBuffer.readIntLE(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); Class163.method2209((byte) -106, nodeModelId, var19); Unsorted.incomingOpcode = -1; return true; } else { RSInterface var25; if (Unsorted.incomingOpcode == 22) { - nodeModelId = GraphicDefinition.incomingBuffer.readInt(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedShort(); + nodeModelId = BufferedDataStream.incomingBuffer.readInt(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedShort(); if (nodeModelId < -70000) { var19 += 32768; } @@ -1415,14 +1415,14 @@ public final class PacketParser { var25 = Class7.getRSInterface(nodeModelId); } - for (; Unsorted.incomingPacketLength > GraphicDefinition.incomingBuffer.index; Class168.method2277(var6 + -1, counter, var30, var19, (byte) 46)) { - counter = GraphicDefinition.incomingBuffer.getSmart(); - var6 = GraphicDefinition.incomingBuffer.readUnsignedShort(); + for (; Unsorted.incomingPacketLength > BufferedDataStream.incomingBuffer.index; Class168.method2277(var6 + -1, counter, var30, var19, (byte) 46)) { + counter = BufferedDataStream.incomingBuffer.getSmart(); + var6 = BufferedDataStream.incomingBuffer.readUnsignedShort(); var30 = 0; if (var6 != 0) { - var30 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + var30 = BufferedDataStream.incomingBuffer.readUnsignedByte(); if (var30 == 255) { - var30 = GraphicDefinition.incomingBuffer.readInt(); + var30 = BufferedDataStream.incomingBuffer.readInt(); } } @@ -1436,12 +1436,12 @@ public final class PacketParser { Class20.method909(var25); } - Class3_Sub30_Sub1.method819(); + BufferedDataStream.method819(); Class3_Sub28_Sub4.anIntArray3565[Unsorted.bitwiseAnd(Unsorted.anInt944++, 31)] = Unsorted.bitwiseAnd(32767, var19); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 24) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); Class146.updateInterfacePacketCounter(nodeModelId); Class3_Sub28_Sub5.method560(); @@ -1455,25 +1455,25 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return false; } else if (116 == Unsorted.incomingOpcode) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedByte(); - if (GraphicDefinition.incomingBuffer.readUnsignedByte() == 0) { + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedByte(); + if (BufferedDataStream.incomingBuffer.readUnsignedByte() == 0) { TextureOperation29.aClass133Array3393[nodeModelId] = new Class133(); } else { - --GraphicDefinition.incomingBuffer.index; - TextureOperation29.aClass133Array3393[nodeModelId] = new Class133(GraphicDefinition.incomingBuffer); + --BufferedDataStream.incomingBuffer.index; + TextureOperation29.aClass133Array3393[nodeModelId] = new Class133(BufferedDataStream.incomingBuffer); } Unsorted.incomingOpcode = -1; Class121.anInt1642 = anInt3213; return true; } else if (Unsorted.incomingOpcode == 73) {//npc model - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - var19 = GraphicDefinition.incomingBuffer.readIntLE(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + var19 = BufferedDataStream.incomingBuffer.readIntLE(); if (nodeModelId == 65535) { nodeModelId = -1; } - modelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); Class146.updateInterfacePacketCounter(modelId); method256(-1, 2, var19, nodeModelId); @@ -1484,15 +1484,15 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (165 == Unsorted.incomingOpcode) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); if (var19 == 65535) { var19 = -1; } - modelId = GraphicDefinition.incomingBuffer.readInt(); - counter = GraphicDefinition.incomingBuffer.readUnsignedShort128(); - var6 = GraphicDefinition.incomingBuffer.readIntV1(); + modelId = BufferedDataStream.incomingBuffer.readInt(); + counter = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + var6 = BufferedDataStream.incomingBuffer.readIntV1(); if (counter == 65535) { counter = -1; } @@ -1518,14 +1518,14 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 197) { - CS2Script.anInt1357 = GraphicDefinition.incomingBuffer.readUnsignedByte(); + CS2Script.anInt1357 = BufferedDataStream.incomingBuffer.readUnsignedByte(); Class110.anInt1472 = anInt3213; Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 196) { - var2 = GraphicDefinition.incomingBuffer.readLong(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShort(); - byte var28 = GraphicDefinition.incomingBuffer.readSignedByte(); + var2 = BufferedDataStream.incomingBuffer.readLong(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); + byte var28 = BufferedDataStream.incomingBuffer.readSignedByte(); isIgnored = (Long.MIN_VALUE & var2) != 0; if (isIgnored) { @@ -1549,7 +1549,7 @@ public final class PacketParser { aClass3_Sub19Array3694[Unsorted.clanSize] = null; } } else { - var41 = GraphicDefinition.incomingBuffer.readString(); + var41 = BufferedDataStream.incomingBuffer.readString(); Class3_Sub19 var40 = new Class3_Sub19(); var40.linkableKey = var2; var40.aClass94_2476 = Unsorted.method1052(var40.linkableKey); @@ -1602,14 +1602,14 @@ public final class PacketParser { Class167.anInt2087 = anInt3213; return true; } else if (50 == Unsorted.incomingOpcode) { - nodeModelId = GraphicDefinition.incomingBuffer.readInt(); - var19 = GraphicDefinition.incomingBuffer.readIntV2(); - modelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); + nodeModelId = BufferedDataStream.incomingBuffer.readInt(); + var19 = BufferedDataStream.incomingBuffer.readIntV2(); + modelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); if (65535 == modelId) { modelId = -1; } - counter = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); + counter = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); Class146.updateInterfacePacketCounter(counter); RSInterface var34 = Class7.getRSInterface(var19); ItemDefinition var43; @@ -1637,8 +1637,8 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 105) { - nodeModelId = GraphicDefinition.incomingBuffer.readInt(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedShort(); + nodeModelId = BufferedDataStream.incomingBuffer.readInt(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedShort(); if (nodeModelId < -70000) { var19 += 32768; } @@ -1657,15 +1657,15 @@ public final class PacketParser { } Class10.method852((byte) 114, var19); - counter = GraphicDefinition.incomingBuffer.readUnsignedShort(); + counter = BufferedDataStream.incomingBuffer.readUnsignedShort(); for (var6 = 0; counter > var6; ++var6) { - var30 = GraphicDefinition.incomingBuffer.readUnsigned128Byte(); + var30 = BufferedDataStream.incomingBuffer.readUnsigned128Byte(); if (255 == var30) { - var30 = GraphicDefinition.incomingBuffer.readInt(); + var30 = BufferedDataStream.incomingBuffer.readInt(); } - chatIcon = GraphicDefinition.incomingBuffer.readUnsignedShort(); + chatIcon = BufferedDataStream.incomingBuffer.readUnsignedShort(); if (null != var25 && var25.itemAmounts.length > var6) { var25.itemAmounts[var6] = chatIcon; var25.itemIds[var6] = var30; @@ -1678,21 +1678,21 @@ public final class PacketParser { Class20.method909(var25); } - Class3_Sub30_Sub1.method819(); + BufferedDataStream.method819(); Class3_Sub28_Sub4.anIntArray3565[Unsorted.bitwiseAnd(Unsorted.anInt944++, 31)] = Unsorted.bitwiseAnd(32767, var19); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 142) { - LinkableRSString.method734(GraphicDefinition.incomingBuffer.readString()); + LinkableRSString.method734(BufferedDataStream.incomingBuffer.readString()); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 26) { - Class65.currentChunkX = GraphicDefinition.incomingBuffer.readUnsignedNegativeByte(); - Class39.currentChunkY = GraphicDefinition.incomingBuffer.readUnsignedByte(); + Class65.currentChunkX = BufferedDataStream.incomingBuffer.readUnsignedNegativeByte(); + Class39.currentChunkY = BufferedDataStream.incomingBuffer.readUnsignedByte(); Unsorted.incomingOpcode = -1; return true; } else if (4 == Unsorted.incomingOpcode) { - nodeModelId = GraphicDefinition.incomingBuffer.readUnsignedShortLE128(); + nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); if (nodeModelId == 65535) { nodeModelId = -1; } @@ -1701,8 +1701,8 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 208) { - nodeModelId = GraphicDefinition.incomingBuffer.getTriByte2(); - var19 = GraphicDefinition.incomingBuffer.readUnsignedShortLE(); + nodeModelId = BufferedDataStream.incomingBuffer.getTriByte2(); + var19 = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); if (var19 == 65535) { var19 = -1; } diff --git a/Client/src/main/java/org/runite/client/Player.java b/Client/src/main/java/org/runite/client/Player.java index 99656489a..ac6d5adb2 100644 --- a/Client/src/main/java/org/runite/client/Player.java +++ b/Client/src/main/java/org/runite/client/Player.java @@ -224,7 +224,7 @@ public final class Player extends Class140_Sub4 { try { if (this.class52 != null) { SequenceDefinition var13 = this.anInt2771 != -1 && 0 == this.anInt2828 ? SequenceDefinition.getAnimationDefinition(this.anInt2771) : null; - SequenceDefinition var14 = this.anInt2764 != -1 && !this.aBoolean3968 && (this.method1965().anInt368 != this.anInt2764 || var13 == null) ? SequenceDefinition.getAnimationDefinition(this.anInt2764) : null; + SequenceDefinition var14 = this.anInt2764 != -1 && !this.aBoolean3968 && (this.getRenderAnimationType().stand_animation != this.anInt2764 || var13 == null) ? SequenceDefinition.getAnimationDefinition(this.anInt2764) : null; Model var15 = this.class52.method1165(this.aClass145Array2809, this.anInt2776, var14, var13, this.anInt2802, this.anInt2793, -120, this.anInt2760, this.anInt2832, this.anInt2813); int var16 = Unsorted.method1727((byte) 123); if (HDToolKit.highDetail && Class3_Sub24_Sub3.maxClientMemory < 96 && var16 > 50) { @@ -282,8 +282,8 @@ public final class Player extends Class140_Sub4 { 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 < TextureOperation0.players.length) { - Player var28 = TextureOperation0.players[var27.anInt1359]; + if (var27.anInt1360 == 10 && var27.anInt1359 >= 0 && var27.anInt1359 < Unsorted.players.length) { + Player var28 = Unsorted.players[var27.anInt1359]; if (null != var28) { var20 = -(Class102.player.anInt2819 / 32) + var28.anInt2819 / 32; var21 = var28.anInt2829 / 32 + -(Class102.player.anInt2829 / 32); @@ -420,8 +420,8 @@ public final class Player extends Class140_Sub4 { try { RSString var2 = this.displayName; - if (Class3_Sub30_Sub1.aClass94Array3802 != null) { - var2 = RSString.stringCombiner(new RSString[]{Class3_Sub30_Sub1.aClass94Array3802[this.anInt3958], var2}); + if (BufferedDataStream.aClass94Array3802 != null) { + var2 = RSString.stringCombiner(new RSString[]{BufferedDataStream.aClass94Array3802[this.anInt3958], var2}); } if (null != Unsorted.aClass94Array45) { diff --git a/Client/src/main/java/org/runite/client/PlayerRendering.java b/Client/src/main/java/org/runite/client/PlayerRendering.java new file mode 100644 index 000000000..2b38ace59 --- /dev/null +++ b/Client/src/main/java/org/runite/client/PlayerRendering.java @@ -0,0 +1,487 @@ +package org.runite.client; + +import java.util.Objects; + +public final class PlayerRendering { + + + static final int[] PLAYER_RENDER_LOG = new int[4]; + static DataBuffer playerRenderBuffer = new DataBuffer(new byte[5000]); + + static void renderPlayers() { + try { + Unsorted.maskUpdateCount = 0; + Class139.anInt1829 = 0; + + updateLocalPosition(); + PLAYER_RENDER_LOG[0] = BufferedDataStream.incomingBuffer.index; + + renderLocalPlayers(); + PLAYER_RENDER_LOG[1] = BufferedDataStream.incomingBuffer.index; + + addLocalPlayers(); + PLAYER_RENDER_LOG[2] = BufferedDataStream.incomingBuffer.index; + + parsePlayerMasks(); + PLAYER_RENDER_LOG[3] = BufferedDataStream.incomingBuffer.index; + + int var1; + for (var1 = 0; Class139.anInt1829 > var1; ++var1) { + int var2 = Class3_Sub7.anIntArray2292[var1]; + if (Class44.anInt719 != Unsorted.players[var2].anInt2838) { + if (0 < Unsorted.players[var2].anInt3969) { + Class162.method2203(Unsorted.players[var2]); + } + + Unsorted.players[var2] = null; + } + } + + if (BufferedDataStream.incomingBuffer.index == Unsorted.incomingPacketLength) { + for (var1 = 0; var1 < Class159.localPlayerCount; ++var1) { + if (null == Unsorted.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); + } + } + + } else { + System.err.println("Player rendering packet size mismatch - size log: self=" + PLAYER_RENDER_LOG[0] + ", local=" + PLAYER_RENDER_LOG[1] + ", add global=" + PLAYER_RENDER_LOG[2] + ", masks=" + PLAYER_RENDER_LOG[3] + "."); + // System.err.println("gpp1 pos:" + GraphicDefinition.incomingBuffer.index + " psize:" + Class130.incomingPacketLength); + // throw new RuntimeException("gpp1 pos:" + Class28.incomingBuffer.index + " psize:" + Class130.incomingPacketLength); + } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "fb.B(" + (byte) -122 + ')'); + } + } + + static void renderLocalPlayers() { + try { + int localPlayerAmount = BufferedDataStream.incomingBuffer.getBits(8); + int var2; + if (localPlayerAmount < Class159.localPlayerCount) { + for (var2 = localPlayerAmount; Class159.localPlayerCount > var2; ++var2) { + Class3_Sub7.anIntArray2292[Class139.anInt1829++] = Class56.localPlayerIndexes[var2]; + } + } + + if (Class159.localPlayerCount >= localPlayerAmount) { + Class159.localPlayerCount = 0; + var2 = 0; + + for (; localPlayerAmount > var2; ++var2) { + int var3 = Class56.localPlayerIndexes[var2]; + Player var4 = Unsorted.players[var3]; + int update = BufferedDataStream.incomingBuffer.getBits(1); + if (update == 0) { + Class56.localPlayerIndexes[Class159.localPlayerCount++] = var3; + var4.anInt2838 = Class44.anInt719; + } else { + int type = BufferedDataStream.incomingBuffer.getBits(2); + if (type == 0) { + Class56.localPlayerIndexes[Class159.localPlayerCount++] = var3; + var4.anInt2838 = Class44.anInt719; + Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = var3; + } else { + int var7; + int var8; + if (type == 1) { + Class56.localPlayerIndexes[Class159.localPlayerCount++] = var3; + var4.anInt2838 = Class44.anInt719; + var7 = BufferedDataStream.incomingBuffer.getBits(3); + var4.walkStep(1, (byte) 46, var7); + var8 = BufferedDataStream.incomingBuffer.getBits(1); + if (var8 == 1) { + Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = var3; + } + } else if (type == 2) { + Class56.localPlayerIndexes[Class159.localPlayerCount++] = var3; + var4.anInt2838 = Class44.anInt719; + if (BufferedDataStream.incomingBuffer.getBits(1) == 1) { + var7 = BufferedDataStream.incomingBuffer.getBits(3); + var4.walkStep(2, (byte) -92, var7); + var8 = BufferedDataStream.incomingBuffer.getBits(3); + var4.walkStep(2, (byte) 88, var8); + } else { + var7 = BufferedDataStream.incomingBuffer.getBits(3); + var4.walkStep(0, (byte) 113, var7); + } + + var7 = BufferedDataStream.incomingBuffer.getBits(1); + if (1 == var7) { + Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = var3; + } + } else if (type == 3) { + Class3_Sub7.anIntArray2292[Class139.anInt1829++] = var3; + } + } + } + } + + } else { + throw new RuntimeException("gppov1"); + } + } catch (RuntimeException var9) { + throw ClientErrorException.clientError(var9, "dc.B(" + false + ')'); + } + } + + static void addLocalPlayers() { + try { + while (true) { + if (BufferedDataStream.incomingBuffer.method815(Unsorted.incomingPacketLength) >= 11) { + int index = BufferedDataStream.incomingBuffer.getBits(11); + if (index != 2047) { + boolean var2 = false; + if (null == Unsorted.players[index]) { + Unsorted.players[index] = new Player(); + var2 = true; + if (null != Class65.aClass3_Sub30Array986[index]) { + Unsorted.players[index].parseAppearance(-54, Class65.aClass3_Sub30Array986[index]); + } + } + + Class56.localPlayerIndexes[Class159.localPlayerCount++] = index; + Player var3 = Unsorted.players[index]; + var3.anInt2838 = Class44.anInt719; + int var4 = BufferedDataStream.incomingBuffer.getBits(1); + if (var4 == 1) { + Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = index; + } + + int var5 = BufferedDataStream.incomingBuffer.getBits(5); + int var6 = Class27.anIntArray510[BufferedDataStream.incomingBuffer.getBits(3)]; + if (var5 > 15) { + var5 -= 32; + } + + if (var2) { + var3.anInt2806 = var3.anInt2785 = var6; + } + + int var7 = BufferedDataStream.incomingBuffer.getBits(1); + int var8 = BufferedDataStream.incomingBuffer.getBits(5); + if (var8 > 15) { + var8 -= 32; + } + + var3.method1981(var5 + Class102.player.anIntArray2767[0], var7 == 1, Class102.player.anIntArray2755[0] + var8); + continue; + } + } + + BufferedDataStream.incomingBuffer.method818(); + return; + } + } catch (RuntimeException var9) { + throw ClientErrorException.clientError(var9, "se.D(" + -59 + ')'); + } + } + + static void parsePlayerMasks() { + int var1 = 0; + + while (var1 < Unsorted.maskUpdateCount) { + int var2 = Class21.maskUpdateIndexes[var1]; + Player var3 = Unsorted.players[var2]; + int var4 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + if ((16 & var4) != 0) { + var4 += BufferedDataStream.incomingBuffer.readUnsignedByte() << 8; + } + + parsePlayerMask(var4, var2, var3); + ++var1; + } + } + + static void parsePlayerMask(int var0, int var1, Player var3) { + try { + int var4; + int chatIcon; + int var7; + //Ordinal: 0 Chat + if (0 != (var0 & 128)) { + var4 = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); + chatIcon = BufferedDataStream.incomingBuffer.readUnsignedByte(); + int var6 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + var7 = BufferedDataStream.incomingBuffer.index; + 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 || TextureOperation31.aBoolean3166)) { + var11 = true; + } else { + for (int var12 = 0; var12 < Class3_Sub28_Sub5.anInt3591; ++var12) { + if (Class114.ignores[var12] == var9) { + var11 = true; + break; + } + } + } + } + + if (!var11 && 0 == PacketParser.inTutorialIsland) { + playerRenderBuffer.index = 0; + BufferedDataStream.incomingBuffer.readBytesReverse(var6, playerRenderBuffer.buffer); + playerRenderBuffer.index = 0; + int var13 = -1; + RSString message; + if (var8) { + Class10 var14 = Class155.method2156(playerRenderBuffer); + var4 &= 32767; + var13 = var14.anInt149; + message = var14.aClass3_Sub28_Sub4_151.method555(playerRenderBuffer); + } else { + message = Font.method686(Objects.requireNonNull(Class32.method992(playerRenderBuffer).properlyCapitalize())); + } + + var3.textSpoken = message.trim(1); + var3.textEffect = var4 & 0xFF; + var3.textCycle = 150; + var3.textColor = var4 >> 8; + if (chatIcon >= 2) { + Class3_Sub28_Sub12.sendGameMessage(var13, var8 ? 17 : 1, message, null, RSString.stringCombiner(new RSString[]{RSString.parse(""), var3.getName()})); + } else if (chatIcon == 1) { + Class3_Sub28_Sub12.sendGameMessage(var13, var8 ? 17 : 1, message, null, RSString.stringCombiner(new RSString[]{TextCore.aClass94_592, var3.getName()})); + } else { + Class3_Sub28_Sub12.sendGameMessage(var13, var8 ? 17 : 2, message, null, var3.getName()); + } + } + } + BufferedDataStream.incomingBuffer.index = var7 + var6; + } + + //Ordinal: 1 Hit + if ((var0 & 1) != 0) { + var4 = BufferedDataStream.incomingBuffer.getSmart(); + chatIcon = BufferedDataStream.incomingBuffer.readUnsignedByte128(); + var3.addHit(chatIcon, Class44.anInt719, var4); + var3.anInt2781 = 300 + Class44.anInt719; + var3.anInt2775 = BufferedDataStream.incomingBuffer.readUnsigned128Byte(); + } + + //Ordinal: 2 Animation + if ((var0 & 8) != 0) { + var4 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + if (var4 == 65535) { + var4 = -1; + } + + chatIcon = BufferedDataStream.incomingBuffer.readUnsignedByte(); + method628(chatIcon, var4, var3); + } + + //Ordinal: 3 Appearance + if (0 != (4 & var0)) { + var4 = BufferedDataStream.incomingBuffer.readUnsignedByte128(); + byte[] var16 = new byte[var4]; + DataBuffer var19 = new DataBuffer(var16); + BufferedDataStream.incomingBuffer.readBytes(var16, var4); + Class65.aClass3_Sub30Array986[var1] = var19; + var3.parseAppearance(-15, var19); + } + + //Ordinal: 4 Face entity + if ((2 & var0) != 0) { + var3.anInt2772 = BufferedDataStream.incomingBuffer.readUnsignedShort128(); + if (var3.anInt2772 == 65535) { + var3.anInt2772 = -1; + } + } + + //Ordinal: 5 Force movement + if ((1024 & var0) != 0) { + var3.anInt2784 = BufferedDataStream.incomingBuffer.readUnsignedNegativeByte(); + var3.anInt2835 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + var3.anInt2823 = BufferedDataStream.incomingBuffer.readUnsignedByte128(); + var3.anInt2798 = BufferedDataStream.incomingBuffer.readUnsignedByte(); + var3.anInt2800 = BufferedDataStream.incomingBuffer.readUnsignedShortLE() + Class44.anInt719; + var3.anInt2790 = BufferedDataStream.incomingBuffer.readUnsignedShortLE() - -Class44.anInt719; + var3.anInt2840 = BufferedDataStream.incomingBuffer.readUnsignedNegativeByte(); + var3.anInt2816 = 1; + var3.anInt2811 = 0; + } + + //Ordinal: 6 Force chat + if ((var0 & 32) != 0) { + var3.textSpoken = BufferedDataStream.incomingBuffer.readString(); + if (var3.textSpoken.charAt(0, (byte) -45) == 126) { + var3.textSpoken = var3.textSpoken.substring(1); + BufferedDataStream.addChatMessage(var3.getName(), 2, var3.textSpoken, (byte) -79 ^ 78); + } else if (var3 == Class102.player) { + BufferedDataStream.addChatMessage(var3.getName(), 2, var3.textSpoken, (byte) -79 + 78); + } + + var3.textEffect = 0; + var3.textColor = 0; + var3.textCycle = 150; + } + + //Ordinal: 7 Hit 2 + if ((var0 & 512) != 0) { + var4 = BufferedDataStream.incomingBuffer.getSmart(); + chatIcon = BufferedDataStream.incomingBuffer.readUnsigned128Byte(); + var3.addHit(chatIcon, Class44.anInt719, var4); + } + + //Ordinal: 8 + if ((2048 & var0) != 0) { + var4 = BufferedDataStream.incomingBuffer.readUnsignedNegativeByte(); + int[] var18 = new int[var4]; + int[] var17 = new int[var4]; + int[] var20 = new int[var4]; + + for (int var22 = 0; var22 < var4; ++var22) { + int var23 = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); + if (65535 == var23) { + var23 = -1; + } + + var18[var22] = var23; + var17[var22] = BufferedDataStream.incomingBuffer.readUnsignedByte128(); + var20[var22] = BufferedDataStream.incomingBuffer.readUnsignedShort(); + } + + Class75_Sub1.method1342(var17, var18, var3, var20); + } + + //Ordinal: 9 Graphic + if ((256 & var0) != 0) { + var4 = BufferedDataStream.incomingBuffer.readUnsignedShortLE(); + if (var4 == 65535) { + var4 = -1; + } + + chatIcon = BufferedDataStream.incomingBuffer.readIntV2(); + boolean var21 = true; + if (var4 != -1 && var3.anInt2842 != -1 && SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, var4).anInt542).forcedPriority < SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, var3.anInt2842).anInt542).forcedPriority) { + var21 = false; + } + + if (var21) { + var3.anInt2759 = (chatIcon & 65535) + Class44.anInt719; + var3.anInt2761 = 0; + var3.anInt2805 = 0; + var3.anInt2842 = var4; + if (Class44.anInt719 < var3.anInt2759) { + var3.anInt2805 = -1; + } + + var3.anInt2799 = chatIcon >> 16; + var3.anInt2826 = 1; + if (var3.anInt2842 != -1 && Class44.anInt719 == var3.anInt2759) { + var7 = GraphicDefinition.getGraphicDefinition((byte) 42, var3.anInt2842).anInt542; + if (var7 != -1) { + SequenceDefinition var24 = SequenceDefinition.getAnimationDefinition(var7); + if (var24.frames != null) { + Unsorted.method1470(var3.anInt2829, var24, 183921384, var3.anInt2819, var3 == Class102.player, 0); + } + } + } + } + } + + //Ordinal: 10 Face location + if ((var0 & 64) != 0) { + var3.anInt2786 = BufferedDataStream.incomingBuffer.readUnsignedShort(); + var3.anInt2762 = BufferedDataStream.incomingBuffer.readUnsignedShortLE128(); + } + + } catch (RuntimeException var15) { + throw ClientErrorException.clientError(var15, "gk.A(" + var0 + ',' + var1 + ',' + (byte) -79 + ',' + (var3 != null ? "{...}" : "null") + ')'); + } + } + + static void method628(int var1, int var2, Player var3) { + try { + + if (var3.anInt2771 == var2 && var2 != -1) { + SequenceDefinition var4 = SequenceDefinition.getAnimationDefinition(var2); + int var5 = var4.delayType; + if (1 == var5) { + var3.anInt2828 = var1; + var3.anInt2760 = 0; + var3.anInt2776 = 1; + var3.anInt2832 = 0; + var3.anInt2773 = 0; + Unsorted.method1470(var3.anInt2829, var4, 183921384, var3.anInt2819, Class102.player == var3, var3.anInt2832); + } + + if (var5 == 2) { + var3.anInt2773 = 0; + } + } else if (-1 == var2 || var3.anInt2771 == -1 || SequenceDefinition.getAnimationDefinition(var2).forcedPriority >= SequenceDefinition.getAnimationDefinition(var3.anInt2771).forcedPriority) { + var3.anInt2776 = 1; + var3.anInt2832 = 0; + var3.anInt2828 = var1; + var3.anInt2811 = var3.anInt2816; + var3.anInt2773 = 0; + var3.anInt2760 = 0; + var3.anInt2771 = var2; + if (var3.anInt2771 != -1) { + Unsorted.method1470(var3.anInt2829, SequenceDefinition.getAnimationDefinition(var3.anInt2771), 183921384, var3.anInt2819, var3 == Class102.player, var3.anInt2832); + } + } + + } catch (RuntimeException var6) { + throw ClientErrorException.clientError(var6, "pa.C(" + 0 + ',' + var1 + ',' + var2 + ',' + (var3 != null ? "{...}" : "null") + ')'); + } + } + + public static void updateLocalPosition() { + try { + BufferedDataStream.incomingBuffer.setBitAccess(); + int opcode = BufferedDataStream.incomingBuffer.getBits(1); + if (opcode != 0) { + int type = BufferedDataStream.incomingBuffer.getBits(2); + if (type == 0) { + Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = 2047; + } else { + int var4; + int var5; + if (type == 1) { //Walk + var4 = BufferedDataStream.incomingBuffer.getBits(3); + Class102.player.walkStep(1, (byte) -128, var4); + var5 = BufferedDataStream.incomingBuffer.getBits(1); + if (var5 == 1) { + Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = 2047; + } + + } else if (type == 2) { + if (BufferedDataStream.incomingBuffer.getBits(1) == 1) { + var4 = BufferedDataStream.incomingBuffer.getBits(3); + Class102.player.walkStep(2, (byte) -104, var4); + var5 = BufferedDataStream.incomingBuffer.getBits(3); + Class102.player.walkStep(2, (byte) -126, var5); + } else { + var4 = BufferedDataStream.incomingBuffer.getBits(3); + Class102.player.walkStep(0, (byte) -109, var4); + } + + var4 = BufferedDataStream.incomingBuffer.getBits(1); + if (var4 == 1) { + Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = 2047; + } + + } else if (type == 3) { + var4 = BufferedDataStream.incomingBuffer.getBits(7); + var5 = BufferedDataStream.incomingBuffer.getBits(1); + WorldListCountry.localPlane = BufferedDataStream.incomingBuffer.getBits(2); + int var6 = BufferedDataStream.incomingBuffer.getBits(1); + if (var6 == 1) { + Class21.maskUpdateIndexes[Unsorted.maskUpdateCount++] = 2047; + } + + int var7 = BufferedDataStream.incomingBuffer.getBits(7); + Class102.player.method1981(var7, var5 == 1, var4); + } + } + } + } catch (RuntimeException var8) { + throw ClientErrorException.clientError(var8, "bg.G(" + (byte) 81 + ')'); + } + } +} diff --git a/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java b/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java index f56568100..a1cb043da 100644 --- a/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java +++ b/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java @@ -6,40 +6,40 @@ final class RenderAnimationDefinition { static int[] anIntArray356 = new int[]{1, 0, -1, 0}; static ReferenceCache aReferenceCache_1955 = new ReferenceCache(64); - int anInt357 = 0; - int[][] anIntArrayArray359; - int anInt360 = -1; + int yaw_max_speed = 0; + int[][] equipment_transforms; + int movement_acceleration = -1; static volatile int anInt362 = 0; - int anInt364 = -1; - int anInt367 = -1; - int anInt368 = -1; - int anInt369 = 0; - int anInt370 = 0; - int anInt371 = 0; - int anInt372 = -1; - int anInt373 = -1; - int anInt375 = -1; + int walk_follow_cw_turn_anim = -1; + int standing_ccw_turn = -1; + int stand_animation = -1; + int yaw_acceleration = 0; + int roll_max_speed = 0; + int pitch_target_angle = 0; + int slow_walk_follow_full_turn_anim = -1; + int run_follow_ccw_turn_anim = -1; + int run_follow_cw_turn_anim = -1; static int anInt377 = 0; static RSString aClass94_378 = null; - int anInt379 = -1; - int anInt381 = 0; - int anInt382 = -1; + int slow_walk_follow_cw_turn_anim = -1; + int hill_height = 0; + int walk_animation = -1; static byte[][][] aByteArrayArrayArray383; static int anInt384 = 0; - int anInt386 = -1; - int anInt387 = 0; - int anInt389 = -1; - int anInt390 = -1; - int anInt393 = -1; - int anInt395 = 0; + int run_follow_full_turn_anim = -1; + int roll_acceleration = 0; + int walk_follow_full_turn_anim = -1; + int walk_follow_ccw_turn_anim = -1; + int run_anim = -1; + int hill_width = 0; static int anInt396; - int anInt398 = -1; - int anInt399 = 0; - int anInt400 = 0; + int slow_walk_anim = -1; + int pitch_max_speed = 0; + int roll_target_angle = 0; static boolean aBoolean402 = false; - int anInt403 = 0; - int anInt406 = -1; - int anInt407 = -1; + int pitch_acceleration = 0; + int slow_walk_follow_ccw_turn_anim = -1; + int standing_cw_turn = -1; static void method897(Class3_Sub24_Sub4 var1, CacheIndex var2, CacheIndex var3, CacheIndex var4) { try { @@ -232,102 +232,112 @@ final class RenderAnimationDefinition { } } - final void parse(DataBuffer var2) { + final void parse(DataBuffer buffer) { try { while (true) { - int opcode = var2.readUnsignedByte(); + int opcode = buffer.readUnsignedByte(); if (opcode == 0) { return; } - this.parseOpcode(opcode, var2); + this.parseOpcode(opcode, buffer); } } catch (RuntimeException var4) { - throw ClientErrorException.clientError(var4, "ck.H(" + -1 + ',' + (var2 != null ? "{...}" : "null") + ')'); + throw ClientErrorException.clientError(var4, "ck.H(" + -1 + ',' + (buffer != null ? "{...}" : "null") + ')'); } } - private void parseOpcode(int var1, DataBuffer var3) { + private void parseOpcode(int opcode, DataBuffer buffer) { try { - if (var1 == 1) { - this.anInt368 = var3.readUnsignedShort(); - this.anInt382 = var3.readUnsignedShort(); - if (this.anInt382 == 65535) { - this.anInt382 = -1; + if (opcode == 1) { + this.stand_animation = buffer.readUnsignedShort(); + this.walk_animation = buffer.readUnsignedShort(); + if (this.walk_animation == 65535) { + this.walk_animation = -1; } - if (65535 == this.anInt368) { - this.anInt368 = -1; + if (65535 == this.stand_animation) { + this.stand_animation = -1; } - } else if (var1 == 2) { - this.anInt398 = var3.readUnsignedShort(); - } else if (var1 == 3) { - this.anInt372 = var3.readUnsignedShort(); - } else if (4 == var1) { - this.anInt406 = var3.readUnsignedShort(); - } else if (var1 == 5) { - this.anInt379 = var3.readUnsignedShort(); - } else if (6 == var1) { - this.anInt393 = var3.readUnsignedShort(); - } else if (7 == var1) { - this.anInt386 = var3.readUnsignedShort(); - } else if (var1 == 8) { - this.anInt373 = var3.readUnsignedShort(); - } else if (var1 == 9) { - this.anInt375 = var3.readUnsignedShort(); - } else if (var1 == 26) { - this.anInt395 = (short) (4 * var3.readUnsignedByte()); - this.anInt381 = (short) (4 * var3.readUnsignedByte()); - } else if (var1 == 27) { - if (this.anIntArrayArray359 == null) { - this.anIntArrayArray359 = new int[12][]; + } else if (opcode == 2) { + this.slow_walk_anim = buffer.readUnsignedShort(); + } else if (opcode == 3) { + this.slow_walk_follow_full_turn_anim = buffer.readUnsignedShort(); + } else if (4 == opcode) { + this.slow_walk_follow_ccw_turn_anim = buffer.readUnsignedShort(); + } else if (opcode == 5) { + this.slow_walk_follow_cw_turn_anim = buffer.readUnsignedShort(); + } else if (6 == opcode) { + this.run_anim = buffer.readUnsignedShort(); + } else if (7 == opcode) { + this.run_follow_full_turn_anim = buffer.readUnsignedShort(); + } else if (opcode == 8) { + this.run_follow_ccw_turn_anim = buffer.readUnsignedShort(); + } else if (opcode == 9) { + this.run_follow_cw_turn_anim = buffer.readUnsignedShort(); + } else if (opcode == 26) { + this.hill_width = (short) (4 * buffer.readUnsignedByte()); + this.hill_height = (short) (4 * buffer.readUnsignedByte()); + } else if (opcode == 27) { + if (this.equipment_transforms == null) { + this.equipment_transforms = new int[12][]; } - int var4 = var3.readUnsignedByte(); - this.anIntArrayArray359[var4] = new int[6]; + int bodyID = buffer.readUnsignedByte(); + this.equipment_transforms[bodyID] = new int[6]; - for (int var5 = 0; var5 < 6; ++var5) { - this.anIntArrayArray359[var4][var5] = var3.readSignedShort(); + for (int type = 0; type < 6; ++type) { + + /* + * 0 -Rotate X + * 1 - Rotate Y + * 2 - Rotate Z + * 3 - Translate X + * 4 - Translate Y + * 5 - Translate Z + */ + + this.equipment_transforms[bodyID][type] = buffer.readSignedShort(); } - } else if (var1 == 29) { - this.anInt369 = var3.readUnsignedByte(); - } else if (var1 == 30) { - this.anInt357 = var3.readUnsignedShort(); - } else if (var1 == 31) { - this.anInt387 = var3.readUnsignedByte(); - } else if (32 == var1) { - this.anInt370 = var3.readUnsignedShort(); - } else if (33 == var1) { - this.anInt400 = var3.readSignedShort(); - } else if (34 == var1) { - this.anInt403 = var3.readUnsignedByte(); - } else if (var1 == 35) { - this.anInt399 = var3.readUnsignedShort(); - } else if (var1 == 36) { - this.anInt371 = var3.readSignedShort(); - } else if (var1 == 37) { - this.anInt360 = var3.readUnsignedByte(); - } else if (var1 == 38) { - this.anInt367 = var3.readUnsignedShort(); - } else if (39 == var1) { - this.anInt407 = var3.readUnsignedShort(); - } else if (var1 == 40) { - this.anInt389 = var3.readUnsignedShort(); - } else if (41 == var1) { - this.anInt390 = var3.readUnsignedShort(); - } else if (var1 == 42) { - this.anInt364 = var3.readUnsignedShort(); - } else if (var1 == 43) { - var3.readUnsignedShort(); - } else if (var1 == 44) { - var3.readUnsignedShort(); - } else if (var1 == 45) { - var3.readUnsignedShort(); + } else if (opcode == 29) { + this.yaw_acceleration = buffer.readUnsignedByte(); + } else if (opcode == 30) { + this.yaw_max_speed = buffer.readUnsignedShort(); + } else if (opcode == 31) { + this.roll_acceleration = buffer.readUnsignedByte(); + } else if (32 == opcode) { + this.roll_max_speed = buffer.readUnsignedShort(); + } else if (33 == opcode) { + this.roll_target_angle = buffer.readSignedShort(); + } else if (34 == opcode) { + this.pitch_acceleration = buffer.readUnsignedByte(); + } else if (opcode == 35) { + this.pitch_max_speed = buffer.readUnsignedShort(); + } else if (opcode == 36) { + this.pitch_target_angle = buffer.readSignedShort(); + } else if (opcode == 37) { + this.movement_acceleration = buffer.readUnsignedByte(); + } else if (opcode == 38) { + this.standing_ccw_turn = buffer.readUnsignedShort(); + } else if (39 == opcode) { + this.standing_cw_turn = buffer.readUnsignedShort(); + } else if (opcode == 40) { + this.walk_follow_full_turn_anim = buffer.readUnsignedShort(); + } else if (41 == opcode) { + this.walk_follow_ccw_turn_anim = buffer.readUnsignedShort(); + } else if (opcode == 42) { + this.walk_follow_cw_turn_anim = buffer.readUnsignedShort(); + } else if (opcode == 43) { + buffer.readUnsignedShort(); + } else if (opcode == 44) { + buffer.readUnsignedShort(); + } else if (opcode == 45) { + buffer.readUnsignedShort(); } } catch (RuntimeException var6) { - throw ClientErrorException.clientError(var6, "ck.E(" + var1 + ',' + (byte) -106 + ',' + (var3 != null ? "{...}" : "null") + ')'); + throw ClientErrorException.clientError(var6, "ck.E(" + opcode + ',' + (byte) -106 + ',' + (buffer != null ? "{...}" : "null") + ')'); } } diff --git a/Client/src/main/java/org/runite/client/SequenceDefinition.java b/Client/src/main/java/org/runite/client/SequenceDefinition.java index 9f41049fd..a388c1c7d 100644 --- a/Client/src/main/java/org/runite/client/SequenceDefinition.java +++ b/Client/src/main/java/org/runite/client/SequenceDefinition.java @@ -18,7 +18,7 @@ public final class SequenceDefinition { static AbstractIndexedSprite aClass109_1856; int forcedPriority = 5; boolean aBoolean1859 = false; - static CacheIndex aClass153_1860; + static CacheIndex animationReferenceIndex; int maxLoops = 99; static int anInt1862 = 0; int animId; @@ -36,7 +36,7 @@ public final class SequenceDefinition { SequenceDefinition var2 = (SequenceDefinition) Texture.aReferenceCache_1146.get(var0); if (var2 == null) { - byte[] var3 = aClass153_1860.getFile(Class129.method1765(var0), Class67.method1262(117, var0)); + byte[] var3 = animationReferenceIndex.getFile(Class129.method1765(var0), Class67.method1262(117, var0)); var2 = new SequenceDefinition(); var2.animId = var0; if (var3 != null) { @@ -413,7 +413,7 @@ public final class SequenceDefinition { TextureOperation20.aLong1465 = 0L; TextureOperation20.aClass67_1443.anInt1018 = 0; TextureOperation26.aBoolean3078 = true; - TextureOperation.method153(112); + TextureOperation.method153(); Class24.anInt469 = -1; Class7.anInt2166 = -1; Unsorted.incomingOpcode = -1; @@ -422,7 +422,7 @@ public final class SequenceDefinition { TextureOperation12.outgoingBuffer.index = 0; LinkableRSString.anInt2582 = -1; AbstractSprite.anInt3699 = 0; - GraphicDefinition.incomingBuffer.index = 0; + BufferedDataStream.incomingBuffer.index = 0; int var1; for(var1 = 0; ClientErrorException.aClass96Array2114.length > var1; ++var1) { @@ -455,7 +455,7 @@ public final class SequenceDefinition { Class163.localNPCCount = 0; for(var1 = 0; 2048 > var1; ++var1) { - TextureOperation0.players[var1] = null; + Unsorted.players[var1] = null; Class65.aClass3_Sub30Array986[var1] = null; } @@ -463,20 +463,20 @@ public final class SequenceDefinition { NPC.npcs[var1] = null; } - Class102.player = TextureOperation0.players[2047] = new Player(); - TextureOperation13.aClass61_3364.method1211(-112); - TextureOperation17.aClass61_3177.method1211(-58); - if(null != TextureOperation0.aClass61ArrayArrayArray3273) { + Class102.player = Unsorted.players[2047] = new Player(); + TextureOperation13.aLinkedList_3364.method1211(-112); + TextureOperation17.aLinkedList_3177.method1211(-58); + if(null != Class39.aLinkedListArrayArrayArray3273) { for(var1 = 0; 4 > var1; ++var1) { for(int var2 = 0; var2 < 104; ++var2) { for(int var3 = 0; var3 < 104; ++var3) { - TextureOperation0.aClass61ArrayArrayArray3273[var1][var2][var3] = null; + Class39.aLinkedListArrayArrayArray3273[var1][var2][var3] = null; } } } } - TextureOperation26.aClass61_3075 = new Class61(); + TextureOperation26.aLinkedList_3075 = new LinkedList(); CS2Script.anInt1357 = 0; Class8.anInt104 = 0; TextureOperation6.method176(-114); diff --git a/Client/src/main/java/org/runite/client/Sprites.java b/Client/src/main/java/org/runite/client/Sprites.java index 59421dda9..8326207d6 100644 --- a/Client/src/main/java/org/runite/client/Sprites.java +++ b/Client/src/main/java/org/runite/client/Sprites.java @@ -6,6 +6,7 @@ final class Sprites { public static int compassSpriteArchive; public static int hintMapEdgeSpriteArchive; + public static AbstractIndexedSprite[] nameIconsSpriteArray; static boolean aBoolean337; static int anInt340 = 127; static int p11FullSpriteArchive; @@ -49,10 +50,10 @@ final class Sprites { Class65.aAbstractSpriteArray1825 = TextureOperation18.method286(crossSpriteArchive, index8); Unsorted.aAbstractSpriteArray1136 = TextureOperation18.method286(mapDotsSpriteArchive, index8); GameObject.aClass109Array1831 = Class85.method1424(index8, scrollbarSpriteArchive); - TextureOperation0.nameIconsSpriteArray = Class85.method1424(index8, nameIconsSpriteArchive); - FontType.smallFont.method697(TextureOperation0.nameIconsSpriteArray, null); - FontType.plainFont.method697(TextureOperation0.nameIconsSpriteArray, null); - FontType.bold.method697(TextureOperation0.nameIconsSpriteArray, null); + nameIconsSpriteArray = Class85.method1424(index8, nameIconsSpriteArchive); + FontType.smallFont.method697(nameIconsSpriteArray, null); + FontType.plainFont.method697(nameIconsSpriteArray, null); + FontType.bold.method697(nameIconsSpriteArray, null); if (HDToolKit.highDetail) { Class141.aClass109_Sub1Array1843 = method885(floorShadowSpriteArchive, index8); diff --git a/Client/src/main/java/org/runite/client/Texture.java b/Client/src/main/java/org/runite/client/Texture.java index fc61961d0..e9a0f9dc2 100644 --- a/Client/src/main/java/org/runite/client/Texture.java +++ b/Client/src/main/java/org/runite/client/Texture.java @@ -59,7 +59,7 @@ public final class Texture { ++var3; } - if (textureOperation.method155((byte) 19) >= 0) { + if (textureOperation.getSpriteFrame() >= 0) { ++var4; } @@ -87,7 +87,7 @@ public final class Texture { } var9 = textureOperation.method159(4); - int var10 = textureOperation.method155((byte) 19); + int var10 = textureOperation.getSpriteFrame(); if (var9 > 0) { this.anIntArray1144[var3++] = var9; } @@ -122,7 +122,7 @@ public final class Texture { if (var7 == -1) { var8 = Class102.player; } else if (var7 < Class159.localPlayerCount) { - var8 = TextureOperation0.players[Class56.localPlayerIndexes[var7]]; + var8 = Unsorted.players[Class56.localPlayerIndexes[var7]]; } else { var8 = NPC.npcs[Class15.localNPCIndexes[-Class159.localPlayerCount + var7]]; } @@ -494,10 +494,10 @@ public final class Texture { int codes = var1.readUnsignedByte(); for (int var5 = 0; var5 < codes; ++var5) { int opcode = var1.readUnsignedByte(); - var3.method157(opcode, var1, true); + var3.decode(opcode, var1); } - var3.method158(16251); + var3.postDecode(); return var3; } catch (RuntimeException var7) { throw ClientErrorException.clientError(var7, "qk.B(" + (byte) -67 + ',' + (var1 != null ? "{...}" : "null") + ')'); @@ -648,7 +648,7 @@ public final class Texture { var20 = 0; } - var20 = Class3_Sub30_Sub1.anIntArray3804[var20]; + var20 = BufferedDataStream.anIntArray3804[var20]; int var22 = var18[var25] >> 4; int var21 = var17[var25] >> 4; if (var21 > 255) { @@ -663,12 +663,12 @@ public final class Texture { var22 = 255; } - var21 = Class3_Sub30_Sub1.anIntArray3804[var21]; + var21 = BufferedDataStream.anIntArray3804[var21]; if (var22 < 0) { var22 = 0; } - var22 = Class3_Sub30_Sub1.anIntArray3804[var22]; + var22 = BufferedDataStream.anIntArray3804[var22]; var10[var14++] = (var20 << 16) - -(var21 << 8) + var22; if (var2) { var14 += var3 + -1; @@ -749,7 +749,7 @@ public final class Texture { var19 = 255; } - var17 = Class3_Sub30_Sub1.anIntArray3804[var17]; + var17 = BufferedDataStream.anIntArray3804[var17]; if (var19 < 0) { var19 = 0; } @@ -758,8 +758,8 @@ public final class Texture { var18 = 0; } - var18 = Class3_Sub30_Sub1.anIntArray3804[var18]; - var19 = Class3_Sub30_Sub1.anIntArray3804[var19]; + var18 = BufferedDataStream.anIntArray3804[var18]; + var19 = BufferedDataStream.anIntArray3804[var19]; int var20; if (var17 == 0 && var18 == 0 && var19 == 0) { var20 = 0; diff --git a/Client/src/main/java/org/runite/client/TextureOperation.java b/Client/src/main/java/org/runite/client/TextureOperation.java index 1c43a864c..5e9f22f6b 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation.java +++ b/Client/src/main/java/org/runite/client/TextureOperation.java @@ -29,7 +29,7 @@ public abstract class TextureOperation extends Linkable { var4 = var2.nextInt(); } while (var3 <= var4); - return TextureOperation27.method201(var4, var1, -58); + return TextureOperation27.method201(var4, var1); } } catch (RuntimeException var6) { throw ClientErrorException.clientError(var6, "ni.C(" + var0 + ',' + var1 + ',' + (var2 != null ? "{...}" : "null") + ')'); @@ -37,26 +37,12 @@ public abstract class TextureOperation extends Linkable { } - final int[] method152(int var1, int var2, int var3) { - try { - if (var3 != 32755) { - anInt2383 = 121; - } - - 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 + ')'); - } + final int[] method152(int var1, int var2) { + return this.subOperations[var1].aBoolean2375 ? this.subOperations[var1].method154(var2, (byte) -118) : this.subOperations[var1].method166(var2)[0]; } - static void method153(int var0) { - try { - if (var0 >= 91) { - Class3_Sub26.aClass61_2557 = new Class61(); - } - } catch (RuntimeException var2) { - throw ClientErrorException.clientError(var2, "j.QA(" + var0 + ')'); - } + static void method153() { + Class3_Sub26.aLinkedList_2557 = new LinkedList(); } int[] method154(int var1, byte var2) { @@ -67,38 +53,14 @@ public abstract class TextureOperation extends Linkable { } } - int method155(byte var1) { - try { - if (var1 != 19) { - this.method152(-80, 116, -73); - } - - return -1; - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "j.HA(" + var1 + ')'); - } + int getSpriteFrame() { + return -1; } - void method157(int var1, DataBuffer var2, boolean var3) { - try { - if (!var3) { - this.subOperations = null; - } - - } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "j.A(" + var1 + ',' + (var2 != null ? "{...}" : "null") + ',' + var3 + ')'); - } + void decode(int var1, DataBuffer var2) { } - void method158(int var1) { - try { - if (var1 != 16251) { - anInt2378 = 12; - } - - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "j.P(" + var1 + ')'); - } + void postDecode() { } int method159(int var1) { diff --git a/Client/src/main/java/org/runite/client/TextureOperation0.java b/Client/src/main/java/org/runite/client/TextureOperation0.java index 8725f3c21..413fe9b83 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation0.java +++ b/Client/src/main/java/org/runite/client/TextureOperation0.java @@ -4,110 +4,35 @@ import org.rs09.client.util.ArrayUtils; public final class TextureOperation0 extends TextureOperation { - public static Player[] players = new Player[2048]; - public static AbstractIndexedSprite[] nameIconsSpriteArray; - static long[] aLongArray3271 = new long[500]; - static boolean[] aBooleanArray3272; - public static Class61[][][] aClass61ArrayArrayArray3273 = new Class61[4][104][104]; - static boolean aBoolean3275 = true; - private int anInt3276; + private int anInt3276; + protected TextureOperation0() { + super(0, true); + this.anInt3276 = 4096; - protected TextureOperation0() { - super(0, true); - this.anInt3276 = 4096; + try { + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "mi.(" + 4096 + ')'); + } + } - try { - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "mi.(" + 4096 + ')'); - } - } - - final void method157(int var1, DataBuffer var2, boolean var3) { - try { - if(!var3) { - this.method154(121, (byte)52); - } - - if(var1 == 0) { + final void decode(int var1, DataBuffer var2) { + if (var1 == 0) { this.anInt3276 = (var2.readUnsignedByte() << 12) / 255; - } + } + } - } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "mi.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); - } - } - - static void method273(int[] var0, NPC var2, int[] var3, int[] var4) { - try { - int var5 = 0; - while(var5 < var4.length) { - int var6 = var4[var5]; - int var7 = var0[var5]; - int var8 = var3[var5]; - - for(int var9 = 0; var7 != 0 && var9 < var2.aClass145Array2809.length; ++var9) { - if((1 & var7) != 0) { - if(var6 == -1) { - var2.aClass145Array2809[var9] = null; - } else { - SequenceDefinition var10 = SequenceDefinition.getAnimationDefinition(var6); - Class145 var12 = var2.aClass145Array2809[var9]; - int var11 = var10.delayType; - if(null != var12) { - if(var12.animationId != var6) { - if(SequenceDefinition.getAnimationDefinition(var12.animationId).forcedPriority <= var10.forcedPriority) { - var12 = var2.aClass145Array2809[var9] = null; - } - } else if(var11 == 0) { - var12 = var2.aClass145Array2809[var9] = null; - } else if(var11 == 1) { - var12.anInt1893 = 0; - var12.anInt1894 = 0; - var12.anInt1891 = 1; - var12.anInt1897 = 0; - var12.anInt1900 = var8; - Unsorted.method1470(var2.anInt2829, var10, 183921384, var2.anInt2819, false, 0); - } else if(var11 == 2) { - var12.anInt1894 = 0; - } - } - - if(null == var12) { - var12 = var2.aClass145Array2809[var9] = new Class145(); - var12.anInt1891 = 1; - var12.anInt1897 = 0; - var12.anInt1900 = var8; - var12.animationId = var6; - var12.anInt1894 = 0; - var12.anInt1893 = 0; - Unsorted.method1470(var2.anInt2829, var10, 183921384, var2.anInt2819, false, 0); - } - } - } - - var7 >>>= 1; + final int[] method154(int var1, byte var2) { + try { + int[] var4 = this.aClass114_2382.method1709(var1); + if (this.aClass114_2382.aBoolean1580) { + ArrayUtils.fill(var4, 0, Class113.anInt1559, this.anInt3276); } - ++var5; - } - - } catch (RuntimeException var13) { - throw ClientErrorException.clientError(var13, "mi.B(" + (var0 != null?"{...}":"null") + ',' + (byte) 92 + ',' + (var2 != null?"{...}":"null") + ',' + (var3 != null?"{...}":"null") + ',' + (var4 != null?"{...}":"null") + ')'); - } - } - - final int[] method154(int var1, byte var2) { - try { - int[] var4 = this.aClass114_2382.method1709(var1); - if(this.aClass114_2382.aBoolean1580) { - ArrayUtils.fill(var4, 0, Class113.anInt1559, this.anInt3276); - } - - return var4; - } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "mi.D(" + var1 + ',' + var2 + ')'); - } - } + return var4; + } catch (RuntimeException var5) { + throw ClientErrorException.clientError(var5, "mi.D(" + var1 + ',' + var2 + ')'); + } + } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation1.java b/Client/src/main/java/org/runite/client/TextureOperation1.java index 04b0fc67c..2aafb7198 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation1.java +++ b/Client/src/main/java/org/runite/client/TextureOperation1.java @@ -123,9 +123,9 @@ final class TextureOperation1 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { - if(!var3) { + if(!true) { method221(-64, null, null, null, 34); } @@ -134,7 +134,7 @@ final class TextureOperation1 extends TextureOperation { } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "fm.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "fm.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation10.java b/Client/src/main/java/org/runite/client/TextureOperation10.java index 5c79c706d..2923811c1 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation10.java +++ b/Client/src/main/java/org/runite/client/TextureOperation10.java @@ -11,11 +11,8 @@ final class TextureOperation10 extends TextureOperation { private int[] anIntArray3443 = new int[257]; - final void method158(int var1) { + final void postDecode() { try { - if(var1 != 16251) { - this.anIntArray3443 = null; - } if(this.anIntArrayArray3438 == null) { this.method345(1); @@ -23,7 +20,7 @@ final class TextureOperation10 extends TextureOperation { this.method346(); } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "um.P(" + var1 + ')'); + throw ClientErrorException.clientError(var3, "um.P(" + ')'); } } @@ -230,9 +227,9 @@ final class TextureOperation10 extends TextureOperation { super(1, false); } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { - if(var3) { + if(true) { if(var1 == 0) { int var4 = var2.readUnsignedByte(); if(var4 == 0) { @@ -351,12 +348,9 @@ final class TextureOperation10 extends TextureOperation { final int[][] method166(int var2) { try { int[][] var3 = this.aClass97_2376.method1594((byte)90, var2); - if(-1 != -1) { - this.method157(-71, null, false); - } if(this.aClass97_2376.aBoolean1379) { - int[] var5 = this.method152(0, var2, 32755); + int[] var5 = this.method152(0, var2); int[] var7 = var3[1]; int[] var6 = var3[0]; int[] var8 = var3[2]; diff --git a/Client/src/main/java/org/runite/client/TextureOperation11.java b/Client/src/main/java/org/runite/client/TextureOperation11.java index 9bfbd2b70..d99050549 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation11.java +++ b/Client/src/main/java/org/runite/client/TextureOperation11.java @@ -9,7 +9,7 @@ final class TextureOperation11 extends TextureOperation { private int anInt3250 = 4096; private int anInt3252 = 4096; - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { if(var1 == 0) { this.anInt3252 = var2.readUnsignedShort(); @@ -19,12 +19,12 @@ final class TextureOperation11 extends TextureOperation { this.anInt3250 = var2.readUnsignedShort(); } - if(!var3) { + if(!true) { method266(12); } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "mg.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "mg.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation12.java b/Client/src/main/java/org/runite/client/TextureOperation12.java index ca4194fef..d9a9bf0c1 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation12.java +++ b/Client/src/main/java/org/runite/client/TextureOperation12.java @@ -5,7 +5,7 @@ import org.rs09.client.config.GameConfig; public final class TextureOperation12 extends TextureOperation { - public static Class3_Sub30_Sub1 outgoingBuffer = new Class3_Sub30_Sub1(); + public static BufferedDataStream outgoingBuffer = new BufferedDataStream(); private int anInt3036 = 0; private int anInt3037 = 1; private int anInt3038 = 0; @@ -114,15 +114,12 @@ public final class TextureOperation12 extends TextureOperation { } } - final void method158(int var1) { + final void postDecode() { try { Class8.method844((byte)-9); - if(var1 != 16251) { - method171(106, -38, 106, 7, -28, -61, 30, -77, -47); - } } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "ag.P(" + var1 + ')'); + throw ClientErrorException.clientError(var3, "ag.P(" + ')'); } } @@ -146,11 +143,8 @@ public final class TextureOperation12 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { - if(!var3) { - this.method158(10); - } if(var1 == 0) { this.anInt3038 = var2.readUnsignedByte(); @@ -161,7 +155,7 @@ public final class TextureOperation12 extends TextureOperation { } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "ag.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "ag.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation13.java b/Client/src/main/java/org/runite/client/TextureOperation13.java index c09904f2f..87fdb2206 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation13.java +++ b/Client/src/main/java/org/runite/client/TextureOperation13.java @@ -6,7 +6,7 @@ final class TextureOperation13 extends TextureOperation { static int anInt3362 = -1; static int anInt3363; - static Class61 aClass61_3364 = new Class61(); + static LinkedList aLinkedList_3364 = new LinkedList(); static long aLong3366; static int[] anIntArray3367 = new int[64]; diff --git a/Client/src/main/java/org/runite/client/TextureOperation14.java b/Client/src/main/java/org/runite/client/TextureOperation14.java index 40c551d6d..2a575618d 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation14.java +++ b/Client/src/main/java/org/runite/client/TextureOperation14.java @@ -88,9 +88,9 @@ final class TextureOperation14 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { - if(!var3) { + if(!true) { anInt3389 = 99; } @@ -99,7 +99,7 @@ final class TextureOperation14 extends TextureOperation { } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "sa.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "sa.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation15.java b/Client/src/main/java/org/runite/client/TextureOperation15.java index f78342bb9..08a3802e2 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation15.java +++ b/Client/src/main/java/org/runite/client/TextureOperation15.java @@ -29,16 +29,12 @@ final class TextureOperation15 extends TextureOperation { } } - final void method158(int var1) { + final void postDecode() { try { - if(var1 != 16251) { - Unsorted.aClass44_Sub1Array3201 = null; - } - - this.aByteArray3195 = Class49.method1123(var1 ^ 16727940, this.anInt3197); + this.aByteArray3195 = Class49.method1123(this.anInt3197); this.method242(); } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "hm.P(" + var1 + ')'); + throw ClientErrorException.clientError(var3, "hm.P(" + ')'); } } @@ -166,12 +162,8 @@ final class TextureOperation15 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { - if(!var3) { - this.method157(-122, null, false); - } - if(var1 == 0) { this.anInt3203 = this.anInt3204 = var2.readUnsignedByte(); } else if(var1 == 1) { @@ -189,7 +181,7 @@ final class TextureOperation15 extends TextureOperation { } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "hm.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "hm.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation16.java b/Client/src/main/java/org/runite/client/TextureOperation16.java index 1dbe27d36..b1ccac665 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation16.java +++ b/Client/src/main/java/org/runite/client/TextureOperation16.java @@ -15,9 +15,9 @@ final class TextureOperation16 extends TextureOperation { super(0, true); } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { - if(var3) { + if(true) { if(var1 == 0) { this.anInt3108 = var2.readUnsignedByte(); } else if (var1 == 1) { diff --git a/Client/src/main/java/org/runite/client/TextureOperation17.java b/Client/src/main/java/org/runite/client/TextureOperation17.java index 72b0e3ae0..5e688630f 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation17.java +++ b/Client/src/main/java/org/runite/client/TextureOperation17.java @@ -7,7 +7,7 @@ final class TextureOperation17 extends TextureOperation { private int anInt3174; private int anInt3175 = 0; private int anInt3176 = 0; - static Class61 aClass61_3177 = new Class61(); + static LinkedList aLinkedList_3177 = new LinkedList(); private int anInt3178 = 0; static int anInt3179; private int anInt3180; @@ -20,7 +20,7 @@ final class TextureOperation17 extends TextureOperation { private int anInt3189; - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { if(var1 == 0) { this.anInt3175 = var2.readSignedShort(); @@ -30,12 +30,12 @@ final class TextureOperation17 extends TextureOperation { this.anInt3176 = (var2.readSignedByte() << 12) / 100; } - if(!var3) { + if(!true) { this.method240(-114, 127, 95); } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "hk.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "hk.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation19.java b/Client/src/main/java/org/runite/client/TextureOperation19.java index 865b2bc5a..81eb55474 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation19.java +++ b/Client/src/main/java/org/runite/client/TextureOperation19.java @@ -86,8 +86,8 @@ final class TextureOperation19 extends TextureOperation { int[][] var3 = this.aClass97_2376.method1594((byte)4, var2); if(this.aClass97_2376.aBoolean1379) { - int[] var4 = this.method152(1, var2, 32755); - int[] var5 = this.method152(2, var2, 32755); + int[] var4 = this.method152(1, var2); + int[] var5 = this.method152(2, var2); int[] var8 = var3[2]; int[] var7 = var3[1]; int[] var6 = var3[0]; @@ -116,8 +116,8 @@ final class TextureOperation19 extends TextureOperation { try { int[] var4 = this.aClass114_2382.method1709(var1); if(this.aClass114_2382.aBoolean1580) { - int[] var5 = this.method152(1, var1, 32755); - int[] var6 = this.method152(2, var1, 32755); + int[] var5 = this.method152(1, var1); + int[] var6 = this.method152(2, var1); for(int var7 = 0; var7 < Class113.anInt1559; ++var7) { int var9 = this.anInt3217 * var6[var7] >> 12; @@ -126,7 +126,7 @@ final class TextureOperation19 extends TextureOperation { 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); + int[] var14 = this.method152(0, var13); var4[var7] = var14[var12]; } } @@ -137,7 +137,7 @@ final class TextureOperation19 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { if(var1 == 0) { this.anInt3217 = var2.readUnsignedShort() << 4; @@ -145,12 +145,12 @@ final class TextureOperation19 extends TextureOperation { this.aBoolean2375 = var2.readUnsignedByte() == 1; } - if(!var3) { + if(!true) { TextureOperation20.anInt3216 = -7; } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "ke.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "ke.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } @@ -238,7 +238,7 @@ final class TextureOperation19 extends TextureOperation { if(var0.anInt1664 != 12345678) { Class51.method1154(var27, var29, var25, var26, var28, var24, var0.anInt1664, var0.anInt1663, var0.anInt1667); } - } else if(TextureOperation0.aBoolean3275) { + } else if(Unsorted.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 { @@ -264,7 +264,7 @@ final class TextureOperation19 extends TextureOperation { if(var0.anInt1675 != 12345678) { Class51.method1154(var23, var25, var29, var22, var24, var28, var0.anInt1675, var0.anInt1667, var0.anInt1663); } - } else if(TextureOperation0.aBoolean3275) { + } else if(Unsorted.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, 65535); @@ -279,15 +279,11 @@ final class TextureOperation19 extends TextureOperation { } } - final void method158(int var1) { + final void postDecode() { try { - if(var1 != 16251) { - method255(33, 78, 124); - } - Class8.method844((byte)-9); } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "ke.P(" + var1 + ')'); + throw ClientErrorException.clientError(var3, "ke.P(" + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation20.java b/Client/src/main/java/org/runite/client/TextureOperation20.java index b9b5d947b..7c99c8d91 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation20.java +++ b/Client/src/main/java/org/runite/client/TextureOperation20.java @@ -71,9 +71,9 @@ final class TextureOperation20 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { - if(!var3) { + if(!true) { paramModeWhat = -117; } @@ -84,7 +84,7 @@ final class TextureOperation20 extends TextureOperation { } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "gg.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "gg.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } @@ -145,10 +145,10 @@ final class TextureOperation20 extends TextureOperation { int[] var4; int var7; if(var6 <= 0) { - var4 = this.method152(0, 0, 32755); + var4 = this.method152(0, 0); } else { var7 = var1 % var6; - var4 = this.method152(0, Class101.anInt1427 * var7 / var6, 32755); + var4 = this.method152(0, Class101.anInt1427 * var7 / var6); } for(var7 = 0; var7 < Class113.anInt1559; ++var7) { @@ -574,8 +574,8 @@ final class TextureOperation20 extends TextureOperation { ++Class106.anInt1446; if(Unsorted.aClass11_1933 != null) { - ++Class3_Sub30_Sub1.anInt2330; - if(15 <= Class3_Sub30_Sub1.anInt2330) { + ++BufferedDataStream.anInt2330; + if(15 <= BufferedDataStream.anInt2330) { Class20.method909(Unsorted.aClass11_1933); Unsorted.aClass11_1933 = null; } @@ -639,7 +639,7 @@ final class TextureOperation20 extends TextureOperation { } Unsorted.anInt3644 = 0; - Class3_Sub30_Sub1.anInt2330 = 10; + BufferedDataStream.anInt2330 = 10; Class67.aClass11_1017 = null; } } @@ -665,15 +665,15 @@ final class TextureOperation20 extends TextureOperation { ++PacketParser.anInt3213; while(true) { - CS2Script var26 = (CS2Script)PacketParser.aClass61_82.method1220(); + CS2Script var26 = (CS2Script)PacketParser.aLinkedList_82.method1220(); RSInterface var23; RSInterface var25; if(var26 == null) { while(true) { - var26 = (CS2Script)Class65.aClass61_983.method1220(); + var26 = (CS2Script)Class65.aLinkedList_983.method1220(); if(var26 == null) { while(true) { - var26 = (CS2Script) Client.aClass61_1471.method1220(); + var26 = (CS2Script) Client.aLinkedList_1471.method1220(); if(var26 == null) { if(Class3_Sub28_Sub3.aClass11_3551 == null) { Class3_Sub19.anInt2475 = 0; @@ -704,7 +704,7 @@ final class TextureOperation20 extends TextureOperation { } else if(CS2Script.anInt2440 == 2) { if(Class27.anInt515 != -1) { TextureOperation12.outgoingBuffer.putOpcode(131); - TextureOperation12.outgoingBuffer.writeIntV2(Class3_Sub30_Sub1.anInt872); + TextureOperation12.outgoingBuffer.writeIntV2(BufferedDataStream.anInt872); TextureOperation12.outgoingBuffer.putShortA(Class131.anInt1716 + Class27.anInt515); TextureOperation12.outgoingBuffer.writeShort128LE(RSInterface.anInt278); TextureOperation12.outgoingBuffer.putShortA(Unsorted.anInt999 + Texture.anInt1152); diff --git a/Client/src/main/java/org/runite/client/TextureOperation21.java b/Client/src/main/java/org/runite/client/TextureOperation21.java index 9f05fbeba..5ee1f7e6e 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation21.java +++ b/Client/src/main/java/org/runite/client/TextureOperation21.java @@ -15,7 +15,7 @@ final class TextureOperation21 extends TextureOperation { int[][] var3 = this.aClass97_2376.method1594((byte)7, var2); if(this.aClass97_2376.aBoolean1379) { - int[] var4 = this.method152(2, var2, 32755); + int[] var4 = this.method152(2, var2); int[][] var5 = this.method162(var2, 0, (byte)-119); int[][] var6 = this.method162(var2, 1, (byte)-107); int[] var9 = var3[2]; @@ -57,18 +57,14 @@ final class TextureOperation21 extends TextureOperation { super(3, false); } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { if(var1 == 0) { this.aBoolean2375 = var2.readUnsignedByte() == 1; } - if(!var3) { - this.method157(118, null, true); - } - } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "bl.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "bl.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } @@ -89,9 +85,9 @@ final class TextureOperation21 extends TextureOperation { try { int[] var3 = this.aClass114_2382.method1709(var1); if(this.aClass114_2382.aBoolean1580) { - int[] var5 = this.method152(0, var1, 32755); - int[] var6 = this.method152(1, var1, 32755); - int[] var7 = this.method152(2, var1, 32755); + int[] var5 = this.method152(0, var1); + int[] var6 = this.method152(1, var1); + int[] var7 = this.method152(2, var1); for(int var8 = 0; var8 < Class113.anInt1559; ++var8) { int var9 = var7[var8]; diff --git a/Client/src/main/java/org/runite/client/TextureOperation22.java b/Client/src/main/java/org/runite/client/TextureOperation22.java index 2019d421d..355bc6e3f 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation22.java +++ b/Client/src/main/java/org/runite/client/TextureOperation22.java @@ -12,7 +12,7 @@ public final class TextureOperation22 extends TextureOperation { try { int[] var3 = this.aClass114_2382.method1709(var1); if(this.aClass114_2382.aBoolean1580) { - int[] var4 = this.method152(0, var1, 32755); + int[] var4 = this.method152(0, var1); for(int var5 = 0; var5 < Class113.anInt1559; ++var5) { var3[var5] = 4096 - var4[var5]; @@ -41,9 +41,9 @@ public final class TextureOperation22 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { - if(var3) { + if(true) { if(var1 == 0) { this.aBoolean2375 = var2.readUnsignedByte() == 1; } diff --git a/Client/src/main/java/org/runite/client/TextureOperation23.java b/Client/src/main/java/org/runite/client/TextureOperation23.java index a241b05ce..f74dc9d73 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation23.java +++ b/Client/src/main/java/org/runite/client/TextureOperation23.java @@ -68,18 +68,18 @@ final class TextureOperation23 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { if(var1 == 0) { this.aBoolean2375 = var2.readUnsignedByte() == 1; } - if(!var3) { + if(!true) { WorldMap.aClass153_3210 = null; } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "je.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "je.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } @@ -114,13 +114,13 @@ final class TextureOperation23 extends TextureOperation { static void method252() { try { Class3_Sub9 var1; - for(var1 = (Class3_Sub9) Unsorted.aClass61_78.method1222(); null != var1; var1 = (Class3_Sub9) Unsorted.aClass61_78.method1221()) { + for(var1 = (Class3_Sub9) Unsorted.aLinkedList_78.method1222(); null != var1; var1 = (Class3_Sub9) Unsorted.aLinkedList_78.method1221()) { if(var1.aBoolean2329) { var1.method134(); } } - for(var1 = (Class3_Sub9) Unsorted.aClass61_1242.method1222(); null != var1; var1 = (Class3_Sub9) Unsorted.aClass61_1242.method1221()) { + for(var1 = (Class3_Sub9) Unsorted.aLinkedList_1242.method1222(); null != var1; var1 = (Class3_Sub9) Unsorted.aLinkedList_1242.method1221()) { if(var1.aBoolean2329) { var1.method134(); } @@ -137,7 +137,7 @@ final class TextureOperation23 extends TextureOperation { if(this.aClass114_2382.aBoolean1580) { for(int var5 = 0; var5 < Class113.anInt1559; ++var5) { this.method248(var1, (byte)105, var5); - int[] var6 = this.method152(0, Class50.anInt828, 32755); + int[] var6 = this.method152(0, Class50.anInt828); var4[var5] = var6[Class159.anInt2024]; } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation25.java b/Client/src/main/java/org/runite/client/TextureOperation25.java index 0c63f5b56..4ddc38cf1 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation25.java +++ b/Client/src/main/java/org/runite/client/TextureOperation25.java @@ -211,9 +211,9 @@ public final class TextureOperation25 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { - if (var3) { + if (true) { if (var1 == 0) { this.anInt3404 = var2.readUnsignedShort(); } else if (1 == var1) { diff --git a/Client/src/main/java/org/runite/client/TextureOperation26.java b/Client/src/main/java/org/runite/client/TextureOperation26.java index 2b16bcaf2..594c97116 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation26.java +++ b/Client/src/main/java/org/runite/client/TextureOperation26.java @@ -6,7 +6,7 @@ final class TextureOperation26 extends TextureOperation { private int anInt3073 = 0; private int anInt3074 = 4096; - static Class61 aClass61_3075 = new Class61(); + static LinkedList aLinkedList_3075 = new LinkedList(); static boolean aBoolean3078; static int anInt3081 = 0; @@ -123,7 +123,7 @@ final class TextureOperation26 extends TextureOperation { try { int[] var4 = this.aClass114_2382.method1709(var1); if(this.aClass114_2382.aBoolean1580) { - int[] var5 = this.method152(0, var1, 32755); + int[] var5 = this.method152(0, var1); for(int var6 = 0; var6 < Class113.anInt1559; ++var6) { int var7 = var5[var6]; @@ -146,9 +146,9 @@ final class TextureOperation26 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { - if(!var3) { + if(!true) { method196(); } @@ -159,7 +159,7 @@ final class TextureOperation26 extends TextureOperation { } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "ca.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "ca.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation27.java b/Client/src/main/java/org/runite/client/TextureOperation27.java index 17fe41918..5915aa7a0 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation27.java +++ b/Client/src/main/java/org/runite/client/TextureOperation27.java @@ -14,22 +14,20 @@ final class TextureOperation27 extends TextureOperation { static CacheIndex aClass153_3098; - final void method158(int var1) { + final void postDecode() { try { - if(var1 == 16251) { - this.method202(); - } + this.method202(); } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "d.P(" + var1 + ')'); + throw ClientErrorException.clientError(var3, "d.P(" + ')'); } } - static int method201(int var0, int var1, int var2) { + static int method201(int var0, int var1) { try { int var3 = var1 + -1 & var0 >> 31; return var3 + (var0 + (var0 >>> 31)) % var1; } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "d.C(" + var0 + ',' + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var5, "d.C(" + var0 + ',' + var1 + ',' + -58 + ')'); } } @@ -54,7 +52,7 @@ final class TextureOperation27 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { if(var1 == 0) { this.anInt3085 = var2.readUnsignedByte(); @@ -64,12 +62,12 @@ final class TextureOperation27 extends TextureOperation { this.anInt3086 = var2.readUnsignedByte(); } - if(!var3) { + if(!true) { this.anIntArray3089 = null; } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "d.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "d.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation28.java b/Client/src/main/java/org/runite/client/TextureOperation28.java index 2ee0fdccc..c8b26e8cb 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation28.java +++ b/Client/src/main/java/org/runite/client/TextureOperation28.java @@ -20,14 +20,11 @@ final class TextureOperation28 extends TextureOperation { private int anInt3316 = 1024; - final void method158(int var1) { + final void postDecode() { try { - if(var1 != 16251) { - this.method157(-7, null, true); - } } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "ol.P(" + var1 + ')'); + throw ClientErrorException.clientError(var3, "ol.P(" + ')'); } } @@ -321,9 +318,9 @@ final class TextureOperation28 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { - if(!var3) { + if(!true) { this.anInt3301 = 4; } @@ -348,7 +345,7 @@ final class TextureOperation28 extends TextureOperation { } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "ol.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "ol.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation29.java b/Client/src/main/java/org/runite/client/TextureOperation29.java index 1b44bb65c..37ad8017e 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation29.java +++ b/Client/src/main/java/org/runite/client/TextureOperation29.java @@ -63,7 +63,7 @@ final class TextureOperation29 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { if(var1 == 0) { this.aClass75Array3392 = new Class75[var2.readUnsignedByte()]; @@ -84,12 +84,12 @@ final class TextureOperation29 extends TextureOperation { this.aBoolean2375 = var2.readUnsignedByte() == 1; } - if(!var3) { + if(!true) { this.method323(124, null); } } catch (RuntimeException var7) { - throw ClientErrorException.clientError(var7, "si.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var7, "si.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation3.java b/Client/src/main/java/org/runite/client/TextureOperation3.java index c310dcf4d..292db387b 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation3.java +++ b/Client/src/main/java/org/runite/client/TextureOperation3.java @@ -106,7 +106,7 @@ final class TextureOperation3 extends TextureOperation { } } - Class3_Sub26.aClass61_2557.method1215(var4); + Class3_Sub26.aLinkedList_2557.method1215(var4); } catch (RuntimeException var20) { throw ClientErrorException.clientError(var20, "qg.E(" + (var0 != null?"{...}":"null") + ',' + (var1 != null?"{...}":"null") + ',' + var2 + ',' + (byte) -126 + ')'); } diff --git a/Client/src/main/java/org/runite/client/TextureOperation30.java b/Client/src/main/java/org/runite/client/TextureOperation30.java index 32c9662a6..73229309c 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation30.java +++ b/Client/src/main/java/org/runite/client/TextureOperation30.java @@ -29,7 +29,7 @@ final class TextureOperation30 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { if(var1 == 0) { this.anInt3128 = var2.readUnsignedShort(); @@ -39,12 +39,8 @@ final class TextureOperation30 extends TextureOperation { this.aBoolean2375 = var2.readUnsignedByte() == 1; } - if(!var3) { - this.method157(56, null, true); - } - } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "fh.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "fh.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } @@ -66,7 +62,7 @@ final class TextureOperation30 extends TextureOperation { try { int[] var7 = this.aClass114_2382.method1709(var1); if(this.aClass114_2382.aBoolean1580) { - int[] var4 = this.method152(0, var1, 32755); + int[] var4 = this.method152(0, var1); for(int var5 = 0; var5 < Class113.anInt1559; ++var5) { var7[var5] = this.anInt3128 - -(var4[var5] * this.anInt3126 >> 12); @@ -261,13 +257,11 @@ final class TextureOperation30 extends TextureOperation { } } - final void method158(int var1) { + final void postDecode() { try { - if(var1 == 16251) { - this.anInt3126 = this.anInt3127 - this.anInt3128; - } + this.anInt3126 = this.anInt3127 - this.anInt3128; } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "fh.P(" + var1 + ')'); + throw ClientErrorException.clientError(var3, "fh.P(" + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation31.java b/Client/src/main/java/org/runite/client/TextureOperation31.java index fd24bbcb4..8cdc77455 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation31.java +++ b/Client/src/main/java/org/runite/client/TextureOperation31.java @@ -1,122 +1,75 @@ package org.runite.client; + import org.rs09.client.config.GameConfig; import java.math.BigInteger; final class TextureOperation31 extends TextureOperation { - static CacheResourceWorker aCacheResourceWorker_3159; - private int anInt3160 = 0; - static BigInteger MODULUS = GameConfig.MODULUS; - private int anInt3163 = 20; - private int anInt3164 = 1365; - private int anInt3165 = 0; - static boolean aBoolean3166 = false; + static CacheResourceWorker aCacheResourceWorker_3159; + private int anInt3160 = 0; + static BigInteger MODULUS = GameConfig.MODULUS; + private int anInt3163 = 20; + private int anInt3164 = 1365; + private int anInt3165 = 0; + static boolean aBoolean3166 = false; - final void method157(int var1, DataBuffer var2, boolean var3) { - try { - if(var1 == 0) { - this.anInt3164 = var2.readUnsignedShort(); - } else if (var1 == 1) { - this.anInt3163 = var2.readUnsignedShort(); - } else if (var1 == 2) { - this.anInt3160 = var2.readUnsignedShort(); - } else if (var1 == 3) { - this.anInt3165 = var2.readUnsignedShort(); - } - - } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "gm.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); - } - } - - static void method236() { - try { - TextureOperation14.aBoolean3387 = true; - } catch (RuntimeException var2) { - throw ClientErrorException.clientError(var2, "gm.C(" + (byte) 64 + ')'); - } - } - - static final int[] NPC_RENDER_LOG = new int[3]; - - static void renderNPCs(int var0) { - try { - Unsorted.maskUpdateCount = 0; - Class139.anInt1829 = 0; - Class24.renderLocalNPCs(); - NPC_RENDER_LOG[0] = GraphicDefinition.incomingBuffer.index; - Class167.addLocalNPCs(); - NPC_RENDER_LOG[1] = GraphicDefinition.incomingBuffer.index; - NPC.renderNPCMasks(var0 ^ 8106); - NPC_RENDER_LOG[2] = GraphicDefinition.incomingBuffer.index; - - int var1; - for(var1 = 0; Class139.anInt1829 > var1; ++var1) { - int var2 = Class3_Sub7.anIntArray2292[var1]; - if(Class44.anInt719 != NPC.npcs[var2].anInt2838) { - if(NPC.npcs[var2].definition.method1474()) { - Class3_Sub28_Sub8.method574(NPC.npcs[var2]); - } - - NPC.npcs[var2].setDefinitions(null); - NPC.npcs[var2] = null; - } - } - - if(var0 != 8169) { - renderNPCs(96); - } - - if(Unsorted.incomingPacketLength == GraphicDefinition.incomingBuffer.index) { - for(var1 = 0; var1 < Class163.localNPCCount; ++var1) { - if(null == NPC.npcs[Class15.localNPCIndexes[var1]]) { -// System.err.println("gnp2 pos:" + var1 + " size:" + Class163.anInt2046); - System.err.println("Local NPC was null - index: " + Class15.localNPCIndexes[var1] + ", list index: " + var1 + ", list size: " + Class163.localNPCCount); - } + final void decode(int var1, DataBuffer var2) { + try { + if (var1 == 0) { + this.anInt3164 = var2.readUnsignedShort(); + } else if (var1 == 1) { + this.anInt3163 = var2.readUnsignedShort(); + } else if (var1 == 2) { + this.anInt3160 = var2.readUnsignedShort(); + } else if (var1 == 3) { + this.anInt3165 = var2.readUnsignedShort(); } - } else { - System.err.println("NPC rendering packet size mismatch - size log: local=" + NPC_RENDER_LOG[0] + ", add global=" + NPC_RENDER_LOG[1] + ", masks=" + NPC_RENDER_LOG[2] + "."); -// System.err.println("gnp1 pos:" + GraphicDefinition.incomingBuffer.index + " psize:" + Class130.incomingPacketLength); -// throw new RuntimeException("gnp1 pos:" + Class28.incomingBuffer.index + " psize:" + Class130.incomingPacketLength); - } - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "gm.B(" + var0 + ')'); - } - } + } catch (RuntimeException var5) { + throw ClientErrorException.clientError(var5, "gm.A(" + var1 + ',' + (var2 != null ? "{...}" : "null") + ',' + true + ')'); + } + } - final int[] method154(int var1, byte var2) { - try { - int[] var3 = this.aClass114_2382.method1709(var1); - if(this.aClass114_2382.aBoolean1580) { - for(int var5 = 0; var5 < Class113.anInt1559; ++var5) { - int var7 = this.anInt3165 + (Class163_Sub3.anIntArray2999[var1] << 12) / this.anInt3164; - int var6 = this.anInt3160 + (Class102.anIntArray2125[var5] << 12) / this.anInt3164; - int var10 = var6; - int var11 = var7; - int var14 = 0; - int var12 = var6 * var6 >> 12; + static void method236() { + try { + TextureOperation14.aBoolean3387 = true; + } catch (RuntimeException var2) { + throw ClientErrorException.clientError(var2, "gm.C(" + (byte) 64 + ')'); + } + } - for(int var13 = var7 * var7 >> 12; var12 - -var13 < 16384 && var14 < this.anInt3163; var12 = var10 * var10 >> 12) { - var11 = (var10 * var11 >> 12) * 2 + var7; - ++var14; - var10 = var12 + -var13 + var6; - var13 = var11 * var11 >> 12; - } + final int[] method154(int var1, byte var2) { + try { + int[] var3 = this.aClass114_2382.method1709(var1); + if (this.aClass114_2382.aBoolean1580) { + for (int var5 = 0; var5 < Class113.anInt1559; ++var5) { + int var7 = this.anInt3165 + (Class163_Sub3.anIntArray2999[var1] << 12) / this.anInt3164; + int var6 = this.anInt3160 + (Class102.anIntArray2125[var5] << 12) / this.anInt3164; + int var10 = var6; + int var11 = var7; + int var14 = 0; + int var12 = var6 * var6 >> 12; - var3[var5] = this.anInt3163 + -1 <= var14 ?0:(var14 << 12) / this.anInt3163; + for (int var13 = var7 * var7 >> 12; var12 - -var13 < 16384 && var14 < this.anInt3163; var12 = var10 * var10 >> 12) { + var11 = (var10 * var11 >> 12) * 2 + var7; + ++var14; + var10 = var12 + -var13 + var6; + var13 = var11 * var11 >> 12; + } + + var3[var5] = this.anInt3163 + -1 <= var14 ? 0 : (var14 << 12) / this.anInt3163; + } } - } - return var3; - } catch (RuntimeException var15) { - throw ClientErrorException.clientError(var15, "gm.D(" + var1 + ',' + var2 + ')'); - } - } + return var3; + } catch (RuntimeException var15) { + throw ClientErrorException.clientError(var15, "gm.D(" + var1 + ',' + var2 + ')'); + } + } - public TextureOperation31() { - super(0, true); - } + public TextureOperation31() { + super(0, true); + } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation32.java b/Client/src/main/java/org/runite/client/TextureOperation32.java index 9449d0b5e..e067dee7c 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation32.java +++ b/Client/src/main/java/org/runite/client/TextureOperation32.java @@ -10,7 +10,7 @@ final class TextureOperation32 extends TextureOperation { private int anInt3354 = 3216; - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { if(0 == var1) { this.anInt3350 = var2.readUnsignedShort(); @@ -20,12 +20,12 @@ final class TextureOperation32 extends TextureOperation { this.anInt3354 = var2.readUnsignedShort(); } - if(!var3) { + if(!true) { method302(-47); } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "pk.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "pk.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } @@ -42,13 +42,11 @@ final class TextureOperation32 extends TextureOperation { super(1, true); } - final void method158(int var1) { + final void postDecode() { try { - if(var1 == 16251) { - this.method303(); - } + this.method303(); } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "pk.P(" + var1 + ')'); + throw ClientErrorException.clientError(var3, "pk.P(" + ')'); } } @@ -57,9 +55,9 @@ final class TextureOperation32 extends TextureOperation { int[] var4 = this.aClass114_2382.method1709(var1); if(this.aClass114_2382.aBoolean1580) { int var8 = Class95.anInt1343 * this.anInt3350 >> 12; - int[] var9 = this.method152(0, Class3_Sub20.anInt2487 & var1 + -1, 32755); - int[] var10 = this.method152(0, var1, 32755); - int[] var11 = this.method152(0, 1 + var1 & Class3_Sub20.anInt2487, 32755); + int[] var9 = this.method152(0, Class3_Sub20.anInt2487 & var1 + -1); + int[] var10 = this.method152(0, var1); + int[] var11 = this.method152(0, 1 + var1 & Class3_Sub20.anInt2487); for(int var12 = 0; Class113.anInt1559 > var12; ++var12) { int var14 = (var10[RenderAnimationDefinition.anInt396 & -1 + var12] - var10[1 + var12 & RenderAnimationDefinition.anInt396]) * var8 >> 12; @@ -105,7 +103,7 @@ final class TextureOperation32 extends TextureOperation { method301((byte)56); } - for(Class3_Sub28_Sub19 var1 = (Class3_Sub28_Sub19) TextureOperation13.aClass61_3364.method1222(); var1 != null; var1 = (Class3_Sub28_Sub19) TextureOperation13.aClass61_3364.method1221()) { + for(Class3_Sub28_Sub19 var1 = (Class3_Sub28_Sub19) TextureOperation13.aLinkedList_3364.method1222(); var1 != null; var1 = (Class3_Sub28_Sub19) TextureOperation13.aLinkedList_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 +120,7 @@ final class TextureOperation32 extends TextureOperation { if(Class3_Sub1.localIndex == var4) { var6 = Class102.player; } else { - var6 = TextureOperation0.players[var4]; + var6 = Unsorted.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/TextureOperation33.java b/Client/src/main/java/org/runite/client/TextureOperation33.java index db2c64f48..364e7cca2 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation33.java +++ b/Client/src/main/java/org/runite/client/TextureOperation33.java @@ -45,9 +45,9 @@ public final class TextureOperation33 extends TextureOperation { super(1, false); } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { - if (!var3) { + if (!true) { CS2Script.aShort3052 = -37; } @@ -58,7 +58,7 @@ public final class TextureOperation33 extends TextureOperation { } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "an.A(" + var1 + ',' + (var2 != null ? "{...}" : "null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "an.A(" + var1 + ',' + (var2 != null ? "{...}" : "null") + ',' + true + ')'); } } @@ -139,7 +139,7 @@ public final class TextureOperation33 extends TextureOperation { 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] + ","; + var2 = var2 + BufferedDataStream.incomingBuffer.buffer[var3] + ","; } Class49.reportError(var2, var5, (byte) 108); @@ -208,9 +208,9 @@ public final class TextureOperation33 extends TextureOperation { try { int[][] var3 = this.aClass97_2376.method1594((byte) 58, var2); if (this.aClass97_2376.aBoolean1379) { - int[] var4 = this.method152(0, Class3_Sub20.anInt2487 & var2 + -1, 32755); - int[] var5 = this.method152(0, var2, 32755); - int[] var6 = this.method152(0, 1 + var2 & Class3_Sub20.anInt2487, 32755); + int[] var4 = this.method152(0, Class3_Sub20.anInt2487 & var2 + -1); + int[] var5 = this.method152(0, var2); + int[] var6 = this.method152(0, 1 + var2 & Class3_Sub20.anInt2487); int[] var7 = var3[0]; int[] var8 = var3[1]; int[] var9 = var3[2]; diff --git a/Client/src/main/java/org/runite/client/TextureOperation34.java b/Client/src/main/java/org/runite/client/TextureOperation34.java index fe2251396..48ee0f281 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation34.java +++ b/Client/src/main/java/org/runite/client/TextureOperation34.java @@ -68,14 +68,14 @@ final class TextureOperation34 extends TextureOperation { if(this.aBoolean3065) { for(var10 = 0; Class113.anInt1559 > var10; ++var10) { var4 = this.anInt3060 * Class102.anIntArray2125[var10]; - var6 = this.method192(var8 * var4 >> 12, var18, var17, var12, 121, var11, var14); + var6 = this.method192(var8 * var4 >> 12, var18, var17, var12, var11, var14); var6 = var9 * var6 >> 12; var3[var10] = 2048 - -(var6 >> 1); } } else { for(var10 = 0; var10 < Class113.anInt1559; ++var10) { var4 = this.anInt3060 * Class102.anIntArray2125[var10]; - var6 = this.method192(var8 * var4 >> 12, var18, var17, var12, 124, var11, var14); + var6 = this.method192(var8 * var4 >> 12, var18, var17, var12, var11, var14); var3[var10] = var9 * var6 >> 12; } } @@ -99,7 +99,7 @@ final class TextureOperation34 extends TextureOperation { for(var10 = 0; Class113.anInt1559 > var10; ++var10) { var4 = Class102.anIntArray2125[var10] * this.anInt3060; - var6 = this.method192(var4 * var8 >> 12, var18, var17, var12, 122, var11, var14); + var6 = this.method192(var4 * var8 >> 12, var18, var17, var12, var11, var14); var3[var10] = var6 * var9 >> 12; } } @@ -124,14 +124,14 @@ final class TextureOperation34 extends TextureOperation { if(this.aBoolean3065 && this.anInt3058 + -1 == var7) { for(var10 = 0; var10 < Class113.anInt1559; ++var10) { var4 = Class102.anIntArray2125[var10] * this.anInt3060; - var6 = this.method192(var8 * var4 >> 12, var18, var17, var12, 120, var11, var14); + var6 = this.method192(var8 * var4 >> 12, var18, var17, var12, var11, var14); var6 = (var9 * var6 >> 12) + var3[var10]; var3[var10] = (var6 >> 1) + 2048; } } else { for(var10 = 0; Class113.anInt1559 > var10; ++var10) { var4 = Class102.anIntArray2125[var10] * this.anInt3060; - var6 = this.method192(var4 * var8 >> 12, var18, var17, var12, 126, var11, var14); + var6 = this.method192(var4 * var8 >> 12, var18, var17, var12, var11, var14); var3[var10] += var6 * var9 >> 12; } } @@ -144,9 +144,9 @@ final class TextureOperation34 extends TextureOperation { } } - final void method158(int var1) { + final void postDecode() { try { - this.aByteArray3059 = Class49.method1123(16711935, this.anInt3067); + this.aByteArray3059 = Class49.method1123(this.anInt3067); this.method191(); for(int var2 = -1 + this.anInt3058; var2 >= 1; --var2) { @@ -158,12 +158,8 @@ final class TextureOperation34 extends TextureOperation { --this.anInt3058; } - if(var1 != 16251) { - this.anInt3062 = 101; - } - } catch (RuntimeException var4) { - throw ClientErrorException.clientError(var4, "bi.P(" + var1 + ')'); + throw ClientErrorException.clientError(var4, "bi.P(" + ')'); } } @@ -180,7 +176,7 @@ final class TextureOperation34 extends TextureOperation { var3 = Class56.localPlayerIndexes[var1]; } - Player var4 = TextureOperation0.players[var3]; + Player var4 = Unsorted.players[var3]; if(var4 != null && 0 < var4.textCycle) { --var4.textCycle; if(var4.textCycle == 0) { @@ -205,11 +201,8 @@ final class TextureOperation34 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { - if(!var3) { - this.method192(49, -110, -55, -117, 117, 10, -51); - } if(var1 == 0) { this.aBoolean3065 = var2.readUnsignedByte() == 1; @@ -235,7 +228,7 @@ final class TextureOperation34 extends TextureOperation { } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "bi.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "bi.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } @@ -319,12 +312,8 @@ final class TextureOperation34 extends TextureOperation { } } - private int method192(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + private int method192(int var1, int var2, int var3, int var4, int var6, int var7) { try { - if(var5 < 117) { - this.method158(89); - } - int var10 = -4096 + var6; int var13 = var1 >> 12; int var12 = 1 + var13; @@ -371,7 +360,7 @@ final class TextureOperation34 extends TextureOperation { int var17 = var8 + ((-var8 + var9) * var15 >> 12); return var16 - -(var7 * (var17 + -var16) >> 12); } catch (RuntimeException var18) { - throw ClientErrorException.clientError(var18, "bi.R(" + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ',' + var7 + ')'); + throw ClientErrorException.clientError(var18, "bi.R(" + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var6 + ',' + var7 + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation35.java b/Client/src/main/java/org/runite/client/TextureOperation35.java index 42dfc53c7..581713ea8 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation35.java +++ b/Client/src/main/java/org/runite/client/TextureOperation35.java @@ -36,9 +36,9 @@ final class TextureOperation35 extends TextureOperation { try { int[] var4 = this.aClass114_2382.method1709(var1); if(this.aClass114_2382.aBoolean1580) { - int[] var5 = this.method152(0, var1 - 1 & Class3_Sub20.anInt2487, 32755); - int[] var6 = this.method152(0, var1, 32755); - int[] var7 = this.method152(0, Class3_Sub20.anInt2487 & var1 + 1, 32755); + int[] var5 = this.method152(0, var1 - 1 & Class3_Sub20.anInt2487); + int[] var6 = this.method152(0, var1); + int[] var7 = this.method152(0, Class3_Sub20.anInt2487 & var1 + 1); for(int var8 = 0; Class113.anInt1559 > var8; ++var8) { int var9 = (var7[var8] + -var5[var8]) * this.anInt3322; @@ -59,9 +59,9 @@ final class TextureOperation35 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { - if(!var3) { + if(!true) { method294((byte)-57); } @@ -70,7 +70,7 @@ final class TextureOperation35 extends TextureOperation { } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "pg.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "pg.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation36.java b/Client/src/main/java/org/runite/client/TextureOperation36.java index 63a164fc2..7acca2344 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation36.java +++ b/Client/src/main/java/org/runite/client/TextureOperation36.java @@ -1,8 +1,6 @@ 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 TextureOperation36 extends TextureOperation { @@ -17,174 +15,6 @@ public final class TextureOperation36 extends TextureOperation { private int anInt3434 = -1; static float aFloat3435; - static void method338(int var1, boolean var2, int var3, int var4, int var5) { - try { - ++Class79.anInt1127; - Class124.method1745(); - if(!var2) { - Class3_Sub5.method116(true); - Class102.method1611(71, true); - Class3_Sub5.method116(false); - } - - Class102.method1611(100, false); - if(!var2) { - TextureOperation32.method302(2); - } - - Unsorted.method2067(); - if(HDToolKit.highDetail) { - Class65.method1239(var4, 125, var5, var1, var3, true); - var3 = Class163_Sub1.anInt2989; - var5 = Class3_Sub28_Sub3.anInt3564; - var4 = Class96.anInt1358; - var1 = Unsorted.anInt31; - } - - int var6; - int var7; - if(1 == Class133.anInt1753) { - var7 = 2047 & LinkableRSString.anInt2589 + GraphicDefinition.CAMERA_DIRECTION; - var6 = Unsorted.anInt2309; - if(Class75_Sub4.anInt2670 / 256 > var6) { - var6 = Class75_Sub4.anInt2670 / 256; - } - - if(WaterfallShader.aBooleanArray2169[4] && Class166.anIntArray2073[4] + 128 > var6) { - var6 = 128 + Class166.anIntArray2073[4]; - } - - Class140_Sub2.method1952(Unsorted.anInt3155, var1, Class121.method1736(WorldListCountry.localPlane, 1, Class102.player.anInt2819, Class102.player.anInt2829) + -50, Client.ZOOM - -(var6 * 3), var7, Unsorted.anInt942, var6); - } - - var7 = Class7.anInt2162; - var6 = NPC.anInt3995; - int var8 = Class77.anInt1111; - int var9 = Class139.anInt1823; - int var10 = TextureOperation28.anInt3315; - - int var11; - int var12; - for(var11 = 0; 5 > var11; ++var11) { - if(WaterfallShader.aBooleanArray2169[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) { - TextureOperation28.anInt3315 = var12 + TextureOperation28.anInt3315 & 0x7FF; - } - - if(var11 == 4) { - Class139.anInt1823 += var12; - if(128 > Class139.anInt1823) { - Class139.anInt1823 = 128; - } - - if(Class139.anInt1823 > 383) { - Class139.anInt1823 = 383; - } - } - - if(var11 == 2) { - Class77.anInt1111 += var12; - } - - if(var11 == 1) { - Class7.anInt2162 += var12; - } - - if(var11 == 0) { - NPC.anInt3995 += var12; - } - } - } - - Class3_Sub28_Sub20.method725(); - if(HDToolKit.highDetail) { - Class22.setClipping(var3, var5, var3 + var4, var5 - -var1); - float var17 = (float)Class139.anInt1823 * 0.17578125F; - 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; - } - - HDToolKit.viewport(var3, var5, var4, var1, var4 / 2 + var3, var5 - -(var1 / 2), var17, var16, Unsorted.anInt1705, Unsorted.anInt1705); - } else { - Class74.setClipping(var3, var5, var4 + var3, var1 + var5); - Class51.method1134(); - } - - if(!Class38_Sub1.aBoolean2615 && var3 <= NPCDefinition.anInt1297 && var4 + var3 > NPCDefinition.anInt1297 && var5 <= Class38_Sub1.anInt2612 && Class38_Sub1.anInt2612 < var1 + var5) { - aBoolean3094 = true; - Unsorted.anInt59 = 0; - var12 = Class145.screenUpperX; - int var13 = Class1.screenUpperY; - var11 = Class139.screenLowerX; - Unsorted.anInt3642 = var11 + (var12 - var11) * (-var3 + NPCDefinition.anInt1297) / var4; - int var14 = AtmosphereParser.screenLowerY; - RenderAnimationDefinition.anInt384 = (-var13 + var14) * (Class38_Sub1.anInt2612 - var5) / var1 + var13; - } else { - aBoolean3094 = false; - Unsorted.anInt59 = 0; - } - - Class58.method1194(); - byte var19 = Class137.method1817() != 2 ?1:(byte)Class79.anInt1127; - if(HDToolKit.highDetail) { - HDToolKit.method1846(); - HDToolKit.method1831(true); - HDToolKit.method1827(true); - if(Class143.gameStage == 10) { - var12 = Class3_Sub30_Sub1.method809(Class106.anInt1446, Class77.anInt1111 >> 10, Unsorted.anInt3625, NPC.anInt3995 >> 10); - } else { - var12 = Class3_Sub30_Sub1.method809(Class106.anInt1446, Class102.player.anIntArray2755[0] >> 3, Unsorted.anInt3625, Class102.player.anIntArray2767[0] >> 3); - } - - Class68.method1269(Class44.anInt719, !WorldListEntry.aBoolean2623); - HDToolKit.clearScreen(var12); - 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, 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(); - 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, 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(); - Texture.method1405(var5, var4, var3, 256, var1, 256, -6403 + -994); - Class163_Sub2_Sub1.method2221(var4, var3, var1, 256, 256, var5); - } - - ((Class102)Class51.anInterface2_838).method1610(Class106.anInt1446); - Class65.method1235(var4, var5, var1, var3); - Class139.anInt1823 = var9; - Class77.anInt1111 = var8; - Class7.anInt2162 = var7; - NPC.anInt3995 = var6; - TextureOperation28.anInt3315 = var10; - if(TextureOperation34.aBoolean3064 && Class58.aJs5Worker_917.countPriorityRequests() == 0) { - TextureOperation34.aBoolean3064 = false; - } - - if(TextureOperation34.aBoolean3064) { - Toolkit.getActiveToolkit().method934(var3, var5, var4, var1, 0); - LoadingBox.draw(false, TextCore.LoadingPleaseWait2); - } - - 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); - } - - } catch (RuntimeException var15) { - throw ClientErrorException.clientError(var15, "ui.OA(" + -6403 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ')'); - } - } - static void method1628(int var0, int var1, int var2, int var3, int var4, int var5) { try { int var9; @@ -197,7 +27,7 @@ public final class TextureOperation36 extends TextureOperation { int var11 = (var5 - var3) * (-var7 + var8) / var1 - -var7; var12 = var9 + (var10 + -var9) * (-var0 + var4) / var2; if(GameObject.aBoolean1837 && (64 & Class164.anInt2051) != 0) { - RSInterface var13 = AbstractSprite.method638(Class3_Sub30_Sub1.anInt872, RSInterface.anInt278); + RSInterface var13 = AbstractSprite.method638(BufferedDataStream.anInt872, RSInterface.anInt278); if(var13 == null) { Class25.method958((byte)-87); } else { @@ -236,7 +66,7 @@ public final class TextureOperation36 extends TextureOperation { if(Class164_Sub1.anInt3012 == 1) { Class3_Sub24_Sub4.method1177(Class99.anInt1403, var26, (byte)-58, RSString.stringCombiner(new RSString[]{RenderAnimationDefinition.aClass94_378, ColorCore.PMColor, var16.name}), var12, (short)14, TextCore.HasUse, var27); } else if(GameObject.aBoolean1837) { - Class3_Sub28_Sub9 var17 = -1 == Unsorted.anInt1038?null:Class61.method1210(Unsorted.anInt1038); + Class3_Sub28_Sub9 var17 = -1 == Unsorted.anInt1038?null: LinkedList.method1210(Unsorted.anInt1038); if(0 != (Class164.anInt2051 & 4) && (var17 == null || var17.anInt3614 != var16.method1691(var17.anInt3614, Unsorted.anInt1038, (byte) 98))) { Class3_Sub24_Sub4.method1177(Unsorted.anInt1887, var26, (byte)-77, RSString.stringCombiner(new RSString[]{TextCore.aClass94_676, ColorCore.PMColor, var16.name}), var12, (short)38, Class3_Sub28_Sub9.aClass94_3621, var27); } @@ -319,7 +149,7 @@ public final class TextureOperation36 extends TextureOperation { } for(var37 = 0; var37 < Class159.localPlayerCount; ++var37) { - var38 = TextureOperation0.players[Class56.localPlayerIndexes[var37]]; + var38 = Unsorted.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) { @@ -332,7 +162,7 @@ public final class TextureOperation36 extends TextureOperation { } if(var14 == 0) { - Player var30 = TextureOperation0.players[var15]; + Player var30 = Unsorted.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); @@ -347,7 +177,7 @@ public final class TextureOperation36 extends TextureOperation { } for(var37 = 0; var37 < Class159.localPlayerCount; ++var37) { - var38 = TextureOperation0.players[Class56.localPlayerIndexes[var37]]; + var38 = Unsorted.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()) { @@ -360,7 +190,7 @@ public final class TextureOperation36 extends TextureOperation { } if(var14 == 3) { - Class61 var28 = TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var12][var27]; + LinkedList var28 = Class39.aLinkedListArrayArrayArray3273[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; @@ -368,7 +198,7 @@ public final class TextureOperation36 extends TextureOperation { if(Class164_Sub1.anInt3012 == 1) { Class3_Sub24_Sub4.method1177(Class99.anInt1403, var18, (byte)-75, RSString.stringCombiner(new RSString[]{RenderAnimationDefinition.aClass94_378, ColorCore.BankItemColor, var40.name}), var12, (short)33, TextCore.HasUse, var27); } else if(GameObject.aBoolean1837) { - Class3_Sub28_Sub9 var39 = Unsorted.anInt1038 == -1?null:Class61.method1210(Unsorted.anInt1038); + Class3_Sub28_Sub9 var39 = Unsorted.anInt1038 == -1?null: LinkedList.method1210(Unsorted.anInt1038); if((Class164.anInt2051 & 1) != 0 && (null == var39 || var39.anInt3614 != var40.method1115(var39.anInt3614, 100, Unsorted.anInt1038))) { Class3_Sub24_Sub4.method1177(Unsorted.anInt1887, var18, (byte)-70, RSString.stringCombiner(new RSString[]{TextCore.aClass94_676, ColorCore.BankItemColor, var40.name}), var12, (short)39, Class3_Sub28_Sub9.aClass94_3621, var27); } @@ -499,9 +329,9 @@ public final class TextureOperation36 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { - if(!var3) { + if(!true) { CacheIndex.animationIndex = null; } @@ -510,7 +340,7 @@ public final class TextureOperation36 extends TextureOperation { } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "ui.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "ui.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } @@ -545,15 +375,11 @@ public final class TextureOperation36 extends TextureOperation { } } - final int method155(byte var1) { + final int getSpriteFrame() { try { - if(var1 != 19) { - this.method155((byte)-60); - } - return this.anInt3434; } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "ui.HA(" + var1 + ')'); + throw ClientErrorException.clientError(var3, "ui.HA(" + (byte) 19 + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation37.java b/Client/src/main/java/org/runite/client/TextureOperation37.java index c92eddd79..59d076e3d 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation37.java +++ b/Client/src/main/java/org/runite/client/TextureOperation37.java @@ -21,7 +21,7 @@ final class TextureOperation37 extends TextureOperation { private int anInt3266 = 8192; - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { if(var1 == 0) { this.anInt3265 = var2.readUnsignedShort(); @@ -39,12 +39,12 @@ final class TextureOperation37 extends TextureOperation { this.anInt3266 = var2.readUnsignedShort(); } - if(!var3) { + if(!true) { this.anInt3266 = 85; } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "mh.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "mh.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } @@ -129,11 +129,11 @@ final class TextureOperation37 extends TextureOperation { return; } - GraphicDefinition.incomingBuffer.index = 0; - Class3_Sub15.activeConnection.readBytes(GraphicDefinition.incomingBuffer.buffer, 0, 8 * TextureOperation29.aClass94Array3391.length); + BufferedDataStream.incomingBuffer.index = 0; + Class3_Sub15.activeConnection.readBytes(BufferedDataStream.incomingBuffer.buffer, 0, 8 * TextureOperation29.aClass94Array3391.length); for(response = 0; response < TextureOperation29.aClass94Array3391.length; ++response) { - TextureOperation29.aClass94Array3391[response] = Unsorted.method1052(GraphicDefinition.incomingBuffer.readLong()); + TextureOperation29.aClass94Array3391[response] = Unsorted.method1052(BufferedDataStream.incomingBuffer.readLong()); } Unsorted.anInt1711 = 21; @@ -218,15 +218,11 @@ final class TextureOperation37 extends TextureOperation { } } - final void method158(int var1) { + final void postDecode() { try { Class8.method844((byte)-9); - if(var1 != 16251) { - method272((byte)-85); - } - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "mh.P(" + var1 + ')'); + throw ClientErrorException.clientError(var3, "mh.P(" + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation38.java b/Client/src/main/java/org/runite/client/TextureOperation38.java index 6ef8b739b..b5e38cc1f 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation38.java +++ b/Client/src/main/java/org/runite/client/TextureOperation38.java @@ -16,19 +16,15 @@ final class TextureOperation38 extends TextureOperation { static short[] aShortArray3455; static int[] anIntArray3456 = new int[4096]; - final void method158(int var1) { + final void postDecode() { try { Class8.method844((byte)-9); - if(var1 != 16251) { - this.anInt3454 = 107; - } - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "vc.P(" + var1 + ')'); + throw ClientErrorException.clientError(var3, "vc.P(" + ')'); } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { if(var1 == 0) { this.anInt3454 = var2.readUnsignedByte(); @@ -43,7 +39,7 @@ final class TextureOperation38 extends TextureOperation { } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "vc.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "vc.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation39.java b/Client/src/main/java/org/runite/client/TextureOperation39.java index faaa02c7a..20c75ebac 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation39.java +++ b/Client/src/main/java/org/runite/client/TextureOperation39.java @@ -107,7 +107,7 @@ class TextureOperation39 extends TextureOperation { var13.anInt2268 = var7; var13.anInt2272 = var0; var13.anInt2278 = var9; - Unsorted.aClass61_2468.method1215(var13); + Unsorted.aLinkedList_2468.method1215(var13); } catch (RuntimeException var14) { throw ClientErrorException.clientError(var14, "nh.V(" + var0 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ',' + var7 + ',' + var8 + ',' + var9 + ',' + -745213428 + ',' + var11 + ',' + var12 + ')'); } @@ -151,18 +151,18 @@ class TextureOperation39 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { if(var1 == 0) { this.anInt3278 = var2.readUnsignedShort(); } - if(!var3) { + if(!true) { method276(115, 107, 22, 20, null, 87L, false); } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "nh.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "nh.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation4.java b/Client/src/main/java/org/runite/client/TextureOperation4.java index 97c2d7b2a..105a2984f 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation4.java +++ b/Client/src/main/java/org/runite/client/TextureOperation4.java @@ -26,15 +26,11 @@ final class TextureOperation4 extends TextureOperation { static RSString[] aClass94Array3238 = new RSString[]{aClass94_3237, aClass94_3243, aClass94_3239, aClass94_3232}; - final void method158(int var1) { + final void postDecode() { try { - if(var1 != 16251) { - this.method158(-93); - } - this.method263(); } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "mc.P(" + var1 + ')'); + throw ClientErrorException.clientError(var3, "mc.P(" + ')'); } } @@ -49,7 +45,7 @@ final class TextureOperation4 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { if(0 == var1) { this.anInt3242 = var2.readUnsignedByte(); @@ -69,12 +65,12 @@ final class TextureOperation4 extends TextureOperation { this.anInt3229 = var2.readUnsignedShort(); } - if(!var3) { + if(!true) { aClass94_3239 = null; } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "mc.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "mc.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation5.java b/Client/src/main/java/org/runite/client/TextureOperation5.java index 8769a7521..3da5be70d 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation5.java +++ b/Client/src/main/java/org/runite/client/TextureOperation5.java @@ -21,7 +21,7 @@ final class TextureOperation5 extends TextureOperation { int var10; for(var10 = -this.anInt3297 + var1; var1 - -this.anInt3297 >= var10; ++var10) { - int[] var11 = this.method152(0, var10 & Class3_Sub20.anInt2487, 32755); + int[] var11 = this.method152(0, var10 & Class3_Sub20.anInt2487); int[] var12 = new int[Class113.anInt1559]; int var13 = 0; @@ -141,7 +141,7 @@ final class TextureOperation5 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { if(var1 == 0) { this.anInt3294 = var2.readUnsignedByte(); @@ -151,12 +151,12 @@ final class TextureOperation5 extends TextureOperation { this.aBoolean2375 = var2.readUnsignedByte() == 1; } - if(!var3) { + if(!true) { this.anInt3294 = 60; } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "nm.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "nm.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation6.java b/Client/src/main/java/org/runite/client/TextureOperation6.java index a04c70622..44d8f2131 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation6.java +++ b/Client/src/main/java/org/runite/client/TextureOperation6.java @@ -11,7 +11,7 @@ final class TextureOperation6 extends TextureOperation { private int anInt3046 = 4096; - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { if(0 == var1) { this.anInt3043 = var2.readUnsignedShort(); @@ -24,7 +24,7 @@ final class TextureOperation6 extends TextureOperation { //aClass94_3042 = (RSString)null; } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "aj.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "aj.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } @@ -218,7 +218,7 @@ final class TextureOperation6 extends TextureOperation { try { int[] var3 = this.aClass114_2382.method1709(var1); if(this.aClass114_2382.aBoolean1580) { - int[] var5 = this.method152(0, var1, 32755); + int[] var5 = this.method152(0, var1); for(int var6 = 0; var6 < Class113.anInt1559; ++var6) { int var7 = var5[var6]; diff --git a/Client/src/main/java/org/runite/client/TextureOperation7.java b/Client/src/main/java/org/runite/client/TextureOperation7.java index b40499f6e..ea8f58105 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation7.java +++ b/Client/src/main/java/org/runite/client/TextureOperation7.java @@ -16,8 +16,8 @@ final class TextureOperation7 extends TextureOperation { int[] var3 = this.aClass114_2382.method1709(var1); int var4; if(this.aClass114_2382.aBoolean1580) { - int[] var6 = this.method152(0, var1, 32755); - int[] var7 = this.method152(1, var1, 32755); + int[] var6 = this.method152(0, var1); + int[] var7 = this.method152(1, var1); int var8 = this.anInt3343; if(var8 == 1) { for(var8 = 0; var8 < Class113.anInt1559; ++var8) { @@ -93,10 +93,6 @@ final class TextureOperation7 extends TextureOperation { final int[][] method166(int var2) { try { - if(-1 != -1) { - this.method157(-8, null, false); - } - int[][] var3 = this.aClass97_2376.method1594((byte)-125, var2); if(this.aClass97_2376.aBoolean1379) { int[][] var10 = this.method162(var2, 0, (byte)-87); @@ -589,7 +585,7 @@ final class TextureOperation7 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { if(var1 == 0) { this.anInt3343 = var2.readUnsignedByte(); @@ -597,12 +593,12 @@ final class TextureOperation7 extends TextureOperation { this.aBoolean2375 = var2.readUnsignedByte() == 1; } - if(!var3) { + if(!true) { TextCore.aClass94_3339 = null; } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "pi.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "pi.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation8.java b/Client/src/main/java/org/runite/client/TextureOperation8.java index aef0715c4..584ff8b37 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation8.java +++ b/Client/src/main/java/org/runite/client/TextureOperation8.java @@ -114,7 +114,7 @@ final class TextureOperation8 extends TextureOperation { try { int[] var8 = this.aClass114_2382.method1709(var1); if(this.aClass114_2382.aBoolean1580) { - int[] var5 = this.method152(0, var1, 32755); + int[] var5 = this.method152(0, var1); for(int var6 = 0; var6 < Class113.anInt1559; ++var6) { int var4 = var5[var6] >> 4; @@ -168,7 +168,7 @@ final class TextureOperation8 extends TextureOperation { } } - final void method158(int var1) { + final void postDecode() { try { if(null == this.anIntArrayArray3469) { this.anIntArrayArray3469 = new int[][]{{0, 0}, {4096, 4096}}; @@ -181,15 +181,11 @@ final class TextureOperation8 extends TextureOperation { this.method355(); } - if(var1 != 16251) { - anInt3463 = 22; - } - Class8.method844((byte)-9); this.method352(); } } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "wi.P(" + var1 + ')'); + throw ClientErrorException.clientError(var3, "wi.P(" + ')'); } } @@ -207,7 +203,7 @@ final class TextureOperation8 extends TextureOperation { } } - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { if(0 == var1) { this.anInt3462 = var2.readUnsignedByte(); @@ -219,12 +215,12 @@ final class TextureOperation8 extends TextureOperation { } } - if(!var3) { + if(!true) { this.anInt3462 = -6; } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "wi.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "wi.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } diff --git a/Client/src/main/java/org/runite/client/TextureOperation9.java b/Client/src/main/java/org/runite/client/TextureOperation9.java index 893d8ef1e..ba24e3b8f 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation9.java +++ b/Client/src/main/java/org/runite/client/TextureOperation9.java @@ -14,9 +14,9 @@ public final class TextureOperation9 extends TextureOperation { static float aFloat3105; - final void method157(int var1, DataBuffer var2, boolean var3) { + final void decode(int var1, DataBuffer var2) { try { - if(!var3) { + if(!true) { method207(18, false, -19, 102L); } @@ -29,7 +29,7 @@ public final class TextureOperation9 extends TextureOperation { } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "ej.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + var3 + ')'); + throw ClientErrorException.clientError(var5, "ej.A(" + var1 + ',' + (var2 != null?"{...}":"null") + ',' + true + ')'); } } @@ -77,17 +77,17 @@ public final class TextureOperation9 extends TextureOperation { 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); + BufferedDataStream.method806(Unsorted.menuOptionCount + -2); } else { - Class3_Sub30_Sub1.method806(Unsorted.menuOptionCount + -1); + BufferedDataStream.method806(Unsorted.menuOptionCount + -1); } } } else if(NPCDefinition.anInt1297 == Class163_Sub1.anInt2993 && Class38_Sub1.anInt2614 == Class38_Sub1.anInt2612) { Unsorted.anInt3660 = 0; if(ClientCommands.shiftClickEnabled && ObjectDefinition.aBooleanArray1490[81] && Unsorted.menuOptionCount > 2) { - Class3_Sub30_Sub1.method806(Unsorted.menuOptionCount - 2); + BufferedDataStream.method806(Unsorted.menuOptionCount - 2); } else { - Class3_Sub30_Sub1.method806(Unsorted.menuOptionCount - 1); + BufferedDataStream.method806(Unsorted.menuOptionCount - 1); } } else { Class168.anInt2099 = Class38_Sub1.anInt2614; @@ -142,7 +142,7 @@ public final class TextureOperation9 extends TextureOperation { try { int[] var4 = this.aClass114_2382.method1709(var1); if(this.aClass114_2382.aBoolean1580) { - int[] var5 = this.method152(0, !this.aBoolean3104?var1:Class3_Sub20.anInt2487 + -var1, 32755); + int[] var5 = this.method152(0, !this.aBoolean3104?var1:Class3_Sub20.anInt2487 + -var1); if(this.aBoolean3100) { for(int var6 = 0; var6 < Class113.anInt1559; ++var6) { var4[var6] = var5[-var6 + RenderAnimationDefinition.anInt396]; diff --git a/Client/src/main/java/org/runite/client/Unsorted.java b/Client/src/main/java/org/runite/client/Unsorted.java index dc4e7cf67..8fa83af72 100644 --- a/Client/src/main/java/org/runite/client/Unsorted.java +++ b/Client/src/main/java/org/runite/client/Unsorted.java @@ -41,15 +41,15 @@ public class Unsorted { public static int[] anIntArray49; public static int anInt1234; public static Class33 aClass33_1238; - public static Class61 aClass61_1242 = new Class61(); + public static LinkedList aLinkedList_1242 = new LinkedList(); public static int anInt1244 = -1; public static RSInterface aClass11_1933; public static float[] aFloatArray1934 = new float[]{0.073F, 0.169F, 0.24F, 1.0F}; public static Class8 aClass8_1936; - public static Class3_Sub30_Sub1 aClass3_Sub30_Sub1_2942 = new Class3_Sub30_Sub1(); + public static BufferedDataStream aBufferedDataStream_2942 = new BufferedDataStream(); public static int[] anIntArray2952 = new int[128]; public static int anInt2958 = 0; - public static Class61 aClass61_78 = new Class61(); + public static LinkedList aLinkedList_78 = new LinkedList(); public static int anInt72 = 0; public static boolean[] aBooleanArray73 = new boolean[200]; public static boolean[] aBooleanArray1703; @@ -95,7 +95,7 @@ public class Unsorted { public static int anInt3657; public static int anInt3660 = 0; public static boolean aBoolean3665 = true; - public static Class61 aClass61_2468 = new Class61(); + public static LinkedList aLinkedList_2468 = new LinkedList(); public static int[] anIntArray2469; public static int[] anIntArray2470 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; public static boolean paramJavaScriptEnabled = false; @@ -126,6 +126,7 @@ public class Unsorted { public static ReferenceCache aReferenceCache_4051 = new ReferenceCache(30); public static short[][] aShortArrayArray1619 = new short[][]{{(short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898}, {(short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10347, (short) 10582, (short) 10429, (short) 10407, (short) 10359, (short) 8414, (short) 9540, (short) 10456, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0}, {(short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898}, {(short) 4300, (short) 3294, (short) 3303, (short) 3264, (short) 4506, (short) 4382, (short) 4387, (short) 5293, (short) 7622, (short) 7384, (short) 8412, (short) 7496, (short) 86, (short) 123, (short) 111, (short) 99, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 13766, (short) 13745, (short) 13726, (short) 13890, (short) 13743, (short) 13852, (short) 17602, (short) 18605, (short) 21660, (short) 24000, (short) 24997, (short) 24088, (short) 27972, (short) 25903, (short) 26904, (short) 27193, (short) 27175, (short) 27156, (short) 30020, (short) 28975, (short) 29976, (short) 12482, (short) 13485, (short) 10392, (short) 10692, (short) 10669, (short) 10776, (short) 6717, (short) 6695, (short) 7830, (short) 6971, (short) 6951, (short) 5910, (short) 3389, (short) 3369, (short) 3356, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0}, {(short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898}}; public static int gameWindowWidth = 0; + public static Player[] players = new Player[2048]; static int anInt942; static int anInt944 = 0; static int anInt952; @@ -172,6 +173,8 @@ public class Unsorted { public static int menuOptionCount = 0; static boolean aBoolean11 = false; public static Class158 aClass158_3009; + static long[] aLongArray3271 = new long[500]; + static boolean aBoolean3275 = true; static void method2086() { try { @@ -515,7 +518,7 @@ public class Unsorted { method84(null, 89); } - aClass61_78 = null; + aLinkedList_78 = null; aBooleanArray73 = null; } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "ab.H(" + var0 + ')'); @@ -700,7 +703,7 @@ public class Unsorted { Class146.anIntArrayArrayArray1903 = null; WorldMap.anInt2737 = 0; aClass3_Sub28_Sub3_2600 = null; - Class84.aClass61_1162.method1211(-108); + Class84.aLinkedList_1162.method1211(-108); Class119.aClass131_1624 = null; TextureOperation13.anInt3362 = -1; Class75_Sub2.aClass33_2648 = null; @@ -730,7 +733,7 @@ public class Unsorted { var9.anInt3056 = 8; var9.anInt3062 = (int) ((float) 0.4 * 4096.0F); var9.aBoolean3065 = true; - var9.method158(16251); + var9.postDecode(); TextureOperation33.method180(-106, 1, 2048); var9.method186(0, var8); return var8; @@ -776,7 +779,7 @@ public class Unsorted { boolean var8 = true; if (0 < var5.anInt189) { - var8 = Class3_Sub30_Sub1.method715(var5); + var8 = BufferedDataStream.method715(var5); } if (var8) { @@ -928,7 +931,7 @@ public class Unsorted { } } } catch (RuntimeException var12) { - throw ClientErrorException.clientError(var12, "ma.C(" + var0 + ',' + (var1 != null ? "{...}" : "null") + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ')'); + throw ClientErrorException.clientError(var12, "ma.C(" + var0 + ',' + (var1 != null ? "{...}" : "null") + ',' + var3 + ',' + var4 + ',' + var5 + ')'); } } @@ -1044,60 +1047,6 @@ public class Unsorted { } } - public static void updateLocalPosition() { - try { - GraphicDefinition.incomingBuffer.setBitAccess(); - int opcode = GraphicDefinition.incomingBuffer.getBits(1); - if (opcode != 0) { - int type = GraphicDefinition.incomingBuffer.getBits(2); - if (type == 0) { - Class21.maskUpdateIndexes[maskUpdateCount++] = 2047; - } else { - int var4; - int var5; - if (type == 1) { //Walk - var4 = GraphicDefinition.incomingBuffer.getBits(3); - Class102.player.walkStep(1, (byte) -128, var4); - var5 = GraphicDefinition.incomingBuffer.getBits(1); - if (var5 == 1) { - Class21.maskUpdateIndexes[maskUpdateCount++] = 2047; - } - - } else if (type == 2) { - if (GraphicDefinition.incomingBuffer.getBits(1) == 1) { - var4 = GraphicDefinition.incomingBuffer.getBits(3); - Class102.player.walkStep(2, (byte) -104, var4); - var5 = GraphicDefinition.incomingBuffer.getBits(3); - Class102.player.walkStep(2, (byte) -126, var5); - } else { - var4 = GraphicDefinition.incomingBuffer.getBits(3); - Class102.player.walkStep(0, (byte) -109, var4); - } - - var4 = GraphicDefinition.incomingBuffer.getBits(1); - if (var4 == 1) { - Class21.maskUpdateIndexes[maskUpdateCount++] = 2047; - } - - } else if (type == 3) { - var4 = GraphicDefinition.incomingBuffer.getBits(7); - var5 = GraphicDefinition.incomingBuffer.getBits(1); - WorldListCountry.localPlane = GraphicDefinition.incomingBuffer.getBits(2); - int var6 = GraphicDefinition.incomingBuffer.getBits(1); - if (var6 == 1) { - Class21.maskUpdateIndexes[maskUpdateCount++] = 2047; - } - - int var7 = GraphicDefinition.incomingBuffer.getBits(7); - Class102.player.method1981(var7, var5 == 1, var4); - } - } - } - } catch (RuntimeException var8) { - throw ClientErrorException.clientError(var8, "bg.G(" + (byte) 81 + ')'); - } - } - public static boolean method2103(int var0, int var1) { try { return var1 >= -78 || (var0 == 198 || 230 == var0 || var0 == 156 || var0 == 140 || 223 == var0); @@ -1771,7 +1720,7 @@ public class Unsorted { if (var2 <= -65) { Class3_Sub4 var10 = null; - for (Class3_Sub4 var11 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1222(); var11 != null; var11 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1221()) { + for (Class3_Sub4 var11 = (Class3_Sub4) TextureOperation26.aLinkedList_3075.method1222(); var11 != null; var11 = (Class3_Sub4) TextureOperation26.aLinkedList_3075.method1221()) { if (var11.anInt2250 == var0 && var11.anInt2264 == var4 && var11.anInt2248 == var1 && var11.anInt2263 == var7) { var10 = var11; break; @@ -1785,7 +1734,7 @@ public class Unsorted { var10.anInt2250 = var0; var10.anInt2263 = var7; Class132.method1798(72, var10); - TextureOperation26.aClass61_3075.method1215(var10); + TextureOperation26.aLinkedList_3075.method1215(var10); } var10.anInt2262 = var8; @@ -1815,9 +1764,9 @@ public class Unsorted { public static Class3_Sub28_Sub3 method884(int var0, byte var1, int var2) { try { - Class3_Sub28_Sub3 var3 = (Class3_Sub28_Sub3) Class134.aClass61_1758.method1222(); + Class3_Sub28_Sub3 var3 = (Class3_Sub28_Sub3) Class134.aLinkedList_1758.method1222(); - for (; var3 != null; var3 = (Class3_Sub28_Sub3) Class134.aClass61_1758.method1221()) { + for (; var3 != null; var3 = (Class3_Sub28_Sub3) Class134.aLinkedList_1758.method1221()) { if (var3.aBoolean3553 && var3.method537(var2, var0)) { return var3; } @@ -2207,7 +2156,7 @@ public class Unsorted { } for (var11 = 0; var11 < 2048; ++var11) { - Player var23 = TextureOperation0.players[var11]; + Player var23 = players[var11]; if (null != var23) { for (var13 = 0; 10 > var13; ++var13) { var23.anIntArray2767[var13] -= var9; @@ -2246,15 +2195,15 @@ public class Unsorted { for (int var21 = 0; 4 > var21; ++var21) { if (var19 >= 0 && var20 >= 0 && var19 < 104 && var20 < 104) { - TextureOperation0.aClass61ArrayArrayArray3273[var21][var17][var18] = TextureOperation0.aClass61ArrayArrayArray3273[var21][var19][var20]; + Class39.aLinkedListArrayArrayArray3273[var21][var17][var18] = Class39.aLinkedListArrayArrayArray3273[var21][var19][var20]; } else { - TextureOperation0.aClass61ArrayArrayArray3273[var21][var17][var18] = null; + Class39.aLinkedListArrayArrayArray3273[var21][var17][var18] = null; } } } } - for (Class3_Sub4 var27 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1222(); var27 != null; var27 = (Class3_Sub4) TextureOperation26.aClass61_3075.method1221()) { + for (Class3_Sub4 var27 = (Class3_Sub4) TextureOperation26.aLinkedList_3075.method1222(); var27 != null; var27 = (Class3_Sub4) TextureOperation26.aLinkedList_3075.method1221()) { var27.anInt2248 -= var10; var27.anInt2264 -= var9; if (0 > var27.anInt2264 || var27.anInt2248 < 0 || var27.anInt2264 >= 104 || var27.anInt2248 >= 104) { @@ -2284,8 +2233,8 @@ public class Unsorted { } Class58.anInt909 = -1; - TextureOperation17.aClass61_3177.method1211(-122); - TextureOperation13.aClass61_3364.method1211(-87); + TextureOperation17.aLinkedList_3177.method1211(-122); + TextureOperation13.aLinkedList_3364.method1211(-87); } } catch (RuntimeException var22) { throw ClientErrorException.clientError(var22, "k.D(" + plane + ',' + regionY + ',' + regionX + ',' + sceneY + ',' + var4 + ',' + sceneX + ',' + true + ')'); @@ -2412,7 +2361,7 @@ public class Unsorted { public static void method2067() { try { - for (Class3_Sub28_Sub2 var1 = (Class3_Sub28_Sub2) TextureOperation17.aClass61_3177.method1222(); null != var1; var1 = (Class3_Sub28_Sub2) TextureOperation17.aClass61_3177.method1221()) { + for (Class3_Sub28_Sub2 var1 = (Class3_Sub28_Sub2) TextureOperation17.aLinkedList_3177.method1222(); null != var1; var1 = (Class3_Sub28_Sub2) TextureOperation17.aLinkedList_3177.method1221()) { Class140_Sub2 var2 = var1.aClass140_Sub2_3545; if (WorldListCountry.localPlane == var2.anInt2717 && !var2.aBoolean2718) { if (Class44.anInt719 >= var2.anInt2703) { @@ -2453,7 +2402,7 @@ public class Unsorted { if (Class164_Sub1.anInt3012 == 1) { Class3_Sub24_Sub4.method1177(Class99.anInt1403, var3, (byte) -125, RSString.stringCombiner(new RSString[]{RenderAnimationDefinition.aClass94_378, ColorCore.TextColor, var5}), var1, (short) 26, TextCore.HasUse, var4); } else if (GameObject.aBoolean1837) { - Class3_Sub28_Sub9 var12 = -1 == anInt1038 ? null : Class61.method1210(anInt1038); + Class3_Sub28_Sub9 var12 = -1 == anInt1038 ? null : LinkedList.method1210(anInt1038); if ((2 & Class164.anInt2051) != 0 && (var12 == null || var0.method1475(anInt1038, var12.anInt3614) != var12.anInt3614)) { Class3_Sub24_Sub4.method1177(anInt1887, var3, (byte) -93, RSString.stringCombiner(new RSString[]{TextCore.aClass94_676, ColorCore.TextColor, var5}), var1, (short) 45, Class3_Sub28_Sub9.aClass94_3621, var4); } @@ -2613,22 +2562,6 @@ public class Unsorted { } } - static void parsePlayerMasks() { - int var1 = 0; - - while (var1 < maskUpdateCount) { - int var2 = Class21.maskUpdateIndexes[var1]; - Player var3 = TextureOperation0.players[var2]; - int var4 = GraphicDefinition.incomingBuffer.readUnsignedByte(); - if ((16 & var4) != 0) { - var4 += GraphicDefinition.incomingBuffer.readUnsignedByte() << 8; - } - - Class45.parsePlayerMask(var4, var2, var3); - ++var1; - } - } - static void method60(int var0, int var1, int var2, Class91[] var3, int var4, byte var5, byte[] var6, int var7, int var8, int var9, boolean var10) { int var13; if (!var10) { @@ -2809,18 +2742,6 @@ public class Unsorted { } } -// public static void method55() { -// try { -// -// aReferenceCache_21.clearSoftReferences(); -// ObjectDefinition.aReferenceCache_1401.clearSoftReferences(); -// aReferenceCache_4051.clearSoftReferences(); -// ObjectDefinition.aReferenceCache_1965.clearSoftReferences(); -// } catch (RuntimeException var2) { -// throw ClientErrorException.clientError(var2, "oe.B(" + 22683 + ')'); -// } -// } - public static LDIndexedSprite[] method619(byte var0, int var1, CacheIndex var2) { try { return Class140_Sub7.method2029((byte) -119, var2, var1) ? (var0 <= 52 ? null : method1281()) : null; @@ -2941,7 +2862,7 @@ public class Unsorted { CS2Script script = new CS2Script(); script.arguments = iface.anObjectArray235; script.aClass11_2449 = iface; - Client.aClass61_1471.method1215(script); + Client.aLinkedList_1471.method1215(script); } } @@ -3025,8 +2946,8 @@ public class Unsorted { static void method1180(byte var0, Class140_Sub4 var1) { try { - RenderAnimationDefinition var2 = var1.method1965(); - var1.anInt2764 = var2.anInt368; + RenderAnimationDefinition var2 = var1.getRenderAnimationType(); + var1.anInt2764 = var2.stand_animation; if (var0 >= -5) { anIntArray882 = null; } @@ -3082,7 +3003,7 @@ public class Unsorted { } int var7 = 2047 & -var1.anInt2785 + var1.anInt2806; - int var8 = var2.anInt389; + int var8 = var2.walk_follow_full_turn_anim; if (1024 < var7) { var7 -= 2048; } @@ -3090,16 +3011,16 @@ public class Unsorted { boolean var10 = true; byte var11 = 1; if (var7 >= -256 && var7 <= 256) { - var8 = var2.anInt382; + var8 = var2.walk_animation; } else if (var7 >= 256 && 768 > var7) { - var8 = var2.anInt364; + var8 = var2.walk_follow_cw_turn_anim; } else if (var7 >= -768 && -256 >= var7) { - var8 = var2.anInt390; + var8 = var2.walk_follow_ccw_turn_anim; } int var9 = 4; if (var8 == -1) { - var8 = var2.anInt382; + var8 = var2.walk_animation; } var1.anInt2764 = var8; @@ -3147,44 +3068,44 @@ public class Unsorted { var9 >>= 1; } - if (var9 >= 8 && -1 != var2.anInt393) { - if (var1.anInt2764 == var2.anInt389 && -1 != var2.anInt386) { - var1.anInt2764 = var2.anInt386; - } else if (var1.anInt2764 == var2.anInt390 && var2.anInt373 != -1) { - var1.anInt2764 = var2.anInt373; - } else if (var2.anInt364 == var1.anInt2764 && var2.anInt375 != -1) { - var1.anInt2764 = var2.anInt375; + if (var9 >= 8 && -1 != var2.run_anim) { + if (var1.anInt2764 == var2.walk_follow_full_turn_anim && -1 != var2.run_follow_full_turn_anim) { + var1.anInt2764 = var2.run_follow_full_turn_anim; + } else if (var1.anInt2764 == var2.walk_follow_ccw_turn_anim && var2.run_follow_ccw_turn_anim != -1) { + var1.anInt2764 = var2.run_follow_ccw_turn_anim; + } else if (var2.walk_follow_cw_turn_anim == var1.anInt2764 && var2.run_follow_cw_turn_anim != -1) { + var1.anInt2764 = var2.run_follow_cw_turn_anim; } else { - var1.anInt2764 = var2.anInt393; + var1.anInt2764 = var2.run_anim; } - } else if (var2.anInt398 != -1 && var11 == 0) { - if (var1.anInt2764 == var2.anInt389 && var2.anInt372 != -1) { - var1.anInt2764 = var2.anInt372; - } else if (var1.anInt2764 == var2.anInt390 && -1 != var2.anInt406) { - var1.anInt2764 = var2.anInt406; - } else if (var2.anInt364 == var1.anInt2764 && -1 != var2.anInt379) { - var1.anInt2764 = var2.anInt379; + } else if (var2.slow_walk_anim != -1 && var11 == 0) { + if (var1.anInt2764 == var2.walk_follow_full_turn_anim && var2.slow_walk_follow_full_turn_anim != -1) { + var1.anInt2764 = var2.slow_walk_follow_full_turn_anim; + } else if (var1.anInt2764 == var2.walk_follow_ccw_turn_anim && -1 != var2.slow_walk_follow_ccw_turn_anim) { + var1.anInt2764 = var2.slow_walk_follow_ccw_turn_anim; + } else if (var2.walk_follow_cw_turn_anim == var1.anInt2764 && -1 != var2.slow_walk_follow_cw_turn_anim) { + var1.anInt2764 = var2.slow_walk_follow_cw_turn_anim; } else { - var1.anInt2764 = var2.anInt398; + var1.anInt2764 = var2.slow_walk_anim; } } - if (var2.anInt360 != -1) { + if (var2.movement_acceleration != -1) { var9 <<= 7; if (var1.anInt2816 == 1) { int var13 = (var1.anInt2819 <= var5 ? var5 - var1.anInt2819 : -var5 + var1.anInt2819) << 7; int var12 = var1.anInt2758 * var1.anInt2758; int var14 = (var1.anInt2829 > var6 ? -var6 + var1.anInt2829 : -var1.anInt2829 + var6) << 7; int var15 = var13 > var14 ? var13 : var14; - int var16 = var2.anInt360 * 2 * var15; + int var16 = var2.movement_acceleration * 2 * var15; if (var12 <= var16) { if (var12 / 2 > var15) { - var1.anInt2758 -= var2.anInt360; + var1.anInt2758 -= var2.movement_acceleration; if (var1.anInt2758 < 0) { var1.anInt2758 = 0; } } else if (var1.anInt2758 < var9) { - var1.anInt2758 += var2.anInt360; + var1.anInt2758 += var2.movement_acceleration; if (var1.anInt2758 > var9) { var1.anInt2758 = var9; } @@ -3193,12 +3114,12 @@ public class Unsorted { var1.anInt2758 /= 2; } } else if (var1.anInt2758 < var9) { - var1.anInt2758 += var2.anInt360; + var1.anInt2758 += var2.movement_acceleration; if (var1.anInt2758 > var9) { var1.anInt2758 = var9; } } else { - var1.anInt2758 -= var2.anInt360; + var1.anInt2758 -= var2.movement_acceleration; if (0 > var1.anInt2758) { var1.anInt2758 = 0; } @@ -3863,7 +3784,7 @@ public class Unsorted { Class168.aClass11_2091 = var11; anInt2567 = var14; Class53.anInt865 = var13; - TextureOperation36.method338(var11.height, var11.anInt189 == 1403, var13, var11.width, var14); + method338(var11.height, var11.anInt189 == 1403, var13, var11.width, var14); if (HDToolKit.highDetail) { Class22.setClipping(var0, var6, var4, var7); } else { @@ -3907,7 +3828,7 @@ public class Unsorted { var28 = Class102.player.anInt2819 + var26 >> 7; var29 = -var47 + Class102.player.anInt2829 >> 7; if (GameObject.aBoolean1837 && 0 != (Class164.anInt2051 & 64)) { - RSInterface var53 = AbstractSprite.method638(Class3_Sub30_Sub1.anInt872, RSInterface.anInt278); + RSInterface var53 = AbstractSprite.method638(BufferedDataStream.anInt872, RSInterface.anInt278); if (null == var53) { Class25.method958((byte) -91); } else { @@ -4158,7 +4079,7 @@ public class Unsorted { var47 = var11.itemAmounts[var20] + -1; if (var0 < 32 + var23 && var4 > var23 && var24 - -32 > var6 && var7 > var24 || var11 == Class67.aClass11_1017 && var20 == PacketParser.anInt86) { AbstractSprite var54; - if (Class164_Sub1.anInt3012 == 1 && Class3_Sub30_Sub1.anInt1473 == var20 && Class3_Sub28_Sub18.anInt3764 == var11.componentHash) { + if (Class164_Sub1.anInt3012 == 1 && BufferedDataStream.anInt1473 == var20 && Class3_Sub28_Sub18.anInt3764 == var11.componentHash) { var54 = Class114.method1707(2, var47, var11.aBoolean227, var11.itemIds[var20], 0); } else { var54 = Class114.method1707(1, var47, var11.aBoolean227, var11.itemIds[var20], 3153952); @@ -4309,7 +4230,7 @@ public class Unsorted { Font var34; if (var11.type == 4) { // TODO RSInterfaceRenderText - var34 = var11.method868(TextureOperation0.nameIconsSpriteArray); + var34 = var11.method868(Sprites.nameIconsSpriteArray); if (var34 != null) { RSString var45 = var11.text; if (Class3_Sub28_Sub12.method609(var11, 97)) { @@ -4497,7 +4418,7 @@ public class Unsorted { var24 = 2047; } - Player var49 = TextureOperation0.players[var24]; + Player var49 = 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); @@ -4570,7 +4491,7 @@ public class Unsorted { } } else { if (var11.type == 7) { - var34 = var11.method868(TextureOperation0.nameIconsSpriteArray); + var34 = var11.method868(Sprites.nameIconsSpriteArray); if (var34 == null) { if (RSInterface.aBoolean6) { Class20.method909(var11); @@ -4886,7 +4807,7 @@ public class Unsorted { Class140_Sub6.aBoolean2910 = true; TextureOperation.anInt2378 = 0; anInt1137 = 2; - TextureOperation0.aBoolean3275 = true; + aBoolean3275 = true; Class106.aBoolean1441 = true; anInt120 = 255; Class25.aBoolean488 = true; @@ -5117,4 +5038,172 @@ public class Unsorted { throw ClientErrorException.clientError(var3, "ni.G(" + 0 + ',' + (var1 != null ? "{...}" : "null") + ')'); } } + + static void method338(int var1, boolean var2, int var3, int var4, int var5) { + try { + ++Class79.anInt1127; + Class124.method1745(); + if(!var2) { + Class3_Sub5.method116(true); + Class102.method1611(71, true); + Class3_Sub5.method116(false); + } + + Class102.method1611(100, false); + if(!var2) { + TextureOperation32.method302(2); + } + + method2067(); + if(HDToolKit.highDetail) { + Class65.method1239(var4, 125, var5, var1, var3, true); + var3 = Class163_Sub1.anInt2989; + var5 = Class3_Sub28_Sub3.anInt3564; + var4 = Class96.anInt1358; + var1 = anInt31; + } + + int var6; + int var7; + if(1 == Class133.anInt1753) { + var7 = 2047 & LinkableRSString.anInt2589 + GraphicDefinition.CAMERA_DIRECTION; + var6 = anInt2309; + if(Class75_Sub4.anInt2670 / 256 > var6) { + var6 = Class75_Sub4.anInt2670 / 256; + } + + if(WaterfallShader.aBooleanArray2169[4] && Class166.anIntArray2073[4] + 128 > var6) { + var6 = 128 + Class166.anIntArray2073[4]; + } + + Class140_Sub2.method1952(anInt3155, var1, Class121.method1736(WorldListCountry.localPlane, 1, Class102.player.anInt2819, Class102.player.anInt2829) + -50, Client.ZOOM - -(var6 * 3), var7, anInt942, var6); + } + + var7 = Class7.anInt2162; + var6 = NPC.anInt3995; + int var8 = Class77.anInt1111; + int var9 = Class139.anInt1823; + int var10 = TextureOperation28.anInt3315; + + int var11; + int var12; + for(var11 = 0; 5 > var11; ++var11) { + if(WaterfallShader.aBooleanArray2169[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) { + TextureOperation28.anInt3315 = var12 + TextureOperation28.anInt3315 & 0x7FF; + } + + if(var11 == 4) { + Class139.anInt1823 += var12; + if(128 > Class139.anInt1823) { + Class139.anInt1823 = 128; + } + + if(Class139.anInt1823 > 383) { + Class139.anInt1823 = 383; + } + } + + if(var11 == 2) { + Class77.anInt1111 += var12; + } + + if(var11 == 1) { + Class7.anInt2162 += var12; + } + + if(var11 == 0) { + NPC.anInt3995 += var12; + } + } + } + + Class3_Sub28_Sub20.method725(); + if(HDToolKit.highDetail) { + Class22.setClipping(var3, var5, var3 + var4, var5 - -var1); + float var17 = (float)Class139.anInt1823 * 0.17578125F; + 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; + } + + HDToolKit.viewport(var3, var5, var4, var1, var4 / 2 + var3, var5 - -(var1 / 2), var17, var16, anInt1705, anInt1705); + } else { + Class74.setClipping(var3, var5, var4 + var3, var1 + var5); + Class51.method1134(); + } + + if(!Class38_Sub1.aBoolean2615 && var3 <= NPCDefinition.anInt1297 && var4 + var3 > NPCDefinition.anInt1297 && var5 <= Class38_Sub1.anInt2612 && Class38_Sub1.anInt2612 < var1 + var5) { + TextureOperation36.aBoolean3094 = true; + anInt59 = 0; + var12 = Class145.screenUpperX; + int var13 = Class1.screenUpperY; + var11 = Class139.screenLowerX; + anInt3642 = var11 + (var12 - var11) * (-var3 + NPCDefinition.anInt1297) / var4; + int var14 = AtmosphereParser.screenLowerY; + RenderAnimationDefinition.anInt384 = (-var13 + var14) * (Class38_Sub1.anInt2612 - var5) / var1 + var13; + } else { + TextureOperation36.aBoolean3094 = false; + anInt59 = 0; + } + + Class58.method1194(); + byte var19 = Class137.method1817() != 2 ?1:(byte)Class79.anInt1127; + if(HDToolKit.highDetail) { + HDToolKit.method1846(); + HDToolKit.method1831(true); + HDToolKit.method1827(true); + if(Class143.gameStage == 10) { + var12 = BufferedDataStream.method809(Class106.anInt1446, Class77.anInt1111 >> 10, anInt3625, NPC.anInt3995 >> 10); + } else { + var12 = BufferedDataStream.method809(Class106.anInt1446, Class102.player.anIntArray2755[0] >> 3, anInt3625, Class102.player.anIntArray2767[0] >> 3); + } + + Class68.method1269(Class44.anInt719, !WorldListEntry.aBoolean2623); + HDToolKit.clearScreen(var12); + 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, TextureOperation28.anInt3315, Class158.aByteArrayArrayArray2008, anIntArray686, Class129_Sub1.anIntArray2696, Class159.anIntArray2021, Player.anIntArray3959, SequenceDefinition.anIntArray1871, WorldListCountry.localPlane + 1, var19, Class102.player.anInt2819 >> 7, Class102.player.anInt2829 >> 7); + aBoolean47 = true; + Class68.method1265(); + ClientErrorException.method2285(0, 0, 0, 0, 0); + Class58.method1194(); + method1775(); + Texture.method1405(var5, var4, var3, anInt1705, var1, anInt1705, -7397); + Class163_Sub2_Sub1.method2221(var4, var3, var1, anInt1705, anInt1705, var5); + } else { + Toolkit.JAVA_TOOLKIT.method934(var3, var5, var4, var1, 0); + Class3_Sub22.method398(NPC.anInt3995, Class7.anInt2162, Class77.anInt1111, Class139.anInt1823, TextureOperation28.anInt3315, Class158.aByteArrayArrayArray2008, anIntArray686, Class129_Sub1.anIntArray2696, Class159.anIntArray2021, Player.anIntArray3959, SequenceDefinition.anIntArray1871, WorldListCountry.localPlane - -1, var19, Class102.player.anInt2819 >> 7, Class102.player.anInt2829 >> 7); + Class58.method1194(); + method1775(); + Texture.method1405(var5, var4, var3, 256, var1, 256, -6403 + -994); + Class163_Sub2_Sub1.method2221(var4, var3, var1, 256, 256, var5); + } + + ((Class102)Class51.anInterface2_838).method1610(Class106.anInt1446); + Class65.method1235(var4, var5, var1, var3); + Class139.anInt1823 = var9; + Class77.anInt1111 = var8; + Class7.anInt2162 = var7; + NPC.anInt3995 = var6; + TextureOperation28.anInt3315 = var10; + if(TextureOperation34.aBoolean3064 && Class58.aJs5Worker_917.countPriorityRequests() == 0) { + TextureOperation34.aBoolean3064 = false; + } + + if(TextureOperation34.aBoolean3064) { + Toolkit.getActiveToolkit().method934(var3, var5, var4, var1, 0); + LoadingBox.draw(false, TextCore.LoadingPleaseWait2); + } + + if(!var2 && !TextureOperation34.aBoolean3064 && !Class38_Sub1.aBoolean2615 && var3 <= NPCDefinition.anInt1297 && var4 + var3 > NPCDefinition.anInt1297 && Class38_Sub1.anInt2612 >= var5 && var1 + var5 > Class38_Sub1.anInt2612) { + TextureOperation36.method1628(var5, var4, var1, var3, Class38_Sub1.anInt2612, NPCDefinition.anInt1297); + } + + } catch (RuntimeException var15) { + throw ClientErrorException.clientError(var15, "ui.OA(" + -6403 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ')'); + } + } } diff --git a/Client/src/main/java/org/runite/client/WorldMap.java b/Client/src/main/java/org/runite/client/WorldMap.java index 4c78bdd1a..d7cd3805b 100644 --- a/Client/src/main/java/org/runite/client/WorldMap.java +++ b/Client/src/main/java/org/runite/client/WorldMap.java @@ -186,42 +186,6 @@ final class WorldMap extends Node { } } - static void method628(int var1, int var2, Player var3) { - try { - - if (var3.anInt2771 == var2 && var2 != -1) { - SequenceDefinition var4 = SequenceDefinition.getAnimationDefinition(var2); - int var5 = var4.delayType; - if (1 == var5) { - var3.anInt2828 = var1; - var3.anInt2760 = 0; - var3.anInt2776 = 1; - var3.anInt2832 = 0; - var3.anInt2773 = 0; - Unsorted.method1470(var3.anInt2829, var4, 183921384, var3.anInt2819, Class102.player == var3, var3.anInt2832); - } - - if (var5 == 2) { - var3.anInt2773 = 0; - } - } else if (-1 == var2 || var3.anInt2771 == -1 || SequenceDefinition.getAnimationDefinition(var2).forcedPriority >= SequenceDefinition.getAnimationDefinition(var3.anInt2771).forcedPriority) { - var3.anInt2776 = 1; - var3.anInt2832 = 0; - var3.anInt2828 = var1; - var3.anInt2811 = var3.anInt2816; - var3.anInt2773 = 0; - var3.anInt2760 = 0; - var3.anInt2771 = var2; - if (var3.anInt2771 != -1) { - Unsorted.method1470(var3.anInt2829, SequenceDefinition.getAnimationDefinition(var3.anInt2771), 183921384, var3.anInt2819, var3 == Class102.player, var3.anInt2832); - } - } - - } catch (RuntimeException var6) { - throw ClientErrorException.clientError(var6, "pa.C(" + 0 + ',' + var1 + ',' + var2 + ',' + (var3 != null ? "{...}" : "null") + ')'); - } - } - public static void drawWorldMap(int var0, int var2, int var3, int var4) { try { if (anInt2737 < 100) { diff --git a/Client/src/main/java/org/runite/client/drawcalls/Minimap.java b/Client/src/main/java/org/runite/client/drawcalls/Minimap.java index 430e3b552..43d5fafd0 100644 --- a/Client/src/main/java/org/runite/client/drawcalls/Minimap.java +++ b/Client/src/main/java/org/runite/client/drawcalls/Minimap.java @@ -95,7 +95,7 @@ public class Minimap { for(var9 = 0; 104 > var9; ++var9) { for(var10 = 0; var10 < 104; ++var10) { - Class61 var25 = TextureOperation0.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var9][var10]; + LinkedList var25 = Class39.aLinkedListArrayArrayArray3273[WorldListCountry.localPlane][var9][var10]; if(null != var25) { var12 = 2 + var9 * 4 + -(Class102.player.anInt2819 / 32); var13 = -(Class102.player.anInt2829 / 32) + 2 + 4 * var10; @@ -125,7 +125,7 @@ public class Minimap { } for(var9 = 0; var9 < Class159.localPlayerCount; ++var9) { - Player var23 = TextureOperation0.players[Class56.localPlayerIndexes[var9]]; + Player var23 = Unsorted.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; @@ -185,8 +185,8 @@ public class Minimap { 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(var26.anInt1360 == 10 && var26.anInt1359 >= 0 && Unsorted.players.length > var26.anInt1359) { + Player var30 = Unsorted.players[var26.anInt1359]; if(null != var30) { var14 = var30.anInt2829 / 32 + -(Class102.player.anInt2829 / 32); var13 = var30.anInt2819 / 32 + -(Class102.player.anInt2819 / 32); 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 95dead74d..1a161398d 100644 --- a/Client/src/main/kotlin/org/rs09/client/console/DeveloperConsole.kt +++ b/Client/src/main/kotlin/org/rs09/client/console/DeveloperConsole.kt @@ -10,6 +10,7 @@ import java.awt.event.KeyEvent import java.text.SimpleDateFormat import java.util.* import org.runite.client.TextureOperation12 +import java.util.LinkedList // TODO Escape characters in the string rendering - is this something we can do using RSString / the text renders? diff --git a/Client/src/main/kotlin/org/rs09/client/net/game/PacketDecoder.kt b/Client/src/main/kotlin/org/rs09/client/net/game/PacketDecoder.kt index 9a2ef1ed6..25f7401f4 100644 --- a/Client/src/main/kotlin/org/rs09/client/net/game/PacketDecoder.kt +++ b/Client/src/main/kotlin/org/rs09/client/net/game/PacketDecoder.kt @@ -35,9 +35,9 @@ object PacketDecoder { if (Unsorted.incomingOpcode == -1) { availableBytes-- - Class3_Sub15.activeConnection.readBytes(GraphicDefinition.incomingBuffer.buffer, 0, 1) - GraphicDefinition.incomingBuffer.index = 0 - Unsorted.incomingOpcode = GraphicDefinition.incomingBuffer.opcode + Class3_Sub15.activeConnection.readBytes(BufferedDataStream.incomingBuffer.buffer, 0, 1) + BufferedDataStream.incomingBuffer.index = 0 + Unsorted.incomingOpcode = BufferedDataStream.incomingBuffer.opcode Unsorted.incomingPacketLength = Class75_Sub4.incomingPacketSizes[Unsorted.incomingOpcode] } @@ -45,23 +45,23 @@ object PacketDecoder { if (availableBytes < 1) return false availableBytes-- - Class3_Sub15.activeConnection.readBytes(GraphicDefinition.incomingBuffer.buffer, 0, 1) - Unsorted.incomingPacketLength = GraphicDefinition.incomingBuffer.buffer[0].toInt() and 0xff + Class3_Sub15.activeConnection.readBytes(BufferedDataStream.incomingBuffer.buffer, 0, 1) + Unsorted.incomingPacketLength = BufferedDataStream.incomingBuffer.buffer[0].toInt() and 0xff } if (Unsorted.incomingPacketLength == -2) { if (availableBytes < 2) return false availableBytes -= 2 - Class3_Sub15.activeConnection.readBytes(GraphicDefinition.incomingBuffer.buffer, 0, 2) - GraphicDefinition.incomingBuffer.index = 0 - Unsorted.incomingPacketLength = GraphicDefinition.incomingBuffer.readUnsignedShort() + Class3_Sub15.activeConnection.readBytes(BufferedDataStream.incomingBuffer.buffer, 0, 2) + BufferedDataStream.incomingBuffer.index = 0 + Unsorted.incomingPacketLength = BufferedDataStream.incomingBuffer.readUnsignedShort() } if (availableBytes < Unsorted.incomingPacketLength) return false - GraphicDefinition.incomingBuffer.index = 0 - Class3_Sub15.activeConnection.readBytes(GraphicDefinition.incomingBuffer.buffer, 0, Unsorted.incomingPacketLength) + BufferedDataStream.incomingBuffer.index = 0 + Class3_Sub15.activeConnection.readBytes(BufferedDataStream.incomingBuffer.buffer, 0, Unsorted.incomingPacketLength) Class24.anInt469 = Class7.anInt2166 Class7.anInt2166 = LinkableRSString.anInt2582 LinkableRSString.anInt2582 = Unsorted.incomingOpcode @@ -69,7 +69,7 @@ object PacketDecoder { val decoder = decoders[Unsorted.incomingOpcode] if (decoder == null) return PacketParser.parseIncomingPackets(); - else decoder.decode(GraphicDefinition.incomingBuffer) + else decoder.decode(BufferedDataStream.incomingBuffer) // TODO This should only happen after everything else. Unsorted.incomingOpcode = -1