2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2025-12-20 13:30:30 -07:00
Code Issues Projects Releases Packages Wiki Activity

Refactored much of the protocol class, new class names for a few

Browse source 
Class3_Sub31 -> ComponentPointer
Class3_Sub22 -> ClanMember
Class102 -> MapMarker
Class3_Sub7 -> SceneryStack
This commit is contained in:
Pazaz 2022-04-27 02:59:48 -04:00
parent 2e4cc73755
commit 83a07e779e
118 changed files with 2196 additions and 2289 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/src/main/java/rt4/AnimFrameset.java
View file

@ -20,14 +20,14 @@ public final class AnimFrameset extends SecondaryNode {
for (@Pc(21) int local21 = 0; local21 < local19.length; local21++) {
@Pc(37) byte[] local37 = arg0.getFile(arg2, local19[local21]);
@Pc(51) int local51 = local37[1] & 0xFF | (local37[0] & 0xFF) << 8;
@Pc(56) AnimBase local56 = (AnimBase) local5.method2289();
@Pc(56) AnimBase local56 = (AnimBase) local5.start();
@Pc(58) AnimBase local58 = null;
while (local56 != null) {
if (local56.id == local51) {
local58 = local56;
break;
}
local56 = (AnimBase) local5.method2288();
local56 = (AnimBase) local5.next();
}
if (local58 == null) {
@Pc(85) byte[] local85 = arg1.method4502(0, local51);

2
client/src/main/java/rt4/AreaSoundManager.java
View file

@ -76,7 +76,7 @@ public class AreaSoundManager {
@OriginalMember(owner = "client!hc", name = "a", descriptor = "(Lclient!km;Z)V")
public static void remove(@OriginalArg(0) Npc arg0) {
for (@Pc(13) AreaSound local13 = (AreaSound) Static152.aClass69_87.method2289(); local13 != null; local13 = (AreaSound) Static152.aClass69_87.method2288()) {
for (@Pc(13) AreaSound local13 = (AreaSound) Static152.aClass69_87.start(); local13 != null; local13 = (AreaSound) Static152.aClass69_87.next()) {
if (arg0 == local13.npc) {
if (local13.primaryStream != null) {
client.soundStream.removeSubStream(local13.primaryStream);

8
client/src/main/java/rt4/ChangeLocRequest.java
View file

@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc;
public class ChangeLocRequest {
@OriginalMember(owner = "client!ug", name = "a", descriptor = "(B)V")
public static void loop() {
for (@Pc(10) Class3_Sub7 local10 = (Class3_Sub7) Static26.aClass69_27.method2289(); local10 != null; local10 = (Class3_Sub7) Static26.aClass69_27.method2288()) {
for (@Pc(10) SceneryStack local10 = (SceneryStack) Static26.sceneryList.start(); local10 != null; local10 = (SceneryStack) Static26.sceneryList.next()) {
if (local10.anInt924 > 0) {
local10.anInt924--;
}
@ -14,8 +14,8 @@ public class ChangeLocRequest {
if (local10.anInt925 > 0) {
local10.anInt925--;
}
if (local10.anInt925 == 0 && local10.anInt928 >= 1 && local10.anInt916 >= 1 && local10.anInt928 <= 102 && local10.anInt916 <= 102 && (local10.anInt929 < 0 || Static113.method3557(local10.anInt929, local10.anInt926))) {
Static79.method1698(local10.anInt929, local10.anInt928, local10.anInt918, local10.anInt922, local10.anInt916, local10.anInt926, local10.anInt927);
if (local10.anInt925 == 0 && local10.x >= 1 && local10.z >= 1 && local10.x <= 102 && local10.z <= 102 && (local10.anInt929 < 0 || Static113.method3557(local10.anInt929, local10.anInt926))) {
Static79.method1698(local10.anInt929, local10.x, local10.level, local10.anInt922, local10.z, local10.anInt926, local10.anInt927);
local10.anInt925 = -1;
if (local10.anInt921 == local10.anInt929 && local10.anInt921 == -1) {
local10.unlink();
@ -24,7 +24,7 @@ public class ChangeLocRequest {
}
}
} else if (local10.anInt921 < 0 || Static113.method3557(local10.anInt921, local10.anInt920)) {
Static79.method1698(local10.anInt921, local10.anInt928, local10.anInt918, local10.anInt923, local10.anInt916, local10.anInt920, local10.anInt927);
Static79.method1698(local10.anInt921, local10.x, local10.level, local10.anInt923, local10.z, local10.anInt920, local10.anInt927);
local10.unlink();
}
}

4
client/src/main/java/rt4/Chat.java
View file

@ -15,6 +15,8 @@ public class Chat {
public static final int[] phraseIds = new int[100];
@OriginalMember(owner = "client!mc", name = "Y", descriptor = "[Lclient!na;")
public static final JagString[] names = new JagString[100];
@OriginalMember(owner = "client!t", name = "w", descriptor = "[J")
public static final long[] recentMessages = new long[100];
@OriginalMember(owner = "client!dm", name = "u", descriptor = "I")
public static int transmitAt = 0;
@OriginalMember(owner = "client!f", name = "Z", descriptor = "I")
@ -25,6 +27,8 @@ public class Chat {
public static int privateFilter = 0;
@OriginalMember(owner = "client!ej", name = "U", descriptor = "I")
public static int publicFilter = 0;
@OriginalMember(owner = "client!ug", name = "e", descriptor = "I")
public static int messageCounter = 0;
@OriginalMember(owner = "client!md", name = "a", descriptor = "(IILclient!na;Lclient!na;BLclient!na;)V")
public static void add(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString arg2, @OriginalArg(3) JagString arg3, @OriginalArg(5) JagString arg4) {

2
client/src/main/java/rt4/ClanChat.java
View file

@ -18,7 +18,7 @@ public class ClanChat {
@OriginalMember(owner = "client!rg", name = "y", descriptor = "I")
public static int size;
@OriginalMember(owner = "client!qc", name = "bb", descriptor = "[Lclient!kl;")
public static Class3_Sub22[] members;
public static ClanMember[] members;
@OriginalMember(owner = "client!kh", name = "b", descriptor = "(I)V")
public static void leave() {

4
client/src/main/java/rt4/Class3_Sub22.java → client/src/main/java/rt4/ClanMember.java
View file

@ -4,13 +4,13 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!kl")
public final class Class3_Sub22 extends Node {
public final class ClanMember extends Node {
@OriginalMember(owner = "client!kl", name = "p", descriptor = "B")
public byte rank;
@OriginalMember(owner = "client!kl", name = "q", descriptor = "Lclient!na;")
public JagString aClass100_635;
public JagString worldName;
@OriginalMember(owner = "client!kl", name = "t", descriptor = "Lclient!na;")
public JagString username;

38
client/src/main/java/rt4/ClientProt.java
View file

@ -19,7 +19,7 @@ public class ClientProt {
local19.source = local8;
local19.opBase = arg0;
local19.op = arg2;
Static82.method1767(local19);
ScriptRunner.run(local19);
}
@Pc(37) boolean local37 = true;
if (local8.anInt453 > 0) {
@ -105,7 +105,7 @@ public class ClientProt {
Protocol.outboundBuffer.p2(Static225.originX + local23);
Protocol.outboundBuffer.p2add(Static142.originZ + local27);
Static84.anInt2255 = Static84.anIntArray209[0];
Static115.anInt2939 = Static259.anIntArray514[0];
Static115.mapFlagX = Static259.anIntArray514[0];
for (@Pc(126) int local126 = 1; local126 < local13; local126++) {
arg0--;
Protocol.outboundBuffer.p1a(Static259.anIntArray514[arg0] - local23);
@ -116,13 +116,13 @@ public class ClientProt {
@OriginalMember(owner = "client!mc", name = "f", descriptor = "(B)V")
public static void method2909() {
Protocol.outboundBuffer.p1isaac(184);
for (@Pc(18) Class3_Sub31 local18 = (Class3_Sub31) Static119.aClass133_9.head(); local18 != null; local18 = (Class3_Sub31) Static119.aClass133_9.next()) {
for (@Pc(18) ComponentPointer local18 = (ComponentPointer) InterfaceList.openInterfaces.head(); local18 != null; local18 = (ComponentPointer) InterfaceList.openInterfaces.next()) {
if (local18.anInt5879 == 0) {
Static132.method2605(true, local18);
Static132.closeInterface(true, local18);
}
}
if (Static39.aClass13_10 != null) {
Static43.redraw(Static39.aClass13_10);
InterfaceList.redraw(Static39.aClass13_10);
Static39.aClass13_10 = null;
}
}
@ -395,7 +395,7 @@ public class ClientProt {
if (local23 == 41 && Static39.aClass13_10 == null) {
method10(local15, local19);
Static39.aClass13_10 = Static201.method1418(local19, local15);
Static43.redraw(Static39.aClass13_10);
InterfaceList.redraw(Static39.aClass13_10);
}
if (local23 == 49) {
Static233.method4003(local31, local19, local15);
@ -487,7 +487,7 @@ public class ClientProt {
if (Static102.aClass100_545 == null) {
Static102.aClass100_545 = Static250.aClass100_1042;
}
if (local693.aBoolean32) {
if (local693.usingScripts) {
Static78.aClass100_466 = JagString.concatenate(new JagString[] { local693.opBase, Static204.aClass100_896 });
} else {
Static78.aClass100_466 = JagString.concatenate(new JagString[] { MiniMenu.COLOR_GREEN, local693.aClass100_85, Static204.aClass100_896 });
@ -576,9 +576,9 @@ public class ClientProt {
local693 = InterfaceList.getComponent(local19);
if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) {
local1955 = local693.anIntArrayArray4[0][1];
if (Static7.varps[local1955] != local693.anIntArray48[0]) {
Static7.varps[local1955] = local693.anIntArray48[0];
Static85.method1775(local1955);
if (VarpDomain.varps[local1955] != local693.anIntArray48[0]) {
VarpDomain.varps[local1955] = local693.anIntArray48[0];
Static85.refreshMagicVarp(local1955);
}
}
}
@ -603,8 +603,8 @@ public class ClientProt {
local693 = InterfaceList.getComponent(local19);
if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) {
local1955 = local693.anIntArrayArray4[0][1];
Static7.varps[local1955] = 1 - Static7.varps[local1955];
Static85.method1775(local1955);
VarpDomain.varps[local1955] = 1 - VarpDomain.varps[local1955];
Static85.refreshMagicVarp(local1955);
}
}
if (local23 == 33) {
@ -733,10 +733,10 @@ public class ClientProt {
Static185.anInt4370 = local15;
Static260.anInt5014 = 1;
Static274.anInt4997 = local36;
Static43.redraw(local693);
InterfaceList.redraw(local693);
Static34.aClass100_203 = JagString.concatenate(new JagString[] { Static8.aClass100_32, ObjTypeList.get(local36).name, Static204.aClass100_896 });
if (Static34.aClass100_203 == null) {
Static34.aClass100_203 = Static92.aClass100_510;
Static34.aClass100_203 = Static92.NULL;
}
return;
}
@ -856,13 +856,13 @@ public class ClientProt {
}
if (Static260.anInt5014 != 0) {
Static260.anInt5014 = 0;
Static43.redraw(InterfaceList.getComponent(Static224.anInt5062));
InterfaceList.redraw(InterfaceList.getComponent(Static224.anInt5062));
}
if (Static241.aBoolean302) {
Static53.method1294();
}
if (Static257.aClass13_7 != null && Static72.anInt2043 == 0) {
Static43.redraw(Static257.aClass13_7);
InterfaceList.redraw(Static257.aClass13_7);
}
}
@ -1168,7 +1168,7 @@ public class ClientProt {
@OriginalMember(owner = "client!ac", name = "b", descriptor = "(I)V")
public static void method28() {
Static43.redraw(Static105.aClass13_14);
InterfaceList.redraw(Static105.aClass13_14);
Static213.anInt4851++;
if (Static44.aBoolean83 && Static146.aBoolean174) {
@Pc(30) int local30 = Mouse.anInt4873;
@ -1202,7 +1202,7 @@ public class ClientProt {
local176.arguments = Static105.aClass13_14.anObjectArray26;
local176.mouseX = local122;
local176.mouseY = local130;
Static82.method1767(local176);
ScriptRunner.run(local176);
}
if (Mouse.pressedButton == 0) {
if (Static138.aBoolean172) {
@ -1213,7 +1213,7 @@ public class ClientProt {
local176.mouseX = local122;
local176.arguments = Static105.aClass13_14.anObjectArray16;
local176.source = Static105.aClass13_14;
Static82.method1767(local176);
ScriptRunner.run(local176);
}
if (Static56.aClass13_12 != null && Static36.method938(Static105.aClass13_14) != null) {
Protocol.outboundBuffer.p1isaac(79);

210
client/src/main/java/rt4/Component.java
View file

@ -294,10 +294,10 @@ public final class Component {
public int anInt480 = 0;
@OriginalMember(owner = "client!be", name = "Hb", descriptor = "Z")
public boolean aBoolean32 = false;
public boolean usingScripts = false;
@OriginalMember(owner = "client!be", name = "gc", descriptor = "Lclient!bf;")
public ServerActiveProperties aClass3_Sub4_1 = Static45.aClass3_Sub4_2;
public ServerActiveProperties properties = Static45.aClass3_Sub4_2;
@OriginalMember(owner = "client!be", name = "cc", descriptor = "I")
public int anInt492 = 0;
@ -559,8 +559,8 @@ public final class Component {
}
@OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!wa;)V")
public final void method481(@OriginalArg(1) Buffer arg0) {
this.aBoolean32 = false;
public final void decodeNoScripts(@OriginalArg(1) Buffer arg0) {
this.usingScripts = false;
this.type = arg0.g1();
this.anInt530 = arg0.g1();
this.anInt453 = arg0.g2();
@ -776,7 +776,7 @@ public final class Component {
if (this.anInt530 == 6) {
local164 |= 0x1;
}
this.aClass3_Sub4_1 = new ServerActiveProperties(local164, -1);
this.properties = new ServerActiveProperties(local164, -1);
}
@OriginalMember(owner = "client!be", name = "a", descriptor = "(ZI)Lclient!qf;")
@ -989,99 +989,99 @@ public final class Component {
}
@OriginalMember(owner = "client!be", name = "c", descriptor = "(ILclient!wa;)V")
public final void method490(@OriginalArg(1) Buffer arg0) {
this.aBoolean32 = true;
arg0.offset++;
this.type = arg0.g1();
public final void decodeScriptFormat(@OriginalArg(1) Buffer buffer) {
this.usingScripts = true;
buffer.offset++;
this.type = buffer.g1();
if ((this.type & 0x80) != 0) {
this.type &= 0x7F;
arg0.gjstr();
buffer.gjstr();
}
this.anInt453 = arg0.g2();
this.baseX = arg0.g2s();
this.baseY = arg0.g2s();
this.baseWidth = arg0.g2();
this.baseHeight = arg0.g2();
this.dynamicWidthValue = arg0.g1s();
this.dynamicHeightValue = arg0.g1s();
this.yMode = arg0.g1s();
this.xMode = arg0.g1s();
this.layer = arg0.g2();
this.anInt453 = buffer.g2();
this.baseX = buffer.g2s();
this.baseY = buffer.g2s();
this.baseWidth = buffer.g2();
this.baseHeight = buffer.g2();
this.dynamicWidthValue = buffer.g1s();
this.dynamicHeightValue = buffer.g1s();
this.yMode = buffer.g1s();
this.xMode = buffer.g1s();
this.layer = buffer.g2();
if (this.layer == 65535) {
this.layer = -1;
} else {
this.layer = (this.id & 0xFFFF0000) + this.layer;
}
this.hidden = arg0.g1() == 1;
this.hidden = buffer.g1() == 1;
if (this.type == 0) {
this.anInt486 = arg0.g2();
this.anInt491 = arg0.g2();
this.noClickThrough = arg0.g1() == 1;
this.anInt486 = buffer.g2();
this.anInt491 = buffer.g2();
this.noClickThrough = buffer.g1() == 1;
}
@Pc(175) int local175;
if (this.type == 5) {
this.anInt477 = arg0.g4();
this.anInt521 = arg0.g2();
local175 = arg0.g1();
this.anInt477 = buffer.g4();
this.anInt521 = buffer.g2();
local175 = buffer.g1();
this.aBoolean18 = (local175 & 0x2) != 0;
this.aBoolean23 = (local175 & 0x1) != 0;
this.anInt476 = arg0.g1();
this.anInt514 = arg0.g1();
this.anInt513 = arg0.g4();
this.aBoolean21 = arg0.g1() == 1;
this.aBoolean26 = arg0.g1() == 1;
this.anInt476 = buffer.g1();
this.anInt514 = buffer.g1();
this.anInt513 = buffer.g4();
this.aBoolean21 = buffer.g1() == 1;
this.aBoolean26 = buffer.g1() == 1;
}
if (this.type == 6) {
this.modelType = 1;
this.modelId = arg0.g2();
this.modelId = buffer.g2();
if (this.modelId == 65535) {
this.modelId = -1;
}
this.anInt495 = arg0.g2s();
this.anInt481 = arg0.g2s();
this.modelXAngle = arg0.g2();
this.modelYAngle = arg0.g2();
this.modelYOffset = arg0.g2();
this.modelZoom = arg0.g2();
this.modelSeqId = arg0.g2();
this.anInt495 = buffer.g2s();
this.anInt481 = buffer.g2s();
this.modelXAngle = buffer.g2();
this.modelYAngle = buffer.g2();
this.modelYOffset = buffer.g2();
this.modelZoom = buffer.g2();
this.modelSeqId = buffer.g2();
if (this.modelSeqId == 65535) {
this.modelSeqId = -1;
}
this.aBoolean22 = arg0.g1() == 1;
this.aShort11 = (short) arg0.g2();
this.aShort10 = (short) arg0.g2();
this.aBoolean34 = arg0.g1() == 1;
this.aBoolean22 = buffer.g1() == 1;
this.aShort11 = (short) buffer.g2();
this.aShort10 = (short) buffer.g2();
this.aBoolean34 = buffer.g1() == 1;
if (this.dynamicWidthValue != 0) {
this.anInt451 = arg0.g2();
this.anInt451 = buffer.g2();
}
if (this.dynamicHeightValue != 0) {
this.anInt526 = arg0.g2();
this.anInt526 = buffer.g2();
}
}
if (this.type == 4) {
this.anInt502 = arg0.g2();
this.anInt502 = buffer.g2();
if (this.anInt502 == 65535) {
this.anInt502 = -1;
}
this.text = arg0.gjstr();
this.anInt467 = arg0.g1();
this.anInt460 = arg0.g1();
this.anInt478 = arg0.g1();
this.aBoolean28 = arg0.g1() == 1;
this.color = arg0.g4();
this.text = buffer.gjstr();
this.anInt467 = buffer.g1();
this.anInt460 = buffer.g1();
this.anInt478 = buffer.g1();
this.aBoolean28 = buffer.g1() == 1;
this.color = buffer.g4();
}
if (this.type == 3) {
this.color = arg0.g4();
this.aBoolean30 = arg0.g1() == 1;
this.anInt476 = arg0.g1();
this.color = buffer.g4();
this.aBoolean30 = buffer.g1() == 1;
this.anInt476 = buffer.g1();
}
if (this.type == 9) {
this.anInt490 = arg0.g1();
this.color = arg0.g4();
this.aBoolean20 = arg0.g1() == 1;
this.anInt490 = buffer.g1();
this.color = buffer.g4();
this.aBoolean20 = buffer.g1() == 1;
}
local175 = arg0.g3();
@Pc(471) int local471 = arg0.g1();
local175 = buffer.g3();
@Pc(471) int local471 = buffer.g1();
@Pc(497) int local497;
if (local471 != 0) {
this.anIntArray46 = new int[10];
@ -1089,86 +1089,86 @@ public final class Component {
this.aByteArray7 = new byte[10];
while (local471 != 0) {
local497 = (local471 >> 4) - 1;
local471 = arg0.g1() | local471 << 8;
local471 = buffer.g1() | local471 << 8;
local471 &= 0xFFF;
if (local471 == 4095) {
this.anIntArray46[local497] = -1;
} else {
this.anIntArray46[local497] = local471;
}
this.aByteArray8[local497] = arg0.g1s();
this.aByteArray7[local497] = arg0.g1s();
local471 = arg0.g1();
this.aByteArray8[local497] = buffer.g1s();
this.aByteArray7[local497] = buffer.g1s();
local471 = buffer.g1();
}
}
this.opBase = arg0.gjstr();
local497 = arg0.g1();
this.opBase = buffer.gjstr();
local497 = buffer.g1();
@Pc(557) int local557 = local497 & 0xF;
@Pc(567) int local567;
if (local557 > 0) {
this.ops = new JagString[local557];
for (local567 = 0; local567 < local557; local567++) {
this.ops[local567] = arg0.gjstr();
this.ops[local567] = buffer.gjstr();
}
}
@Pc(584) int local584 = local497 >> 4;
if (local584 > 0) {
local567 = arg0.g1();
local567 = buffer.g1();
this.anIntArray39 = new int[local567 + 1];
for (@Pc(599) int local599 = 0; local599 < this.anIntArray39.length; local599++) {
this.anIntArray39[local599] = -1;
}
this.anIntArray39[local567] = arg0.g2();
this.anIntArray39[local567] = buffer.g2();
}
if (local584 > 1) {
local567 = arg0.g1();
this.anIntArray39[local567] = arg0.g2();
local567 = buffer.g1();
this.anIntArray39[local567] = buffer.g2();
}
this.anInt472 = arg0.g1();
this.anInt447 = arg0.g1();
this.aBoolean27 = arg0.g1() == 1;
this.anInt472 = buffer.g1();
this.anInt447 = buffer.g1();
this.aBoolean27 = buffer.g1() == 1;
local567 = -1;
this.aClass100_86 = arg0.gjstr();
this.aClass100_86 = buffer.gjstr();
if (Static199.method3594(local175) != 0) {
local567 = arg0.g2();
this.anInt499 = arg0.g2();
local567 = buffer.g2();
this.anInt499 = buffer.g2();
if (local567 == 65535) {
local567 = -1;
}
if (this.anInt499 == 65535) {
this.anInt499 = -1;
}
this.anInt484 = arg0.g2();
this.anInt484 = buffer.g2();
if (this.anInt484 == 65535) {
this.anInt484 = -1;
}
}
this.aClass3_Sub4_1 = new ServerActiveProperties(local175, local567);
this.anObjectArray3 = this.method485(arg0);
this.onMouseOver = this.method485(arg0);
this.onMouseLeave = this.method485(arg0);
this.anObjectArray27 = this.method485(arg0);
this.anObjectArray11 = this.method485(arg0);
this.onVarpTransmit = this.method485(arg0);
this.onInvTransmit = this.method485(arg0);
this.onStatTransmit = this.method485(arg0);
this.onTimer = this.method485(arg0);
this.anObjectArray29 = this.method485(arg0);
this.onMouseRepeat = this.method485(arg0);
this.onClickRepeat = this.method485(arg0);
this.anObjectArray6 = this.method485(arg0);
this.onRelease = this.method485(arg0);
this.onHold = this.method485(arg0);
this.anObjectArray26 = this.method485(arg0);
this.anObjectArray16 = this.method485(arg0);
this.anObjectArray10 = this.method485(arg0);
this.onVarcTransmit = this.method485(arg0);
this.onVarcstrTransmit = this.method485(arg0);
this.varpTriggers = this.method486(arg0);
this.inventoryTriggers = this.method486(arg0);
this.statTriggers = this.method486(arg0);
this.varcTriggers = this.method486(arg0);
this.varcstrTriggers = this.method486(arg0);
this.properties = new ServerActiveProperties(local175, local567);
this.anObjectArray3 = this.method485(buffer);
this.onMouseOver = this.method485(buffer);
this.onMouseLeave = this.method485(buffer);
this.anObjectArray27 = this.method485(buffer);
this.anObjectArray11 = this.method485(buffer);
this.onVarpTransmit = this.method485(buffer);
this.onInvTransmit = this.method485(buffer);
this.onStatTransmit = this.method485(buffer);
this.onTimer = this.method485(buffer);
this.anObjectArray29 = this.method485(buffer);
this.onMouseRepeat = this.method485(buffer);
this.onClickRepeat = this.method485(buffer);
this.anObjectArray6 = this.method485(buffer);
this.onRelease = this.method485(buffer);
this.onHold = this.method485(buffer);
this.anObjectArray26 = this.method485(buffer);
this.anObjectArray16 = this.method485(buffer);
this.anObjectArray10 = this.method485(buffer);
this.onVarcTransmit = this.method485(buffer);
this.onVarcstrTransmit = this.method485(buffer);
this.varpTriggers = this.method486(buffer);
this.inventoryTriggers = this.method486(buffer);
this.statTriggers = this.method486(buffer);
this.varcTriggers = this.method486(buffer);
this.varcstrTriggers = this.method486(buffer);
}
@OriginalMember(owner = "client!be", name = "a", descriptor = "([Lclient!ok;I)Lclient!rk;")

2
client/src/main/java/rt4/Class3_Sub31.java → client/src/main/java/rt4/ComponentPointer.java
View file

@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!wk")
public final class Class3_Sub31 extends Node {
public final class ComponentPointer extends Node {
@OriginalMember(owner = "client!wk", name = "r", descriptor = "I")
public int anInt5878;

8
client/src/main/java/rt4/DelayedStateChange.java
View file

@ -60,14 +60,14 @@ public final class DelayedStateChange extends SecondaryNode {
}
@OriginalMember(owner = "client!ke", name = "c", descriptor = "(III)V")
public static void method2606(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
public static void updateVarC(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(8) DelayedStateChange local8 = Static238.method4143(1, arg0);
local8.pushServer();
local8.intArg1 = arg1;
}
@OriginalMember(owner = "client!ke", name = "a", descriptor = "(IIIBI)V")
public static void method2607(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
public static void updateComponentModel(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
@Pc(8) DelayedStateChange local8 = Static238.method4143(4, arg2);
local8.pushServer();
local8.intArg3 = arg3;
@ -83,7 +83,7 @@ public final class DelayedStateChange extends SecondaryNode {
}
@OriginalMember(owner = "client!ve", name = "a", descriptor = "(BIIII)V")
public static void method4505(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
public static void updateView(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
@Pc(8) DelayedStateChange local8 = Static238.method4143(8, arg1);
local8.pushServer();
local8.intArg2 = arg0;
@ -92,7 +92,7 @@ public final class DelayedStateChange extends SecondaryNode {
}
@OriginalMember(owner = "client!kk", name = "a", descriptor = "(IIB)V")
public static void method2649(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
public static void setColor(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(4) DelayedStateChange local4 = Static238.method4143(6, arg1);
local4.pushServer();
local4.intArg1 = arg0;

2
client/src/main/java/rt4/GlobalConfig.java
View file

@ -17,7 +17,7 @@ public class GlobalConfig {
public static final BigInteger RSA_EXPONENT = new BigInteger("65537");
// Server IP
public static String DEFAULT_HOSTNAME = "play.2009scape.org";
public static String DEFAULT_HOSTNAME = "test.2009scape.org";
// Jagex had this at 40000+id
public static int DEFAULT_PORT = 43594;

38
client/src/main/java/rt4/InterfaceList.java
View file

@ -13,6 +13,8 @@ public class InterfaceList {
public static final int[] keyChars = new int[128];
@OriginalMember(owner = "client!sg", name = "q", descriptor = "[I")
public static final int[] keyCodes = new int[128];
@OriginalMember(owner = "client!rb", name = "b", descriptor = "Lclient!sc;")
public static final HashTable properties = new HashTable(512);
@OriginalMember(owner = "client!bn", name = "V", descriptor = "I")
public static int anInt766 = 0;
@OriginalMember(owner = "client!md", name = "W", descriptor = "I")
@ -35,6 +37,8 @@ public class InterfaceList {
public static int transmitTimer = 1;
@OriginalMember(owner = "client!ra", name = "J", descriptor = "I")
public static int miscTransmitAt = 0;
@OriginalMember(owner = "client!je", name = "T", descriptor = "Lclient!sc;")
public static HashTable openInterfaces = new HashTable(8);
@OriginalMember(owner = "client!ab", name = "a", descriptor = "(ZLclient!ve;Lclient!ve;Lclient!ve;Lclient!ve;)V")
public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2, @OriginalArg(4) Js5 arg3) {
@ -75,7 +79,9 @@ public class InterfaceList {
public static boolean load(@OriginalArg(0) int arg0) {
if (aBooleanArray115[arg0]) {
return true;
} else if (aClass153_84.method4479(arg0)) {
}
if (aClass153_84.method4479(arg0)) {
@Pc(25) int local25 = aClass153_84.getGroupCapacity(arg0);
if (local25 == 0) {
aBooleanArray115[arg0] = true;
@ -91,9 +97,9 @@ public class InterfaceList {
@Pc(74) Component local74 = components[arg0][local46] = new Component();
local74.id = local46 + (arg0 << 16);
if (local62[0] == -1) {
local74.method490(new Buffer(local62));
local74.decodeScriptFormat(new Buffer(local62));
} else {
local74.method481(new Buffer(local62));
local74.decodeNoScripts(new Buffer(local62));
}
}
}
@ -112,8 +118,8 @@ public class InterfaceList {
}
@OriginalMember(owner = "client!i", name = "i", descriptor = "(Z)V")
public static void method2245() {
for (@Pc(6) Class3_Sub31 local6 = (Class3_Sub31) Static119.aClass133_9.head(); local6 != null; local6 = (Class3_Sub31) Static119.aClass133_9.next()) {
public static void redrawActiveInterfaces() {
for (@Pc(6) ComponentPointer local6 = (ComponentPointer) openInterfaces.head(); local6 != null; local6 = (ComponentPointer) openInterfaces.next()) {
@Pc(14) int local14 = local6.anInt5878;
if (load(local14)) {
@Pc(21) boolean local21 = true;
@ -121,7 +127,7 @@ public class InterfaceList {
@Pc(27) int local27;
for (local27 = 0; local27 < local25.length; local27++) {
if (local25[local27] != null) {
local21 = local25[local27].aBoolean32;
local21 = local25[local27].usingScripts;
break;
}
}
@ -129,7 +135,7 @@ public class InterfaceList {
local27 = (int) local6.key;
@Pc(60) Component local60 = getComponent(local27);
if (local60 != null) {
Static43.redraw(local60);
redraw(local60);
}
}
}
@ -138,19 +144,20 @@ public class InterfaceList {
@OriginalMember(owner = "client!af", name = "a", descriptor = "(BI)Lclient!be;")
public static Component getComponent(@OriginalArg(1) int id) {
// TODO: _why_ are there some interfaces/components that are null! (i.e. banking)
try {
@Pc(7) int interfaceId = id >> 16;
@Pc(18) int componentId = id & 0xFFFF;
if (components.length < interfaceId || interfaceId < 0) {
if (components.length <= interfaceId || interfaceId < 0) {
return null;
}
if (components[interfaceId] == null || components[interfaceId][componentId] == null) {
if (components[interfaceId] == null || components[interfaceId].length <= componentId || components[interfaceId][componentId] == null) {
@Pc(33) boolean success = load(interfaceId);
if (!success) {
return null;
}
}
if (components[interfaceId].length < componentId) {
if (components[interfaceId].length <= componentId) {
return null;
}
return components[interfaceId][componentId];
@ -162,7 +169,14 @@ public class InterfaceList {
@OriginalMember(owner = "client!client", name = "b", descriptor = "(Lclient!be;)Lclient!bf;")
public static ServerActiveProperties getServerActiveProperties(@OriginalArg(0) Component arg0) {
@Pc(13) ServerActiveProperties local13 = (ServerActiveProperties) Static210.aClass133_21.get(((long) arg0.id << 32) + (long) arg0.createdComponentId);
return local13 == null ? arg0.aClass3_Sub4_1 : local13;
@Pc(13) ServerActiveProperties local13 = (ServerActiveProperties) properties.get(((long) arg0.id << 32) + (long) arg0.createdComponentId);
return local13 == null ? arg0.properties : local13;
}
@OriginalMember(owner = "client!dg", name = "a", descriptor = "(ILclient!be;)V")
public static void redraw(@OriginalArg(1) Component arg0) {
if (Static182.anInt4311 == arg0.anInt465) {
Static186.aBooleanArray100[arg0.anInt517] = true;
}
}
}

10
client/src/main/java/rt4/Inv.java
View file

@ -10,6 +10,8 @@ public final class Inv extends Node {
@OriginalMember(owner = "client!cb", name = "I", descriptor = "[I")
public static final int[] updatedInventories = new int[32];
@OriginalMember(owner = "client!ii", name = "c", descriptor = "I")
public static int updatedInventoriesWriterIndex = 0;
@OriginalMember(owner = "client!qe", name = "p", descriptor = "[I")
public int[] objectIds = new int[] { -1 };
@ -100,4 +102,12 @@ public final class Inv extends Node {
return -1;
}
}
@OriginalMember(owner = "client!bc", name = "d", descriptor = "(II)V")
public static void delete(@OriginalArg(0) int arg0) {
@Pc(14) Inv local14 = (Inv) Static20.objectContainerCache.get((long) arg0);
if (local14 != null) {
local14.unlink();
}
}
}

2
client/src/main/java/rt4/JagString.java
View file

@ -453,7 +453,7 @@ public final class JagString implements StringInterface {
}
@OriginalMember(owner = "client!na", name = "c", descriptor = "(BLclient!na;)Z")
public final boolean method3130(@OriginalArg(1) JagString arg0) {
public final boolean endsWith(@OriginalArg(1) JagString arg0) {
if (arg0.length > this.length) {
return false;
}

10
client/src/main/java/rt4/Js5CachedResourceProvider.java
View file

@ -98,7 +98,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
return;
}
@Pc(15) Node local15;
for (local15 = this.aClass69_16.method2289(); local15 != null; local15 = this.aClass69_16.method2288()) {
for (local15 = this.aClass69_16.start(); local15 != null; local15 = this.aClass69_16.next()) {
if (local15.key == (long) arg0) {
return;
}
@ -190,7 +190,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
if (this.aClass70_1 == null) {
return 0;
} else if (this.aBoolean35) {
@Pc(25) Node local25 = this.aClass69_17.method2289();
@Pc(25) Node local25 = this.aClass69_17.start();
return local25 == null ? 0 : (int) local25.key;
} else {
return this.aClass70_1.anInt2902;
@ -208,7 +208,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
@Pc(43) int local43;
if (this.aBoolean35) {
local32 = true;
for (local37 = this.aClass69_17.method2289(); local37 != null; local37 = this.aClass69_17.method2288()) {
for (local37 = this.aClass69_17.start(); local37 != null; local37 = this.aClass69_17.next()) {
local43 = (int) local37.key;
if (this.aByteArray9[local43] == 0) {
this.method536(1, local43);
@ -245,7 +245,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
}
} else if (this.aBoolean36) {
local32 = true;
for (local37 = this.aClass69_17.method2289(); local37 != null; local37 = this.aClass69_17.method2288()) {
for (local37 = this.aClass69_17.start(); local37 != null; local37 = this.aClass69_17.next()) {
local43 = (int) local37.key;
if (this.aByteArray9[local43] != 1) {
this.method536(2, local43);
@ -434,7 +434,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
if (this.aClass69_17 == null || this.method521() == null) {
return;
}
for (@Pc(21) Node local21 = this.aClass69_16.method2289(); local21 != null; local21 = this.aClass69_16.method2288()) {
for (@Pc(21) Node local21 = this.aClass69_16.start(); local21 != null; local21 = this.aClass69_16.next()) {
@Pc(28) int local28 = (int) local21.key;
if (local28 < 0 || this.aClass70_1.anInt2907 <= local28 || this.aClass70_1.anIntArray272[local28] == 0) {
local21.unlink();

4
client/src/main/java/rt4/LinkedList.java
View file

@ -90,7 +90,7 @@ public final class LinkedList {
}
@OriginalMember(owner = "client!ih", name = "e", descriptor = "(I)Lclient!ab;")
public final Node method2288() {
public final Node next() {
@Pc(12) Node local12 = this.aClass3_110;
if (local12 == this.aClass3_109) {
this.aClass3_110 = null;
@ -102,7 +102,7 @@ public final class LinkedList {
}
@OriginalMember(owner = "client!ih", name = "f", descriptor = "(I)Lclient!ab;")
public final Node method2289() {
public final Node start() {
@Pc(3) Node local3 = this.aClass3_109.aClass3_222;
if (this.aClass3_109 == local3) {
this.aClass3_110 = null;

2
client/src/main/java/rt4/LocType.java
View file

@ -213,7 +213,7 @@ public final class LocType {
if (this.multiLocVarbit != -1) {
local26 = Static155.getVarbit(this.multiLocVarbit);
} else if (this.multiLocVarp != -1) {
local26 = Static7.varps[this.multiLocVarp];
local26 = VarpDomain.varps[this.multiLocVarp];
}
if (local26 < 0 || local26 >= this.multiLocs.length - 1 || this.multiLocs[local26] == -1) {
@Pc(84) int local84 = this.multiLocs[this.multiLocs.length - 1];

2
client/src/main/java/rt4/LoginManager.java
View file

@ -205,7 +205,7 @@ public class LoginManager {
}
Protocol.socket = new BufferedSocket((Socket) Protocol.socketRequest.result, GameShell.signLink);
Protocol.socketRequest = null;
@Pc(106) long local106 = Static101.aLong98 = Player.usernameInput.encode37();
@Pc(106) long local106 = Player.name37 = Player.usernameInput.encode37();
Protocol.outboundBuffer.offset = 0;
Protocol.outboundBuffer.p1(14);
@Pc(120) int local120 = (int) (local106 >> 16 & 0x1FL);

4
client/src/main/java/rt4/Map.java
View file

@ -75,7 +75,7 @@ public final class Map extends SecondaryNode {
if (this.anInt763 > arg1 || arg1 > this.anInt770 || arg0 < this.anInt771 || arg0 > this.anInt758) {
return false;
}
for (@Pc(33) MapChunk local33 = (MapChunk) this.chunks.method2289(); local33 != null; local33 = (MapChunk) this.chunks.method2288()) {
for (@Pc(33) MapChunk local33 = (MapChunk) this.chunks.start(); local33 != null; local33 = (MapChunk) this.chunks.next()) {
if (local33.method2760(arg0, arg1)) {
return true;
}
@ -89,7 +89,7 @@ public final class Map extends SecondaryNode {
this.anInt770 = 0;
this.anInt758 = 0;
this.anInt763 = 12800;
for (@Pc(29) MapChunk local29 = (MapChunk) this.chunks.method2289(); local29 != null; local29 = (MapChunk) this.chunks.method2288()) {
for (@Pc(29) MapChunk local29 = (MapChunk) this.chunks.start(); local29 != null; local29 = (MapChunk) this.chunks.next()) {
if (local29.anInt3522 < this.anInt771) {
this.anInt771 = local29.anInt3522;
}

4
client/src/main/java/rt4/MapList.java
View file

@ -29,7 +29,7 @@ public class MapList {
@OriginalMember(owner = "client!jk", name = "a", descriptor = "(ILclient!na;)Lclient!bn;")
public static Map get(@OriginalArg(1) JagString arg0) {
for (@Pc(15) Map local15 = (Map) aClass69_120.method2289(); local15 != null; local15 = (Map) aClass69_120.method2288()) {
for (@Pc(15) Map local15 = (Map) aClass69_120.start(); local15 != null; local15 = (Map) aClass69_120.next()) {
if (local15.group.strEquals(arg0)) {
return local15;
}
@ -39,7 +39,7 @@ public class MapList {
@OriginalMember(owner = "client!ce", name = "a", descriptor = "(IBI)Lclient!bn;")
public static Map getContainingSource(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
for (@Pc(10) Map local10 = (Map) aClass69_120.method2289(); local10 != null; local10 = (Map) aClass69_120.method2288()) {
for (@Pc(10) Map local10 = (Map) aClass69_120.start(); local10 != null; local10 = (Map) aClass69_120.next()) {
if (local10.aBoolean50 && local10.method664(arg1, arg0)) {
return local10;
}

10
client/src/main/java/rt4/Class102.java → client/src/main/java/rt4/MapMarker.java
View file

@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!nc")
public final class Class102 {
public final class MapMarker {
@OriginalMember(owner = "client!nc", name = "b", descriptor = "I")
public int anInt4045;
@ -22,14 +22,14 @@ public final class Class102 {
public int anInt4050;
@OriginalMember(owner = "client!nc", name = "l", descriptor = "I")
public int anInt4053;
public int targetX;
@OriginalMember(owner = "client!nc", name = "p", descriptor = "I")
public int anInt4057;
public int actorTargetId;
@OriginalMember(owner = "client!nc", name = "q", descriptor = "I")
public int anInt4058;
public int type;
@OriginalMember(owner = "client!nc", name = "k", descriptor = "I")
public int anInt4052 = -1;
public int playerModelId = -1;
}

8
client/src/main/java/rt4/MidiNoteStream.java
View file

@ -27,7 +27,7 @@ public final class MidiNoteStream extends PcmStream {
public final PcmStream method4409() {
@Pc(9) MidiNote local9;
do {
local9 = (MidiNote) this.aClass69_126.method2288();
local9 = (MidiNote) this.aClass69_126.next();
if (local9 == null) {
return null;
}
@ -38,7 +38,7 @@ public final class MidiNoteStream extends PcmStream {
@OriginalMember(owner = "client!te", name = "b", descriptor = "()Lclient!qb;")
@Override
public final PcmStream method4406() {
@Pc(9) MidiNote local9 = (MidiNote) this.aClass69_126.method2289();
@Pc(9) MidiNote local9 = (MidiNote) this.aClass69_126.start();
if (local9 == null) {
return null;
} else if (local9.aClass3_Sub3_Sub1_3 == null) {
@ -80,7 +80,7 @@ public final class MidiNoteStream extends PcmStream {
@Override
public final void skip(@OriginalArg(0) int arg0) {
this.aClass3_Sub3_Sub2_2.skip(arg0);
for (@Pc(15) MidiNote local15 = (MidiNote) this.aClass69_126.method2289(); local15 != null; local15 = (MidiNote) this.aClass69_126.method2288()) {
for (@Pc(15) MidiNote local15 = (MidiNote) this.aClass69_126.start(); local15 != null; local15 = (MidiNote) this.aClass69_126.next()) {
if (!this.aClass3_Sub3_Sub4_3.method4445(local15)) {
@Pc(27) int local27 = arg0;
do {
@ -100,7 +100,7 @@ public final class MidiNoteStream extends PcmStream {
@Override
public final void read(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
this.aClass3_Sub3_Sub2_2.read(arg0, arg1, arg2);
for (@Pc(17) MidiNote local17 = (MidiNote) this.aClass69_126.method2289(); local17 != null; local17 = (MidiNote) this.aClass69_126.method2288()) {
for (@Pc(17) MidiNote local17 = (MidiNote) this.aClass69_126.start(); local17 != null; local17 = (MidiNote) this.aClass69_126.next()) {
if (!this.aClass3_Sub3_Sub4_3.method4445(local17)) {
@Pc(29) int local29 = arg2;
@Pc(31) int local31 = arg1;

10
client/src/main/java/rt4/MidiPcmStream.java
View file

@ -214,7 +214,7 @@ public final class MidiPcmStream extends PcmStream {
@OriginalMember(owner = "client!va", name = "a", descriptor = "(BI)V")
private void method4422(@OriginalArg(1) int arg0) {
for (@Pc(20) MidiNote local20 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.method2289(); local20 != null; local20 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.method2288()) {
for (@Pc(20) MidiNote local20 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.start(); local20 != null; local20 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.next()) {
if (arg0 < 0 || local20.anInt3773 == arg0) {
if (local20.aClass3_Sub3_Sub1_3 != null) {
local20.aClass3_Sub3_Sub1_3.method384(Static44.sampleRate / 100);
@ -478,7 +478,7 @@ public final class MidiPcmStream extends PcmStream {
@OriginalMember(owner = "client!va", name = "d", descriptor = "(II)V")
private void method4430(@OriginalArg(1) int arg0) {
for (@Pc(12) MidiNote local12 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.method2289(); local12 != null; local12 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.method2288()) {
for (@Pc(12) MidiNote local12 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.start(); local12 != null; local12 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.next()) {
if ((arg0 < 0 || arg0 == local12.anInt3773) && local12.anInt3767 < 0) {
this.aClass3_Sub25ArrayArray1[local12.anInt3773][local12.anInt3779] = null;
local12.anInt3767 = 0;
@ -614,7 +614,7 @@ public final class MidiPcmStream extends PcmStream {
local12.anInt3767 = 0;
return;
}
for (@Pc(44) MidiNote local44 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.method2289(); local44 != null; local44 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.method2288()) {
for (@Pc(44) MidiNote local44 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.start(); local44 != null; local44 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.next()) {
if (local44.anInt3773 == local12.anInt3773 && local44.anInt3767 < 0 && local44 != local12) {
local12.anInt3767 = 0;
break;
@ -710,7 +710,7 @@ public final class MidiPcmStream extends PcmStream {
if ((this.anIntArray508[arg0] & 0x4) == 0) {
return;
}
for (@Pc(24) MidiNote local24 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.method2289(); local24 != null; local24 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.method2288()) {
for (@Pc(24) MidiNote local24 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.start(); local24 != null; local24 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.next()) {
if (local24.anInt3773 == arg0) {
local24.anInt3775 = 0;
}
@ -782,7 +782,7 @@ public final class MidiPcmStream extends PcmStream {
if ((this.anIntArray508[arg0] & 0x2) == 0) {
return;
}
for (@Pc(20) MidiNote local20 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.method2289(); local20 != null; local20 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.method2288()) {
for (@Pc(20) MidiNote local20 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.start(); local20 != null; local20 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.next()) {
if (arg0 == local20.anInt3773 && this.aClass3_Sub25ArrayArray1[arg0][local20.anInt3779] == null && local20.anInt3767 < 0) {
local20.anInt3767 = 0;
}

14
client/src/main/java/rt4/MixerPcmStream.java
View file

@ -56,7 +56,7 @@ public final class MixerPcmStream extends PcmStream {
arg2 -= local33;
this.anInt1780 += local33;
this.method1344();
@Pc(60) MixerListener local60 = (MixerListener) this.aClass69_44.method2289();
@Pc(60) MixerListener local60 = (MixerListener) this.aClass69_44.start();
synchronized (local60) {
@Pc(68) int local68 = local60.method779(this);
if (local68 < 0) {
@ -75,7 +75,7 @@ public final class MixerPcmStream extends PcmStream {
if (this.anInt1780 <= 0) {
return;
}
for (@Pc(8) MixerListener local8 = (MixerListener) this.aClass69_44.method2289(); local8 != null; local8 = (MixerListener) this.aClass69_44.method2288()) {
for (@Pc(8) MixerListener local8 = (MixerListener) this.aClass69_44.start(); local8 != null; local8 = (MixerListener) this.aClass69_44.next()) {
local8.anInt905 -= this.anInt1780;
}
this.anInt1781 -= this.anInt1780;
@ -85,19 +85,19 @@ public final class MixerPcmStream extends PcmStream {
@OriginalMember(owner = "client!ei", name = "b", descriptor = "()Lclient!qb;")
@Override
public final PcmStream method4406() {
return (PcmStream) this.aClass69_43.method2289();
return (PcmStream) this.aClass69_43.start();
}
@OriginalMember(owner = "client!ei", name = "d", descriptor = "(I)V")
private void method1345(@OriginalArg(0) int arg0) {
for (@Pc(5) PcmStream local5 = (PcmStream) this.aClass69_43.method2289(); local5 != null; local5 = (PcmStream) this.aClass69_43.method2288()) {
for (@Pc(5) PcmStream local5 = (PcmStream) this.aClass69_43.start(); local5 != null; local5 = (PcmStream) this.aClass69_43.next()) {
local5.skip(arg0);
}
}
@OriginalMember(owner = "client!ei", name = "c", descriptor = "([III)V")
private void method1346(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
for (@Pc(5) PcmStream local5 = (PcmStream) this.aClass69_43.method2289(); local5 != null; local5 = (PcmStream) this.aClass69_43.method2288()) {
for (@Pc(5) PcmStream local5 = (PcmStream) this.aClass69_43.start(); local5 != null; local5 = (PcmStream) this.aClass69_43.next()) {
local5.method4405(arg0, arg1, arg2);
}
}
@ -131,7 +131,7 @@ public final class MixerPcmStream extends PcmStream {
arg0 -= local29;
this.anInt1780 += local29;
this.method1344();
@Pc(50) MixerListener local50 = (MixerListener) this.aClass69_44.method2289();
@Pc(50) MixerListener local50 = (MixerListener) this.aClass69_44.start();
synchronized (local50) {
@Pc(58) int local58 = local50.method779(this);
if (local58 < 0) {
@ -148,7 +148,7 @@ public final class MixerPcmStream extends PcmStream {
@OriginalMember(owner = "client!ei", name = "d", descriptor = "()Lclient!qb;")
@Override
public final PcmStream method4409() {
return (PcmStream) this.aClass69_43.method2288();
return (PcmStream) this.aClass69_43.next();
}
@OriginalMember(owner = "client!ei", name = "a", descriptor = "(Lclient!ab;Lclient!cc;)V")

4
client/src/main/java/rt4/NpcType.java
View file

@ -161,7 +161,7 @@ public final class NpcType {
if (this.multiNpcVarbit != -1) {
local5 = Static155.getVarbit(this.multiNpcVarbit);
} else if (this.multiNpcVarp != -1) {
local5 = Static7.varps[this.multiNpcVarp];
local5 = VarpDomain.varps[this.multiNpcVarp];
}
if (local5 < 0 || local5 >= this.multiNpcs.length - 1 || this.multiNpcs[local5] == -1) {
@Pc(55) int local55 = this.multiNpcs[this.multiNpcs.length - 1];
@ -180,7 +180,7 @@ public final class NpcType {
if (this.multiNpcVarbit != -1) {
local16 = Static155.getVarbit(this.multiNpcVarbit);
} else if (this.multiNpcVarp != -1) {
local16 = Static7.varps[this.multiNpcVarp];
local16 = VarpDomain.varps[this.multiNpcVarp];
}
if (local16 < 0 || local16 >= this.multiNpcs.length - 1 || this.multiNpcs[local16] == -1) {
@Pc(62) int local62 = this.multiNpcs[this.multiNpcs.length - 1];

5
client/src/main/java/rt4/ObjType.java
View file

@ -8,9 +8,6 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!h")
public final class ObjType {
@OriginalMember(owner = "client!h", name = "S", descriptor = "[I")
public static final int[] anIntArray213 = new int[99];
@OriginalMember(owner = "client!h", name = "a", descriptor = "[S")
private short[] retextureDestination;
@ -179,7 +176,7 @@ public final class ObjType {
@Pc(13) int local13 = local6 + 1;
@Pc(26) int local26 = (int) (Math.pow(2.0D, (double) local13 / 7.0D) * 300.0D + (double) local13);
local4 += local26;
anIntArray213[local6] = local4 / 4;
PlayerSkillXpTable.xpLevelLookup[local6] = local4 / 4;
}
}

40
client/src/main/java/rt4/Player.java
View file

@ -8,7 +8,13 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!e")
public final class Player extends PathingEntity {
@OriginalMember(owner = "client!pa", name = "P", descriptor = "Lclient!na;")
@OriginalMember(owner = "client!mj", name = "d", descriptor = "[Lclient!na;")
public static final JagString[] options = new JagString[8];
@OriginalMember(owner = "client!pg", name = "ab", descriptor = "[I")
public static final int[] cursors = new int[8];
@OriginalMember(owner = "client!a", name = "f", descriptor = "[Z")
public static final boolean[] secondaryOptions = new boolean[8];
@OriginalMember(owner = "client!pa", name = "P", descriptor = "Lclient!na;")
public static JagString password = JagString.EMPTY;
@OriginalMember(owner = "client!pa", name = "S", descriptor = "Lclient!na;")
public static JagString usernameInput = JagString.EMPTY;
@ -24,6 +30,10 @@ public final class Player extends PathingEntity {
public static int worldId = -1;
@OriginalMember(owner = "client!em", name = "B", descriptor = "I")
public static int rebootTimer = 0;
@OriginalMember(owner = "client!hm", name = "gb", descriptor = "J")
public static long name37;
@OriginalMember(owner = "client!sm", name = "k", descriptor = "Lsignlink!im;")
public static PrivilegedRequest lastLogAddress;
@OriginalMember(owner = "client!e", name = "Bc", descriptor = "Lclient!hh;")
public PlayerAppearance appearance;
@ -88,7 +98,7 @@ public final class Player extends PathingEntity {
if (local92 == 2) {
arg2.anInt3371 = 0;
}
} else if (arg1 == -1 || arg2.seqId == -1 || SeqTypeList.get(arg1).anInt5355 >= SeqTypeList.get(arg2.seqId).anInt5355) {
} else if (arg1 == -1 || arg2.seqId == -1 || SeqTypeList.get(arg1).forcedPriority >= SeqTypeList.get(arg2.seqId).forcedPriority) {
arg2.anInt3373 = 1;
arg2.anInt3425 = 0;
arg2.anInt3420 = arg0;
@ -131,7 +141,7 @@ public final class Player extends PathingEntity {
} else if (local71 == 2) {
local76.anInt5400 = 0;
}
} else if (local68.anInt5355 >= SeqTypeList.get(local76.anInt5396).anInt5355) {
} else if (local68.forcedPriority >= SeqTypeList.get(local76.anInt5396).forcedPriority) {
local76 = arg2.aClass147Array3[local30] = null;
}
}
@ -309,30 +319,30 @@ public final class Player extends PathingEntity {
}
}
if (PlayerList.self == this) {
for (local102 = Static143.aClass102Array1.length - 1; local102 >= 0; local102--) {
@Pc(245) Class102 local245 = Static143.aClass102Array1[local102];
if (local245 != null && local245.anInt4052 != -1) {
for (local102 = Static143.hintMapMarkers.length - 1; local102 >= 0; local102--) {
@Pc(245) MapMarker local245 = Static143.hintMapMarkers[local102];
if (local245 != null && local245.playerModelId != -1) {
@Pc(291) int local291;
@Pc(302) int local302;
if (local245.anInt4058 == 1 && local245.anInt4057 >= 0 && NpcList.npcs.length > local245.anInt4057) {
@Pc(278) Npc local278 = NpcList.npcs[local245.anInt4057];
if (local245.type == 1 && local245.actorTargetId >= 0 && NpcList.npcs.length > local245.actorTargetId) {
@Pc(278) Npc local278 = NpcList.npcs[local245.actorTargetId];
if (local278 != null) {
local291 = local278.xFine / 32 - PlayerList.self.xFine / 32;
local302 = local278.zFine / 32 - PlayerList.self.zFine / 32;
this.method1263(null, local302, local76, local291, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6);
this.method1263(null, local302, local76, local291, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.playerModelId, arg2, arg6);
}
}
if (local245.anInt4058 == 2) {
@Pc(340) int local340 = (local245.anInt4053 - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32;
if (local245.type == 2) {
@Pc(340) int local340 = (local245.targetX - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32;
local291 = (local245.anInt4046 - Static142.originZ) * 4 + 2 - PlayerList.self.zFine / 32;
this.method1263(null, local291, local76, local340, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6);
this.method1263(null, local291, local76, local340, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.playerModelId, arg2, arg6);
}
if (local245.anInt4058 == 10 && local245.anInt4057 >= 0 && PlayerList.players.length > local245.anInt4057) {
@Pc(395) Player local395 = PlayerList.players[local245.anInt4057];
if (local245.type == 10 && local245.actorTargetId >= 0 && PlayerList.players.length > local245.actorTargetId) {
@Pc(395) Player local395 = PlayerList.players[local245.actorTargetId];
if (local395 != null) {
local291 = local395.xFine / 32 - PlayerList.self.xFine / 32;
local302 = local395.zFine / 32 - PlayerList.self.zFine / 32;
this.method1263(null, local302, local76, local291, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6);
this.method1263(null, local302, local76, local291, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.playerModelId, arg2, arg6);
}
}
}

2
client/src/main/java/rt4/PlayerSkillXpTable.java
View file

@ -11,6 +11,8 @@ public class PlayerSkillXpTable {
public static final int[] boostedLevels = new int[25];
@OriginalMember(owner = "client!sg", name = "b", descriptor = "[I")
public static final int[] experience = new int[25];
@OriginalMember(owner = "client!h", name = "S", descriptor = "[I")
public static final int[] xpLevelLookup = new int[99];
@OriginalMember(owner = "client!ha", name = "m", descriptor = "I")
public static int updatedStatsWriterIndex = 0;
}

3349
client/src/main/java/rt4/Protocol.java
View file

File diff suppressed because it is too large Load diff

2
client/src/main/java/rt4/ReflectionCheck.java
View file

@ -40,7 +40,7 @@ public final class ReflectionCheck extends Node {
@OriginalMember(owner = "client!t", name = "a", descriptor = "(Lclient!i;II)V")
public static void loop(@OriginalArg(0) Packet arg0) {
while (true) {
@Pc(18) ReflectionCheck local18 = (ReflectionCheck) Static204.aClass69_113.method2289();
@Pc(18) ReflectionCheck local18 = (ReflectionCheck) Static204.aClass69_113.start();
if (local18 == null) {
return;
}

8
client/src/main/java/rt4/Class3_Sub7.java → client/src/main/java/rt4/SceneryStack.java
View file

@ -4,13 +4,13 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!cd")
public final class Class3_Sub7 extends Node {
public final class SceneryStack extends Node {
@OriginalMember(owner = "client!cd", name = "r", descriptor = "I")
public int anInt916;
public int z;
@OriginalMember(owner = "client!cd", name = "t", descriptor = "I")
public int anInt918;
public int level;
@OriginalMember(owner = "client!cd", name = "w", descriptor = "I")
public int anInt920;
@ -31,7 +31,7 @@ public final class Class3_Sub7 extends Node {
public int anInt927;
@OriginalMember(owner = "client!cd", name = "H", descriptor = "I")
public int anInt928;
public int x;
@OriginalMember(owner = "client!cd", name = "I", descriptor = "I")
public int anInt929;

86
client/src/main/java/rt4/ScriptRunner.java
View file

@ -98,7 +98,7 @@ public final class ScriptRunner {
}
if (opcode == 1) {
id = intOperands[pc];
intStack[isp++] = Static7.varps[id];
intStack[isp++] = VarpDomain.varps[id];
continue;
}
if (opcode == 2) {
@ -358,7 +358,7 @@ public final class ScriptRunner {
throw new RuntimeException("Gap at:" + (int2 - 1));
}
@Pc(1137) Component local1137 = new Component();
local1137.aBoolean32 = true;
local1137.usingScripts = true;
local1137.createdComponentId = int2;
local1137.layer = local1137.id = local1063.id;
local1137.type = int3;
@ -368,7 +368,7 @@ public final class ScriptRunner {
} else {
Static227.staticActiveComponent2 = local1137;
}
Static43.redraw(local1063);
InterfaceList.redraw(local1063);
continue;
}
throw new RuntimeException();
@ -384,14 +384,14 @@ public final class ScriptRunner {
}
local1204 = InterfaceList.getComponent(component.id);
local1204.createdComponents[component.createdComponentId] = null;
Static43.redraw(local1204);
InterfaceList.redraw(local1204);
continue;
}
if (opcode == 102) {
isp--;
component = InterfaceList.getComponent(intStack[isp]);
component.createdComponents = null;
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (opcode == 200) {
@ -493,7 +493,7 @@ public final class ScriptRunner {
if (component.scrollY < 0) {
component.scrollY = 0;
}
Static43.redraw(component);
InterfaceList.redraw(component);
if (component.createdComponentId == -1) {
Static118.method2353(component.id);
}
@ -502,7 +502,7 @@ public final class ScriptRunner {
if (opcode == 1101) {
isp--;
component.color = intStack[isp];
Static43.redraw(component);
InterfaceList.redraw(component);
if (component.createdComponentId == -1) {
Static245.method4224(component.id);
}
@ -511,44 +511,44 @@ public final class ScriptRunner {
if (opcode == 1102) {
isp--;
component.aBoolean30 = intStack[isp] == 1;
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (opcode == 1103) {
isp--;
component.anInt476 = intStack[isp];
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (opcode == 1104) {
isp--;
component.anInt490 = intStack[isp];
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (opcode == 1105) {
isp--;
component.anInt477 = intStack[isp];
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (opcode == 1106) {
isp--;
component.anInt521 = intStack[isp];
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (opcode == 1107) {
isp--;
component.aBoolean23 = intStack[isp] == 1;
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (opcode == 1108) {
component.modelType = 1;
isp--;
component.modelId = intStack[isp];
Static43.redraw(component);
InterfaceList.redraw(component);
if (component.createdComponentId == -1) {
Static271.method4600(component.id);
}
@ -562,7 +562,7 @@ public final class ScriptRunner {
component.modelYAngle = intStack[isp + 3];
component.modelYOffset = intStack[isp + 4];
component.modelZoom = intStack[isp + 5];
Static43.redraw(component);
InterfaceList.redraw(component);
if (component.createdComponentId == -1) {
Static153.method2910(component.id);
Static180.method3328(component.id);
@ -577,7 +577,7 @@ public final class ScriptRunner {
component.anInt510 = 0;
component.anInt500 = 0;
component.anInt496 = 1;
Static43.redraw(component);
InterfaceList.redraw(component);
}
if (component.createdComponentId == -1) {
Static181.method3345(component.id);
@ -587,7 +587,7 @@ public final class ScriptRunner {
if (opcode == 1111) {
isp--;
component.aBoolean22 = intStack[isp] == 1;
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (opcode == 1112) {
@ -595,7 +595,7 @@ public final class ScriptRunner {
local2522 = stringStack[ssp];
if (!local2522.strEquals(component.text)) {
component.text = local2522;
Static43.redraw(component);
InterfaceList.redraw(component);
}
if (component.createdComponentId == -1) {
Static163.method3096(component.id);
@ -605,7 +605,7 @@ public final class ScriptRunner {
if (opcode == 1113) {
isp--;
component.anInt502 = intStack[isp];
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (opcode == 1114) {
@ -613,44 +613,44 @@ public final class ScriptRunner {
component.anInt460 = intStack[isp];
component.anInt478 = intStack[isp + 1];
component.anInt467 = intStack[isp + 2];
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (opcode == 1115) {
isp--;
component.aBoolean28 = intStack[isp] == 1;
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (opcode == 1116) {
isp--;
component.anInt514 = intStack[isp];
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (opcode == 1117) {
isp--;
component.anInt513 = intStack[isp];
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (opcode == 1118) {
isp--;
component.aBoolean21 = intStack[isp] == 1;
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (opcode == 1119) {
isp--;
component.aBoolean26 = intStack[isp] == 1;
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (opcode == 1120) {
isp -= 2;
component.anInt486 = intStack[isp];
component.anInt491 = intStack[isp + 1];
Static43.redraw(component);
InterfaceList.redraw(component);
if (component.type == 0) {
Static17.method531(component, false);
}
@ -660,19 +660,19 @@ public final class ScriptRunner {
isp -= 2;
component.aShort11 = (short) intStack[isp];
component.aShort10 = (short) intStack[isp + 1];
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (opcode == 1122) {
isp--;
component.aBoolean18 = intStack[isp] == 1;
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (opcode == 1123) {
isp--;
component.modelZoom = intStack[isp];
Static43.redraw(component);
InterfaceList.redraw(component);
if (component.createdComponentId == -1) {
Static153.method2910(component.id);
}
@ -686,7 +686,7 @@ public final class ScriptRunner {
component = InterfaceList.getComponent(intStack[isp]);
opcode -= 1000;
}
Static43.redraw(component);
InterfaceList.redraw(component);
if (opcode == 1200 || opcode == 1205) {
isp -= 2;
int2 = intStack[isp + 1];
@ -1164,7 +1164,7 @@ public final class ScriptRunner {
if (opcode == 2702) {
isp--;
int1 = intStack[isp];
@Pc(12566) Class3_Sub31 local12566 = (Class3_Sub31) Static119.aClass133_9.get((long) int1);
@Pc(12566) ComponentPointer local12566 = (ComponentPointer) InterfaceList.openInterfaces.get((long) int1);
if (local12566 == null) {
intStack[isp++] = 0;
} else {
@ -1193,7 +1193,7 @@ public final class ScriptRunner {
isp -= 2;
int1 = intStack[isp];
int3 = intStack[isp + 1];
@Pc(12663) Class3_Sub31 local12663 = (Class3_Sub31) Static119.aClass133_9.get((long) int1);
@Pc(12663) ComponentPointer local12663 = (ComponentPointer) InterfaceList.openInterfaces.get((long) int1);
if (local12663 != null && local12663.anInt5878 == int3) {
intStack[isp++] = 1;
continue;
@ -1798,7 +1798,7 @@ public final class ScriptRunner {
isp--;
int1 = intStack[isp];
if (ClanChat.name != null && ClanChat.size > int1) {
stringStack[ssp++] = ClanChat.members[int1].aClass100_635;
stringStack[ssp++] = ClanChat.members[int1].worldName;
continue;
}
stringStack[ssp++] = EMPTY_STRING;
@ -2957,11 +2957,11 @@ public final class ScriptRunner {
}
if (opcode == 5419) {
string = EMPTY_STRING;
if (Static232.aClass212_5 != null) {
string = Static181.method3341(Static232.aClass212_5.intArg2);
if (Player.lastLogAddress != null) {
string = Static181.method3341(Player.lastLogAddress.intArg2);
try {
if (Static232.aClass212_5.result != null) {
@Pc(8281) byte[] local8281 = ((String) Static232.aClass212_5.result).getBytes("ISO-8859-1");
if (Player.lastLogAddress.result != null) {
@Pc(8281) byte[] local8281 = ((String) Player.lastLogAddress.result).getBytes("ISO-8859-1");
string = Static10.decodeString(local8281, local8281.length, 0);
}
} catch (@Pc(8290) UnsupportedEncodingException local8290) {
@ -4054,7 +4054,7 @@ public final class ScriptRunner {
}
component.xMode = (byte) int2;
component.yMode = (byte) int3;
Static43.redraw(component);
InterfaceList.redraw(component);
Static74.update(component);
if (component.createdComponentId == -1) {
Static280.method4675(component.id);
@ -4081,7 +4081,7 @@ public final class ScriptRunner {
int3 = 4;
}
component.dynamicWidthValue = (byte) int3;
Static43.redraw(component);
InterfaceList.redraw(component);
Static74.update(component);
if (component.type == 0) {
Static17.method531(component, false);
@ -4093,7 +4093,7 @@ public final class ScriptRunner {
local1552 = intStack[isp] == 1;
if (local1552 != component.hidden) {
component.hidden = local1552;
Static43.redraw(component);
InterfaceList.redraw(component);
}
if (component.createdComponentId == -1) {
Static93.method1906(component.id);
@ -4104,7 +4104,7 @@ public final class ScriptRunner {
isp -= 2;
component.aspectWidth = intStack[isp];
component.aspectHeight = intStack[isp + 1];
Static43.redraw(component);
InterfaceList.redraw(component);
Static74.update(component);
if (component.type == 0) {
Static17.method531(component, false);
@ -4145,4 +4145,8 @@ public final class ScriptRunner {
}
}
@OriginalMember(owner = "client!gi", name = "a", descriptor = "(ILclient!jl;)V")
public static void run(@OriginalArg(1) HookRequest request) {
run(200000, request);
}
}

4
client/src/main/java/rt4/SeqType.java
View file

@ -51,7 +51,7 @@ public final class SeqType {
public int anInt5363 = -1;
@OriginalMember(owner = "client!tk", name = "p", descriptor = "I")
public int anInt5355 = 5;
public int forcedPriority = 5;
@OriginalMember(owner = "client!tk", name = "r", descriptor = "Z")
public boolean aBoolean279 = false;
@ -314,7 +314,7 @@ public final class SeqType {
} else if (arg0 == 4) {
this.aBoolean279 = true;
} else if (arg0 == 5) {
this.anInt5355 = arg1.g1();
this.forcedPriority = arg1.g1();
} else if (arg0 == 6) {
this.anInt5353 = arg1.g2();
} else if (arg0 == 7) {

24
client/src/main/java/rt4/ServerActiveProperties.java
View file

@ -11,61 +11,61 @@ public final class ServerActiveProperties extends Node {
public final int anInt540;
@OriginalMember(owner = "client!bf", name = "x", descriptor = "I")
public final int anInt546;
public final int accessMask;
@OriginalMember(owner = "client!bf", name = "<init>", descriptor = "(II)V")
public ServerActiveProperties(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
this.anInt540 = arg1;
this.anInt546 = arg0;
this.accessMask = arg0;
}
@OriginalMember(owner = "client!bf", name = "a", descriptor = "(IB)Z")
public final boolean method503(@OriginalArg(0) int arg0) {
return (this.anInt546 >> arg0 + 1 & 0x1) != 0;
return (this.accessMask >> arg0 + 1 & 0x1) != 0;
}
@OriginalMember(owner = "client!bf", name = "d", descriptor = "(I)Z")
public final boolean isObjReplaceEnabled() {
return (this.anInt546 >> 29 & 0x1) != 0;
return (this.accessMask >> 29 & 0x1) != 0;
}
@OriginalMember(owner = "client!bf", name = "e", descriptor = "(B)I")
public final int method505() {
return this.anInt546 >> 18 & 0x7;
return this.accessMask >> 18 & 0x7;
}
@OriginalMember(owner = "client!bf", name = "e", descriptor = "(I)Z")
public final boolean method506() {
return (this.anInt546 & 0x1) != 0;
return (this.accessMask & 0x1) != 0;
}
@OriginalMember(owner = "client!bf", name = "f", descriptor = "(I)Z")
public final boolean method507() {
return (this.anInt546 >> 31 & 0x1) != 0;
return (this.accessMask >> 31 & 0x1) != 0;
}
@OriginalMember(owner = "client!bf", name = "g", descriptor = "(I)Z")
public final boolean method508() {
return (this.anInt546 >> 22 & 0x1) != 0;
return (this.accessMask >> 22 & 0x1) != 0;
}
@OriginalMember(owner = "client!bf", name = "a", descriptor = "(Z)Z")
public final boolean method509() {
return (this.anInt546 >> 21 & 0x1) != 0;
return (this.accessMask >> 21 & 0x1) != 0;
}
@OriginalMember(owner = "client!bf", name = "h", descriptor = "(I)Z")
public final boolean method510() {
return (this.anInt546 >> 30 & 0x1) != 0;
return (this.accessMask >> 30 & 0x1) != 0;
}
@OriginalMember(owner = "client!bf", name = "f", descriptor = "(B)Z")
public final boolean method511() {
return (this.anInt546 >> 28 & 0x1) != 0;
return (this.accessMask >> 28 & 0x1) != 0;
}
@OriginalMember(owner = "client!bf", name = "i", descriptor = "(I)I")
public final int getTargetMask() {
return Static199.method3594(this.anInt546);
return Static199.method3594(this.accessMask);
}
}

5
client/src/main/java/rt4/Static1.java
View file

@ -15,9 +15,6 @@ public final class Static1 {
@OriginalMember(owner = "client!a", name = "e", descriptor = "Lclient!na;")
public static final JagString TITLE_SONG = JagString.parse("scape main");
@OriginalMember(owner = "client!a", name = "f", descriptor = "[Z")
public static final boolean[] aBooleanArray1 = new boolean[8];
@OriginalMember(owner = "client!a", name = "i", descriptor = "I")
public static int anInt6 = 0;
@ -582,7 +579,7 @@ public final class Static1 {
} else {
local225 = Static91.anInt2428 * 25;
}
for (@Pc(238) MapElement local238 = (MapElement) WorldMap.mapElements.method2289(); local238 != null; local238 = (MapElement) WorldMap.mapElements.method2288()) {
for (@Pc(238) MapElement local238 = (MapElement) WorldMap.mapElements.start(); local238 != null; local238 = (MapElement) WorldMap.mapElements.next()) {
if (local238.id == Static9.anInt172) {
@Pc(258) int local258 = arg3 + local238.anInt4314 * arg1 / WorldMap.length;
@Pc(267) int local267 = arg2 * local238.anInt4307 / WorldMap.width + arg0;

3
client/src/main/java/rt4/Static101.java
View file

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static101 {
@OriginalMember(owner = "client!hm", name = "gb", descriptor = "J")
public static long aLong98;
@OriginalMember(owner = "client!hm", name = "R", descriptor = "Lclient!na;")
public static final JagString aClass100_537 = JagString.parse("<img=1>");

2
client/src/main/java/rt4/Static106.java
View file

@ -8,6 +8,6 @@ public final class Static106 {
public static Sprite compass;
@OriginalMember(owner = "client!ic", name = "e", descriptor = "[I")
public static final int[] anIntArray257 = new int[2500];
public static final int[] varp = new int[2500];
}

4
client/src/main/java/rt4/Static110.java
View file

@ -14,13 +14,13 @@ public final class Static110 {
@OriginalMember(owner = "client!ih", name = "a", descriptor = "(IIIII)V")
public static void method2281(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
@Pc(6) AreaSound local6;
for (local6 = (AreaSound) Static3.aClass69_135.method2289(); local6 != null; local6 = (AreaSound) Static3.aClass69_135.method2288()) {
for (local6 = (AreaSound) Static3.aClass69_135.start(); local6 != null; local6 = (AreaSound) Static3.aClass69_135.next()) {
Static150.method2804(arg1, local6, arg3, arg0, arg2);
}
@Pc(37) byte local37;
@Pc(42) BasType local42;
@Pc(141) int local141;
for (local6 = (AreaSound) Static152.aClass69_87.method2289(); local6 != null; local6 = (AreaSound) Static152.aClass69_87.method2288()) {
for (local6 = (AreaSound) Static152.aClass69_87.start(); local6 != null; local6 = (AreaSound) Static152.aClass69_87.next()) {
local37 = 1;
local42 = local6.npc.method2681();
if (local42.idleAnimationId == local6.npc.anInt3366) {

7
client/src/main/java/rt4/Static111.java
View file

@ -11,10 +11,7 @@ public final class Static111 {
@OriginalMember(owner = "client!ii", name = "y", descriptor = "I")
public static int anInt2910;
@OriginalMember(owner = "client!ii", name = "c", descriptor = "I")
public static int updatedInventoriesWriterIndex = 0;
@OriginalMember(owner = "client!ii", name = "e", descriptor = "Lclient!na;")
@OriginalMember(owner = "client!ii", name = "e", descriptor = "Lclient!na;")
public static final JagString aClass100_570 = JagString.parse(")2");
@OriginalMember(owner = "client!ii", name = "a", descriptor = "(Lclient!be;III)V")
@ -45,7 +42,7 @@ public final class Static111 {
} else {
arg0.x = arg2 - (arg2 * arg0.baseX >> 14) - arg0.anInt445;
}
if (!Static121.aBoolean154 || InterfaceList.getServerActiveProperties(arg0).anInt546 == 0 && arg0.type != 0) {
if (!Static121.aBoolean154 || InterfaceList.getServerActiveProperties(arg0).accessMask == 0 && arg0.type != 0) {
return;
}
if (arg0.y < 0) {

2
client/src/main/java/rt4/Static112.java
View file

@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static112 {
@OriginalMember(owner = "client!ij", name = "a", descriptor = "Lclient!na;")
public static final JagString aClass100_574 = JagString.parse(":duelfriend:");
public static final JagString DUELFRIEND = JagString.parse(":duelfriend:");
@OriginalMember(owner = "client!ij", name = "a", descriptor = "(B)V")
public static void method2297() {

4
client/src/main/java/rt4/Static115.java
View file

@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static115 {
@OriginalMember(owner = "client!ja", name = "q", descriptor = "I")
public static int anInt2940;
public static int currentChunkX;
@OriginalMember(owner = "client!ja", name = "f", descriptor = "Lclient!ih;")
public static final LinkedList mediumPriorityRequests = new LinkedList();
@ -19,7 +19,7 @@ public final class Static115 {
public static final JagString aClass100_579 = JagString.parse("Fps:");
@OriginalMember(owner = "client!ja", name = "n", descriptor = "I")
public static int anInt2939 = 0;
public static int mapFlagX = 0;
@OriginalMember(owner = "client!ja", name = "r", descriptor = "I")
public static int anInt2941 = -1;

12
client/src/main/java/rt4/Static118.java
View file

@ -28,16 +28,16 @@ public final class Static118 {
public static void method2354(@OriginalArg(1) int arg0, @OriginalArg(2) Component[] arg1) {
for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) {
@Pc(15) Component local15 = arg1[local7];
if (local15 != null && local15.layer == arg0 && (!local15.aBoolean32 || !Static36.method947(local15))) {
if (local15 != null && local15.layer == arg0 && (!local15.usingScripts || !Static36.method947(local15))) {
if (local15.type == 0) {
if (!local15.aBoolean32 && Static36.method947(local15) && local15 != Static180.aClass13_22) {
if (!local15.usingScripts && Static36.method947(local15) && local15 != Static180.aClass13_22) {
continue;
}
method2354(local15.id, arg1);
if (local15.createdComponents != null) {
method2354(local15.id, local15.createdComponents);
}
@Pc(73) Class3_Sub31 local73 = (Class3_Sub31) Static119.aClass133_9.get((long) local15.id);
@Pc(73) ComponentPointer local73 = (ComponentPointer) InterfaceList.openInterfaces.get((long) local15.id);
if (local73 != null) {
Static96.method1949(local73.anInt5878);
}
@ -71,19 +71,19 @@ public final class Static118 {
local15.anInt496 = -1;
}
}
Static43.redraw(local15);
InterfaceList.redraw(local15);
}
}
}
}
if (local15.modelRotationSpeed != 0 && !local15.aBoolean32) {
if (local15.modelRotationSpeed != 0 && !local15.usingScripts) {
@Pc(239) int local239 = local15.modelRotationSpeed >> 16;
@Pc(243) int local243 = local239 * Static178.anInt4247;
local105 = local15.modelRotationSpeed << 16 >> 16;
local15.modelXAngle = local243 + local15.modelXAngle & 0x7FF;
local105 *= Static178.anInt4247;
local15.modelYAngle = local15.modelYAngle + local105 & 0x7FF;
Static43.redraw(local15);
InterfaceList.redraw(local15);
}
}
}

7
client/src/main/java/rt4/Static119.java
View file

@ -8,9 +8,6 @@ public final class Static119 {
@OriginalMember(owner = "client!je", name = "eb", descriptor = "[I")
public static int[] anIntArray282;
@OriginalMember(owner = "client!je", name = "T", descriptor = "Lclient!sc;")
public static HashTable aClass133_9 = new HashTable(8);
@OriginalMember(owner = "client!je", name = "U", descriptor = "Lclient!na;")
public static final JagString aClass100_588 = JagString.parse("showingVideoAd");
@ -34,12 +31,12 @@ public final class Static119 {
@OriginalMember(owner = "client!je", name = "k", descriptor = "(I)V")
public static void method2386() {
@Pc(6) AreaSound local6;
for (local6 = (AreaSound) Static3.aClass69_135.method2289(); local6 != null; local6 = (AreaSound) Static3.aClass69_135.method2288()) {
for (local6 = (AreaSound) Static3.aClass69_135.start(); local6 != null; local6 = (AreaSound) Static3.aClass69_135.next()) {
if (local6.multiLocOrNpc) {
local6.update();
}
}
for (local6 = (AreaSound) Static152.aClass69_87.method2289(); local6 != null; local6 = (AreaSound) Static152.aClass69_87.method2288()) {
for (local6 = (AreaSound) Static152.aClass69_87.start(); local6 != null; local6 = (AreaSound) Static152.aClass69_87.next()) {
if (local6.multiLocOrNpc) {
local6.update();
}

20
client/src/main/java/rt4/Static127.java
View file

@ -126,10 +126,10 @@ public final class Static127 {
}
}
}
for (@Pc(451) Class3_Sub7 local451 = (Class3_Sub7) Static26.aClass69_27.method2289(); local451 != null; local451 = (Class3_Sub7) Static26.aClass69_27.method2288()) {
local451.anInt916 -= local81;
local451.anInt928 -= local86;
if (local451.anInt928 < 0 || local451.anInt916 < 0 || local451.anInt928 >= 104 || local451.anInt916 >= 104) {
for (@Pc(451) SceneryStack local451 = (SceneryStack) Static26.sceneryList.start(); local451 != null; local451 = (SceneryStack) Static26.sceneryList.next()) {
local451.z -= local81;
local451.x -= local86;
if (local451.x < 0 || local451.z < 0 || local451.x >= 104 || local451.z >= 104) {
local451.unlink();
}
}
@ -144,9 +144,9 @@ public final class Static127 {
Static227.cameraType = 1;
}
SoundPlayer.anInt4451 = 0;
if (Static115.anInt2939 != 0) {
if (Static115.mapFlagX != 0) {
Static84.anInt2255 -= local81;
Static115.anInt2939 -= local86;
Static115.mapFlagX -= local86;
}
if (GlRenderer.enabled && arg4 && (Math.abs(local86) > 104 || Math.abs(local81) > 104)) {
Static86.setInstantFade();
@ -204,11 +204,11 @@ public final class Static127 {
return arg1;
}
@Pc(246) JagString local246 = JagString.EMPTY;
if (Static232.aClass212_5 != null) {
local246 = Static181.method3341(Static232.aClass212_5.intArg2);
if (Player.lastLogAddress != null) {
local246 = Static181.method3341(Player.lastLogAddress.intArg2);
try {
if (Static232.aClass212_5.result != null) {
@Pc(265) byte[] local265 = ((String) Static232.aClass212_5.result).getBytes("ISO-8859-1");
if (Player.lastLogAddress.result != null) {
@Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes("ISO-8859-1");
local246 = Static10.decodeString(local265, local265.length, 0);
}
} catch (@Pc(274) UnsupportedEncodingException local274) {

9
client/src/main/java/rt4/Static13.java
View file

@ -1,6 +1,5 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
@ -36,12 +35,4 @@ public final class Static13 {
return local32;
}
@OriginalMember(owner = "client!bc", name = "d", descriptor = "(II)V")
public static void method472(@OriginalArg(0) int arg0) {
@Pc(14) Inv local14 = (Inv) Static20.objectContainerCache.get((long) arg0);
if (local14 != null) {
local14.unlink();
}
}
}

6
client/src/main/java/rt4/Static132.java
View file

@ -13,7 +13,7 @@ public final class Static132 {
public static final int[] anIntArray309 = new int[] { 1, 4 };
@OriginalMember(owner = "client!ke", name = "a", descriptor = "(ZLclient!wk;Z)V")
public static void method2605(@OriginalArg(0) boolean arg0, @OriginalArg(1) Class3_Sub31 arg1) {
public static void closeInterface(@OriginalArg(0) boolean arg0, @OriginalArg(1) ComponentPointer arg1) {
@Pc(9) int local9 = (int) arg1.key;
@Pc(16) int local16 = arg1.anInt5878;
arg1.unlink();
@ -23,7 +23,7 @@ public final class Static132 {
Static273.method3214(local16);
@Pc(32) Component local32 = InterfaceList.getComponent(local9);
if (local32 != null) {
Static43.redraw(local32);
InterfaceList.redraw(local32);
}
@Pc(41) int local41 = Static231.anInt5204;
@Pc(43) int local43;
@ -48,7 +48,7 @@ public final class Static132 {
Static24.anInt761 = local43 + 8;
}
if (InterfaceList.topLevelInterface != -1) {
Static54.method1304(1, InterfaceList.topLevelInterface);
Static54.runScripts(1, InterfaceList.topLevelInterface);
}
}

2
client/src/main/java/rt4/Static138.java
View file

@ -58,7 +58,7 @@ public final class Static138 {
public static final int[] anIntArray324 = new int[] { 19, 55, 38, 155, 255, 110, 137, 205, 76 };
@OriginalMember(owner = "client!km", name = "Sc", descriptor = "Lclient!na;")
public static final JagString aClass100_654 = JagString.parse(":trade:");
public static final JagString TRADE = JagString.parse(":trade:");
@OriginalMember(owner = "client!km", name = "ad", descriptor = "I")
public static int fp = 0;

2
client/src/main/java/rt4/Static141.java
View file

@ -9,7 +9,7 @@ public final class Static141 {
public static int anInt3473;
@OriginalMember(owner = "client!lb", name = "s", descriptor = "Lclient!na;")
public static final JagString aClass100_664 = JagString.parse(":clan:");
public static final JagString CLAN = JagString.parse(":clan:");
@OriginalMember(owner = "client!lb", name = "d", descriptor = "(B)V")
public static void method2720() {

12
client/src/main/java/rt4/Static142.java
View file

@ -56,10 +56,10 @@ public final class Static142 {
Sprites.headiconPrayers[local58.prayerIcon].method1423(arg2 + Static65.anInt1951 - 12, arg0 + -30 - -Static16.anInt548);
}
}
@Pc(308) Class102[] local308 = Static143.aClass102Array1;
@Pc(308) MapMarker[] local308 = Static143.hintMapMarkers;
for (local310 = 0; local310 < local308.length; local310++) {
@Pc(322) Class102 local322 = local308[local310];
if (local322 != null && local322.anInt4058 == 1 && local322.anInt4057 == Static33.anIntArray79[local5 - PlayerList.size] && client.loop % 20 < 10) {
@Pc(322) MapMarker local322 = local308[local310];
if (local322 != null && local322.type == 1 && local322.actorTargetId == Static33.anIntArray79[local5 - PlayerList.size] && client.loop % 20 < 10) {
if (local58.anInt3730 == -1) {
local359 = local17.method2691() + 15;
} else {
@ -88,10 +88,10 @@ public final class Static142 {
}
}
if (local5 >= 0) {
@Pc(159) Class102[] local159 = Static143.aClass102Array1;
@Pc(159) MapMarker[] local159 = Static143.hintMapMarkers;
for (local161 = 0; local161 < local159.length; local161++) {
@Pc(173) Class102 local173 = local159[local161];
if (local173 != null && local173.anInt4058 == 10 && PlayerList.ids[local5] == local173.anInt4057) {
@Pc(173) MapMarker local173 = local159[local161];
if (local173 != null && local173.type == 10 && PlayerList.ids[local5] == local173.actorTargetId) {
Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691() + 15, arg1 >> 1);
if (Static65.anInt1951 > -1) {
Sprites.headhints[local173.anInt4048].method1423(arg2 + Static65.anInt1951 - 12, arg0 + (Static16.anInt548 - local74));

2
client/src/main/java/rt4/Static143.java
View file

@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static143 {
@OriginalMember(owner = "client!ld", name = "b", descriptor = "[Lclient!nc;")
public static final Class102[] aClass102Array1 = new Class102[4];
public static final MapMarker[] hintMapMarkers = new MapMarker[4];
@OriginalMember(owner = "client!ld", name = "c", descriptor = "I")
public static int anInt3484 = -1;

2
client/src/main/java/rt4/Static148.java
View file

@ -20,7 +20,7 @@ public final class Static148 {
@OriginalMember(owner = "client!li", name = "a", descriptor = "(III)V")
public static void method2766(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
Static7.varps[arg0] = arg1;
VarpDomain.varps[arg0] = arg1;
@Pc(21) LongNode local21 = (LongNode) Static199.aClass133_20.get((long) arg0);
if (local21 == null) {
local21 = new LongNode(MonotonicClock.currentTimeMillis() + 500L);

2
client/src/main/java/rt4/Static150.java
View file

@ -48,7 +48,7 @@ public final class Static150 {
if (arg2.dynamicHeightValue == 4) {
arg2.anInt459 = arg2.aspectHeight * arg2.anInt445 / arg2.aspectWidth;
}
if (Static121.aBoolean154 && (InterfaceList.getServerActiveProperties(arg2).anInt546 != 0 || arg2.type == 0)) {
if (Static121.aBoolean154 && (InterfaceList.getServerActiveProperties(arg2).accessMask != 0 || arg2.type == 0)) {
if (arg2.anInt459 < 5 && arg2.anInt445 < 5) {
arg2.anInt459 = 5;
arg2.anInt445 = 5;

2
client/src/main/java/rt4/Static155.java
View file

@ -52,6 +52,6 @@ public final class Static155 {
@Pc(19) int local19 = local13.endBit;
@Pc(22) int local22 = local13.startBit;
@Pc(29) int local29 = Class3_Sub9.anIntArray135[local19 - local22];
return Static7.varps[local16] >> local22 & local29;
return VarpDomain.varps[local16] >> local22 & local29;
}
}

2
client/src/main/java/rt4/Static159.java
View file

@ -46,7 +46,7 @@ public final class Static159 {
} else if (local68 == 2) {
local65.anInt5400 = 0;
}
} else if (local60.anInt5355 >= SeqTypeList.get(local65.anInt5396).anInt5355) {
} else if (local60.forcedPriority >= SeqTypeList.get(local65.anInt5396).forcedPriority) {
local65 = arg1.aClass147Array3[local25] = null;
}
}

5
client/src/main/java/rt4/Static160.java
View file

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static160 {
@OriginalMember(owner = "client!mj", name = "d", descriptor = "[Lclient!na;")
public static final JagString[] aClass100Array121 = new JagString[8];
@OriginalMember(owner = "client!mj", name = "g", descriptor = "Lclient!na;")
public static final JagString aClass100_761 = JagString.parse("(U3");
@ -20,7 +17,7 @@ public final class Static160 {
if (GlRenderer.enabled) {
Static46.method1187(arg0, arg1, arg2.anInt445 + arg0, arg2.anInt459 + arg1);
}
if (Static270.anInt5795 >= 3) {
if (Static270.minimapState >= 3) {
if (GlRenderer.enabled) {
@Pc(44) Sprite local44 = arg2.method489(false);
if (local44 != null) {

2
client/src/main/java/rt4/Static17.java
View file

@ -22,7 +22,7 @@ public final class Static17 {
if (arg0.createdComponents != null) {
Static266.method4190(arg0.id, arg1, local20, local32, arg0.createdComponents);
}
@Pc(66) Class3_Sub31 local66 = (Class3_Sub31) Static119.aClass133_9.get((long) arg0.id);
@Pc(66) ComponentPointer local66 = (ComponentPointer) InterfaceList.openInterfaces.get((long) arg0.id);
if (local66 != null) {
Static234.method4017(local32, arg1, local66.anInt5878, local20);
}

11
client/src/main/java/rt4/Static170.java
View file

@ -54,15 +54,4 @@ public final class Static170 {
Static128.aClass69_77.addTail(local7);
}
@OriginalMember(owner = "client!nh", name = "a", descriptor = "(BII)V")
public static void method2575(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
Static106.anIntArray257[arg1] = arg0;
@Pc(20) LongNode local20 = (LongNode) Static199.aClass133_20.get((long) arg1);
if (local20 == null) {
local20 = new LongNode(4611686018427387905L);
Static199.aClass133_20.put(local20, (long) arg1);
} else if (local20.value != 4611686018427387905L) {
local20.value = MonotonicClock.currentTimeMillis() + 500L | 0x4000000000000000L;
}
}
}

4
client/src/main/java/rt4/Static176.java
View file

@ -10,7 +10,7 @@ public final class Static176 {
public static Js5 aClass153_76;
@OriginalMember(owner = "client!ob", name = "a", descriptor = "[Z")
public static final boolean[] aBooleanArray95 = new boolean[5];
public static final boolean[] customCameraActive = new boolean[5];
@OriginalMember(owner = "client!ob", name = "e", descriptor = "Lclient!na;")
public static final JagString aClass100_800 = JagString.parse("");
@ -77,7 +77,7 @@ public final class Static176 {
if (client.game == 1) {
Static98.method1966(-1, 0L, JagString.EMPTY, local33, (short) 36, LocalizedText.FACEHERE, local47);
}
Static98.method1966(-1, 0L, JagString.EMPTY, local33, (short) 60, Static195.aClass100_859, local47);
Static98.method1966(-1, 0L, JagString.EMPTY, local33, (short) 60, Static195.walkText, local47);
}
}
@Pc(112) long local112 = -1L;

2
client/src/main/java/rt4/Static180.java
View file

@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static180 {
@OriginalMember(owner = "client!og", name = "b", descriptor = "I")
public static int anInt4264;
public static int currentChunkZ;
@OriginalMember(owner = "client!og", name = "e", descriptor = "Lclient!be;")
public static Component aClass13_22;

2
client/src/main/java/rt4/Static183.java
View file

@ -29,7 +29,7 @@ public final class Static183 {
@OriginalMember(owner = "client!ok", name = "a", descriptor = "(IIB)Lclient!ce;")
public static SecondaryLinkedList method3333(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(9) SecondaryLinkedList local9 = new SecondaryLinkedList();
for (@Pc(14) Map local14 = (Map) MapList.aClass69_120.method2289(); local14 != null; local14 = (Map) MapList.aClass69_120.method2288()) {
for (@Pc(14) Map local14 = (Map) MapList.aClass69_120.start(); local14 != null; local14 = (Map) MapList.aClass69_120.next()) {
if (local14.aBoolean50 && local14.method664(arg1, arg0)) {
local9.addTail(local14);
}

5
client/src/main/java/rt4/Static191.java
View file

@ -28,14 +28,11 @@ public final class Static191 {
@OriginalMember(owner = "client!pg", name = "Z", descriptor = "[I")
public static final int[] anIntArray387 = new int[anInt4506];
@OriginalMember(owner = "client!pg", name = "ab", descriptor = "[I")
public static final int[] anIntArray388 = new int[8];
@OriginalMember(owner = "client!pg", name = "cb", descriptor = "[I")
public static final int[] anIntArray389 = new int[anInt4506];
@OriginalMember(owner = "client!pg", name = "db", descriptor = "Lclient!na;")
public static final JagString aClass100_845 = JagString.parse(":assistreq:");
public static final JagString ASSISTREQ = JagString.parse(":assistreq:");
@OriginalMember(owner = "client!pg", name = "eb", descriptor = "[I")
public static final int[] anIntArray390 = new int[anInt4506];

4
client/src/main/java/rt4/Static195.java
View file

@ -12,11 +12,11 @@ public final class Static195 {
public static int anInt4581;
@OriginalMember(owner = "client!pk", name = "bb", descriptor = "Lclient!na;")
public static JagString aClass100_859;
public static JagString walkText;
@OriginalMember(owner = "client!pk", name = "i", descriptor = "(I)V")
public static void method3532() {
for (@Pc(16) ProjAnimNode local16 = (ProjAnimNode) Static217.aClass69_116.method2289(); local16 != null; local16 = (ProjAnimNode) Static217.aClass69_116.method2288()) {
for (@Pc(16) ProjAnimNode local16 = (ProjAnimNode) Static217.aClass69_116.start(); local16 != null; local16 = (ProjAnimNode) Static217.aClass69_116.next()) {
@Pc(21) ProjAnim local21 = local16.aClass8_Sub6_1;
if (Player.level != local21.anInt4810 || local21.anInt4800 < client.loop) {
local16.unlink();

2
client/src/main/java/rt4/Static196.java
View file

@ -10,7 +10,7 @@ public final class Static196 {
public static final int[] anIntArray408 = new int[500];
@OriginalMember(owner = "client!pl", name = "f", descriptor = "Lclient!na;")
public static final JagString aClass100_863 = JagString.parse(":tradereq:");
public static final JagString TRADEREQ = JagString.parse(":tradereq:");
@OriginalMember(owner = "client!pl", name = "a", descriptor = "(ZI)V")
public static void method3535(@OriginalArg(0) boolean arg0) {

8
client/src/main/java/rt4/Static2.java
View file

@ -34,9 +34,9 @@ public final class Static2 {
if (local23.createdComponents != null) {
method7(local23.createdComponents, arg1);
}
@Pc(49) Class3_Sub31 local49 = (Class3_Sub31) Static119.aClass133_9.get((long) local23.id);
@Pc(49) ComponentPointer local49 = (ComponentPointer) InterfaceList.openInterfaces.get((long) local23.id);
if (local49 != null) {
Static54.method1304(arg1, local49.anInt5878);
Static54.runScripts(arg1, local49.anInt5878);
}
}
@Pc(72) HookRequest local72;
@ -44,7 +44,7 @@ public final class Static2 {
local72 = new HookRequest();
local72.arguments = local23.anObjectArray12;
local72.source = local23;
Static82.method1767(local72);
ScriptRunner.run(local72);
}
if (arg1 == 1 && local23.anObjectArray8 != null) {
if (local23.createdComponentId >= 0) {
@ -56,7 +56,7 @@ public final class Static2 {
local72 = new HookRequest();
local72.arguments = local23.anObjectArray8;
local72.source = local23;
Static82.method1767(local72);
ScriptRunner.run(local72);
}
}
}

4
client/src/main/java/rt4/Static202.java
View file

@ -10,7 +10,7 @@ public final class Static202 {
public static final JagString aClass100_891 = JagString.parse("");
@OriginalMember(owner = "client!qg", name = "Y", descriptor = "[I")
public static final int[] anIntArray424 = new int[5];
public static final int[] cameraFrequency = new int[5];
@OriginalMember(owner = "client!qg", name = "Z", descriptor = "Lclient!na;")
public static final JagString aClass100_892 = JagString.parse("mem=");
@ -93,7 +93,7 @@ public final class Static202 {
arg1 = 0;
}
local25 <<= local16;
Static148.method2766(local19, local25 & arg1 << local16 | Static7.varps[local19] & ~local25);
Static148.method2766(local19, local25 & arg1 << local16 | VarpDomain.varps[local19] & ~local25);
}
@OriginalMember(owner = "client!qg", name = "a", descriptor = "([Lclient!na;[SI)V")

2
client/src/main/java/rt4/Static209.java
View file

@ -8,7 +8,7 @@ public final class Static209 {
@OriginalMember(owner = "client!ra", name = "a", descriptor = "(ILclient!pb;BII)V")
public static void method3701(@OriginalArg(0) int arg0, @OriginalArg(1) LocType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
for (@Pc(10) AreaSound local10 = (AreaSound) Static3.aClass69_135.method2289(); local10 != null; local10 = (AreaSound) Static3.aClass69_135.method2288()) {
for (@Pc(10) AreaSound local10 = (AreaSound) Static3.aClass69_135.start(); local10 != null; local10 = (AreaSound) Static3.aClass69_135.next()) {
if (arg3 == local10.anInt2033 && local10.anInt2041 == arg0 * 128 && local10.anInt2029 == arg2 * 128 && arg1.id == local10.locType.id) {
if (local10.primaryStream != null) {
client.soundStream.removeSubStream(local10.primaryStream);

3
client/src/main/java/rt4/Static210.java
View file

@ -9,9 +9,6 @@ public final class Static210 {
@OriginalMember(owner = "client!rb", name = "f", descriptor = "Lclient!ve;")
public static Js5 aClass153_87;
@OriginalMember(owner = "client!rb", name = "b", descriptor = "Lclient!sc;")
public static final HashTable aClass133_21 = new HashTable(512);
@OriginalMember(owner = "client!rb", name = "a", descriptor = "(I)V")
public static void method3711() {
for (@Pc(7) int local7 = 0; local7 < 104; local7++) {

8
client/src/main/java/rt4/Static217.java
View file

@ -52,9 +52,9 @@ public final class Static217 {
Static98.method1966(Static169.anInt4075, (long) arg0, JagString.concatenate(new JagString[] { Static34.aClass100_203, Static105.aClass100_561, local158 }), arg3, (short) 1, LocalizedText.USE, arg1);
} else if (!Static241.aBoolean302) {
for (local275 = 7; local275 >= 0; local275--) {
if (Static160.aClass100Array121[local275] != null) {
if (Player.options[local275] != null) {
@Pc(291) short local291 = 0;
if (client.game == 0 && Static160.aClass100Array121[local275].equalsIgnoreCase(LocalizedText.ATTACK)) {
if (client.game == 0 && Player.options[local275].equalsIgnoreCase(LocalizedText.ATTACK)) {
if (arg2.combatLevel > PlayerList.self.combatLevel) {
local291 = 2000;
}
@ -65,12 +65,12 @@ public final class Static217 {
local291 = 0;
}
}
} else if (Static1.aBooleanArray1[local275]) {
} else if (Player.secondaryOptions[local275]) {
local291 = 2000;
}
@Pc(353) short local353 = Static5.aShortArray2[local275];
@Pc(358) short local358 = (short) (local353 + local291);
Static98.method1966(Static191.anIntArray388[local275], (long) arg0, JagString.concatenate(new JagString[] { Static204.aClass100_896, local158 }), arg3, local358, Static160.aClass100Array121[local275], arg1);
Static98.method1966(Player.cursors[local275], (long) arg0, JagString.concatenate(new JagString[] { Static204.aClass100_896, local158 }), arg3, local358, Player.options[local275], arg1);
}
}
} else if ((Static274.anInt4999 & 0x8) != 0) {

2
client/src/main/java/rt4/Static219.java
View file

@ -37,7 +37,7 @@ public final class Static219 {
@OriginalMember(owner = "client!rl", name = "i", descriptor = "(I)V")
public static void method3796() {
for (@Pc(10) Class3_Sub7 local10 = (Class3_Sub7) Static26.aClass69_27.method2289(); local10 != null; local10 = (Class3_Sub7) Static26.aClass69_27.method2288()) {
for (@Pc(10) SceneryStack local10 = (SceneryStack) Static26.sceneryList.start(); local10 != null; local10 = (SceneryStack) Static26.sceneryList.next()) {
if (local10.anInt924 == -1) {
local10.anInt925 = 0;
Static226.method3898(local10);

4
client/src/main/java/rt4/Static220.java
View file

@ -22,7 +22,7 @@ public final class Static220 {
@Pc(28) int local28 = -99999999;
@Pc(30) ObjStackNode local30 = null;
@Pc(35) ObjStackNode local35;
for (local35 = (ObjStackNode) local9.method2289(); local35 != null; local35 = (ObjStackNode) local9.method2288()) {
for (local35 = (ObjStackNode) local9.start(); local35 != null; local35 = (ObjStackNode) local9.next()) {
@Pc(44) ObjType local44 = ObjTypeList.get(local35.aClass8_Sub7_1.anInt5555);
@Pc(47) int local47 = local44.cost;
if (local44.stackable == 1) {
@ -40,7 +40,7 @@ public final class Static220 {
local9.addHead(local30);
@Pc(89) ObjStack local89 = null;
@Pc(91) ObjStack local91 = null;
for (local35 = (ObjStackNode) local9.method2289(); local35 != null; local35 = (ObjStackNode) local9.method2288()) {
for (local35 = (ObjStackNode) local9.start(); local35 != null; local35 = (ObjStackNode) local9.next()) {
@Pc(103) ObjStack local103 = local35.aClass8_Sub7_1;
if (local103.anInt5555 != local30.aClass8_Sub7_1.anInt5555) {
if (local89 == null) {

2
client/src/main/java/rt4/Static222.java
View file

@ -11,7 +11,7 @@ public final class Static222 {
public static Font aFont1;
@OriginalMember(owner = "client!sa", name = "Q", descriptor = "[I")
public static final int[] anIntArray437 = new int[5];
public static final int[] cameraJitter = new int[5];
@OriginalMember(owner = "client!sa", name = "W", descriptor = "Z")
public static boolean instantScreenFade = true;

4
client/src/main/java/rt4/Static223.java
View file

@ -19,7 +19,7 @@ public final class Static223 {
public static final JagString aClass100_951 = JagString.parse("<col=ff7000>");
@OriginalMember(owner = "client!sc", name = "a", descriptor = "(IIILclient!km;)V")
public static void method3855(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) Npc arg2) {
public static void animateNpc(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) Npc arg2) {
if (arg2.seqId == arg1 && arg1 != -1) {
@Pc(10) SeqType local10 = SeqTypeList.get(arg1);
@Pc(13) int local13 = local10.anInt5347;
@ -34,7 +34,7 @@ public final class Static223 {
if (local13 == 2) {
arg2.anInt3371 = 0;
}
} else if (arg1 == -1 || arg2.seqId == -1 || SeqTypeList.get(arg1).anInt5355 >= SeqTypeList.get(arg2.seqId).anInt5355) {
} else if (arg1 == -1 || arg2.seqId == -1 || SeqTypeList.get(arg1).forcedPriority >= SeqTypeList.get(arg2.seqId).forcedPriority) {
arg2.anInt3360 = 0;
arg2.seqId = arg1;
arg2.anInt3373 = 1;

10
client/src/main/java/rt4/Static226.java
View file

@ -21,22 +21,22 @@ public final class Static226 {
public static int anInt3953 = 0;
@OriginalMember(owner = "client!sf", name = "a", descriptor = "(ILclient!cd;)V")
public static void method3898(@OriginalArg(1) Class3_Sub7 arg0) {
public static void method3898(@OriginalArg(1) SceneryStack arg0) {
@Pc(5) long local5 = 0L;
@Pc(7) int local7 = -1;
@Pc(14) int local14 = 0;
if (arg0.anInt927 == 0) {
local5 = Static265.method4521(arg0.anInt918, arg0.anInt928, arg0.anInt916);
local5 = Static265.method4521(arg0.level, arg0.x, arg0.z);
}
@Pc(31) int local31 = 0;
if (arg0.anInt927 == 1) {
local5 = Static139.method2703(arg0.anInt918, arg0.anInt928, arg0.anInt916);
local5 = Static139.method2703(arg0.level, arg0.x, arg0.z);
}
if (arg0.anInt927 == 2) {
local5 = Static35.method899(arg0.anInt918, arg0.anInt928, arg0.anInt916);
local5 = Static35.method899(arg0.level, arg0.x, arg0.z);
}
if (arg0.anInt927 == 3) {
local5 = Static20.method602(arg0.anInt918, arg0.anInt928, arg0.anInt916);
local5 = Static20.method602(arg0.level, arg0.x, arg0.z);
}
if (local5 != 0L) {
local7 = Integer.MAX_VALUE & (int) (local5 >>> 32);

5
client/src/main/java/rt4/Static230.java
View file

@ -29,10 +29,7 @@ public final class Static230 {
@OriginalMember(owner = "client!sj", name = "p", descriptor = "I")
public static int anInt5150 = 1;
@OriginalMember(owner = "client!sj", name = "t", descriptor = "I")
public static int opcode2 = 0;
@OriginalMember(owner = "client!sj", name = "u", descriptor = "Z")
@OriginalMember(owner = "client!sj", name = "u", descriptor = "Z")
public static boolean dynamicMapRegion = false;
@OriginalMember(owner = "client!sj", name = "w", descriptor = "Lclient!na;")

5
client/src/main/java/rt4/Static232.java
View file

@ -12,9 +12,6 @@ public final class Static232 {
@OriginalMember(owner = "client!sm", name = "e", descriptor = "[[[B")
public static byte[][][] aByteArrayArrayArray13;
@OriginalMember(owner = "client!sm", name = "k", descriptor = "Lsignlink!im;")
public static PrivilegedRequest aClass212_5;
@OriginalMember(owner = "client!sm", name = "m", descriptor = "I")
public static int anInt5212;
@ -71,7 +68,7 @@ public final class Static232 {
}
}
}
for (@Pc(285) MapElement local285 = (MapElement) Static172.aClass69_97.method2289(); local285 != null; local285 = (MapElement) Static172.aClass69_97.method2288()) {
for (@Pc(285) MapElement local285 = (MapElement) Static172.aClass69_97.start(); local285 != null; local285 = (MapElement) Static172.aClass69_97.next()) {
SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 15, local11);
SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 13, local11);
SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 11, local11);

13
client/src/main/java/rt4/Static233.java
View file

@ -21,10 +21,7 @@ public final class Static233 {
@OriginalMember(owner = "client!t", name = "v", descriptor = "[Lclient!na;")
public static final JagString[] aClass100Array160 = new JagString[500];
@OriginalMember(owner = "client!t", name = "w", descriptor = "[J")
public static final long[] aLongArray9 = new long[100];
@OriginalMember(owner = "client!t", name = "y", descriptor = "I")
@OriginalMember(owner = "client!t", name = "y", descriptor = "I")
public static int loadingScreenState = 0;
@OriginalMember(owner = "client!t", name = "z", descriptor = "I")
@ -36,11 +33,11 @@ public final class Static233 {
@OriginalMember(owner = "client!t", name = "a", descriptor = "(IIIZIII)V")
public static void method4000(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
@Pc(3) int local3 = 0;
@Pc(5) Class102[] local5 = Static143.aClass102Array1;
@Pc(5) MapMarker[] local5 = Static143.hintMapMarkers;
while (local5.length > local3) {
@Pc(17) Class102 local17 = local5[local3];
if (local17 != null && local17.anInt4058 == 2) {
Static198.method1026(arg0 >> 1, arg4, (local17.anInt4046 - Static142.originZ << 7) + local17.anInt4047, local17.anInt4050 * 2, arg2 >> 1, local17.anInt4045 + (local17.anInt4053 - Static225.originX << 7), arg3);
@Pc(17) MapMarker local17 = local5[local3];
if (local17 != null && local17.type == 2) {
Static198.method1026(arg0 >> 1, arg4, (local17.anInt4046 - Static142.originZ << 7) + local17.anInt4047, local17.anInt4050 * 2, arg2 >> 1, local17.anInt4045 + (local17.targetX - Static225.originX << 7), arg3);
if (Static65.anInt1951 > -1 && client.loop % 20 < 10) {
Sprites.headhints[local17.anInt4048].method1423(arg1 + Static65.anInt1951 - 12, arg5 + -28 - -Static16.anInt548);
}

8
client/src/main/java/rt4/Static236.java
View file

@ -32,10 +32,10 @@ public final class Static236 {
if (Mouse.pressedButton != 0) {
if (arg4 <= arg3 && arg4 + 16 > arg3 && arg0 >= arg5 && arg5 + 16 > arg0) {
arg2.scrollY -= 4;
Static43.redraw(arg2);
InterfaceList.redraw(arg2);
} else if (arg3 >= arg4 && arg3 < arg4 + 16 && arg0 >= arg1 + arg5 - 16 && arg1 + arg5 > arg0) {
arg2.scrollY += 4;
Static43.redraw(arg2);
InterfaceList.redraw(arg2);
} else if (arg3 >= arg4 - anInt1396 && arg3 < arg4 + anInt1396 + 16 && arg0 >= arg5 + 16 && arg1 + arg5 - 16 > arg0) {
local139 = arg1 * (arg1 - 32) / arg6;
if (local139 < 8) {
@ -44,7 +44,7 @@ public final class Static236 {
@Pc(150) int local150 = arg1 - local139 - 32;
@Pc(162) int local162 = arg0 - local139 / 2 - arg5 - 16;
arg2.scrollY = (arg6 - arg1) * local162 / local150;
Static43.redraw(arg2);
InterfaceList.redraw(arg2);
Static45.aBoolean84 = true;
}
}
@ -54,7 +54,7 @@ public final class Static236 {
local139 = arg2.anInt445;
if (arg4 - local139 <= arg3 && arg5 <= arg0 && arg3 < arg4 + 16 && arg1 + arg5 >= arg0) {
arg2.scrollY += Static58.wheelRotation * 45;
Static43.redraw(arg2);
InterfaceList.redraw(arg2);
}
}
}

2
client/src/main/java/rt4/Static244.java
View file

@ -6,7 +6,7 @@ public final class Static244 {
@OriginalMember(owner = "client!tl", name = "f", descriptor = "Lclient!na;")
public static final JagString aClass100_1014 = JagString.parse(":assist:");
public static final JagString ASSIST = JagString.parse(":assist:");
@OriginalMember(owner = "client!tl", name = "i", descriptor = "Lclient!na;")
public static final JagString aClass100_1017 = JagString.parse(")1");

2
client/src/main/java/rt4/Static246.java
View file

@ -14,7 +14,7 @@ public final class Static246 {
@OriginalMember(owner = "client!u", name = "a", descriptor = "(Z)V")
public static void method4239() {
for (@Pc(9) SpotAnimNode local9 = (SpotAnimNode) Static99.aClass69_64.method2289(); local9 != null; local9 = (SpotAnimNode) Static99.aClass69_64.method2288()) {
for (@Pc(9) SpotAnimNode local9 = (SpotAnimNode) Static99.aClass69_64.start(); local9 != null; local9 = (SpotAnimNode) Static99.aClass69_64.next()) {
@Pc(15) SpotAnim local15 = local9.aClass8_Sub2_1;
if (local15.anInt606 != Player.level || local15.aBoolean41) {
local9.unlink();

4
client/src/main/java/rt4/Static247.java
View file

@ -667,7 +667,7 @@ public final class Static247 {
@Pc(19) HookRequest local19 = new HookRequest();
local19.source = local8;
local19.arguments = local8.anObjectArray11;
Static82.method1767(local19);
ScriptRunner.run(local19);
}
Static15.anInt506 = arg1;
Static121.anInt3039 = arg3;
@ -676,7 +676,7 @@ public final class Static247 {
Static241.aBoolean302 = true;
Static246.anInt5393 = arg4;
Static35.anInt1092 = arg5;
Static43.redraw(local8);
InterfaceList.redraw(local8);
}
@OriginalMember(owner = "client!ub", name = "a", descriptor = "(IB)I")

3
client/src/main/java/rt4/Static251.java
View file

@ -18,9 +18,6 @@ public final class Static251 {
@OriginalMember(owner = "client!ug", name = "b", descriptor = "[F")
public static final float[] aFloatArray28 = new float[4];
@OriginalMember(owner = "client!ug", name = "e", descriptor = "I")
public static int anInt5447 = 0;
@OriginalMember(owner = "client!ug", name = "r", descriptor = "I")
public static int anInt5459 = 0;

8
client/src/main/java/rt4/Static253.java
View file

@ -50,8 +50,8 @@ public final class Static253 {
if (local59 < Static234.anInt5245 / 256) {
local59 = Static234.anInt5245 / 256;
}
if (Static176.aBooleanArray95[4] && Static276.anIntArray564[4] + 128 > local59) {
local59 = Static276.anIntArray564[4] + 128;
if (Static176.customCameraActive[4] && Static276.cameraAmplitude[4] + 128 > local59) {
local59 = Static276.cameraAmplitude[4] + 128;
}
Static18.method555(Static81.cameraX, arg0, SceneGraph.getTileHeight(Player.level, PlayerList.self.xFine, PlayerList.self.zFine) - 50, 600 - -(local59 * 3), local57, Static111.cameraZ, local59);
}
@ -63,8 +63,8 @@ public final class Static253 {
@Pc(127) int local127;
@Pc(171) int local171;
for (local127 = 0; local127 < 5; local127++) {
if (Static176.aBooleanArray95[local127]) {
local171 = (int) ((double) -Static222.anIntArray437[local127] + (double) (Static222.anIntArray437[local127] * 2 + 1) * Math.random() + Math.sin((double) Static31.anIntArray76[local127] * ((double) Static202.anIntArray424[local127] / 100.0D)) * (double) Static276.anIntArray564[local127]);
if (Static176.customCameraActive[local127]) {
local171 = (int) ((double) -Static222.cameraJitter[local127] + (double) (Static222.cameraJitter[local127] * 2 + 1) * Math.random() + Math.sin((double) Static31.anIntArray76[local127] * ((double) Static202.cameraFrequency[local127] / 100.0D)) * (double) Static276.cameraAmplitude[local127]);
if (local127 == 3) {
Static184.cameraYaw = local171 + Static184.cameraYaw & 0x7FF;
}

2
client/src/main/java/rt4/Static258.java
View file

@ -131,7 +131,7 @@ public final class Static258 {
}
}
}
if (!arg2.aBoolean32) {
if (!arg2.usingScripts) {
return;
}
if (!Static241.aBoolean302) {

2
client/src/main/java/rt4/Static26.java
View file

@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static26 {
@OriginalMember(owner = "client!ca", name = "X", descriptor = "Lclient!ih;")
public static LinkedList aClass69_27 = new LinkedList();
public static LinkedList sceneryList = new LinkedList();
@OriginalMember(owner = "client!ca", name = "cb", descriptor = "Lclient!na;")
public static final JagString aClass100_160 = Static165.method3165();

4
client/src/main/java/rt4/Static260.java
View file

@ -170,7 +170,7 @@ public final class Static260 {
@OriginalMember(owner = "client!vd", name = "a", descriptor = "(BZ)V")
public static void clearAmbientSounds(@OriginalArg(1) boolean arg0) {
@Pc(14) AreaSound local14;
for (local14 = (AreaSound) Static3.aClass69_135.method2289(); local14 != null; local14 = (AreaSound) Static3.aClass69_135.method2288()) {
for (local14 = (AreaSound) Static3.aClass69_135.start(); local14 != null; local14 = (AreaSound) Static3.aClass69_135.next()) {
if (local14.primaryStream != null) {
client.soundStream.removeSubStream(local14.primaryStream);
local14.primaryStream = null;
@ -184,7 +184,7 @@ public final class Static260 {
if (!arg0) {
return;
}
for (local14 = (AreaSound) Static152.aClass69_87.method2289(); local14 != null; local14 = (AreaSound) Static152.aClass69_87.method2288()) {
for (local14 = (AreaSound) Static152.aClass69_87.start(); local14 != null; local14 = (AreaSound) Static152.aClass69_87.next()) {
if (local14.primaryStream != null) {
client.soundStream.removeSubStream(local14.primaryStream);
local14.primaryStream = null;

2
client/src/main/java/rt4/Static264.java
View file

@ -13,7 +13,7 @@ public final class Static264 {
public static final int[] anIntArray410 = new int[100];
@OriginalMember(owner = "client!vh", name = "c", descriptor = "Lclient!na;")
public static final JagString aClass100_875 = JagString.parse(":");
public static final JagString COLON = JagString.parse(":");
@OriginalMember(owner = "client!vh", name = "p", descriptor = "[I")
public static final int[] anIntArray412 = new int[] { 1, 0, 0, 0, 1, 0, 2, 1, 1, 1, 0, 2, 0, 0, 1, 0 };

2
client/src/main/java/rt4/Static270.java
View file

@ -16,7 +16,7 @@ public final class Static270 {
public static int anInt5794 = -1;
@OriginalMember(owner = "client!wb", name = "d", descriptor = "I")
public static int anInt5795 = 0;
public static int minimapState = 0;
@OriginalMember(owner = "client!wb", name = "e", descriptor = "Lclient!na;")
public static final JagString aClass100_1090 = JagString.parse("l");

2
client/src/main/java/rt4/Static271.java
View file

@ -10,7 +10,7 @@ public final class Static271 {
public static int anInt5804 = 0;
@OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!wa;I)V")
public static void method4598(@OriginalArg(0) Buffer arg0) {
public static void writeRandom(@OriginalArg(0) Buffer arg0) {
if (client.uid != null) {
try {
client.uid.seek(0L);

4
client/src/main/java/rt4/Static272.java
View file

@ -10,7 +10,7 @@ public final class Static272 {
public static int anInt5214 = 0;
@OriginalMember(owner = "client!wd", name = "a", descriptor = "(BII)V")
public static void method3995(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
public static void setVarbit(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
@Pc(14) VarbitType local14 = VarbitTypeList.get(arg1);
@Pc(17) int local17 = local14.baseVar;
@Pc(20) int local20 = local14.endBit;
@ -20,6 +20,6 @@ public final class Static272 {
arg0 = 0;
}
local29 <<= local23;
Static170.method2575(arg0 << local23 & local29 | ~local29 & Static106.anIntArray257[local17], local17);
VarpDomain.set(arg0 << local23 & local29 | ~local29 & Static106.varp[local17], local17);
}
}

10
client/src/main/java/rt4/Static273.java
View file

@ -73,13 +73,13 @@ public final class Static273 {
}
}
if (local46 == 5) {
local41 = Static7.varps[local33[local39++]];
local41 = VarpDomain.varps[local33[local39++]];
}
if (local46 == 6) {
local41 = ObjType.anIntArray213[PlayerSkillXpTable.baseLevels[local33[local39++]] - 1];
local41 = PlayerSkillXpTable.xpLevelLookup[PlayerSkillXpTable.baseLevels[local33[local39++]] - 1];
}
if (local46 == 7) {
local41 = Static7.varps[local33[local39++]] * 100 / 46875;
local41 = VarpDomain.varps[local33[local39++]] * 100 / 46875;
}
if (local46 == 8) {
local41 = PlayerList.self.combatLevel;
@ -112,7 +112,7 @@ public final class Static273 {
local41 = Player.weight;
}
if (local46 == 13) {
local124 = Static7.varps[local33[local39++]];
local124 = VarpDomain.varps[local33[local39++]];
@Pc(353) int local353 = local33[local39++];
local41 = (0x1 << local353 & local124) == 0 ? 0 : 1;
}
@ -165,7 +165,7 @@ public final class Static273 {
@OriginalMember(owner = "client!we", name = "b", descriptor = "(BI)V")
public static void method3214(@OriginalArg(1) int arg0) {
for (@Pc(11) Node local11 = Static210.aClass133_21.head(); local11 != null; local11 = Static210.aClass133_21.next()) {
for (@Pc(11) Node local11 = InterfaceList.properties.head(); local11 != null; local11 = InterfaceList.properties.next()) {
if ((local11.key >> 48 & 0xFFFFL) == (long) arg0) {
local11.unlink();
}

2
client/src/main/java/rt4/Static276.java
View file

@ -13,7 +13,7 @@ public final class Static276 {
public static final AnimFrameset[] aClass3_Sub2_Sub7Array8 = new AnimFrameset[14];
@OriginalMember(owner = "client!wh", name = "m", descriptor = "[I")
public static final int[] anIntArray564 = new int[5];
public static final int[] cameraAmplitude = new int[5];
@OriginalMember(owner = "client!wh", name = "o", descriptor = "Lclient!na;")
public static final JagString aClass100_1096 = JagString.parse("rect_debug=");

6
client/src/main/java/rt4/Static278.java
View file

@ -136,8 +136,8 @@ public final class Static278 {
Static80.centralZoneX = 0;
Static52.anInt1695 = 0;
Static225.originX = 0;
for (local19 = 0; local19 < Static143.aClass102Array1.length; local19++) {
Static143.aClass102Array1[local19] = null;
for (local19 = 0; local19 < Static143.hintMapMarkers.length; local19++) {
Static143.hintMapMarkers[local19] = null;
}
PlayerList.size = 0;
Static272.anInt5214 = 0;
@ -157,7 +157,7 @@ public final class Static278 {
}
Static35.resetCameraEffects();
Protocol.verifyId = 0;
Static8.method121();
Static8.resetTransientVars();
Static73.method1596(true);
}
}

6
client/src/main/java/rt4/Static280.java
View file

@ -530,8 +530,8 @@ public final class Static280 {
return InterfaceList.getComponent(arg0.layer);
}
@Pc(28) int local28 = arg0.id >>> 16;
@Pc(33) HashTableIterator local33 = new HashTableIterator(Static119.aClass133_9);
for (@Pc(38) Class3_Sub31 local38 = (Class3_Sub31) local33.method2701(); local38 != null; local38 = (Class3_Sub31) local33.method2700()) {
@Pc(33) HashTableIterator local33 = new HashTableIterator(InterfaceList.openInterfaces);
for (@Pc(38) ComponentPointer local38 = (ComponentPointer) local33.method2701(); local38 != null; local38 = (ComponentPointer) local33.method2700()) {
if (local28 == local38.anInt5878) {
return InterfaceList.getComponent((int) local38.key);
}
@ -656,7 +656,7 @@ public final class Static280 {
}
@OriginalMember(owner = "client!wl", name = "a", descriptor = "(IIIIB)V")
public static void method4672(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
public static void updateContainer(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
@Pc(12) Inv local12 = (Inv) Static20.objectContainerCache.get((long) arg3);
if (local12 == null) {
local12 = new Inv();

16
client/src/main/java/rt4/Static29.java
View file

@ -23,21 +23,21 @@ public final class Static29 {
@OriginalMember(owner = "client!ce", name = "a", descriptor = "(IIIIIIIIII)V")
public static void method800(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8) {
@Pc(9) Class3_Sub7 local9 = null;
for (@Pc(14) Class3_Sub7 local14 = (Class3_Sub7) Static26.aClass69_27.method2289(); local14 != null; local14 = (Class3_Sub7) Static26.aClass69_27.method2288()) {
if (local14.anInt918 == arg0 && arg3 == local14.anInt928 && local14.anInt916 == arg1 && arg6 == local14.anInt927) {
@Pc(9) SceneryStack local9 = null;
for (@Pc(14) SceneryStack local14 = (SceneryStack) Static26.sceneryList.start(); local14 != null; local14 = (SceneryStack) Static26.sceneryList.next()) {
if (local14.level == arg0 && arg3 == local14.x && local14.z == arg1 && arg6 == local14.anInt927) {
local9 = local14;
break;
}
}
if (local9 == null) {
local9 = new Class3_Sub7();
local9.anInt928 = arg3;
local9.anInt916 = arg1;
local9.anInt918 = arg0;
local9 = new SceneryStack();
local9.x = arg3;
local9.z = arg1;
local9.level = arg0;
local9.anInt927 = arg6;
Static226.method3898(local9);
Static26.aClass69_27.addTail(local9);
Static26.sceneryList.addTail(local9);
}
local9.anInt926 = arg7;
local9.anInt925 = arg8;

2
client/src/main/java/rt4/Static33.java
View file

@ -76,7 +76,7 @@ public final class Static33 {
@Pc(36) int local36 = Static35.aCalendar1.get(11);
@Pc(40) int local40 = Static35.aCalendar1.get(12);
@Pc(44) int local44 = Static35.aCalendar1.get(13);
return JagString.concatenate(new JagString[] { Static219.aClass100Array149[local13 - 1], Static74.aClass100_461, Static123.parseInt(local17 / 10), Static123.parseInt(local17 % 10), Static270.aClass100_1089, Static138.aClass100Array102[local21], Static270.aClass100_1089, Static123.parseInt(local32), Static49.aClass100_351, Static123.parseInt(local36 / 10), Static123.parseInt(local36 % 10), Static264.aClass100_875, Static123.parseInt(local40 / 10), Static123.parseInt(local40 % 10), Static264.aClass100_875, Static123.parseInt(local44 / 10), Static123.parseInt(local44 % 10), Static55.aClass100_376 });
return JagString.concatenate(new JagString[] { Static219.aClass100Array149[local13 - 1], Static74.aClass100_461, Static123.parseInt(local17 / 10), Static123.parseInt(local17 % 10), Static270.aClass100_1089, Static138.aClass100Array102[local21], Static270.aClass100_1089, Static123.parseInt(local32), Static49.aClass100_351, Static123.parseInt(local36 / 10), Static123.parseInt(local36 % 10), Static264.COLON, Static123.parseInt(local40 / 10), Static123.parseInt(local40 % 10), Static264.COLON, Static123.parseInt(local44 / 10), Static123.parseInt(local44 % 10), Static55.aClass100_376 });
}
@OriginalMember(owner = "client!cj", name = "a", descriptor = "(ZIIIIIIFB)[[I")

2
client/src/main/java/rt4/Static35.java
View file

@ -102,7 +102,7 @@ public final class Static35 {
@OriginalMember(owner = "client!cl", name = "e", descriptor = "(I)V")
public static void resetCameraEffects() {
for (@Pc(3) int local3 = 0; local3 < 5; local3++) {
Static176.aBooleanArray95[local3] = false;
Static176.customCameraActive[local3] = false;
}
Static133.anInt5230 = 0;
Static233.anInt5217 = 0;

28
client/src/main/java/rt4/Static36.java
View file

@ -31,7 +31,7 @@ public final class Static36 {
public static void method946(@OriginalArg(0) Component[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) {
for (@Pc(1) int local1 = 0; local1 < arg0.length; local1++) {
@Pc(9) Component component = arg0[local1];
if (component != null && component.layer == arg1 && (!component.aBoolean32 || component.type == 0 || component.aBoolean25 || InterfaceList.getServerActiveProperties(component).anInt546 != 0 || component == Static4.aClass13_1 || component.anInt453 == 1338) && (!component.aBoolean32 || !method947(component))) {
if (component != null && component.layer == arg1 && (!component.usingScripts || component.type == 0 || component.aBoolean25 || InterfaceList.getServerActiveProperties(component).accessMask != 0 || component == Static4.aClass13_1 || component.anInt453 == 1338) && (!component.usingScripts || !method947(component))) {
@Pc(50) int local50 = component.x + arg6;
@Pc(55) int local55 = component.y + arg7;
@Pc(61) int local61;
@ -60,13 +60,13 @@ public final class Static36 {
Static124.anInt3075 = local50;
Static20.anInt660 = local55;
}
if (!component.aBoolean32 || local61 < local65 && local63 < local67) {
if (!component.usingScripts || local61 < local65 && local63 < local67) {
if (component.type == 0) {
if (!component.aBoolean32 && method947(component) && Static180.aClass13_22 != component) {
if (!component.usingScripts && method947(component) && Static180.aClass13_22 != component) {
continue;
}
if (component.noClickThrough && Mouse.anInt4873 >= local61 && Mouse.anInt5032 >= local63 && Mouse.anInt4873 < local65 && Mouse.anInt5032 < local67) {
for (@Pc(164) HookRequest local164 = (HookRequest) InterfaceList.lowPriorityRequests.method2289(); local164 != null; local164 = (HookRequest) InterfaceList.lowPriorityRequests.method2288()) {
for (@Pc(164) HookRequest local164 = (HookRequest) InterfaceList.lowPriorityRequests.start(); local164 != null; local164 = (HookRequest) InterfaceList.lowPriorityRequests.next()) {
if (local164.aBoolean158) {
local164.unlink();
local164.source.aBoolean19 = false;
@ -79,7 +79,7 @@ public final class Static36 {
Static137.anInt3337 = 0;
}
}
if (component.aBoolean32) {
if (component.usingScripts) {
@Pc(207) boolean local207;
if (Mouse.anInt4873 >= local61 && Mouse.anInt5032 >= local63 && Mouse.anInt4873 < local65 && Mouse.anInt5032 < local67) {
local207 = true;
@ -149,7 +149,7 @@ public final class Static36 {
if (component.anInt453 != 0) {
if (component.anInt453 == 1337) {
Static280.aClass13_26 = component;
Static43.redraw(component);
InterfaceList.redraw(component);
continue;
}
if (component.anInt453 == 1338) {
@ -201,7 +201,7 @@ public final class Static36 {
}
if (component.anInt453 == 1402) {
if (!GlRenderer.enabled) {
Static43.redraw(component);
InterfaceList.redraw(component);
}
continue;
}
@ -354,15 +354,15 @@ public final class Static36 {
}
component.updatedVarpsReaderIndex = VarpDomain.updatedVarpsWriterIndex;
}
if (component.onInvTransmit != null && Static111.updatedInventoriesWriterIndex > component.updatedInventoriesReaderIndex) {
if (component.inventoryTriggers == null || Static111.updatedInventoriesWriterIndex - component.updatedInventoriesReaderIndex > 32) {
if (component.onInvTransmit != null && Inv.updatedInventoriesWriterIndex > component.updatedInventoriesReaderIndex) {
if (component.inventoryTriggers == null || Inv.updatedInventoriesWriterIndex - component.updatedInventoriesReaderIndex > 32) {
request = new HookRequest();
request.source = component;
request.arguments = component.onInvTransmit;
InterfaceList.lowPriorityRequests.addTail(request);
} else {
outer:
for (i = component.updatedInventoriesReaderIndex; i < Static111.updatedInventoriesWriterIndex; i++) {
for (i = component.updatedInventoriesReaderIndex; i < Inv.updatedInventoriesWriterIndex; i++) {
skill = Inv.updatedInventories[i & 0x1F];
for (k = 0; k < component.inventoryTriggers.length; k++) {
if (component.inventoryTriggers[k] == skill) {
@ -375,7 +375,7 @@ public final class Static36 {
}
}
}
component.updatedInventoriesReaderIndex = Static111.updatedInventoriesWriterIndex;
component.updatedInventoriesReaderIndex = Inv.updatedInventoriesWriterIndex;
}
if (component.onStatTransmit != null && PlayerSkillXpTable.updatedStatsWriterIndex > component.updatedStatsReaderIndex) {
if (component.statTriggers == null || PlayerSkillXpTable.updatedStatsWriterIndex - component.updatedStatsReaderIndex > 32) {
@ -449,7 +449,7 @@ public final class Static36 {
}
}
}
if (!component.aBoolean32 && Static105.aClass13_14 == null && Static118.aClass13_15 == null && !Static60.aBoolean108) {
if (!component.usingScripts && Static105.aClass13_14 == null && Static118.aClass13_15 == null && !Static60.aBoolean108) {
if ((component.anInt470 >= 0 || component.anInt480 != 0) && Mouse.anInt4873 >= local61 && Mouse.anInt5032 >= local63 && Mouse.anInt4873 < local65 && Mouse.anInt5032 < local67) {
if (component.anInt470 >= 0) {
Static180.aClass13_22 = arg0[component.anInt470];
@ -469,7 +469,7 @@ public final class Static36 {
if (component.createdComponents != null) {
method946(component.createdComponents, component.id, local61, local63, local65, local67, local50 - component.anInt489, local55 - component.scrollY);
}
@Pc(1595) Class3_Sub31 local1595 = (Class3_Sub31) Static119.aClass133_9.get((long) component.id);
@Pc(1595) ComponentPointer local1595 = (ComponentPointer) InterfaceList.openInterfaces.get((long) component.id);
if (local1595 != null) {
Static57.method1320(local50, local63, local55, local65, local1595.anInt5878, local61, local67);
}
@ -482,7 +482,7 @@ public final class Static36 {
@OriginalMember(owner = "client!client", name = "c", descriptor = "(Lclient!be;)Z")
public static boolean method947(@OriginalArg(0) Component arg0) {
if (Static121.aBoolean154) {
if (InterfaceList.getServerActiveProperties(arg0).anInt546 != 0) {
if (InterfaceList.getServerActiveProperties(arg0).accessMask != 0) {
return false;
}
if (arg0.type == 0) {

6
client/src/main/java/rt4/Static38.java
View file

@ -144,7 +144,7 @@ public final class Static38 {
if ((local28.value & 0x3FFFFFFFFFFFFFFFL) < local4) {
if ((local28.value & 0x4000000000000000L) != 0L) {
@Pc(58) int local58 = (int) local28.key;
Static7.varps[local58] = Static106.anIntArray257[local58];
VarpDomain.varps[local58] = Static106.varp[local58];
local28.unlink();
return local58;
}
@ -157,8 +157,8 @@ public final class Static38 {
@OriginalMember(owner = "client!cn", name = "b", descriptor = "(ZI)V")
public static void method964(@OriginalArg(0) boolean arg0) {
@Pc(3) int local3 = PlayerList.size;
if (Static115.anInt2939 == PlayerList.self.xFine >> 7 && PlayerList.self.zFine >> 7 == Static84.anInt2255) {
Static115.anInt2939 = 0;
if (Static115.mapFlagX == PlayerList.self.xFine >> 7 && PlayerList.self.zFine >> 7 == Static84.anInt2255) {
Static115.mapFlagX = 0;
}
if (arg0) {
local3 = 1;

9
client/src/main/java/rt4/Static43.java
View file

@ -39,14 +39,7 @@ public final class Static43 {
return Static105.method2256(arg0, local7, local11, local15 + 1 - local7, local19 - local11 + 1, arg1, arg2, arg3, arg5, arg6, true, arg7);
}
@OriginalMember(owner = "client!dg", name = "a", descriptor = "(ILclient!be;)V")
public static void redraw(@OriginalArg(1) Component arg0) {
if (Static182.anInt4311 == arg0.anInt465) {
Static186.aBooleanArray100[arg0.anInt517] = true;
}
}
@OriginalMember(owner = "client!dg", name = "a", descriptor = "(IIIIIILclient!mj;)V")
@OriginalMember(owner = "client!dg", name = "a", descriptor = "(IIIIIILclient!mj;)V")
public static void method1144(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) CollisionMap arg5) {
@Pc(9) long local9 = 0L;
if (arg3 == 0) {

24
client/src/main/java/rt4/Static44.java
View file

@ -16,20 +16,20 @@ public final class Static44 {
public static final JagString aClass100_335 = JagString.parse("Number of player models in cache:");
@OriginalMember(owner = "client!dh", name = "i", descriptor = "Lclient!na;")
public static final JagString aClass100_336 = JagString.parse("<img=1>");
public static final JagString IMG1 = JagString.parse("<img=1>");
@OriginalMember(owner = "client!dh", name = "a", descriptor = "(Z)V")
public static void method1146() {
Protocol.outboundBuffer.offset = 0;
Static5.opcode3 = -1;
Protocol.opcode3 = -1;
Static60.aBoolean108 = false;
Protocol.length = 0;
Static115.anInt2939 = 0;
Static115.mapFlagX = 0;
Static231.anInt5204 = 0;
Static230.opcode2 = -1;
Static270.anInt5795 = 0;
Protocol.opcode2 = -1;
Static270.minimapState = 0;
Player.rebootTimer = 0;
Static49.opcode4 = -1;
Protocol.opcode4 = -1;
Protocol.inboundBuffer.offset = 0;
Static201.anInt1862 = 0;
Protocol.opcode = -1;
@ -63,18 +63,18 @@ public final class Static44 {
}
@OriginalMember(owner = "client!dh", name = "a", descriptor = "(IIII)Lclient!wk;")
public static Class3_Sub31 method1148(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
@Pc(9) Class3_Sub31 local9 = new Class3_Sub31();
public static ComponentPointer method1148(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
@Pc(9) ComponentPointer local9 = new ComponentPointer();
local9.anInt5879 = arg2;
local9.anInt5878 = arg0;
Static119.aClass133_9.put(local9, (long) arg1);
InterfaceList.openInterfaces.put(local9, (long) arg1);
Static81.method1753(arg0);
@Pc(28) Component local28 = InterfaceList.getComponent(arg1);
if (local28 != null) {
Static43.redraw(local28);
InterfaceList.redraw(local28);
}
if (Static39.aClass13_10 != null) {
Static43.redraw(Static39.aClass13_10);
InterfaceList.redraw(Static39.aClass13_10);
Static39.aClass13_10 = null;
}
@Pc(45) int local45 = Static231.anInt5204;
@ -104,7 +104,7 @@ public final class Static44 {
}
Static74.method1626(arg0);
if (InterfaceList.topLevelInterface != -1) {
Static54.method1304(1, InterfaceList.topLevelInterface);
Static54.runScripts(1, InterfaceList.topLevelInterface);
}
return local9;
}

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