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

Move packets to Protocol class, general refactoring

Browse source
This commit is contained in:
Pazaz 2022-04-25 02:41:31 -04:00
parent b3a5fdbec9
commit 49ccfc34ec
142 changed files with 3092 additions and 3089 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/src/main/java/AreaSoundManager.java Normal file
View file

@ -0,0 +1,18 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class AreaSoundManager {
@OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!e;I)V")
public static void remove(@OriginalArg(0) Player arg0) {
@Pc(10) AreaSound local10 = (AreaSound) Static93.aClass133_7.get(arg0.username.encode37());
if (local10 == null) {
return;
}
if (local10.primaryStream != null) {
client.soundStream.removeSubStream(local10.primaryStream);
local10.primaryStream = null;
}
local10.unlink();
}
}

4
client/src/main/java/Camera.java
View file

@ -35,13 +35,13 @@ public class Camera {
yawTarget = mod(yawTarget, 2047.0d);
@Pc(33) int local33 = Static81.cameraX >> 7;
@Pc(37) int local37 = Static111.cameraZ >> 7;
@Pc(43) int local43 = SceneGraph.getTileHeight(Static55.level, Static81.cameraX, Static111.cameraZ);
@Pc(43) int local43 = SceneGraph.getTileHeight(Player.level, Static81.cameraX, Static111.cameraZ);
@Pc(45) int local45 = 0;
@Pc(64) int local64;
if (local33 > 3 && local37 > 3 && local33 < 100 && local37 < 100) {
for (local64 = local33 - 4; local64 <= local33 + 4; local64++) {
for (@Pc(73) int local73 = local37 - 4; local73 <= local37 + 4; local73++) {
@Pc(80) int local80 = Static55.level;
@Pc(80) int local80 = Player.level;
if (local80 < 3 && (Static12.tileSettings[1][local64][local73] & 0x2) == 2) {
local80++;
}

43
client/src/main/java/Chat.java Normal file
View file

@ -0,0 +1,43 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class Chat {
@OriginalMember(owner = "client!ca", name = "eb", descriptor = "[I")
public static final int[] anIntArray67 = new int[100];
@OriginalMember(owner = "client!fb", name = "l", descriptor = "[Lclient!na;")
public static final JagString[] aClass100Array62 = new JagString[100];
@OriginalMember(owner = "client!sj", name = "q", descriptor = "[Lclient!na;")
public static final JagString[] aClass100Array158 = new JagString[100];
@OriginalMember(owner = "client!th", name = "l", descriptor = "[I")
public static final int[] anIntArray521 = new int[100];
@OriginalMember(owner = "client!mc", name = "Y", descriptor = "[Lclient!na;")
public static final JagString[] aClass100Array112 = new JagString[100];
@OriginalMember(owner = "client!dm", name = "u", descriptor = "I")
public static int transmitAt = 0;
@OriginalMember(owner = "client!f", name = "Z", descriptor = "I")
public static int anInt1941 = 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) {
for (@Pc(14) int local14 = 99; local14 > 0; local14--) {
anIntArray67[local14] = anIntArray67[local14 - 1];
aClass100Array112[local14] = aClass100Array112[local14 - 1];
aClass100Array158[local14] = aClass100Array158[local14 - 1];
aClass100Array62[local14] = aClass100Array62[local14 - 1];
anIntArray521[local14] = anIntArray521[local14 - 1];
}
anInt1941++;
anIntArray67[0] = arg1;
aClass100Array112[0] = arg4;
transmitAt = InterfaceList.transmitTimer;
anIntArray521[0] = arg0;
aClass100Array158[0] = arg2;
aClass100Array62[0] = arg3;
}
@OriginalMember(owner = "client!i", name = "a", descriptor = "(Lclient!na;ILclient!na;I)V")
public static void add(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString arg2) {
add(-1, arg1, arg2, null, arg0);
}
}

9
client/src/main/java/Cheat.java
View file

@ -1,4 +1,6 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class Cheat {
@OriginalMember(owner = "client!p", name = "f", descriptor = "Lclient!na;")
@ -27,4 +29,11 @@ public class Cheat {
public static final JagString aClass100_232 = JagString.parse("::rect_debug");
@OriginalMember(owner = "client!dg", name = "f", descriptor = "Z")
public static boolean displayFps = false;
@OriginalMember(owner = "client!en", name = "a", descriptor = "(IIIB)V")
public static void teleport(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(66) JagString local66 = JagString.concatenate(new JagString[] { Static96.aClass100_521, Static123.parseInt(arg2), Static159.aClass100_760, Static123.parseInt(arg0 >> 6), Static159.aClass100_760, Static123.parseInt(arg1 >> 6), Static159.aClass100_760, Static123.parseInt(arg0 & 0x3F), Static159.aClass100_760, Static123.parseInt(arg1 & 0x3F) });
local66.method3129();
Static127.method2470(local66);
}
}

6
client/src/main/java/ClanChat.java Normal file
View file

@ -0,0 +1,6 @@
import org.openrs2.deob.annotation.OriginalMember;
public class ClanChat {
@OriginalMember(owner = "client!wj", name = "l", descriptor = "I")
public static int transmitAt = 0;
}

94
client/src/main/java/Component.java
View file

@ -13,19 +13,19 @@ public final class Component {
@OriginalMember(owner = "client!gn", name = "i", descriptor = "Lclient!n;")
public static final SoftLruHashTable fonts = new SoftLruHashTable(20);
@OriginalMember(owner = "client!be", name = "b", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray1;
public Object[] onFriendTransmit;
@OriginalMember(owner = "client!be", name = "d", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray2;
public Object[] onStatTransmit;
@OriginalMember(owner = "client!be", name = "e", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray3;
@OriginalMember(owner = "client!be", name = "g", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray4;
public Object[] onVarcTransmit;
@OriginalMember(owner = "client!be", name = "k", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray5;
public Object[] onClickRepeat;
@OriginalMember(owner = "client!be", name = "p", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray6;
@ -37,10 +37,10 @@ public final class Component {
public JagString[] aClass100Array19;
@OriginalMember(owner = "client!be", name = "t", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray7;
public Object[] onInvTransmit;
@OriginalMember(owner = "client!be", name = "u", descriptor = "[I")
public int[] anIntArray34;
public int[] inventoryTriggers;
@OriginalMember(owner = "client!be", name = "v", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray8;
@ -49,13 +49,13 @@ public final class Component {
public boolean aBoolean21;
@OriginalMember(owner = "client!be", name = "z", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray9;
public Object[] onHold;
@OriginalMember(owner = "client!be", name = "E", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray10;
@OriginalMember(owner = "client!be", name = "G", descriptor = "[I")
public int[] anIntArray35;
public int[] varcstrTriggers;
@OriginalMember(owner = "client!be", name = "I", descriptor = "I")
public int type;
@ -79,16 +79,16 @@ public final class Component {
public int[] anIntArray37;
@OriginalMember(owner = "client!be", name = "kb", descriptor = "[I")
public int[] anIntArray38;
public int[] varcTriggers;
@OriginalMember(owner = "client!be", name = "qb", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray13;
public Object[] onCamFinished;
@OriginalMember(owner = "client!be", name = "tb", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray14;
public Object[] onKey;
@OriginalMember(owner = "client!be", name = "ub", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray15;
public Object[] onVarcstrTransmit;
@OriginalMember(owner = "client!be", name = "Db", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray16;
@ -100,10 +100,10 @@ public final class Component {
public Object[] anObjectArray17;
@OriginalMember(owner = "client!be", name = "Nb", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray18;
public Object[] onRelease;
@OriginalMember(owner = "client!be", name = "Xb", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray19;
public Object[] onMouseOver;
@OriginalMember(owner = "client!be", name = "Yb", descriptor = "[I")
public int[] anIntArray39;
@ -112,7 +112,7 @@ public final class Component {
public int[] objTypes;
@OriginalMember(owner = "client!be", name = "fc", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray20;
public Object[] onChatTransmit;
@OriginalMember(owner = "client!be", name = "lc", descriptor = "[Lclient!be;")
public Component[] createdComponents;
@ -121,31 +121,31 @@ public final class Component {
public byte[] aByteArray8;
@OriginalMember(owner = "client!be", name = "rc", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray21;
public Object[] onStockTransmit;
@OriginalMember(owner = "client!be", name = "tc", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray22;
public Object[] onTimer;
@OriginalMember(owner = "client!be", name = "yc", descriptor = "[I")
public int[] anIntArray41;
@OriginalMember(owner = "client!be", name = "Ac", descriptor = "[I")
public int[] anIntArray42;
public int[] statTriggers;
@OriginalMember(owner = "client!be", name = "Bc", descriptor = "[I")
public int[] anIntArray43;
@OriginalMember(owner = "client!be", name = "Cc", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray23;
public Object[] onMouseRepeat;
@OriginalMember(owner = "client!be", name = "Ic", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray24;
public Object[] onMouseLeave;
@OriginalMember(owner = "client!be", name = "Jc", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray25;
public Object[] onVarpTransmit;
@OriginalMember(owner = "client!be", name = "Nc", descriptor = "[I")
public int[] anIntArray44;
public int[] varpTriggers;
@OriginalMember(owner = "client!be", name = "Tc", descriptor = "[I")
public int[] anIntArray45;
@ -172,13 +172,13 @@ public final class Component {
public int[] anIntArray49;
@OriginalMember(owner = "client!be", name = "qd", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray28;
public Object[] onClanTransmit;
@OriginalMember(owner = "client!be", name = "rd", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray29;
@OriginalMember(owner = "client!be", name = "sd", descriptor = "[Ljava/lang/Object;")
public Object[] anObjectArray30;
public Object[] onMiscTransmit;
@OriginalMember(owner = "client!be", name = "wd", descriptor = "[I")
public int[] objCounts;
@ -334,7 +334,7 @@ public final class Component {
public JagString aClass100_88 = Static176.aClass100_800;
@OriginalMember(owner = "client!be", name = "Lc", descriptor = "I")
public int anInt511 = 0;
public int updatedVarcsReaderIndex = 0;
@OriginalMember(owner = "client!be", name = "w", descriptor = "I")
public int baseWidth = 0;
@ -343,7 +343,7 @@ public final class Component {
public int anInt512 = 0;
@OriginalMember(owner = "client!be", name = "Ib", descriptor = "I")
public int anInt482 = -1;
public int lastTransmitTimer = -1;
@OriginalMember(owner = "client!be", name = "c", descriptor = "Z")
public boolean aBoolean18 = false;
@ -373,7 +373,7 @@ public final class Component {
public int anInt498 = -1;
@OriginalMember(owner = "client!be", name = "Rb", descriptor = "I")
public int anInt487 = 0;
public int updatedVarcstrsReaderIndex = 0;
@OriginalMember(owner = "client!be", name = "ic", descriptor = "I")
public int anInt495 = 0;
@ -403,7 +403,7 @@ public final class Component {
public int anInt486 = 0;
@OriginalMember(owner = "client!be", name = "ec", descriptor = "I")
public int anInt493 = 0;
public int updatedInventoriesReaderIndex = 0;
@OriginalMember(owner = "client!be", name = "Vc", descriptor = "S")
public short aShort11 = 0;
@ -436,7 +436,7 @@ public final class Component {
public Component aClass13_5 = null;
@OriginalMember(owner = "client!be", name = "od", descriptor = "I")
public int anInt525 = 0;
public int updatedStatsReaderIndex = 0;
@OriginalMember(owner = "client!be", name = "ab", descriptor = "I")
public int modelType = 1;
@ -475,7 +475,7 @@ public final class Component {
public int anInt510 = 0;
@OriginalMember(owner = "client!be", name = "mb", descriptor = "I")
public int anInt471 = 0;
public int updatedVarpsReaderIndex = 0;
@OriginalMember(owner = "client!be", name = "rb", descriptor = "I")
public int anInt474 = 0;
@ -1143,30 +1143,30 @@ public final class Component {
}
this.aClass3_Sub4_1 = new ServerActiveProperties(local175, local567);
this.anObjectArray3 = this.method485(arg0);
this.anObjectArray19 = this.method485(arg0);
this.anObjectArray24 = this.method485(arg0);
this.onMouseOver = this.method485(arg0);
this.onMouseLeave = this.method485(arg0);
this.anObjectArray27 = this.method485(arg0);
this.anObjectArray11 = this.method485(arg0);
this.anObjectArray25 = this.method485(arg0);
this.anObjectArray7 = this.method485(arg0);
this.anObjectArray2 = this.method485(arg0);
this.anObjectArray22 = 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.anObjectArray23 = this.method485(arg0);
this.anObjectArray5 = this.method485(arg0);
this.onMouseRepeat = this.method485(arg0);
this.onClickRepeat = this.method485(arg0);
this.anObjectArray6 = this.method485(arg0);
this.anObjectArray18 = this.method485(arg0);
this.anObjectArray9 = 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.anObjectArray4 = this.method485(arg0);
this.anObjectArray15 = this.method485(arg0);
this.anIntArray44 = this.method486(arg0);
this.anIntArray34 = this.method486(arg0);
this.anIntArray42 = this.method486(arg0);
this.anIntArray38 = this.method486(arg0);
this.anIntArray35 = this.method486(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);
}
@OriginalMember(owner = "client!be", name = "a", descriptor = "([Lclient!ok;I)Lclient!rk;")

6
client/src/main/java/FriendsList.java Normal file
View file

@ -0,0 +1,6 @@
import org.openrs2.deob.annotation.OriginalMember;
public class FriendsList {
@OriginalMember(owner = "client!p", name = "d", descriptor = "I")
public static int transmitAt = 0;
}

8
client/src/main/java/HintArrowManager.java
View file

@ -44,18 +44,18 @@ public class HintArrowManager {
@Pc(94) int local94;
if (GlRenderer.enabled) {
@Pc(68) GlModel local68 = (GlModel) local10;
if (arg5 != SceneGraph.getTileHeight(Static55.level, arg3 + local42, arg1 + local48) || arg5 != SceneGraph.getTileHeight(Static55.level, arg3 + local45, local51 + arg1)) {
if (arg5 != SceneGraph.getTileHeight(Player.level, arg3 + local42, arg1 + local48) || arg5 != SceneGraph.getTileHeight(Player.level, arg3 + local45, local51 + arg1)) {
for (local94 = 0; local94 < local68.vertexCount; local94++) {
local68.anIntArray465[local94] += SceneGraph.getTileHeight(Static55.level, local68.anIntArray461[local94] + arg3, local68.anIntArray466[local94] + arg1) - arg5;
local68.anIntArray465[local94] += SceneGraph.getTileHeight(Player.level, local68.anIntArray461[local94] + arg3, local68.anIntArray466[local94] + arg1) - arg5;
}
local68.bounds.valid = false;
local68.vertexBuffer.valid = false;
}
} else {
@Pc(142) SoftwareModel local142 = (SoftwareModel) local10;
if (arg5 != SceneGraph.getTileHeight(Static55.level, local42 + arg3, local48 + arg1) || arg5 != SceneGraph.getTileHeight(Static55.level, arg3 + local45, local51 + arg1)) {
if (arg5 != SceneGraph.getTileHeight(Player.level, local42 + arg3, local48 + arg1) || arg5 != SceneGraph.getTileHeight(Player.level, arg3 + local45, local51 + arg1)) {
for (local94 = 0; local94 < local142.vertexCount; local94++) {
local142.anIntArray527[local94] += SceneGraph.getTileHeight(Static55.level, arg3 + local142.anIntArray528[local94], local142.anIntArray531[local94] + arg1) - arg5;
local142.anIntArray527[local94] += SceneGraph.getTileHeight(Player.level, arg3 + local142.anIntArray528[local94], local142.anIntArray531[local94] + arg1) - arg5;
}
local142.boundsValid = false;
}

6
client/src/main/java/IgnoreList.java Normal file
View file

@ -0,0 +1,6 @@
import org.openrs2.deob.annotation.OriginalMember;
public class IgnoreList {
@OriginalMember(owner = "client!pf", name = "h", descriptor = "[J")
public static final long[] encodedUsernames = new long[100];
}

2
client/src/main/java/InterfaceList.java
View file

@ -31,6 +31,8 @@ public class InterfaceList {
public static int keyQueueSize = 0;
@OriginalMember(owner = "client!je", name = "fb", descriptor = "I")
public static int transmitTimer = 1;
@OriginalMember(owner = "client!ra", name = "J", descriptor = "I")
public static int miscTransmitAt = 0;
@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) {

4
client/src/main/java/JagString.java
View file

@ -262,7 +262,7 @@ public final class JagString implements StringInterface {
}
@OriginalMember(owner = "client!na", name = "b", descriptor = "(I)Lclient!na;")
public final JagString method3116() {
public final JagString encodeMessage() {
@Pc(7) byte local7 = 2;
@Pc(11) JagString local11 = new JagString();
local11.length = this.length;
@ -682,7 +682,7 @@ public final class JagString implements StringInterface {
}
@OriginalMember(owner = "client!na", name = "h", descriptor = "(I)Lclient!na;")
public final JagString method3144() {
public final JagString trim() {
@Pc(17) int local17;
for (local17 = 0; local17 < this.length && (this.chars[local17] >= 0 && this.chars[local17] <= 32 || (this.chars[local17] & 0xFF) == 160); local17++) {
}

22
client/src/main/java/Loc.java
View file

@ -6,7 +6,9 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!dc")
public final class Loc extends Entity {
@OriginalMember(owner = "client!dc", name = "U", descriptor = "Lclient!ga;")
@OriginalMember(owner = "client!ci", name = "q", descriptor = "Lclient!ek;")
public static SoftwareIndexedSprite aClass36_Sub1_1 = null;
@OriginalMember(owner = "client!dc", name = "U", descriptor = "Lclient!ga;")
private ParticleSystem aClass47_Sub1_2;
@OriginalMember(owner = "client!dc", name = "x", descriptor = "I")
@ -100,7 +102,7 @@ public final class Loc extends Entity {
this.anInt1304 = 1;
}
this.anInt1317 = 1;
this.anInt1320 = Static83.loop - 1;
this.anInt1320 = client.loop - 1;
if (this.aClass144_2.anInt5347 == 0 && arg8 != null && arg8 instanceof Loc) {
@Pc(142) Loc local142 = (Loc) arg8;
if (this.aClass144_2 == local142.aClass144_2) {
@ -121,7 +123,7 @@ public final class Loc extends Entity {
}
}
this.anInt1317 = (int) (Math.random() * (double) this.aClass144_2.anIntArray474[this.anInt1297]) + 1;
this.anInt1320 = Static83.loop - this.anInt1317;
this.anInt1320 = client.loop - this.anInt1317;
}
}
if (GlRenderer.enabled && arg8 != null) {
@ -174,7 +176,7 @@ public final class Loc extends Entity {
if (this.aClass144_2 == null) {
return;
}
@Pc(10) int local10 = Static83.loop - this.anInt1320;
@Pc(10) int local10 = client.loop - this.anInt1320;
if (local10 > 100 && this.aClass144_2.anInt5362 > 0) {
@Pc(29) int local29 = this.aClass144_2.frames.length - this.aClass144_2.anInt5362;
while (this.anInt1297 < local29 && this.aClass144_2.anIntArray474[this.anInt1297] < local10) {
@ -216,7 +218,7 @@ public final class Loc extends Entity {
}
}
this.anInt1317 = local10;
this.anInt1320 = Static83.loop - local10;
this.anInt1320 = client.loop - local10;
}
@OriginalMember(owner = "client!dc", name = "a", descriptor = "(ZI)Lclient!th;")
@ -250,7 +252,7 @@ public final class Loc extends Entity {
this.anInt1320 -= (int) (Math.random() * (double) this.aClass144_2.anIntArray474[this.anInt1297]);
} else {
this.anInt1297 = 0;
this.anInt1320 = Static83.loop - 1;
this.anInt1320 = client.loop - 1;
}
}
}
@ -289,16 +291,16 @@ public final class Loc extends Entity {
@Pc(356) boolean local356 = this.aClass36_Sub1_2 == null;
@Pc(389) Class139 local389;
if (this.aClass144_2 == null) {
local389 = local19.method3428(this.anInt1295, local302, local267, this.anInt1307, local293, local314, false, local356 ? Static32.aClass36_Sub1_1 : this.aClass36_Sub1_2, local256, local311);
local389 = local19.method3428(this.anInt1295, local302, local267, this.anInt1307, local293, local314, false, local356 ? aClass36_Sub1_1 : this.aClass36_Sub1_2, local256, local311);
} else {
local389 = local19.method3429(local311, local302, local356 ? Static32.aClass36_Sub1_1 : this.aClass36_Sub1_2, local293, this.aClass144_2, this.anInt1295, local267, local256, this.anInt1297, local314, this.anInt1304, this.anInt1307, this.anInt1317);
local389 = local19.method3429(local311, local302, local356 ? aClass36_Sub1_1 : this.aClass36_Sub1_2, local293, this.aClass144_2, this.anInt1295, local267, local256, this.anInt1297, local314, this.anInt1304, this.anInt1307, this.anInt1317);
}
if (local389 == null) {
return null;
}
if (GlRenderer.enabled && local256) {
if (local356) {
Static32.aClass36_Sub1_1 = local389.aClass36_Sub1_3;
aClass36_Sub1_1 = local389.aClass36_Sub1_3;
}
@Pc(429) int local429 = 0;
if (this.anInt1303 != 0) {
@ -314,7 +316,7 @@ public final class Loc extends Entity {
this.aClass36_Sub1_2 = local471;
this.anInt1319 = local311;
if (local356) {
Static32.aClass36_Sub1_1 = null;
aClass36_Sub1_1 = null;
}
this.anInt1294 = local429;
this.anInt1296 = local302;

4
client/src/main/java/LoginManager.java
View file

@ -202,7 +202,7 @@ public class LoginManager {
}
Protocol.socket = new BufferedSocket((Socket) Protocol.socketRequest.result, GameShell.signLink);
Protocol.socketRequest = null;
@Pc(106) long local106 = Static101.aLong98 = Player.username.encode37();
@Pc(106) long local106 = Static101.aLong98 = Player.usernameInput.encode37();
Protocol.outboundBuffer.offset = 0;
Protocol.outboundBuffer.p1(14);
@Pc(120) int local120 = (int) (local106 >> 16 & 0x1FL);
@ -248,7 +248,7 @@ public class LoginManager {
Protocol.outboundBuffer.p4(key[1]);
Protocol.outboundBuffer.p4(key[2]);
Protocol.outboundBuffer.p4(key[3]);
Protocol.outboundBuffer.p8(Player.username.encode37());
Protocol.outboundBuffer.p8(Player.usernameInput.encode37());
Protocol.outboundBuffer.pjstr(Player.password);
if (GlobalConfig.LOGIN_EXTRA_INFO) {
Protocol.outboundBuffer.pjstr(JagString.parse(""));

16
client/src/main/java/Mouse.java
View file

@ -14,6 +14,14 @@ import javax.swing.*;
@OriginalClass("client!ug")
public final class Mouse implements MouseListener, MouseMotionListener, FocusListener {
@OriginalMember(owner = "client!ah", name = "s", descriptor = "I")
public static int clickX = 0;
@OriginalMember(owner = "client!em", name = "y", descriptor = "I")
public static int clickY = 0;
@OriginalMember(owner = "client!sc", name = "v", descriptor = "I")
public static int anInt5032 = 0;
@OriginalMember(owner = "client!rh", name = "o", descriptor = "I")
public static int anInt4873 = 0;
public int mouseWheelX;
public int mouseWheelY;
@ -40,12 +48,12 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis
@Pc(2) Mouse local2 = Static93.instance;
synchronized (Static93.instance) {
Static22.anInt723 = Static57.anInt1759;
Static215.anInt4873 = Static147.anInt3521;
Static223.anInt5032 = Static165.anInt4039;
anInt4873 = Static147.anInt3521;
anInt5032 = Static165.anInt4039;
Static150.clickButton = Static41.anInt1313;
Static7.clickX = Static34.anInt1034;
clickX = Static34.anInt1034;
Static93.anInt2467++;
Static60.clickY = Static222.anInt4973;
clickY = Static222.anInt4973;
Static133.clickTime = Static209.aLong161;
Static41.anInt1313 = 0;
}

4
client/src/main/java/MouseRecorder.java
View file

@ -31,8 +31,8 @@ public final class MouseRecorder implements Runnable {
@Pc(12) Object local12 = this.lock;
synchronized (this.lock) {
if (this.samples < 500) {
this.x[this.samples] = Static215.anInt4873;
this.y[this.samples] = Static223.anInt5032;
this.x[this.samples] = Mouse.anInt4873;
this.y[this.samples] = Mouse.anInt5032;
this.samples++;
}
}

6
client/src/main/java/Npc.java
View file

@ -55,11 +55,11 @@ public final class Npc extends PathingEntity {
this.method2687(local74);
this.method2685(local74, arg0);
local140 = null;
if (this.anInt3432 != -1 && this.anInt3399 != -1) {
@Pc(211) SpotAnimType local211 = SpotAnimTypeList.get(this.anInt3432);
if (this.spotAnimId != -1 && this.anInt3399 != -1) {
@Pc(211) SpotAnimType local211 = SpotAnimTypeList.get(this.spotAnimId);
local140 = local211.method1319(this.anInt3418, this.anInt3399, this.anInt3361);
if (local140 != null) {
local140.method4575(0, -this.anInt3394, 0);
local140.method4575(0, -this.spotAnimY, 0);
if (local211.aBoolean100) {
if (Static101.anInt2640 != 0) {
local140.method4574(Static101.anInt2640);

6
client/src/main/java/Packet.java
View file

@ -18,7 +18,7 @@ public final class Packet extends Buffer {
}
@OriginalMember(owner = "client!i", name = "q", descriptor = "(B)V")
public final void method2233() {
public final void accessBits() {
this.anInt2846 = this.offset * 8;
}
@ -30,7 +30,7 @@ public final class Packet extends Buffer {
}
@OriginalMember(owner = "client!i", name = "f", descriptor = "(BI)I")
public final int method2238(@OriginalArg(1) int arg0) {
public final int gBits(@OriginalArg(1) int arg0) {
@Pc(6) int local6 = this.anInt2846 >> 3;
@Pc(14) int local14 = 8 - (this.anInt2846 & 0x7);
@Pc(16) int local16 = 0;
@ -69,7 +69,7 @@ public final class Packet extends Buffer {
}
@OriginalMember(owner = "client!i", name = "h", descriptor = "(Z)V")
public final void method2244() {
public final void accessBytes() {
this.offset = (this.anInt2846 + 7) / 8;
}
}

38
client/src/main/java/PathingEntity.java
View file

@ -7,10 +7,10 @@ import org.openrs2.deob.annotation.Pc;
public abstract class PathingEntity extends Entity {
@OriginalMember(owner = "client!fe", name = "A", descriptor = "I")
public int anInt3359;
public int spotAnimStart;
@OriginalMember(owner = "client!fe", name = "S", descriptor = "I")
public int anInt3372;
public int hitpointsBar;
@OriginalMember(owner = "client!fe", name = "U", descriptor = "I")
public int anInt3374;
@ -37,7 +37,7 @@ public abstract class PathingEntity extends Entity {
public int anInt3392;
@OriginalMember(owner = "client!fe", name = "tb", descriptor = "I")
public int anInt3394;
public int spotAnimY;
@OriginalMember(owner = "client!fe", name = "ub", descriptor = "I")
public int anInt3395;
@ -106,13 +106,13 @@ public abstract class PathingEntity extends Entity {
public boolean aBoolean167 = false;
@OriginalMember(owner = "client!fe", name = "db", descriptor = "I")
public int anInt3382 = 0;
public int faceX = 0;
@OriginalMember(owner = "client!fe", name = "Q", descriptor = "I")
public int anInt3371 = 0;
@OriginalMember(owner = "client!fe", name = "E", descriptor = "I")
public int anInt3363 = 0;
public int faceY = 0;
@OriginalMember(owner = "client!fe", name = "yb", descriptor = "I")
private int anInt3398 = 0;
@ -133,7 +133,7 @@ public abstract class PathingEntity extends Entity {
public int anInt3376 = 32;
@OriginalMember(owner = "client!fe", name = "P", descriptor = "I")
public int anInt3370 = -1;
public int faceEntity = -1;
@OriginalMember(owner = "client!fe", name = "Bb", descriptor = "Z")
private boolean aBoolean170 = false;
@ -151,13 +151,13 @@ public abstract class PathingEntity extends Entity {
public final Class147[] aClass147Array3 = new Class147[12];
@OriginalMember(owner = "client!fe", name = "Lb", descriptor = "I")
public int anInt3408 = 100;
public int chatLoops = 100;
@OriginalMember(owner = "client!fe", name = "V", descriptor = "I")
public int anInt3375 = 0;
@OriginalMember(owner = "client!fe", name = "Y", descriptor = "I")
public int anInt3378 = -1000;
public int hitpointsBarVisibleUntil = -1000;
@OriginalMember(owner = "client!fe", name = "Rb", descriptor = "I")
protected int anInt3413 = -32768;
@ -193,7 +193,7 @@ public abstract class PathingEntity extends Entity {
public int anInt3417 = 0;
@OriginalMember(owner = "client!fe", name = "s", descriptor = "I")
public int anInt3352 = 0;
public int chatEffect = 0;
@OriginalMember(owner = "client!fe", name = "T", descriptor = "I")
public int anInt3373 = -1;
@ -235,19 +235,19 @@ public abstract class PathingEntity extends Entity {
public int anInt3396 = 0;
@OriginalMember(owner = "client!fe", name = "jc", descriptor = "I")
public int anInt3429 = 0;
public int chatColor = 0;
@OriginalMember(owner = "client!fe", name = "kc", descriptor = "I")
public int anInt3430 = 0;
public int lastSeenLoop = 0;
@OriginalMember(owner = "client!fe", name = "ec", descriptor = "I")
public int anInt3425 = 0;
@OriginalMember(owner = "client!fe", name = "Wb", descriptor = "Lclient!na;")
public JagString aClass100_640 = null;
public JagString chatMessage = null;
@OriginalMember(owner = "client!fe", name = "oc", descriptor = "I")
public int anInt3432 = -1;
public int spotAnimId = -1;
@OriginalMember(owner = "client!fe", name = "Xb", descriptor = "I")
public int anInt3418 = -1;
@ -299,7 +299,7 @@ public abstract class PathingEntity extends Entity {
}
@OriginalMember(owner = "client!fe", name = "a", descriptor = "(IBI)V")
public final void method2684(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
public final void move(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
@Pc(10) int local10 = this.movementQueueX[0];
@Pc(15) int local15 = this.movementQueueZ[0];
if (arg1 == 0) {
@ -363,13 +363,13 @@ public abstract class PathingEntity extends Entity {
@Pc(53) int local53 = -local27 / 2;
@Pc(64) int local64 = local53 * local43 - local48 * local39 >> 16;
@Pc(75) int local75 = local39 * local53 + local43 * local48 >> 16;
@Pc(87) int local87 = SceneGraph.getTileHeight(Static55.level, local75 + this.xFine, this.zFine + local64);
@Pc(87) int local87 = SceneGraph.getTileHeight(Player.level, local75 + this.xFine, this.zFine + local64);
@Pc(91) int local91 = local24 / 2;
@Pc(96) int local96 = -local27 / 2;
@Pc(106) int local106 = local91 * local43 + local96 * local39 >> 16;
@Pc(110) int local110 = local27 / 2;
@Pc(121) int local121 = local96 * local43 - local91 * local39 >> 16;
@Pc(134) int local134 = SceneGraph.getTileHeight(Static55.level, local106 + this.xFine, this.zFine - -local121);
@Pc(134) int local134 = SceneGraph.getTileHeight(Player.level, local106 + this.xFine, this.zFine - -local121);
@Pc(139) int local139 = -local24 / 2;
@Pc(150) int local150 = local110 * local43 - local39 * local139 >> 16;
@Pc(154) int local154 = local27 / 2;
@ -377,9 +377,9 @@ public abstract class PathingEntity extends Entity {
@Pc(169) int local169 = local39 * local110 + local43 * local139 >> 16;
@Pc(179) int local179 = local154 * local43 - local39 * local158 >> 16;
@Pc(189) int local189 = local39 * local154 + local43 * local158 >> 16;
@Pc(201) int local201 = SceneGraph.getTileHeight(Static55.level, this.xFine + local169, local150 + this.zFine);
@Pc(201) int local201 = SceneGraph.getTileHeight(Player.level, this.xFine + local169, local150 + this.zFine);
@Pc(212) int local212 = local134 > local87 ? local87 : local134;
@Pc(224) int local224 = SceneGraph.getTileHeight(Static55.level, local189 + this.xFine, local179 + this.zFine);
@Pc(224) int local224 = SceneGraph.getTileHeight(Player.level, local189 + this.xFine, local179 + this.zFine);
@Pc(231) int local231 = local224 > local201 ? local201 : local224;
@Pc(238) int local238 = local224 > local134 ? local134 : local224;
@Pc(245) int local245 = local201 <= local87 ? local201 : local87;
@ -402,7 +402,7 @@ public abstract class PathingEntity extends Entity {
}
@OriginalMember(owner = "client!fe", name = "a", descriptor = "(IIII)V")
public final void method2686(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
public final void addHit(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
for (@Pc(11) int local11 = 0; local11 < 4; local11++) {
if (arg1 >= this.anIntArray319[local11]) {
this.anIntArray322[local11] = arg2;

85
client/src/main/java/Player.java
View file

@ -9,12 +9,16 @@ public final class Player extends PathingEntity {
@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 username = JagString.EMPTY;
public static JagString usernameInput = JagString.EMPTY;
@OriginalMember(owner = "client!ba", name = "w", descriptor = "I")
public static int inTutorialIsland = 0;
@OriginalMember(owner = "client!ee", name = "b", descriptor = "I")
public static int level;
@OriginalMember(owner = "client!e", name = "Bc", descriptor = "Lclient!hh;")
public PlayerAppearance appearance;
@OriginalMember(owner = "client!e", name = "Mc", descriptor = "Lclient!na;")
public JagString aClass100_364;
public JagString username;
@OriginalMember(owner = "client!e", name = "tc", descriptor = "I")
public int anInt1649 = -1;
@ -88,6 +92,57 @@ public final class Player extends PathingEntity {
}
}
@OriginalMember(owner = "client!ci", name = "a", descriptor = "([I[ILclient!e;B[I)V")
public static void method865(@OriginalArg(0) int[] arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) Player arg2, @OriginalArg(4) int[] arg3) {
for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) {
@Pc(20) int local20 = arg1[local7];
@Pc(24) int local24 = arg3[local7];
@Pc(28) int local28 = arg0[local7];
@Pc(30) int local30 = 0;
while (local24 != 0 && local30 < arg2.aClass147Array3.length) {
if ((local24 & 0x1) != 0) {
if (local20 == -1) {
arg2.aClass147Array3[local30] = null;
} else {
@Pc(68) SeqType local68 = SeqTypeList.get(local20);
@Pc(71) int local71 = local68.anInt5347;
@Pc(76) Class147 local76 = arg2.aClass147Array3[local30];
if (local76 != null) {
if (local20 == local76.anInt5396) {
if (local71 == 0) {
local76 = arg2.aClass147Array3[local30] = null;
} else if (local71 == 1) {
local76.anInt5400 = 0;
local76.anInt5398 = 1;
local76.anInt5399 = 0;
local76.anInt5408 = local28;
local76.anInt5404 = 0;
SoundPlayer.playSeqSound(arg2.zFine, local68, arg2.xFine, arg2 == PlayerList.self, 0);
} else if (local71 == 2) {
local76.anInt5400 = 0;
}
} else if (local68.anInt5355 >= SeqTypeList.get(local76.anInt5396).anInt5355) {
local76 = arg2.aClass147Array3[local30] = null;
}
}
if (local76 == null) {
local76 = arg2.aClass147Array3[local30] = new Class147();
local76.anInt5396 = local20;
local76.anInt5398 = 1;
local76.anInt5404 = 0;
local76.anInt5408 = local28;
local76.anInt5399 = 0;
local76.anInt5400 = 0;
SoundPlayer.playSeqSound(arg2.zFine, local68, arg2.xFine, arg2 == PlayerList.self, 0);
}
}
}
local30++;
local24 >>>= 0x1;
}
}
}
@OriginalMember(owner = "client!e", name = "c", descriptor = "(B)I")
@Override
public final int getSize() {
@ -101,7 +156,7 @@ public final class Player extends PathingEntity {
}
@OriginalMember(owner = "client!e", name = "a", descriptor = "(ILclient!wa;)V")
public final void method1262(@OriginalArg(1) Buffer arg0) {
public final void decodeAppearance(@OriginalArg(1) Buffer arg0) {
arg0.offset = 0;
@Pc(20) int local20 = arg0.g1();
@Pc(22) int local22 = -1;
@ -154,7 +209,7 @@ public final class Player extends PathingEntity {
}
this.anInt3365 = arg0.g2();
@Pc(236) long local236 = arg0.g8();
this.aClass100_364 = Base37.decodeLowerCase(local236).method3125();
this.username = Base37.decodeLowerCase(local236).method3125();
this.anInt1652 = arg0.g1();
if (local37) {
this.anInt1671 = arg0.g2();
@ -171,7 +226,7 @@ public final class Player extends PathingEntity {
local134 = this.soundRadius;
this.soundRadius = arg0.g1();
if (this.soundRadius == 0) {
Static271.method4597(this);
AreaSoundManager.remove(this);
} else {
@Pc(309) int local309 = this.anInt1658;
@Pc(312) int local312 = this.anInt1654;
@ -262,8 +317,8 @@ public final class Player extends PathingEntity {
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);
}
if (local245.anInt4058 == 10 && local245.anInt4057 >= 0 && Static159.players.length > local245.anInt4057) {
@Pc(395) Player local395 = Static159.players[local245.anInt4057];
if (local245.anInt4058 == 10 && local245.anInt4057 >= 0 && PlayerList.players.length > local245.anInt4057) {
@Pc(395) Player local395 = PlayerList.players[local245.anInt4057];
if (local395 != null) {
local291 = local395.xFine / 32 - PlayerList.self.xFine / 32;
local302 = local395.zFine / 32 - PlayerList.self.zFine / 32;
@ -276,11 +331,11 @@ public final class Player extends PathingEntity {
this.method2687(local76);
this.method2685(local76, arg0);
local184 = null;
if (!this.aBoolean98 && this.anInt3432 != -1 && this.anInt3399 != -1) {
@Pc(471) SpotAnimType local471 = SpotAnimTypeList.get(this.anInt3432);
if (!this.aBoolean98 && this.spotAnimId != -1 && this.anInt3399 != -1) {
@Pc(471) SpotAnimType local471 = SpotAnimTypeList.get(this.spotAnimId);
local184 = local471.method1319(this.anInt3418, this.anInt3399, this.anInt3361);
if (local184 != null) {
local184.method4575(0, -this.anInt3394, 0);
local184.method4575(0, -this.spotAnimY, 0);
if (local471.aBoolean100) {
if (Static101.anInt2640 != 0) {
local184.method4574(Static101.anInt2640);
@ -296,10 +351,10 @@ public final class Player extends PathingEntity {
}
@Pc(515) Model local515 = null;
if (!this.aBoolean98 && this.attachment != null) {
if (Static83.loop >= this.anInt3375) {
if (client.loop >= this.anInt3375) {
this.attachment = null;
}
if (this.anInt3390 <= Static83.loop && this.anInt3375 > Static83.loop) {
if (this.anInt3390 <= client.loop && this.anInt3375 > client.loop) {
if (this.attachment instanceof Loc) {
local515 = (Model) ((Loc) this.attachment).method1049();
} else {
@ -376,8 +431,8 @@ public final class Player extends PathingEntity {
}
@OriginalMember(owner = "client!e", name = "e", descriptor = "(I)Lclient!na;")
public final JagString method1264() {
@Pc(2) JagString local2 = this.aClass100_364;
public final JagString getName() {
@Pc(2) JagString local2 = this.username;
if (Static103.aClass100Array88 != null) {
local2 = JagString.concatenate(new JagString[] { Static103.aClass100Array88[this.anInt1651], local2 });
}
@ -393,7 +448,7 @@ public final class Player extends PathingEntity {
}
@OriginalMember(owner = "client!e", name = "a", descriptor = "(BIZI)V")
public final void method1265(@OriginalArg(1) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2) {
public final void teleport(@OriginalArg(1) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2) {
super.method2683(this.getSize(), arg0, arg2, arg1);
}

8
client/src/main/java/PlayerList.java
View file

@ -1,8 +1,16 @@
import org.openrs2.deob.annotation.OriginalMember;
public class PlayerList {
@OriginalMember(owner = "client!ja", name = "l", descriptor = "[Lclient!wa;")
public static final Buffer[] appearanceCache = new Buffer[2048];
@OriginalMember(owner = "client!mi", name = "S", descriptor = "[Lclient!e;")
public static final Player[] players = new Player[2048];
@OriginalMember(owner = "client!ib", name = "f", descriptor = "[I")
public static final int[] ids = new int[2048];
@OriginalMember(owner = "client!nk", name = "O", descriptor = "Lclient!e;")
public static Player self;
@OriginalMember(owner = "client!bf", name = "E", descriptor = "I")
public static int selfId = -1;
@OriginalMember(owner = "client!vl", name = "j", descriptor = "I")
public static int size = 0;
}

8
client/src/main/java/PlayerSkillXpTable.java Normal file
View file

@ -0,0 +1,8 @@
import org.openrs2.deob.annotation.OriginalMember;
public class PlayerSkillXpTable {
@OriginalMember(owner = "client!ud", name = "T", descriptor = "[I")
public static final int[] updatedStats = new int[32];
@OriginalMember(owner = "client!ha", name = "m", descriptor = "I")
public static int updatedStatsWriterIndex = 0;
}

1928
client/src/main/java/Protocol.java
View file

File diff suppressed because it is too large Load diff

4
client/src/main/java/QuickChatPhrase.java
View file

@ -5,10 +5,10 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class QuickChatPhrase {
@OriginalMember(owner = "client!bd", name = "c", descriptor = "I")
public int anInt439;
public int id;
@OriginalMember(owner = "client!bd", name = "f", descriptor = "Lclient!cb;")
public QuickChatPhraseType aClass3_Sub2_Sub6_1;
public QuickChatPhraseType type;
@OriginalMember(owner = "client!bd", name = "h", descriptor = "[I")
public int[] anIntArray33;

2
client/src/main/java/QuickChatPhraseType.java
View file

@ -121,7 +121,7 @@ public final class QuickChatPhraseType extends SecondaryNode {
}
@OriginalMember(owner = "client!cb", name = "a", descriptor = "(ILclient!wa;)Lclient!na;")
public final JagString method770(@OriginalArg(1) Buffer arg0) {
public final JagString decodeMessage(@OriginalArg(1) Buffer arg0) {
@Pc(17) JagString local17 = Static87.allocate(80);
if (this.anIntArray71 != null) {
for (@Pc(22) int local22 = 0; local22 < this.anIntArray71.length; local22++) {

8
client/src/main/java/ShadowModelList.java
View file

@ -125,18 +125,18 @@ public class ShadowModelList {
}
if (GlRenderer.enabled) {
@Pc(650) GlModel local650 = (GlModel) local33;
if (SceneGraph.getTileHeight(Static55.level, arg3 + local384, local126 + arg5) != arg11 || SceneGraph.getTileHeight(Static55.level, local115 + arg3, arg5 - -local130) != arg11) {
if (SceneGraph.getTileHeight(Player.level, arg3 + local384, local126 + arg5) != arg11 || SceneGraph.getTileHeight(Player.level, local115 + arg3, arg5 - -local130) != arg11) {
for (local162 = 0; local162 < local650.vertexCount; local162++) {
local650.anIntArray465[local162] += SceneGraph.getTileHeight(Static55.level, local650.anIntArray461[local162] + arg3, arg5 + local650.anIntArray466[local162]) - arg11;
local650.anIntArray465[local162] += SceneGraph.getTileHeight(Player.level, local650.anIntArray461[local162] + arg3, arg5 + local650.anIntArray466[local162]) - arg11;
}
local650.vertexBuffer.valid = false;
local650.bounds.valid = false;
}
} else {
@Pc(574) SoftwareModel local574 = (SoftwareModel) local33;
if (SceneGraph.getTileHeight(Static55.level, arg3 + local384, arg5 - -local126) != arg11 || arg11 != SceneGraph.getTileHeight(Static55.level, arg3 + local115, arg5 - -local130)) {
if (SceneGraph.getTileHeight(Player.level, arg3 + local384, arg5 - -local126) != arg11 || arg11 != SceneGraph.getTileHeight(Player.level, arg3 + local115, arg5 - -local130)) {
for (local162 = 0; local162 < local574.vertexCount; local162++) {
local574.anIntArray527[local162] += SceneGraph.getTileHeight(Static55.level, arg3 + local574.anIntArray528[local162], arg5 + local574.anIntArray531[local162]) - arg11;
local574.anIntArray527[local162] += SceneGraph.getTileHeight(Player.level, arg3 + local574.anIntArray528[local162], arg5 + local574.anIntArray531[local162]) - arg11;
}
local574.boundsValid = false;
}

19
client/src/main/java/Static10.java
View file

@ -1,4 +1,3 @@
import java.io.IOException;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
@ -47,24 +46,6 @@ public final class Static10 {
Static141.anInt3473 = arg0 - 1;
}
@OriginalMember(owner = "client!an", name = "h", descriptor = "(I)Z")
public static boolean readPacket() {
try {
return Static4.method26();
} catch (@Pc(14) IOException local14) {
Static175.method3279();
return true;
} catch (@Pc(19) Exception local19) {
@Pc(61) String local61 = "T2 - " + Protocol.opcode + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Protocol.length + "," + (Static225.originX + PlayerList.self.movementQueueX[0]) + "," + (PlayerList.self.movementQueueZ[0] + Static142.originZ) + " - ";
for (@Pc(63) int local63 = 0; local63 < Protocol.length && local63 < 50; local63++) {
local61 = local61 + Protocol.inboundBuffer.data[local63] + ",";
}
TracingException.report(local61, local19);
Static278.processLogout();
return true;
}
}
@OriginalMember(owner = "client!an", name = "a", descriptor = "(IIIIIII)V")
public static void method352(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
@Pc(11) int local11 = Static78.method1690(Static106.anInt2869, arg5, Static267.anInt5773);

145
client/src/main/java/Static103.java
View file

@ -16,11 +16,6 @@ public final class Static103 {
@OriginalMember(owner = "client!i", name = "ic", descriptor = "Lclient!na;")
public static final JagString aClass100_558 = JagString.parse("m");
@OriginalMember(owner = "client!i", name = "a", descriptor = "(Lclient!na;ILclient!na;I)V")
public static void method2231(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString arg2) {
Static154.method2928(-1, arg1, arg2, null, arg0);
}
@OriginalMember(owner = "client!i", name = "p", descriptor = "(II)V")
public static void method2232(@OriginalArg(1) int arg0) {
if (arg0 < 0) {
@ -36,13 +31,13 @@ public final class Static103 {
@Pc(36) int local36 = (int) Static159.aLongArray5[arg0];
@Pc(43) Player local43;
if (local23 == 31) {
local43 = Static159.players[local36];
local43 = PlayerList.players[local36];
if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static70.type = 2;
Static17.milliseconds = 0;
Static122.x = Static7.clickX;
Static25.y = Static60.clickY;
Static122.x = Mouse.clickX;
Static25.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(71);
Protocol.outboundBuffer.p2leadd(local36);
}
@ -71,10 +66,10 @@ public final class Static103 {
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static122.x = Static7.clickX;
Static122.x = Mouse.clickX;
Static70.type = 2;
Static17.milliseconds = 0;
Static25.y = Static60.clickY;
Static25.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(30);
Protocol.outboundBuffer.p2(local36);
}
@ -83,21 +78,21 @@ public final class Static103 {
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static122.x = Static7.clickX;
Static122.x = Mouse.clickX;
Static17.milliseconds = 0;
Static70.type = 2;
Static25.y = Static60.clickY;
Static25.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(78);
Protocol.outboundBuffer.p2le(local36);
}
}
if (local23 == 44) {
local43 = Static159.players[local36];
local43 = PlayerList.players[local36];
if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static122.x = Static7.clickX;
Static122.x = Mouse.clickX;
Static70.type = 2;
Static25.y = Static60.clickY;
Static25.y = Mouse.clickY;
Static17.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(133);
Protocol.outboundBuffer.p2le(local36);
@ -126,10 +121,10 @@ public final class Static103 {
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static122.x = Static7.clickX;
Static122.x = Mouse.clickX;
Static70.type = 2;
Static17.milliseconds = 0;
Static25.y = Static60.clickY;
Static25.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(239);
Protocol.outboundBuffer.p4le2(Static98.anInt2512);
Protocol.outboundBuffer.p2add(Static15.anInt506);
@ -146,10 +141,10 @@ public final class Static103 {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
}
}
Static122.x = Static7.clickX;
Static122.x = Mouse.clickX;
Static17.milliseconds = 0;
Static70.type = 2;
Static25.y = Static60.clickY;
Static25.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(66);
Protocol.outboundBuffer.p2le(Static225.originX + local15);
Protocol.outboundBuffer.p2(local36);
@ -164,8 +159,8 @@ public final class Static103 {
}
if (local23 == 1002) {
Static70.type = 2;
Static122.x = Static7.clickX;
Static25.y = Static60.clickY;
Static122.x = Mouse.clickX;
Static25.y = Mouse.clickY;
Static17.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(92);
Protocol.outboundBuffer.p2leadd(local36);
@ -177,7 +172,7 @@ public final class Static103 {
Protocol.outboundBuffer.p1isaac(92);
Protocol.outboundBuffer.p2leadd(local36);
} else {
method2231(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { Static123.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, ObjTypeList.get(local36).name}));
Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { Static123.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, ObjTypeList.get(local36).name}));
}
Static72.anInt2043 = 0;
Static257.aClass13_7 = InterfaceList.getComponent(local19);
@ -185,10 +180,10 @@ public final class Static103 {
}
if (local23 == 60) {
if (local36 == 0) {
Static113.method3556(Static55.level, local15, local19);
Static113.method3556(Player.level, local15, local19);
} else if (local36 == 1) {
if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
Static61.teleport(Static225.originX + local15, Static142.originZ + local19, Static55.level);
Cheat.teleport(Static225.originX + local15, Static142.originZ + local19, Player.level);
} else if (Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, local15, 0, 0, 1, local19, PlayerList.self.movementQueueX[0])) {
Protocol.outboundBuffer.p1(Static1.anInt5);
Protocol.outboundBuffer.p1(Static107.anInt2878);
@ -207,8 +202,8 @@ public final class Static103 {
if (local23 == 1007) {
Static17.milliseconds = 0;
Static70.type = 2;
Static25.y = Static60.clickY;
Static122.x = Static7.clickX;
Static25.y = Mouse.clickY;
Static122.x = Mouse.clickX;
local192 = Static175.npcs[local36];
if (local192 != null) {
@Pc(884) NpcType local884 = local192.type;
@ -242,12 +237,12 @@ public final class Static103 {
Static250.anInt5444 = local15;
}
if (local23 == 10) {
local43 = Static159.players[local36];
local43 = PlayerList.players[local36];
if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static70.type = 2;
Static25.y = Static60.clickY;
Static122.x = Static7.clickX;
Static25.y = Mouse.clickY;
Static122.x = Mouse.clickX;
Static17.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(4);
Protocol.outboundBuffer.p2le(local36);
@ -284,13 +279,13 @@ public final class Static103 {
Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE);
}
if (local23 == 37) {
local43 = Static159.players[local36];
local43 = PlayerList.players[local36];
if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static17.milliseconds = 0;
Static70.type = 2;
Static25.y = Static60.clickY;
Static122.x = Static7.clickX;
Static25.y = Mouse.clickY;
Static122.x = Mouse.clickX;
Protocol.outboundBuffer.p1isaac(114);
Protocol.outboundBuffer.p2leadd(local36);
}
@ -317,9 +312,9 @@ public final class Static103 {
}
}
Static70.type = 2;
Static122.x = Static7.clickX;
Static122.x = Mouse.clickX;
Static17.milliseconds = 0;
Static25.y = Static60.clickY;
Static25.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(228);
Protocol.outboundBuffer.p2(local36);
Protocol.outboundBuffer.p2le(Static225.originX + local15);
@ -331,8 +326,8 @@ public final class Static103 {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static70.type = 2;
Static17.milliseconds = 0;
Static25.y = Static60.clickY;
Static122.x = Static7.clickX;
Static25.y = Mouse.clickY;
Static122.x = Mouse.clickX;
Protocol.outboundBuffer.p1isaac(148);
Protocol.outboundBuffer.p2add(local36);
}
@ -357,13 +352,13 @@ public final class Static103 {
return;
}
if (local23 == 29) {
local43 = Static159.players[local36];
local43 = PlayerList.players[local36];
if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static25.y = Static60.clickY;
Static25.y = Mouse.clickY;
Static17.milliseconds = 0;
Static70.type = 2;
Static122.x = Static7.clickX;
Static122.x = Mouse.clickX;
Protocol.outboundBuffer.p1isaac(180);
Protocol.outboundBuffer.p2leadd(local36);
}
@ -378,13 +373,13 @@ public final class Static103 {
Static250.anInt5444 = local15;
}
if (local23 == 15) {
local43 = Static159.players[local36];
local43 = PlayerList.players[local36];
if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static17.milliseconds = 0;
Static70.type = 2;
Static122.x = Static7.clickX;
Static25.y = Static60.clickY;
Static122.x = Mouse.clickX;
Static25.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(195);
Protocol.outboundBuffer.p2add(Static15.anInt506);
Protocol.outboundBuffer.p4le2(Static98.anInt2512);
@ -400,9 +395,9 @@ public final class Static103 {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
}
}
Static122.x = Static7.clickX;
Static122.x = Mouse.clickX;
Static70.type = 2;
Static25.y = Static60.clickY;
Static25.y = Mouse.clickY;
Static17.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(109);
Protocol.outboundBuffer.p2le(local19 + Static142.originZ);
@ -422,9 +417,9 @@ public final class Static103 {
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static25.y = Static60.clickY;
Static25.y = Mouse.clickY;
Static70.type = 2;
Static122.x = Static7.clickX;
Static122.x = Mouse.clickX;
Static17.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(218);
Protocol.outboundBuffer.p2le(local36);
@ -449,8 +444,8 @@ public final class Static103 {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static70.type = 2;
Static17.milliseconds = 0;
Static25.y = Static60.clickY;
Static122.x = Static7.clickX;
Static25.y = Mouse.clickY;
Static122.x = Mouse.clickX;
Protocol.outboundBuffer.p1isaac(115);
Protocol.outboundBuffer.p4me(Static224.anInt5062);
Protocol.outboundBuffer.p2le(Static185.anInt4370);
@ -473,9 +468,9 @@ public final class Static103 {
if (!local560) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
}
Static122.x = Static7.clickX;
Static122.x = Mouse.clickX;
Static17.milliseconds = 0;
Static25.y = Static60.clickY;
Static25.y = Mouse.clickY;
Static70.type = 2;
Protocol.outboundBuffer.p1isaac(101);
Protocol.outboundBuffer.p2leadd(local15 + Static225.originX);
@ -487,16 +482,16 @@ public final class Static103 {
}
if (local23 == 1004) {
Static17.milliseconds = 0;
Static122.x = Static7.clickX;
Static122.x = Mouse.clickX;
Static70.type = 2;
Static25.y = Static60.clickY;
Static25.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(94);
Protocol.outboundBuffer.p2leadd(local36);
}
if (local23 == 11) {
if (local36 == 0) {
Static125.anInt3096 = 1;
Static113.method3556(Static55.level, local15, local19);
Static113.method3556(Player.level, local15, local19);
} else if (local36 == 1) {
Protocol.outboundBuffer.p1isaac(131);
Protocol.outboundBuffer.p4me(Static98.anInt2512);
@ -517,13 +512,13 @@ public final class Static103 {
}
}
if (local23 == 1) {
local43 = Static159.players[local36];
local43 = PlayerList.players[local36];
if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static17.milliseconds = 0;
Static25.y = Static60.clickY;
Static25.y = Mouse.clickY;
Static70.type = 2;
Static122.x = Static7.clickX;
Static122.x = Mouse.clickX;
Protocol.outboundBuffer.p1isaac(248);
Protocol.outboundBuffer.p2leadd(local36);
Protocol.outboundBuffer.p2(Static274.anInt4997);
@ -550,8 +545,8 @@ public final class Static103 {
}
}
Static70.type = 2;
Static25.y = Static60.clickY;
Static122.x = Static7.clickX;
Static25.y = Mouse.clickY;
Static122.x = Mouse.clickX;
Static17.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(48);
Protocol.outboundBuffer.p2add(local15 + Static225.originX);
@ -576,12 +571,12 @@ public final class Static103 {
Static250.anInt5444 = local15;
}
if (local23 == 57) {
local43 = Static159.players[local36];
local43 = PlayerList.players[local36];
if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static70.type = 2;
Static25.y = Static60.clickY;
Static122.x = Static7.clickX;
Static25.y = Mouse.clickY;
Static122.x = Mouse.clickX;
Static17.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(175);
Protocol.outboundBuffer.p2add(local36);
@ -618,12 +613,12 @@ public final class Static103 {
Static250.anInt5444 = local15;
}
if (local23 == 30) {
local43 = Static159.players[local36];
local43 = PlayerList.players[local36];
if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static17.milliseconds = 0;
Static122.x = Static7.clickX;
Static25.y = Static60.clickY;
Static122.x = Mouse.clickX;
Static25.y = Mouse.clickY;
Static70.type = 2;
Protocol.outboundBuffer.p1isaac(68);
Protocol.outboundBuffer.p2leadd(local36);
@ -643,8 +638,8 @@ public final class Static103 {
if (!local560) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
}
Static25.y = Static60.clickY;
Static122.x = Static7.clickX;
Static25.y = Mouse.clickY;
Static122.x = Mouse.clickX;
Static70.type = 2;
Static17.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(73);
@ -664,9 +659,9 @@ public final class Static103 {
if (local23 == 36) {
if (local36 == 0) {
Static187.anInt4422 = 1;
Static113.method3556(Static55.level, local15, local19);
Static113.method3556(Player.level, local15, local19);
} else if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
Static61.teleport(local15 + Static225.originX, Static142.originZ - -local19, Static55.level);
Cheat.teleport(local15 + Static225.originX, Static142.originZ - -local19, Player.level);
} else {
Protocol.outboundBuffer.p1isaac(179);
Protocol.outboundBuffer.p2(local19 + Static142.originZ);
@ -674,13 +669,13 @@ public final class Static103 {
}
}
if (local23 == 6) {
local43 = Static159.players[local36];
local43 = PlayerList.players[local36];
if (local43 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static25.y = Static60.clickY;
Static25.y = Mouse.clickY;
Static17.milliseconds = 0;
Static70.type = 2;
Static122.x = Static7.clickX;
Static122.x = Mouse.clickX;
Protocol.outboundBuffer.p1isaac(106);
Protocol.outboundBuffer.p2(local36);
}
@ -694,9 +689,9 @@ public final class Static103 {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]);
}
}
Static25.y = Static60.clickY;
Static25.y = Mouse.clickY;
Static17.milliseconds = 0;
Static122.x = Static7.clickX;
Static122.x = Mouse.clickX;
Static70.type = 2;
Protocol.outboundBuffer.p1isaac(33);
Protocol.outboundBuffer.p2(local36);
@ -707,9 +702,9 @@ public final class Static103 {
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
Static122.x = Static7.clickX;
Static122.x = Mouse.clickX;
Static17.milliseconds = 0;
Static25.y = Static60.clickY;
Static25.y = Mouse.clickY;
Static70.type = 2;
Protocol.outboundBuffer.p1isaac(3);
Protocol.outboundBuffer.p2leadd(local36);

2
client/src/main/java/Static104.java
View file

@ -79,7 +79,7 @@ public final class Static104 {
local233 = ((Npc) arg0).type.aBoolean181;
}
if (local233) {
if (arg0.anInt3381 != arg0.anInt3400 && arg0.anInt3370 == -1 && arg0.anInt3376 != 0) {
if (arg0.anInt3381 != arg0.anInt3400 && arg0.faceEntity == -1 && arg0.anInt3376 != 0) {
local273 = 2;
}
if (arg0.movementQueueSize > 2) {

3
client/src/main/java/Static105.java
View file

@ -16,9 +16,6 @@ public final class Static105 {
@OriginalMember(owner = "client!ib", name = "e", descriptor = "Lclient!be;")
public static Component aClass13_14 = null;
@OriginalMember(owner = "client!ib", name = "f", descriptor = "[I")
public static final int[] anIntArray256 = new int[2048];
@OriginalMember(owner = "client!ib", name = "g", descriptor = "Lclient!na;")
public static final JagString aClass100_559 = JagString.parse("<col=ffff00>");

5
client/src/main/java/Static11.java
View file

@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static11 {
@OriginalMember(owner = "client!ba", name = "w", descriptor = "I")
public static int anInt384 = 0;
@OriginalMember(owner = "client!ba", name = "e", descriptor = "(I)V")
@OriginalMember(owner = "client!ba", name = "e", descriptor = "(I)V")
public static void method443() {
NpcTypeList.headModels.clear();
}

2
client/src/main/java/Static111.java
View file

@ -13,7 +13,7 @@ public final class Static111 {
public static int anInt2910;
@OriginalMember(owner = "client!ii", name = "c", descriptor = "I")
public static int anInt2901 = 0;
public static int updatedInventoriesWriterIndex = 0;
@OriginalMember(owner = "client!ii", name = "e", descriptor = "Lclient!na;")
public static final JagString aClass100_570 = JagString.parse(")2");

4
client/src/main/java/Static112.java
View file

@ -51,8 +51,8 @@ public final class Static112 {
} else {
SoftwareRaster.method2484(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910);
}
local114 = Static223.anInt5032;
local112 = Static215.anInt4873;
local114 = Mouse.anInt5032;
local112 = Mouse.anInt4873;
@Pc(203) int local203;
@Pc(219) int local219;
for (local203 = 0; local203 < Static231.anInt5204; local203++) {

3
client/src/main/java/Static115.java
View file

@ -16,9 +16,6 @@ public final class Static115 {
@OriginalMember(owner = "client!ja", name = "k", descriptor = "Lclient!na;")
public static final JagString aClass100_579 = JagString.parse("Fps:");
@OriginalMember(owner = "client!ja", name = "l", descriptor = "[Lclient!wa;")
public static final Buffer[] aClass3_Sub15Array1 = new Buffer[2048];
@OriginalMember(owner = "client!ja", name = "n", descriptor = "I")
public static int anInt2939 = 0;

5
client/src/main/java/Static116.java
View file

@ -7,10 +7,7 @@ public final class Static116 {
@OriginalMember(owner = "client!jb", name = "c", descriptor = "Lclient!na;")
public static final JagString aClass100_583 = JagString.parse("(Y<)4col>");
@OriginalMember(owner = "client!jb", name = "m", descriptor = "I")
public static int anInt2951 = 0;
@OriginalMember(owner = "client!jb", name = "n", descriptor = "I")
@OriginalMember(owner = "client!jb", name = "n", descriptor = "I")
public static int anInt2952 = 0;
@OriginalMember(owner = "client!jb", name = "p", descriptor = "I")

9
client/src/main/java/Static119.java
View file

@ -1,4 +1,3 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
@ -48,12 +47,4 @@ public final class Static119 {
}
}
@OriginalMember(owner = "client!je", name = "a", descriptor = "(IIIII)V")
public static void method2387(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
WorldMap.anInt435 = WorldMap.width * arg2 / arg0;
WorldMap.anInt919 = WorldMap.length * arg1 / arg3;
WorldMap.anInt3482 = -1;
WorldMap.anInt4901 = -1;
WorldMap.method965();
}
}

2
client/src/main/java/Static122.java
View file

@ -79,7 +79,7 @@ public final class Static122 {
local13.anInt2028 = (arg6.getSize() + arg0) * 128;
local13.sound = Static140.getSound(arg6);
local13.radius = arg6.soundRadius * 128;
Static93.aClass133_7.put(local13, arg6.aClass100_364.encode37());
Static93.aClass133_7.put(local13, arg6.username.encode37());
}
}

6
client/src/main/java/Static125.java
View file

@ -28,11 +28,11 @@ public final class Static125 {
public static void updateLockedCamera() {
@Pc(9) int local9 = Static248.anInt4232 * 128 + 64;
@Pc(15) int local15 = Static245.anInt5375 * 128 + 64;
@Pc(23) int local23 = SceneGraph.getTileHeight(Static55.level, local15, local9) - Static231.anInt5203;
@Pc(23) int local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static231.anInt5203;
if (Static113.anInt4612 >= 100) {
Static138.renderX = Static245.anInt5375 * 128 + 64;
Static134.renderZ = Static248.anInt4232 * 128 + 64;
Static5.anInt40 = SceneGraph.getTileHeight(Static55.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203;
Static5.anInt40 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203;
} else {
if (Static138.renderX < local15) {
Static138.renderX += Static233.anInt5225 + Static113.anInt4612 * (local15 - Static138.renderX) / 1000;
@ -73,7 +73,7 @@ public final class Static125 {
}
local9 = Static265.anInt5765 * 128 + 64;
local15 = Static251.anInt5449 * 128 + 64;
local23 = SceneGraph.getTileHeight(Static55.level, local15, local9) - Static57.anInt1744;
local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static57.anInt1744;
@Pc(236) int local236 = local23 - Static5.anInt40;
@Pc(241) int local241 = local9 - Static134.renderZ;
@Pc(246) int local246 = local15 - Static138.renderX;

2
client/src/main/java/Static126.java
View file

@ -23,7 +23,7 @@ public final class Static126 {
}
Static97.anInt2503 = -1;
Static169.aClass13_18 = null;
Static182.anInt4311 = Static83.loop;
Static182.anInt4311 = client.loop;
if (GlRenderer.enabled) {
Static263.aBoolean299 = true;
}

22
client/src/main/java/Static127.java
View file

@ -83,7 +83,7 @@ public final class Static127 {
}
}
for (local96 = 0; local96 < 2048; local96++) {
@Pc(265) Player local265 = Static159.players[local96];
@Pc(265) Player local265 = PlayerList.players[local96];
if (local265 != null) {
for (local109 = 0; local109 < 10; local109++) {
local265.movementQueueX[local109] -= local86;
@ -93,8 +93,8 @@ public final class Static127 {
local265.zFine -= local81 * 128;
}
}
Static55.level = arg0;
PlayerList.self.method1265(arg5, false, arg3);
Player.level = arg0;
PlayerList.self.teleport(arg5, false, arg3);
@Pc(322) byte local322 = 104;
@Pc(324) byte local324 = 0;
@Pc(326) byte local326 = 0;
@ -244,7 +244,7 @@ public final class Static127 {
}
local29 = Runtime.getRuntime();
local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static202.aClass100_892, Static123.parseInt(local38), Static17.aClass100_101 }));
Chat.add(null, 0, JagString.concatenate(new JagString[] { Static202.aClass100_892, Static123.parseInt(local38), Static17.aClass100_101 }));
}
@Pc(117) int local117;
if (arg0.equalsIgnoreCase(Static154.aClass100_735)) {
@ -254,17 +254,17 @@ public final class Static127 {
}
local29 = Runtime.getRuntime();
local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static203.aClass100_893, Static123.parseInt(local38), Static17.aClass100_101 }));
Chat.add(null, 0, JagString.concatenate(new JagString[] { Static203.aClass100_893, Static123.parseInt(local38), Static17.aClass100_101 }));
Static16.method501();
client.method2380();
for (local117 = 0; local117 < 10; local117++) {
System.gc();
}
local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Cheat.aClass100_1093, Static123.parseInt(local38), Static17.aClass100_101 }));
Chat.add(null, 0, JagString.concatenate(new JagString[] { Cheat.aClass100_1093, Static123.parseInt(local38), Static17.aClass100_101 }));
}
if (arg0.equalsIgnoreCase(Static240.aClass100_1009)) {
Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static44.aClass100_335, Static123.parseInt(Static198.method1029()) }));
Chat.add(null, 0, JagString.concatenate(new JagString[] { Static44.aClass100_335, Static123.parseInt(Static198.method1029()) }));
}
if (GlRenderer.enabled && arg0.equalsIgnoreCase(Static201.aClass100_406)) {
System.out.println("oncard_geometry:" + GlCleaner.anInt1945);
@ -330,8 +330,8 @@ public final class Static127 {
throw new RuntimeException();
}
if (arg0.startsWith(Cheat.aClass100_232)) {
Static199.rectDebug = arg0.substring(12).method3144().parseInt();
Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.rectDebug) }));
Static199.rectDebug = arg0.substring(12).trim().parseInt();
Chat.add(null, 0, JagString.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.rectDebug) }));
}
if (arg0.equalsIgnoreCase(Static181.aClass100_810)) {
Static121.aBoolean154 = true;
@ -339,10 +339,10 @@ public final class Static127 {
if (arg0.equalsIgnoreCase(Static124.aClass100_596)) {
if (Static204.applyTweening) {
Static204.applyTweening = false;
Static103.method2231(null, 0, Cheat.aClass100_943);
Chat.add(null, 0, Cheat.aClass100_943);
} else {
Static204.applyTweening = true;
Static103.method2231(null, 0, Static50.aClass100_362);
Chat.add(null, 0, Static50.aClass100_362);
}
}
if (arg0.equalsIgnoreCase(Static114.aClass100_1099)) {

4
client/src/main/java/Static137.java
View file

@ -47,7 +47,7 @@ public final class Static137 {
Static251.anInt5454 = 0;
for (local37 = 0; local37 < 104; local37++) {
for (local76 = 0; local76 < 104; local76++) {
@Pc(169) long local169 = Static20.method602(Static55.level, local37 + 0, local76);
@Pc(169) long local169 = Static20.method602(Player.level, local37 + 0, local76);
if (local169 != 0L) {
@Pc(184) LocType local184 = LocTypeList.get((int) (local169 >>> 32) & Integer.MAX_VALUE);
@Pc(187) int local187 = local184.mapElement;
@ -67,7 +67,7 @@ public final class Static137 {
@Pc(237) int local237 = local76;
local194 = local37;
if (local187 != 22 && local187 != 29 && local187 != 34 && local187 != 36 && local187 != 46 && local187 != 47 && local187 != 48) {
@Pc(269) int[][] local269 = PathFinder.collisionMaps[Static55.level].anIntArrayArray30;
@Pc(269) int[][] local269 = PathFinder.collisionMaps[Player.level].anIntArrayArray30;
for (@Pc(271) int local271 = 0; local271 < 10; local271++) {
@Pc(281) int local281 = (int) (Math.random() * 4.0D);
if (local281 == 0 && local194 > 0 && local37 - 3 < local194 && (local269[local194 - 1][local237] & 0x12C0108) == 0) {

5
client/src/main/java/Static138.java
View file

@ -49,10 +49,7 @@ public final class Static138 {
@OriginalMember(owner = "client!km", name = "Ac", descriptor = "[Lclient!na;")
public static final JagString[] aClass100Array102 = new JagString[] { aClass100_649, aClass100_650, aClass100_646, aClass100_655, aClass100_644, aClass100_656, aClass100_642, aClass100_653, aClass100_657, aClass100_658, aClass100_645, aClass100_641 };
@OriginalMember(owner = "client!km", name = "Bc", descriptor = "[I")
public static final int[] updatedVarcs = new int[32];
@OriginalMember(owner = "client!km", name = "Mc", descriptor = "Lclient!na;")
@OriginalMember(owner = "client!km", name = "Mc", descriptor = "Lclient!na;")
public static final JagString LOGINSCREEN = JagString.parse("loginscreen");
@OriginalMember(owner = "client!km", name = "Rc", descriptor = "[I")

16
client/src/main/java/Static140.java
View file

@ -27,30 +27,30 @@ public final class Static140 {
return;
}
if (Static35.anInt1093 >= 100) {
Static103.method2231(JagString.EMPTY, 0, LocalizedText.IGNORELISTFULL);
Chat.add(JagString.EMPTY, 0, LocalizedText.IGNORELISTFULL);
return;
}
@Pc(34) JagString local34 = Base37.decodeLowerCase(arg0).method3125();
@Pc(36) int local36;
for (local36 = 0; local36 < Static35.anInt1093; local36++) {
if (Static190.aLongArray6[local36] == arg0) {
Static103.method2231(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { local34, LocalizedText.IGNORELISTDUPE}));
if (IgnoreList.encodedUsernames[local36] == arg0) {
Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { local34, LocalizedText.IGNORELISTDUPE}));
return;
}
}
for (local36 = 0; local36 < Static9.anInt178; local36++) {
if (Static92.aLongArray3[local36] == arg0) {
Static103.method2231(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL2, local34, LocalizedText.REMOVEFRIEND}));
Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL2, local34, LocalizedText.REMOVEFRIEND}));
return;
}
}
if (local34.strEquals(PlayerList.self.aClass100_364)) {
Static103.method2231(JagString.EMPTY, 0, LocalizedText.IGNORECANTADDSELF);
if (local34.strEquals(PlayerList.self.username)) {
Chat.add(JagString.EMPTY, 0, LocalizedText.IGNORECANTADDSELF);
return;
}
Static190.aLongArray6[Static35.anInt1093] = arg0;
IgnoreList.encodedUsernames[Static35.anInt1093] = arg0;
Static193.aClass100Array134[Static35.anInt1093++] = Base37.decodeLowerCase(arg0);
Static185.anInt4369 = InterfaceList.transmitTimer;
FriendsList.transmitAt = InterfaceList.transmitTimer;
Protocol.outboundBuffer.p1isaac(34);
Protocol.outboundBuffer.p8(arg0);
}

4
client/src/main/java/Static141.java
View file

@ -38,7 +38,7 @@ public final class Static141 {
WorldMap.clear(false);
TitleScreen.clear();
for (@Pc(39) int local39 = 0; local39 < 2048; local39++) {
@Pc(46) Player player = Static159.players[local39];
@Pc(46) Player player = PlayerList.players[local39];
if (player != null) {
player.attachment = null;
}
@ -75,7 +75,7 @@ public final class Static141 {
if (arg0 && Static113.anInt4612 >= 100) {
Static138.renderX = Static245.anInt5375 * 128 + 64;
Static134.renderZ = Static248.anInt4232 * 128 + 64;
Static5.anInt40 = SceneGraph.getTileHeight(Static55.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203;
Static5.anInt40 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203;
}
Static227.cameraType = 2;
}

32
client/src/main/java/Static142.java
View file

@ -20,14 +20,14 @@ public final class Static142 {
@Pc(310) int local310;
@Pc(359) int local359;
@Pc(639) int local639;
for (local5 = -1; local5 < Static267.anInt5774 + Static272.anInt5214; local5++) {
for (local5 = -1; local5 < PlayerList.size + Static272.anInt5214; local5++) {
@Pc(17) PathingEntity local17;
if (local5 == -1) {
local17 = PlayerList.self;
} else if (Static267.anInt5774 > local5) {
local17 = Static159.players[Static105.anIntArray256[local5]];
} else if (PlayerList.size > local5) {
local17 = PlayerList.players[PlayerList.ids[local5]];
} else {
local17 = Static175.npcs[Static33.anIntArray79[local5 - Static267.anInt5774]];
local17 = Static175.npcs[Static33.anIntArray79[local5 - PlayerList.size]];
}
if (local17 != null && local17.method2682()) {
@Pc(58) NpcType local58;
@ -41,7 +41,7 @@ public final class Static142 {
}
}
@Pc(161) int local161;
if (local5 >= Static267.anInt5774) {
if (local5 >= PlayerList.size) {
local58 = ((Npc) local17).type;
if (local58.multiNpcs != null) {
local58 = local58.getMultiNpc();
@ -60,7 +60,7 @@ public final class Static142 {
@Pc(308) Class102[] local308 = Static143.aClass102Array1;
for (local310 = 0; local310 < local308.length; local310++) {
@Pc(322) Class102 local322 = local308[local310];
if (local322 != null && local322.anInt4058 == 1 && local322.anInt4057 == Static33.anIntArray79[local5 - Static267.anInt5774] && Static83.loop % 20 < 10) {
if (local322 != null && local322.anInt4058 == 1 && local322.anInt4057 == Static33.anIntArray79[local5 - PlayerList.size] && client.loop % 20 < 10) {
if (local58.anInt3730 == -1) {
local359 = local17.method2691() + 15;
} else {
@ -92,7 +92,7 @@ public final class Static142 {
@Pc(159) Class102[] local159 = Static143.aClass102Array1;
for (local161 = 0; local161 < local159.length; local161++) {
@Pc(173) Class102 local173 = local159[local161];
if (local173 != null && local173.anInt4058 == 10 && Static105.anIntArray256[local5] == local173.anInt4057) {
if (local173 != null && local173.anInt4058 == 10 && PlayerList.ids[local5] == local173.anInt4057) {
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));
@ -101,21 +101,21 @@ public final class Static142 {
}
}
}
if (local17.aClass100_640 != null && (local5 >= Static267.anInt5774 || Static59.anInt1812 == 0 || Static59.anInt1812 == 3 || Static59.anInt1812 == 1 && Static98.method1965(((Player) local17).aClass100_364))) {
if (local17.chatMessage != null && (local5 >= PlayerList.size || Static59.anInt1812 == 0 || Static59.anInt1812 == 3 || Static59.anInt1812 == 1 && Static98.method1965(((Player) local17).username))) {
Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691(), arg1 >> 1);
if (Static65.anInt1951 > -1 && Static277.anInt5854 < Static191.anInt4506) {
Static191.anIntArray389[Static277.anInt5854] = Fonts.b12Full.getStringWidth(local17.aClass100_640) / 2;
Static191.anIntArray389[Static277.anInt5854] = Fonts.b12Full.getStringWidth(local17.chatMessage) / 2;
Static191.anIntArray387[Static277.anInt5854] = Fonts.b12Full.lineHeight;
Static191.anIntArray385[Static277.anInt5854] = Static65.anInt1951;
Static191.anIntArray392[Static277.anInt5854] = Static16.anInt548;
Static191.anIntArray390[Static277.anInt5854] = local17.anInt3429;
Static191.anIntArray391[Static277.anInt5854] = local17.anInt3352;
Static191.anIntArray384[Static277.anInt5854] = local17.anInt3408;
Static191.aClass100Array132[Static277.anInt5854] = local17.aClass100_640;
Static191.anIntArray390[Static277.anInt5854] = local17.chatColor;
Static191.anIntArray391[Static277.anInt5854] = local17.chatEffect;
Static191.anIntArray384[Static277.anInt5854] = local17.chatLoops;
Static191.aClass100Array132[Static277.anInt5854] = local17.chatMessage;
Static277.anInt5854++;
}
}
if (local17.anInt3378 > Static83.loop) {
if (local17.hitpointsBarVisibleUntil > client.loop) {
@Pc(508) Sprite local508 = Sprites.hitbars[0];
@Pc(512) Sprite local512 = Sprites.hitbars[1];
if (local17 instanceof Npc) {
@ -145,7 +145,7 @@ public final class Static142 {
local161 = Static65.anInt1951 + arg2 - (local508.anInt1867 >> 1);
local359 = Static16.anInt548 + arg0 - 3;
local508.method1423(local161, local359);
local639 = local508.anInt1867 * local17.anInt3372 / 255;
local639 = local508.anInt1867 * local17.hitpointsBar / 255;
local642 = local508.anInt1859;
if (GlRenderer.enabled) {
Static46.method1183(local161, local359, local161 + local639, local359 + local642);
@ -161,7 +161,7 @@ public final class Static142 {
}
}
for (local74 = 0; local74 < 4; local74++) {
if (local17.anIntArray319[local74] > Static83.loop) {
if (local17.anIntArray319[local74] > client.loop) {
if (local17 instanceof Npc) {
@Pc(725) Npc local725 = (Npc) local17;
@Pc(728) NpcType local728 = local725.type;

4
client/src/main/java/Static145.java
View file

@ -72,8 +72,8 @@ public final class Static145 {
SoftwareRaster.drawRect(local11 + 1, local3 + 18, local9 - 2, local15 + -19, 0);
}
Fonts.b12Full.method2857(LocalizedText.CHOOSE_OPTION, local11 + 3, local3 + 14, 6116423, -1);
@Pc(96) int local96 = Static223.anInt5032;
@Pc(98) int local98 = Static215.anInt4873;
@Pc(96) int local96 = Mouse.anInt5032;
@Pc(98) int local98 = Mouse.anInt4873;
for (@Pc(107) int local107 = 0; local107 < Static231.anInt5204; local107++) {
@Pc(127) int local127 = (Static231.anInt5204 - local107 - 1) * 15 + local3 + 31;
@Pc(129) int local129 = 16777215;

5
client/src/main/java/Static153.java
View file

@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static153 {
@OriginalMember(owner = "client!mc", name = "Y", descriptor = "[Lclient!na;")
public static final JagString[] aClass100Array112 = new JagString[100];
@OriginalMember(owner = "client!mc", name = "ab", descriptor = "[I")
@OriginalMember(owner = "client!mc", name = "ab", descriptor = "[I")
public static final int[] anIntArray351 = new int[] { 7, 8, 9, 10, 11, 12, 13, 15 };
@OriginalMember(owner = "client!mc", name = "fb", descriptor = "Lclient!na;")

18
client/src/main/java/Static154.java
View file

@ -40,24 +40,6 @@ public final class Static154 {
return true;
}
@OriginalMember(owner = "client!md", name = "a", descriptor = "(IILclient!na;Lclient!na;BLclient!na;)V")
public static void method2928(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString arg2, @OriginalArg(3) JagString arg3, @OriginalArg(5) JagString arg4) {
for (@Pc(14) int local14 = 99; local14 > 0; local14--) {
Static26.anIntArray67[local14] = Static26.anIntArray67[local14 - 1];
Static153.aClass100Array112[local14] = Static153.aClass100Array112[local14 - 1];
Static230.aClass100Array158[local14] = Static230.aClass100Array158[local14 - 1];
Static64.aClass100Array62[local14] = Static64.aClass100Array62[local14 - 1];
Static241.anIntArray521[local14] = Static241.anIntArray521[local14 - 1];
}
Static62.anInt1941++;
Static26.anIntArray67[0] = arg1;
Static153.aClass100Array112[0] = arg4;
Static49.anInt1464 = InterfaceList.transmitTimer;
Static241.anIntArray521[0] = arg0;
Static230.aClass100Array158[0] = arg2;
Static64.aClass100Array62[0] = arg3;
}
@OriginalMember(owner = "client!md", name = "a", descriptor = "(JB)Lclient!na;")
public static JagString method2929(@OriginalArg(0) long arg0) {
return Static59.method1376(arg0);

2
client/src/main/java/Static158.java
View file

@ -46,7 +46,7 @@ public final class Static158 {
Static175.npcs[local97] = new Npc();
@Pc(198) Npc local198 = Static175.npcs[local97];
Static33.anIntArray79[Static272.anInt5214++] = local97;
local198.anInt3430 = Static83.loop;
local198.lastSeenLoop = client.loop;
local198.method2698(local148);
local198.method2692(local198.type.soze);
local198.anInt3400 = local198.anInt3381 = Static56.anIntArray141[local198.type.aByte11];

5
client/src/main/java/Static159.java
View file

@ -10,10 +10,7 @@ public final class Static159 {
@OriginalMember(owner = "client!mi", name = "R", descriptor = "Lclient!na;")
public static final JagString aClass100_760 = JagString.parse(")1");
@OriginalMember(owner = "client!mi", name = "S", descriptor = "[Lclient!e;")
public static final Player[] players = new Player[2048];
@OriginalMember(owner = "client!mi", name = "U", descriptor = "[J")
@OriginalMember(owner = "client!mi", name = "U", descriptor = "[J")
public static final long[] aLongArray5 = new long[500];
@OriginalMember(owner = "client!mi", name = "Y", descriptor = "[[[Lclient!ih;")

48
client/src/main/java/Static17.java
View file

@ -10,54 +10,6 @@ public final class Static17 {
@OriginalMember(owner = "client!bg", name = "M", descriptor = "I")
public static int milliseconds = 0;
@OriginalMember(owner = "client!bg", name = "a", descriptor = "(B)V")
public static void method527() {
Protocol.inboundBuffer.method2233();
@Pc(11) int local11 = Protocol.inboundBuffer.method2238(1);
if (local11 == 0) {
return;
}
@Pc(23) int local23 = Protocol.inboundBuffer.method2238(2);
if (local23 == 0) {
Static44.anIntArray106[Static116.anInt2951++] = 2047;
return;
}
@Pc(54) int local54;
@Pc(64) int local64;
if (local23 == 1) {
local54 = Protocol.inboundBuffer.method2238(3);
PlayerList.self.method2684(1, local54);
local64 = Protocol.inboundBuffer.method2238(1);
if (local64 == 1) {
Static44.anIntArray106[Static116.anInt2951++] = 2047;
}
} else if (local23 == 2) {
if (Protocol.inboundBuffer.method2238(1) == 1) {
local54 = Protocol.inboundBuffer.method2238(3);
PlayerList.self.method2684(2, local54);
local64 = Protocol.inboundBuffer.method2238(3);
PlayerList.self.method2684(2, local64);
} else {
local54 = Protocol.inboundBuffer.method2238(3);
PlayerList.self.method2684(0, local54);
}
local54 = Protocol.inboundBuffer.method2238(1);
if (local54 == 1) {
Static44.anIntArray106[Static116.anInt2951++] = 2047;
}
} else if (local23 == 3) {
local54 = Protocol.inboundBuffer.method2238(7);
local64 = Protocol.inboundBuffer.method2238(1);
Static55.level = Protocol.inboundBuffer.method2238(2);
@Pc(163) int local163 = Protocol.inboundBuffer.method2238(1);
if (local163 == 1) {
Static44.anIntArray106[Static116.anInt2951++] = 2047;
}
@Pc(181) int local181 = Protocol.inboundBuffer.method2238(7);
PlayerList.self.method1265(local181, local64 == 1, local54);
}
}
@OriginalMember(owner = "client!bg", name = "d", descriptor = "(II)Z")
public static boolean method530(@OriginalArg(0) int arg0) {
return arg0 == 198 || arg0 == 230 || arg0 == 156 || arg0 == 140 || arg0 == 223;

4
client/src/main/java/Static173.java
View file

@ -116,8 +116,8 @@ public final class Static173 {
if (!local16.type.aBoolean183) {
local262 |= Long.MIN_VALUE;
}
local16.anInt3424 = SceneGraph.getTileHeight(Static55.level, local16.xFine, local16.zFine);
Static43.method1141(Static55.level, local16.xFine, local16.zFine, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171);
local16.anInt3424 = SceneGraph.getTileHeight(Player.level, local16.xFine, local16.zFine);
Static43.method1141(Player.level, local16.xFine, local16.zFine, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171);
}
}
}

18
client/src/main/java/Static176.java
View file

@ -88,7 +88,7 @@ public final class Static176 {
if (local121 != local112) {
local112 = local121;
@Pc(240) int local240;
if (local133 == 2 && Static257.method523(Static55.level, local47, local147, local121)) {
if (local133 == 2 && Static257.method523(Player.level, local47, local147, local121)) {
@Pc(172) LocType local172 = LocTypeList.get(local140);
if (local172.multiLocs != null) {
local172 = local172.getMultiLoc();
@ -160,19 +160,19 @@ public final class Static176 {
Static246.method4240(local502.type, local47, Static33.anIntArray79[local493], local147);
}
}
for (local493 = 0; local493 < Static267.anInt5774; local493++) {
local597 = Static159.players[Static105.anIntArray256[local493]];
for (local493 = 0; local493 < PlayerList.size; local493++) {
local597 = PlayerList.players[PlayerList.ids[local493]];
local514 = local597.xFine + 64 - local597.getSize() * 64;
local526 = local597.zFine + 64 - local597.getSize() * 64;
if (local597 != null && local514 >= local479 && local597.getSize() <= local421.type.soze - (local514 - local479 >> 7) && local526 >= local240 && local597.getSize() <= local421.type.soze - (local526 - local240 >> 7)) {
Static217.method3767(Static105.anIntArray256[local493], local147, local597, local47);
Static217.method3767(PlayerList.ids[local493], local147, local597, local47);
}
}
}
Static246.method4240(local421.type, local47, local140, local147);
}
if (local133 == 0) {
@Pc(688) Player local688 = Static159.players[local140];
@Pc(688) Player local688 = PlayerList.players[local140];
if ((local688.xFine & 0x7F) == 64 && (local688.zFine & 0x7F) == 64) {
local479 = local688.xFine - (local688.getSize() - 1) * 64;
local240 = local688.zFine + 64 - local688.getSize() * 64;
@ -184,19 +184,19 @@ public final class Static176 {
Static246.method4240(local502.type, local47, Static33.anIntArray79[local493], local147);
}
}
for (local493 = 0; local493 < Static267.anInt5774; local493++) {
local597 = Static159.players[Static105.anIntArray256[local493]];
for (local493 = 0; local493 < PlayerList.size; local493++) {
local597 = PlayerList.players[PlayerList.ids[local493]];
local514 = local597.xFine - (local597.getSize() - 1) * 64;
local526 = local597.zFine + 64 - local597.getSize() * 64;
if (local597 != null && local597 != local688 && local479 <= local514 && local597.getSize() <= local688.getSize() - (local514 - local479 >> 7) && local526 >= local240 && local597.getSize() <= local688.getSize() - (local526 - local240 >> 7)) {
Static217.method3767(Static105.anIntArray256[local493], local147, local597, local47);
Static217.method3767(PlayerList.ids[local493], local147, local597, local47);
}
}
}
Static217.method3767(local140, local147, local688, local47);
}
if (local133 == 3) {
@Pc(931) LinkedList local931 = Static159.aClass69ArrayArrayArray1[Static55.level][local47][local147];
@Pc(931) LinkedList local931 = Static159.aClass69ArrayArrayArray1[Player.level][local47][local147];
if (local931 != null) {
for (@Pc(940) ObjStackNode local940 = (ObjStackNode) local931.method2279(); local940 != null; local940 = (ObjStackNode) local931.method2286()) {
local240 = local940.aClass8_Sub7_1.anInt5555;

2
client/src/main/java/Static18.java
View file

@ -18,7 +18,7 @@ public final class Static18 {
@OriginalMember(owner = "client!bh", name = "a", descriptor = "(Lclient!fe;Z)V")
public static void method553(@OriginalArg(0) PathingEntity arg0) {
@Pc(8) int local8 = arg0.anInt3395 - Static83.loop;
@Pc(8) int local8 = arg0.anInt3395 - client.loop;
@Pc(20) int local20 = arg0.anInt3380 * 128 + arg0.getSize() * 64;
@Pc(36) int local36 = arg0.anInt3428 * 128 + arg0.getSize() * 64;
if (arg0.anInt3431 == 0) {

3
client/src/main/java/Static185.java
View file

@ -10,9 +10,6 @@ public final class Static185 {
@OriginalMember(owner = "client!p", name = "g", descriptor = "F")
public static float aFloat23;
@OriginalMember(owner = "client!p", name = "d", descriptor = "I")
public static int anInt4369 = 0;
@OriginalMember(owner = "client!p", name = "a", descriptor = "(I)V")
public static void method3395() {
if (LoginManager.step == 5) {

22
client/src/main/java/Static19.java
View file

@ -34,28 +34,28 @@ public final class Static19 {
@OriginalMember(owner = "client!bi", name = "f", descriptor = "(B)V")
public static void loop() {
@Pc(11) int local11;
for (local11 = -1; local11 < Static267.anInt5774; local11++) {
for (local11 = -1; local11 < PlayerList.size; local11++) {
@Pc(22) int local22;
if (local11 == -1) {
local22 = 2047;
} else {
local22 = Static105.anIntArray256[local11];
local22 = PlayerList.ids[local11];
}
@Pc(30) Player local30 = Static159.players[local22];
if (local30 != null && local30.anInt3408 > 0) {
local30.anInt3408--;
if (local30.anInt3408 == 0) {
local30.aClass100_640 = null;
@Pc(30) Player local30 = PlayerList.players[local22];
if (local30 != null && local30.chatLoops > 0) {
local30.chatLoops--;
if (local30.chatLoops == 0) {
local30.chatMessage = null;
}
}
}
for (local11 = 0; local11 < Static272.anInt5214; local11++) {
@Pc(68) int local68 = Static33.anIntArray79[local11];
@Pc(72) Npc local72 = Static175.npcs[local68];
if (local72 != null && local72.anInt3408 > 0) {
local72.anInt3408--;
if (local72.anInt3408 == 0) {
local72.aClass100_640 = null;
if (local72 != null && local72.chatLoops > 0) {
local72.chatLoops--;
if (local72.chatLoops == 0) {
local72.chatMessage = null;
}
}
}

3
client/src/main/java/Static190.java
View file

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static190 {
@OriginalMember(owner = "client!pf", name = "h", descriptor = "[J")
public static final long[] aLongArray6 = new long[100];
@OriginalMember(owner = "client!pf", name = "r", descriptor = "[I")
public static final int[] anIntArray382 = new int[500];

20
client/src/main/java/Static192.java
View file

@ -20,7 +20,7 @@ public final class Static192 {
if (local29 == PlayerList.selfId) {
local40 = PlayerList.self;
} else {
local40 = Static159.players[local29];
local40 = PlayerList.players[local29];
}
} else {
local29 = local17.anInt1192 - 1;
@ -28,7 +28,7 @@ public final class Static192 {
}
if (local40 != null) {
@Pc(63) LocType local63 = LocTypeList.get(local17.anInt1189);
if (Static55.level < 3) {
if (Player.level < 3) {
}
@Pc(86) int local86;
@Pc(83) int local83;
@ -43,40 +43,40 @@ public final class Static192 {
@Pc(110) int local110 = (local86 >> 1) + local17.anInt1190;
@Pc(117) int local117 = (local83 >> 1) + local17.anInt1204;
@Pc(126) int local126 = (local83 + 1 >> 1) + local17.anInt1204;
@Pc(130) int[][] local130 = Static83.activeTileHeightMap[Static55.level];
@Pc(130) int[][] local130 = Static83.activeTileHeightMap[Player.level];
@Pc(157) int local157 = local130[local103][local126] + local130[local110][local126] + local130[local110][local117] + local130[local103][local117] >> 2;
@Pc(159) Entity local159 = null;
@Pc(164) int local164 = Static133.anIntArray453[local17.anInt1198];
if (local164 == 0) {
@Pc(176) Wall local176 = Static262.method4509(Static55.level, local17.anInt1190, local17.anInt1204);
@Pc(176) Wall local176 = Static262.method4509(Player.level, local17.anInt1190, local17.anInt1204);
if (local176 != null) {
local159 = local176.aClass8_5;
}
} else if (local164 == 1) {
@Pc(231) WallDecor local231 = Static83.method435(Static55.level, local17.anInt1190, local17.anInt1204);
@Pc(231) WallDecor local231 = Static83.method435(Player.level, local17.anInt1190, local17.anInt1204);
if (local231 != null) {
local159 = local231.aClass8_3;
}
} else if (local164 == 2) {
@Pc(198) Scenery local198 = Static133.method4008(Static55.level, local17.anInt1190, local17.anInt1204);
@Pc(198) Scenery local198 = Static133.method4008(Player.level, local17.anInt1190, local17.anInt1204);
if (local198 != null) {
local159 = local198.aClass8_4;
}
} else if (local164 == 3) {
@Pc(216) GroundDecor local216 = Static269.method2210(Static55.level, local17.anInt1190, local17.anInt1204);
@Pc(216) GroundDecor local216 = Static269.method2210(Player.level, local17.anInt1190, local17.anInt1204);
if (local216 != null) {
local159 = local216.aClass8_1;
}
}
if (local159 != null) {
Static29.method800(Static55.level, local17.anInt1204, 0, local17.anInt1190, local17.anInt1205 + 1, -1, local164, 0, local17.anInt1187 + 1);
local40.anInt3375 = local17.anInt1205 + Static83.loop;
Static29.method800(Player.level, local17.anInt1204, 0, local17.anInt1190, local17.anInt1205 + 1, -1, local164, 0, local17.anInt1187 + 1);
local40.anInt3375 = local17.anInt1205 + client.loop;
local40.anInt3426 = local83 * 64 + local17.anInt1204 * 128;
local40.anInt3379 = local86 * 64 + local17.anInt1190 * 128;
local40.attachment = local159;
@Pc(292) int local292 = local17.anInt1188;
local40.anInt3406 = local157;
local40.anInt3390 = Static83.loop + local17.anInt1187;
local40.anInt3390 = client.loop + local17.anInt1187;
@Pc(304) int local304 = local17.anInt1191;
@Pc(307) int local307 = local17.anInt1197;
@Pc(310) int local310 = local17.anInt1200;

2
client/src/main/java/Static193.java
View file

@ -36,7 +36,7 @@ public final class Static193 {
Static106.anIntArray258[local41] = Static106.anIntArray258[local41 + 1];
Static3.aBooleanArray135[local41] = Static3.aBooleanArray135[local41 + 1];
}
Static185.anInt4369 = InterfaceList.transmitTimer;
FriendsList.transmitAt = InterfaceList.transmitTimer;
Protocol.outboundBuffer.p1isaac(57);
Protocol.outboundBuffer.p8(arg0);
break;

12
client/src/main/java/Static195.java
View file

@ -21,13 +21,13 @@ public final class Static195 {
public static void method3532() {
for (@Pc(16) ProjAnimNode local16 = (ProjAnimNode) Static217.aClass69_116.method2289(); local16 != null; local16 = (ProjAnimNode) Static217.aClass69_116.method2288()) {
@Pc(21) ProjAnim local21 = local16.aClass8_Sub6_1;
if (Static55.level != local21.anInt4810 || local21.anInt4800 < Static83.loop) {
if (Player.level != local21.anInt4810 || local21.anInt4800 < client.loop) {
local16.unlink();
} else if (Static83.loop >= local21.anInt4822) {
} else if (client.loop >= local21.anInt4822) {
if (local21.anInt4819 > 0) {
@Pc(54) Npc local54 = Static175.npcs[local21.anInt4819 - 1];
if (local54 != null && local54.xFine >= 0 && local54.xFine < 13312 && local54.zFine >= 0 && local54.zFine < 13312) {
local21.method3705(local54.zFine, Static83.loop, SceneGraph.getTileHeight(local21.anInt4810, local54.xFine, local54.zFine) - local21.anInt4805, local54.xFine);
local21.method3705(local54.zFine, client.loop, SceneGraph.getTileHeight(local21.anInt4810, local54.xFine, local54.zFine) - local21.anInt4805, local54.xFine);
}
}
if (local21.anInt4819 < 0) {
@ -36,14 +36,14 @@ public final class Static195 {
if (PlayerList.selfId == local102) {
local107 = PlayerList.self;
} else {
local107 = Static159.players[local102];
local107 = PlayerList.players[local102];
}
if (local107 != null && local107.xFine >= 0 && local107.xFine < 13312 && local107.zFine >= 0 && local107.zFine < 13312) {
local21.method3705(local107.zFine, Static83.loop, SceneGraph.getTileHeight(local21.anInt4810, local107.xFine, local107.zFine) - local21.anInt4805, local107.xFine);
local21.method3705(local107.zFine, client.loop, SceneGraph.getTileHeight(local21.anInt4810, local107.xFine, local107.zFine) - local21.anInt4805, local107.xFine);
}
}
local21.method3704(Static178.anInt4247);
Static43.method1141(Static55.level, (int) local21.aDouble8, (int) local21.aDouble3, (int) local21.aDouble6, 60, local21, local21.anInt4821, -1L, false);
Static43.method1141(Player.level, (int) local21.aDouble8, (int) local21.aDouble3, (int) local21.aDouble6, 60, local21, local21.anInt4821, -1L, false);
}
}
}

2
client/src/main/java/Static198.java
View file

@ -52,7 +52,7 @@ public final class Static198 {
Static65.anInt1951 = -1;
return;
}
@Pc(38) int local38 = SceneGraph.getTileHeight(Static55.level, arg5, arg2) - arg3;
@Pc(38) int local38 = SceneGraph.getTileHeight(Player.level, arg5, arg2) - arg3;
@Pc(42) int local42 = arg2 - Static134.renderZ;
@Pc(46) int local46 = local38 - Static5.anInt40;
@Pc(50) int local50 = arg5 - Static138.renderX;

16
client/src/main/java/Static2.java
View file

@ -83,7 +83,7 @@ public final class Static2 {
@Pc(61) int local61 = 0;
@Pc(64) int local64 = local53 + 1;
Static84.anIntArray209[0] = arg3;
@Pc(71) int[][] local71 = PathFinder.collisionMaps[Static55.level].anIntArrayArray30;
@Pc(71) int[][] local71 = PathFinder.collisionMaps[Player.level].anIntArrayArray30;
@Pc(193) int local193;
while (local61 != local64) {
local3 = Static259.anIntArray514[local61];
@ -94,16 +94,16 @@ public final class Static2 {
break;
}
if (arg1 != 0) {
if ((arg1 < 5 || arg1 == 10) && PathFinder.collisionMaps[Static55.level].method3042(arg4, local3, local8, arg8, arg1 - 1, 2, arg7)) {
if ((arg1 < 5 || arg1 == 10) && PathFinder.collisionMaps[Player.level].method3042(arg4, local3, local8, arg8, arg1 - 1, 2, arg7)) {
local59 = true;
break;
}
if (arg1 < 10 && PathFinder.collisionMaps[Static55.level].method3046(arg4, arg1 - 1, arg8, local8, 2, arg7, local3)) {
if (arg1 < 10 && PathFinder.collisionMaps[Player.level].method3046(arg4, arg1 - 1, arg8, local8, 2, arg7, local3)) {
local59 = true;
break;
}
}
if (arg0 != 0 && arg6 != 0 && PathFinder.collisionMaps[Static55.level].method3052(arg8, local8, local3, 2, arg0, arg2, arg4, arg6)) {
if (arg0 != 0 && arg6 != 0 && PathFinder.collisionMaps[Player.level].method3052(arg8, local8, local3, 2, arg0, arg2, arg4, arg6)) {
local59 = true;
break;
}
@ -271,17 +271,17 @@ public final class Static2 {
}
} else if (local16 == 327) {
arg0.modelXAngle = 150;
arg0.modelYAngle = (int) (Math.sin((double) Static83.loop / 40.0D) * 256.0D) & 0x7FF;
arg0.modelYAngle = (int) (Math.sin((double) client.loop / 40.0D) * 256.0D) & 0x7FF;
arg0.modelType = 5;
arg0.modelId = -1;
} else if (local16 == 328) {
if (PlayerList.self.aClass100_364 == null) {
if (PlayerList.self.username == null) {
arg0.modelId = 0;
} else {
arg0.modelXAngle = 150;
arg0.modelYAngle = (int) (Math.sin((double) Static83.loop / 40.0D) * 256.0D) & 0x7FF;
arg0.modelYAngle = (int) (Math.sin((double) client.loop / 40.0D) * 256.0D) & 0x7FF;
arg0.modelType = 5;
arg0.modelId = ((int) PlayerList.self.aClass100_364.encode37() << 11) + 2047;
arg0.modelId = ((int) PlayerList.self.username.encode37() << 11) + 2047;
arg0.anInt496 = PlayerList.self.anInt3388;
arg0.anInt500 = 0;
arg0.anInt522 = PlayerList.self.anInt3366;

2
client/src/main/java/Static205.java
View file

@ -7,7 +7,7 @@ public final class Static205 {
public static JagString method3677(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1) {
if (!Static36.method940(arg0).method503(arg1) && arg0.anObjectArray29 == null) {
return null;
} else if (arg0.aClass100Array18 == null || arg0.aClass100Array18.length <= arg1 || arg0.aClass100Array18[arg1] == null || arg0.aClass100Array18[arg1].method3144().length() == 0) {
} else if (arg0.aClass100Array18 == null || arg0.aClass100Array18.length <= arg1 || arg0.aClass100Array18[arg1] == null || arg0.aClass100Array18[arg1].trim().length() == 0) {
return Static121.aBoolean154 ? JagString.concatenate(new JagString[] { Static207.aClass100_903, Static123.parseInt(arg1) }) : null;
} else {
return arg0.aClass100Array18[arg1];

3
client/src/main/java/Static207.java
View file

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static207 {
@OriginalMember(owner = "client!ql", name = "d", descriptor = "I")
public static int anInt4778 = 0;
@OriginalMember(owner = "client!ql", name = "h", descriptor = "Lclient!na;")
public static final JagString aClass100_903 = JagString.parse("Hidden)2");

3
client/src/main/java/Static209.java
View file

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static209 {
@OriginalMember(owner = "client!ra", name = "J", descriptor = "I")
public static int miscTransmitAt = 0;
@OriginalMember(owner = "client!ra", name = "jb", descriptor = "J")
public static volatile long aLong161 = 0L;

4
client/src/main/java/Static214.java
View file

@ -18,9 +18,9 @@ public final class Static214 {
@OriginalMember(owner = "client!rg", name = "a", descriptor = "(Lclient!e;I)V")
public static void method4359(@OriginalArg(0) Player arg0) {
@Pc(12) AreaSound local12 = (AreaSound) Static93.aClass133_7.get(arg0.aClass100_364.encode37());
@Pc(12) AreaSound local12 = (AreaSound) Static93.aClass133_7.get(arg0.username.encode37());
if (local12 == null) {
Static122.method2411(arg0.movementQueueZ[0], null, 0, null, arg0.movementQueueX[0], Static55.level, arg0);
Static122.method2411(arg0.movementQueueZ[0], null, 0, null, arg0.movementQueueX[0], Player.level, arg0);
} else {
local12.update();
}

3
client/src/main/java/Static215.java
View file

@ -14,7 +14,4 @@ public final class Static215 {
@OriginalMember(owner = "client!rh", name = "k", descriptor = "I")
public static int anInt4870 = 0;
@OriginalMember(owner = "client!rh", name = "o", descriptor = "I")
public static int anInt4873 = 0;
}

6
client/src/main/java/Static217.java
View file

@ -38,12 +38,12 @@ public final class Static217 {
}
@Pc(95) JagString local95 = client.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
if (arg2.anInt1652 < arg2.anInt1656) {
local158 = JagString.concatenate(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, PlayerList.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.parseInt(arg2.anInt1652), Static78.aClass100_465, Static123.parseInt(arg2.anInt1656 - arg2.anInt1652), Static72.aClass100_448 });
local158 = JagString.concatenate(new JagString[] { arg2.getName(), local22 ? Static123.method2420(arg2.anInt1652, PlayerList.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.parseInt(arg2.anInt1652), Static78.aClass100_465, Static123.parseInt(arg2.anInt1656 - arg2.anInt1652), Static72.aClass100_448 });
} else {
local158 = JagString.concatenate(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, PlayerList.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.parseInt(arg2.anInt1652), Static72.aClass100_448 });
local158 = JagString.concatenate(new JagString[] { arg2.getName(), local22 ? Static123.method2420(arg2.anInt1652, PlayerList.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.parseInt(arg2.anInt1652), Static72.aClass100_448 });
}
} else {
local158 = JagString.concatenate(new JagString[] { arg2.method1264(), Static123.aClass100_593, LocalizedText.SKILL, Static123.parseInt(arg2.anInt1671), Static72.aClass100_448 });
local158 = JagString.concatenate(new JagString[] { arg2.getName(), Static123.aClass100_593, LocalizedText.SKILL, Static123.parseInt(arg2.anInt1671), Static72.aClass100_448 });
}
@Pc(275) int local275;
if (Static260.anInt5014 == 1) {

2
client/src/main/java/Static218.java
View file

@ -116,7 +116,7 @@ public final class Static218 {
public static int spaceWidth = 0;
@OriginalMember(owner = "client!rk", name = "c", descriptor = "(Lclient!na;)Lclient!na;")
public static JagString method2862(@OriginalArg(0) JagString arg0) {
public static JagString escape(@OriginalArg(0) JagString arg0) {
@Pc(3) int local3 = arg0.length();
@Pc(5) int local5 = 0;
@Pc(15) int local15;

8
client/src/main/java/Static220.java
View file

@ -12,9 +12,9 @@ public final class Static220 {
@OriginalMember(owner = "client!rm", name = "a", descriptor = "(IBI)V")
public static void spawnGroundObject(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
@Pc(9) LinkedList local9 = Static159.aClass69ArrayArrayArray1[Static55.level][arg1][arg0];
@Pc(9) LinkedList local9 = Static159.aClass69ArrayArrayArray1[Player.level][arg1][arg0];
if (local9 == null) {
Static187.method3420(Static55.level, arg1, arg0);
Static187.method3420(Player.level, arg1, arg0);
return;
}
@Pc(28) int local28 = -99999999;
@ -32,7 +32,7 @@ public final class Static220 {
}
}
if (local30 == null) {
Static187.method3420(Static55.level, arg1, arg0);
Static187.method3420(Player.level, arg1, arg0);
return;
}
local9.addHead(local30);
@ -50,7 +50,7 @@ public final class Static220 {
}
}
@Pc(152) long local152 = (long) ((arg0 << 7) + arg1 + 1610612736);
Static69.method1543(Static55.level, arg1, arg0, SceneGraph.getTileHeight(Static55.level, arg1 * 128 + 64, arg0 * 128 + 64), local30.aClass8_Sub7_1, local152, local89, local91);
Static69.method1543(Player.level, arg1, arg0, SceneGraph.getTileHeight(Player.level, arg1 * 128 + 64, arg0 * 128 + 64), local30.aClass8_Sub7_1, local152, local89, local91);
}
@OriginalMember(owner = "client!rm", name = "a", descriptor = "(III)V")

5
client/src/main/java/Static223.java
View file

@ -13,10 +13,7 @@ public final class Static223 {
@OriginalMember(owner = "client!sc", name = "p", descriptor = "I")
public static int anInt5029 = 0;
@OriginalMember(owner = "client!sc", name = "v", descriptor = "I")
public static int anInt5032 = 0;
@OriginalMember(owner = "client!sc", name = "z", descriptor = "[Z")
@OriginalMember(owner = "client!sc", name = "z", descriptor = "[Z")
public static final boolean[] aBooleanArray116 = new boolean[100];
@OriginalMember(owner = "client!sc", name = "D", descriptor = "Lclient!na;")

49
client/src/main/java/Static225.java
View file

@ -13,49 +13,6 @@ public final class Static225 {
@OriginalMember(owner = "client!se", name = "m", descriptor = "Lclient!na;")
public static final JagString aClass100_961 = JagString.parse(" )2>");
@OriginalMember(owner = "client!se", name = "a", descriptor = "(I)V")
public static void method3889() {
while (true) {
if (Protocol.inboundBuffer.method2241(Protocol.length) >= 11) {
@Pc(20) int local20 = Protocol.inboundBuffer.method2238(11);
if (local20 != 2047) {
@Pc(27) boolean local27 = false;
if (Static159.players[local20] == null) {
Static159.players[local20] = new Player();
local27 = true;
if (Static115.aClass3_Sub15Array1[local20] != null) {
Static159.players[local20].method1262(Static115.aClass3_Sub15Array1[local20]);
}
}
Static105.anIntArray256[Static267.anInt5774++] = local20;
@Pc(65) Player local65 = Static159.players[local20];
local65.anInt3430 = Static83.loop;
@Pc(73) int local73 = Protocol.inboundBuffer.method2238(1);
if (local73 == 1) {
Static44.anIntArray106[Static116.anInt2951++] = local20;
}
@Pc(92) int local92 = Protocol.inboundBuffer.method2238(5);
@Pc(99) int local99 = Static56.anIntArray141[Protocol.inboundBuffer.method2238(3)];
if (local92 > 15) {
local92 -= 32;
}
if (local27) {
local65.anInt3400 = local65.anInt3381 = local99;
}
@Pc(116) int local116 = Protocol.inboundBuffer.method2238(1);
@Pc(121) int local121 = Protocol.inboundBuffer.method2238(5);
if (local121 > 15) {
local121 -= 32;
}
local65.method1265(local92 + PlayerList.self.movementQueueX[0], local116 == 1, PlayerList.self.movementQueueZ[0] + local121);
continue;
}
}
Protocol.inboundBuffer.method2244();
return;
}
}
@OriginalMember(owner = "client!se", name = "a", descriptor = "(IIIIZ)I")
public static int method3891(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
@Pc(8) int local8 = arg3 & 0xF;
@ -75,8 +32,8 @@ public final class Static225 {
public static void method3896(@OriginalArg(0) JagString arg0, @OriginalArg(1) JagString arg1, @OriginalArg(2) int arg2) {
Player.password = arg1;
LoginManager.anInt39 = arg2;
Player.username = arg0;
if (Player.username.strEquals(JagString.EMPTY) || Player.password.strEquals(JagString.EMPTY)) {
Player.usernameInput = arg0;
if (Player.usernameInput.strEquals(JagString.EMPTY) || Player.password.strEquals(JagString.EMPTY)) {
LoginManager.reply = 3;
} else if (Static125.worldId == -1) {
LoginManager.anInt673 = 0;
@ -87,7 +44,7 @@ public final class Static225 {
local43.p1(10);
local43.p2((int) (Math.random() * 99999.0D));
local43.p2(530);
local43.p8(Player.username.encode37());
local43.p8(Player.usernameInput.encode37());
local43.p4((int) (Math.random() * 9.9999999E7D));
local43.pjstr(Player.password);
local43.p4((int) (Math.random() * 9.9999999E7D));

6
client/src/main/java/Static226.java
View file

@ -85,7 +85,7 @@ public final class Static226 {
Static60.aBoolean108 = true;
Static24.anInt761 = local16;
}
} else if (Static155.anInt3751 == Static7.clickX && Static60.anInt1892 == Static60.clickY) {
} else if (Static155.anInt3751 == Mouse.clickX && Static60.anInt1892 == Mouse.clickY) {
Static183.anInt4271 = local27;
anInt3953 = 0;
Static24.anInt761 = local16;
@ -93,8 +93,8 @@ public final class Static226 {
Static13.anInt436 = (Static261.aBoolean298 ? 26 : 22) + Static231.anInt5204 * 15;
Static60.aBoolean108 = true;
} else {
Static280.anInt5895 = Static60.clickY;
Static277.anInt5850 = Static7.clickX;
Static280.anInt5895 = Mouse.clickY;
Static277.anInt5850 = Mouse.clickX;
anInt3953 = 1;
}
}

3
client/src/main/java/Static229.java
View file

@ -7,9 +7,6 @@ public final class Static229 {
@OriginalMember(owner = "client!si", name = "ab", descriptor = "I")
public static int anInt5138;
@OriginalMember(owner = "client!si", name = "X", descriptor = "[Lclient!sg;")
public static final StockMarketOffer[] aClass136Array1 = new StockMarketOffer[6];
@OriginalMember(owner = "client!si", name = "Z", descriptor = "Lclient!na;")
public static final JagString aClass100_972 = JagString.parse("<col=ffb000>");

7
client/src/main/java/Static230.java
View file

@ -11,11 +11,8 @@ public final class Static230 {
@OriginalMember(owner = "client!sj", name = "p", descriptor = "I")
public static int anInt5150 = 1;
@OriginalMember(owner = "client!sj", name = "q", descriptor = "[Lclient!na;")
public static final JagString[] aClass100Array158 = new JagString[100];
@OriginalMember(owner = "client!sj", name = "t", descriptor = "I")
public static int anInt5152 = 0;
@OriginalMember(owner = "client!sj", name = "t", descriptor = "I")
public static int opcode2 = 0;
@OriginalMember(owner = "client!sj", name = "u", descriptor = "Z")
public static boolean dynamicMapRegion = false;

11
client/src/main/java/Static233.java
View file

@ -40,10 +40,7 @@ public final class Static233 {
@OriginalMember(owner = "client!t", name = "C", descriptor = "Lclient!na;")
public static final JagString aClass100_994 = JagString.parse(")3");
@OriginalMember(owner = "client!t", name = "E", descriptor = "[I")
public static final int[] updatedVarcstrs = new int[32];
@OriginalMember(owner = "client!t", name = "a", descriptor = "(IIIZIII)V")
@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;
@ -51,7 +48,7 @@ public final class Static233 {
@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);
if (Static65.anInt1951 > -1 && Static83.loop % 20 < 10) {
if (Static65.anInt1951 > -1 && client.loop % 20 < 10) {
Sprites.headhints[local17.anInt4048].method1423(arg1 + Static65.anInt1951 - 12, arg5 + -28 - -Static16.anInt548);
}
}
@ -119,10 +116,10 @@ public final class Static233 {
} else {
Static102.method2075(PlayerList.self.movementQueueZ[0], local24, 0, true, 0, arg2, 0, local12 + 1, 2, arg1, PlayerList.self.movementQueueX[0]);
}
Static25.y = Static60.clickY;
Static25.y = Mouse.clickY;
Static17.milliseconds = 0;
Static70.type = 2;
Static122.x = Static7.clickX;
Static122.x = Mouse.clickX;
return true;
}

45
client/src/main/java/Static234.java
View file

@ -7,16 +7,13 @@ public final class Static234 {
@OriginalMember(owner = "client!ta", name = "o", descriptor = "[I")
public static int[] anIntArray454;
@OriginalMember(owner = "client!ta", name = "z", descriptor = "[I")
public static final int[] anIntArray456 = new int[] { -1, 0, 8, 0, 2, 0, 0, 0, 0, 12, 0, 1, 0, 3, 7, 0, 15, 6, 0, 0, 4, 7, -2, -1, 2, 0, 2, 8, 0, 0, 0, 0, -2, 5, 0, 0, 8, 3, 6, 0, 0, 0, -1, 0, -1, 0, 0, 6, -2, 0, 12, 0, 0, 0, -1, -2, 10, 0, 0, 0, 3, 0, -1, 0, 0, 5, 6, 0, 0, 8, -1, -1, 0, 8, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 6, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 5, 0, 0, -2, 0, 0, 0, 0, 0, 12, 2, 0, -2, -2, 20, 0, 0, 10, 0, 15, 0, -1, 0, 8, -2, 0, 0, 0, 8, 0, 12, 0, 0, 7, 0, 0, 0, 0, 0, -1, -1, 0, 4, 5, 0, 0, 0, 6, 0, 0, 0, 0, 8, 9, 0, 0, 0, 2, -1, 0, -2, 0, 4, 14, 0, 0, 0, 24, 0, -2, 5, 0, 0, 0, 10, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 2, 1, 0, 0, 2, -1, 1, 0, 0, 0, 0, 14, 0, 0, 0, 0, 10, 5, 0, 0, 0, 0, 0, -2, 0, 0, 9, 0, 0, 8, 0, 0, 0, 0, -2, 6, 0, 0, 0, -2, 0, 3, 0, 1, 7, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 3, 0, 0 };
@OriginalMember(owner = "client!ta", name = "B", descriptor = "I")
public static int anInt5245 = 0;
@OriginalMember(owner = "client!ta", name = "a", descriptor = "(I)V")
public static void method4014() {
for (@Pc(3) int local3 = 0; local3 < Static116.anInt2951; local3++) {
@Pc(10) int local10 = Static44.anIntArray106[local3];
for (@Pc(3) int local3 = 0; local3 < Protocol.extendedCount; local3++) {
@Pc(10) int local10 = Protocol.extendedIds[local3];
@Pc(14) Npc local14 = Static175.npcs[local10];
@Pc(18) int local18 = Protocol.inboundBuffer.g1();
if ((local18 & 0x8) != 0) {
@ -27,14 +24,14 @@ public final class Static234 {
if ((local18 & 0x40) != 0) {
local43 = Protocol.inboundBuffer.g1();
local47 = Protocol.inboundBuffer.p1neg();
local14.method2686(local47, Static83.loop, local43);
local14.anInt3378 = Static83.loop + 300;
local14.anInt3372 = Protocol.inboundBuffer.g1ssub();
local14.addHit(local47, client.loop, local43);
local14.hitpointsBarVisibleUntil = client.loop + 300;
local14.hitpointsBar = Protocol.inboundBuffer.g1ssub();
}
if ((local18 & 0x2) != 0) {
local43 = Protocol.inboundBuffer.p1neg();
local47 = Protocol.inboundBuffer.g1ssub();
local14.method2686(local47, Static83.loop, local43);
local14.addHit(local47, client.loop, local43);
}
if ((local18 & 0x10) != 0) {
local43 = Protocol.inboundBuffer.g2();
@ -45,9 +42,9 @@ public final class Static234 {
Static223.method3855(local47, local43, local14);
}
if ((local18 & 0x4) != 0) {
local14.anInt3370 = Protocol.inboundBuffer.g2sub();
if (local14.anInt3370 == 65535) {
local14.anInt3370 = -1;
local14.faceEntity = Protocol.inboundBuffer.g2sub();
if (local14.faceEntity == 65535) {
local14.faceEntity = -1;
}
}
if ((local18 & 0x80) != 0) {
@ -57,21 +54,21 @@ public final class Static234 {
}
local47 = Protocol.inboundBuffer.g4me();
@Pc(147) boolean local147 = true;
if (local43 != -1 && local14.anInt3432 != -1 && SeqTypeList.get(SpotAnimTypeList.get(local43).seqId).anInt5355 < SeqTypeList.get(SpotAnimTypeList.get(local14.anInt3432).seqId).anInt5355) {
if (local43 != -1 && local14.spotAnimId != -1 && SeqTypeList.get(SpotAnimTypeList.get(local43).seqId).anInt5355 < SeqTypeList.get(SpotAnimTypeList.get(local14.spotAnimId).seqId).anInt5355) {
local147 = false;
}
if (local147) {
local14.anInt3432 = local43;
local14.anInt3359 = (local47 & 0xFFFF) + Static83.loop;
local14.spotAnimId = local43;
local14.spotAnimStart = (local47 & 0xFFFF) + client.loop;
local14.anInt3361 = 0;
local14.anInt3399 = 0;
local14.anInt3394 = local47 >> 16;
local14.spotAnimY = local47 >> 16;
local14.anInt3418 = 1;
if (local14.anInt3359 > Static83.loop) {
if (local14.spotAnimStart > client.loop) {
local14.anInt3399 = -1;
}
if (local14.anInt3432 != -1 && local14.anInt3359 == Static83.loop) {
@Pc(227) int local227 = SpotAnimTypeList.get(local14.anInt3432).seqId;
if (local14.spotAnimId != -1 && local14.spotAnimStart == client.loop) {
@Pc(227) int local227 = SpotAnimTypeList.get(local14.spotAnimId).seqId;
if (local227 != -1) {
@Pc(236) SeqType local236 = SeqTypeList.get(local227);
if (local236 != null && local236.frames != null) {
@ -89,12 +86,12 @@ public final class Static234 {
local14.method2692(local14.type.soze);
local14.anInt3365 = local14.type.basId;
if (local14.type.hasAreaSound()) {
Static122.method2411(local14.movementQueueZ[0], null, 0, local14, local14.movementQueueX[0], Static55.level, null);
Static122.method2411(local14.movementQueueZ[0], null, 0, local14, local14.movementQueueX[0], Player.level, null);
}
}
if ((local18 & 0x20) != 0) {
local14.aClass100_640 = Protocol.inboundBuffer.gjstr();
local14.anInt3408 = 100;
local14.chatMessage = Protocol.inboundBuffer.gjstr();
local14.chatLoops = 100;
}
if ((local18 & 0x100) != 0) {
local43 = Protocol.inboundBuffer.p1neg();
@ -113,8 +110,8 @@ public final class Static234 {
Static159.method3037(local337, local14, local334, local331);
}
if ((local18 & 0x200) != 0) {
local14.anInt3382 = Protocol.inboundBuffer.g2sub();
local14.anInt3363 = Protocol.inboundBuffer.g2();
local14.faceX = Protocol.inboundBuffer.g2sub();
local14.faceY = Protocol.inboundBuffer.g2();
}
}
}

5
client/src/main/java/Static240.java
View file

@ -18,9 +18,6 @@ public final class Static240 {
@OriginalMember(owner = "client!tg", name = "e", descriptor = "Lclient!na;")
public static final JagString aClass100_1008 = JagString.parse("<col=00ffff>");
@OriginalMember(owner = "client!tg", name = "h", descriptor = "I")
public static int anInt5335 = 0;
@OriginalMember(owner = "client!tg", name = "i", descriptor = "Lclient!na;")
@OriginalMember(owner = "client!tg", name = "i", descriptor = "Lclient!na;")
public static final JagString aClass100_1009 = JagString.parse("::pcachesize");
}

5
client/src/main/java/Static241.java
View file

@ -13,10 +13,7 @@ public final class Static241 {
@OriginalMember(owner = "client!th", name = "i", descriptor = "[I")
public static final int[] anIntArray520 = new int[14];
@OriginalMember(owner = "client!th", name = "l", descriptor = "[I")
public static final int[] anIntArray521 = new int[100];
@OriginalMember(owner = "client!th", name = "n", descriptor = "Z")
@OriginalMember(owner = "client!th", name = "n", descriptor = "Z")
public static boolean aBoolean302 = false;
@OriginalMember(owner = "client!th", name = "a", descriptor = "(DI)V")

20
client/src/main/java/Static243.java
View file

@ -32,13 +32,13 @@ public final class Static243 {
MouseRecorder.instance.samples = 0;
GameShell.focus = true;
Static114.method4625();
Static49.anInt1462 = -1;
Static5.anInt45 = -1;
Static49.opcode4 = -1;
Static5.opcode3 = -1;
Protocol.opcode = -1;
Static267.anInt5775 = 0;
Static60.rebootTimer = 0;
Protocol.outboundBuffer.offset = 0;
Static230.anInt5152 = -1;
Static230.opcode2 = -1;
Static201.anInt1862 = 0;
Protocol.inboundBuffer.offset = 0;
@Pc(3506) int local3506;
@ -49,14 +49,14 @@ public final class Static243 {
Static60.aBoolean108 = false;
Static48.setIdleLoops(0);
for (local3506 = 0; local3506 < 100; local3506++) {
Static230.aClass100Array158[local3506] = null;
Chat.aClass100Array158[local3506] = null;
}
Static260.anInt5014 = 0;
Static132.anInt3291 = (int) (Math.random() * 100.0D) - 50;
Static84.anInt2255 = 0;
Camera.yawTarget = (int) (Math.random() * 20.0D) - 10 & 0x7FF;
Static107.anInt2875 = -1;
Static267.anInt5774 = 0;
PlayerList.size = 0;
Static270.anInt5795 = 0;
Static206.anInt4774 = (int) (Math.random() * 110.0D) - 55;
Static241.aBoolean302 = false;
@ -64,17 +64,17 @@ public final class Static243 {
SoundPlayer.anInt4451 = 0;
Static115.anInt2939 = 0;
Static59.anInt1814 = (int) (Math.random() * 120.0D) - 60;
Static62.anInt1941 = 0;
Chat.anInt1941 = 0;
Static230.anInt5161 = (int) (Math.random() * 80.0D) - 40;
Static272.anInt5214 = 0;
for (local3506 = 0; local3506 < 2048; local3506++) {
Static159.players[local3506] = null;
Static115.aClass3_Sub15Array1[local3506] = null;
PlayerList.players[local3506] = null;
PlayerList.appearanceCache[local3506] = null;
}
for (local3506 = 0; local3506 < 32768; local3506++) {
Static175.npcs[local3506] = null;
}
PlayerList.self = Static159.players[2047] = new Player();
PlayerList.self = PlayerList.players[2047] = new Player();
Static217.aClass69_116.clear();
Static99.aClass69_64.clear();
if (Static159.aClass69ArrayArrayArray1 != null) {
@ -131,7 +131,7 @@ public final class Static243 {
Static199.aClass3_Sub22Array1 = null;
Static15.aClass100_87 = null;
for (local3506 = 0; local3506 < 6; local3506++) {
Static229.aClass136Array1[local3506] = new StockMarketOffer();
StockMarketManager.aClass136Array1[local3506] = new StockMarketOffer();
}
for (local3506 = 0; local3506 < 25; local3506++) {
Static99.anIntArray240[local3506] = 0;

13
client/src/main/java/Static245.java
View file

@ -19,19 +19,6 @@ public final class Static245 {
local16.pushClient();
}
@OriginalMember(owner = "client!tm", name = "a", descriptor = "(I)V")
public static void method4226() {
for (@Pc(7) int local7 = 0; local7 < Static116.anInt2951; local7++) {
@Pc(31) int local31 = Static44.anIntArray106[local7];
@Pc(35) Player local35 = Static159.players[local31];
@Pc(39) int local39 = Protocol.inboundBuffer.g1();
if ((local39 & 0x10) != 0) {
local39 += Protocol.inboundBuffer.g1() << 8;
}
Static84.method1768(local39, local31, local35);
}
}
@OriginalMember(owner = "client!tm", name = "a", descriptor = "(III[Lclient!mj;IB[BIIIZ)V")
public static void method4228(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) CollisionMap[] arg3, @OriginalArg(4) int arg4, @OriginalArg(6) byte[] arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) boolean arg9) {
@Pc(17) int local17;

4
client/src/main/java/Static246.java
View file

@ -17,9 +17,9 @@ public final class Static246 {
public static void method4239() {
for (@Pc(9) SpotAnimNode local9 = (SpotAnimNode) Static99.aClass69_64.method2289(); local9 != null; local9 = (SpotAnimNode) Static99.aClass69_64.method2288()) {
@Pc(15) SpotAnim local15 = local9.aClass8_Sub2_1;
if (local15.anInt606 != Static55.level || local15.aBoolean41) {
if (local15.anInt606 != Player.level || local15.aBoolean41) {
local9.unlink();
} else if (local15.anInt590 <= Static83.loop) {
} else if (local15.anInt590 <= client.loop) {
local15.method558(Static178.anInt4247);
if (local15.aBoolean41) {
local9.unlink();

3
client/src/main/java/Static249.java
View file

@ -6,9 +6,6 @@ public final class Static249 {
@OriginalMember(owner = "client!ud", name = "Q", descriptor = "Lclient!na;")
public static final JagString aClass100_1039 = JagString.parse(" x ");
@OriginalMember(owner = "client!ud", name = "T", descriptor = "[I")
public static final int[] anIntArray478 = new int[32];
@OriginalMember(owner = "client!ud", name = "a", descriptor = "(ILclient!be;)Z")
public static boolean method4265(@OriginalArg(1) Component arg0) {
if (arg0.anInt453 == 205) {

16
client/src/main/java/Static252.java
View file

@ -26,7 +26,7 @@ public final class Static252 {
Static266.aByteArrayArrayArray15[local33][local31][local40] = local27;
}
}
if (Static55.level == 3) {
if (Player.level == 3) {
return;
}
for (local33 = 0; local33 < 2; local33++) {
@ -37,13 +37,13 @@ public final class Static252 {
Static50.anIntArray134[local33] = 0;
}
if (Static227.cameraType != 1) {
local33 = SceneGraph.getTileHeight(Static55.level, Static138.renderX, Static134.renderZ);
if (local33 - Static5.anInt40 < 800 && (Static12.tileSettings[Static55.level][Static138.renderX >> 7][Static134.renderZ >> 7] & 0x4) != 0) {
local33 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ);
if (local33 - Static5.anInt40 < 800 && (Static12.tileSettings[Player.level][Static138.renderX >> 7][Static134.renderZ >> 7] & 0x4) != 0) {
Static254.method4348(false, Static138.renderX >> 7, Static134.renderZ >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 1);
}
return;
}
if ((Static12.tileSettings[Static55.level][PlayerList.self.xFine >> 7][PlayerList.self.zFine >> 7] & 0x4) != 0) {
if ((Static12.tileSettings[Player.level][PlayerList.self.xFine >> 7][PlayerList.self.zFine >> 7] & 0x4) != 0) {
Static254.method4348(false, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 0);
}
if (Static240.cameraPitch >= 310) {
@ -76,7 +76,7 @@ public final class Static252 {
} else if (local40 > local135) {
local40--;
}
if ((Static12.tileSettings[Static55.level][local33][local40] & 0x4) != 0) {
if ((Static12.tileSettings[Player.level][local33][local40] & 0x4) != 0) {
Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1);
break;
}
@ -88,7 +88,7 @@ public final class Static252 {
local33--;
}
local186 -= 65536;
if ((Static12.tileSettings[Static55.level][local33][local40] & 0x4) != 0) {
if ((Static12.tileSettings[Player.level][local33][local40] & 0x4) != 0) {
Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1);
break;
}
@ -104,7 +104,7 @@ public final class Static252 {
} else if (local33 > local162) {
local33--;
}
if ((Static12.tileSettings[Static55.level][local33][local40] & 0x4) != 0) {
if ((Static12.tileSettings[Player.level][local33][local40] & 0x4) != 0) {
Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1);
break;
}
@ -116,7 +116,7 @@ public final class Static252 {
local40--;
}
local186 -= 65536;
if ((Static12.tileSettings[Static55.level][local33][local40] & 0x4) != 0) {
if ((Static12.tileSettings[Player.level][local33][local40] & 0x4) != 0) {
Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1);
break;
}

10
client/src/main/java/Static253.java
View file

@ -51,7 +51,7 @@ public final class Static253 {
if (Static176.aBooleanArray95[4] && Static276.anIntArray564[4] + 128 > local59) {
local59 = Static276.anIntArray564[4] + 128;
}
Static18.method555(Static81.cameraX, arg0, SceneGraph.getTileHeight(Static55.level, PlayerList.self.xFine, PlayerList.self.zFine) - 50, 600 - -(local59 * 3), local57, Static111.cameraZ, local59);
Static18.method555(Static81.cameraX, arg0, SceneGraph.getTileHeight(Player.level, PlayerList.self.xFine, PlayerList.self.zFine) - 50, 600 - -(local59 * 3), local57, Static111.cameraZ, local59);
}
local57 = Static5.anInt40;
local59 = Static138.renderX;
@ -124,11 +124,11 @@ public final class Static253 {
} else {
local171 = Static103.method2235(Static178.anInt4247, PlayerList.self.movementQueueZ[0] >> 3, Preferences.brightness, PlayerList.self.movementQueueX[0] >> 3);
}
Static120.method2394(Static83.loop, !Preferences.flickeringEffectsOn);
Static120.method2394(client.loop, !Preferences.flickeringEffectsOn);
GlRenderer.clearColorAndDepthBuffers(local171);
Static143.method2731(Static240.cameraPitch, Static134.renderZ, Static5.anInt40, Static138.renderX, Static184.cameraYaw);
GlRenderer.anInt5323 = Static83.loop;
Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7);
GlRenderer.anInt5323 = client.loop;
Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7);
Static263.aBoolean299 = true;
Static120.method2390();
Static143.method2731(0, 0, 0, 0, 0);
@ -138,7 +138,7 @@ public final class Static253 {
Static233.method4000(arg3, arg2, arg0, Static223.anInt5029, Static223.anInt5029, arg4);
} else {
SoftwareRaster.fillRect(arg2, arg4, arg3, arg0, 0);
Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7);
Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7);
client.audioLoop();
Static223.method3858();
Static142.method2726(arg4, arg3, arg2, 256, arg0, 256);

46
client/src/main/java/Static254.java
View file

@ -25,9 +25,9 @@ public final class Static254 {
@OriginalMember(owner = "client!uj", name = "a", descriptor = "(BZII[[[Lclient!bj;I)Z")
public static boolean method4348(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Tile[][][] arg3, @OriginalArg(5) int arg4) {
@Pc(14) byte local14 = arg0 ? 1 : (byte) (Static136.anInt3325 & 0xFF);
if (local14 == Static266.aByteArrayArrayArray15[Static55.level][arg1][arg2]) {
if (local14 == Static266.aByteArrayArrayArray15[Player.level][arg1][arg2]) {
return false;
} else if ((Static12.tileSettings[Static55.level][arg1][arg2] & 0x4) == 0) {
} else if ((Static12.tileSettings[Player.level][arg1][arg2] & 0x4) == 0) {
return false;
} else {
@Pc(47) int local47 = 0;
@ -35,7 +35,7 @@ public final class Static254 {
Static259.anIntArray514[0] = arg1;
@Pc(69) int local69 = local49 + 1;
Static84.anIntArray209[0] = arg2;
Static266.aByteArrayArrayArray15[Static55.level][arg1][arg2] = local14;
Static266.aByteArrayArrayArray15[Player.level][arg1][arg2] = local14;
while (local47 != local69) {
@Pc(94) int local94 = Static259.anIntArray514[local47] >> 16 & 0xFF;
@Pc(102) int local102 = Static259.anIntArray514[local47] >> 24 & 0xFF;
@ -45,12 +45,12 @@ public final class Static254 {
local47 = local47 + 1 & 0xFFF;
@Pc(130) boolean local130 = false;
@Pc(132) boolean local132 = false;
if ((Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0) {
if ((Static12.tileSettings[Player.level][local108][local122] & 0x4) == 0) {
local130 = true;
}
@Pc(150) int local150;
@Pc(191) int local191;
label238: for (local150 = Static55.level + 1; local150 <= 3; local150++) {
label238: for (local150 = Player.level + 1; local150 <= 3; local150++) {
if ((Static12.tileSettings[local150][local108][local122] & 0x8) == 0) {
@Pc(227) int local227;
@Pc(358) int local358;
@ -105,8 +105,8 @@ public final class Static254 {
}
}
if (local132) {
if (Static83.activeTileHeightMap[Static55.level + 1][local108][local122] > Static79.anIntArray205[arg4]) {
Static79.anIntArray205[arg4] = Static83.activeTileHeightMap[Static55.level + 1][local108][local122];
if (Static83.activeTileHeightMap[Player.level + 1][local108][local122] > Static79.anIntArray205[arg4]) {
Static79.anIntArray205[arg4] = Static83.activeTileHeightMap[Player.level + 1][local108][local122];
}
local150 = local108 << 7;
if (local150 < Static149.anIntArray338[arg4]) {
@ -122,58 +122,58 @@ public final class Static254 {
}
}
if (!local130) {
if (local108 >= 1 && Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] != local14) {
if (local108 >= 1 && Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] != local14) {
Static259.anIntArray514[local69] = local108 - 1 | 0x120000 | 0xD3000000;
Static84.anIntArray209[local69] = local122 | 0x130000;
local69 = local69 + 1 & 0xFFF;
Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] = local14;
Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] = local14;
}
local122++;
if (local122 < 104) {
if (local108 - 1 >= 0 && local14 != Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] && (Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Static55.level][local108 - 1][local122 - 1] & 0x4) == 0) {
if (local108 - 1 >= 0 && local14 != Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] && (Static12.tileSettings[Player.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Player.level][local108 - 1][local122 - 1] & 0x4) == 0) {
Static259.anIntArray514[local69] = 0x52000000 | 0x120000 | local108 - 1;
Static84.anIntArray209[local69] = local122 | 0x130000;
Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] = local14;
Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] = local14;
local69 = local69 + 1 & 0xFFF;
}
if (local14 != Static266.aByteArrayArrayArray15[Static55.level][local108][local122]) {
if (local14 != Static266.aByteArrayArrayArray15[Player.level][local108][local122]) {
Static259.anIntArray514[local69] = local108 | 0x13000000 | 0x520000;
Static84.anIntArray209[local69] = local122 | 0x530000;
local69 = local69 + 1 & 0xFFF;
Static266.aByteArrayArrayArray15[Static55.level][local108][local122] = local14;
Static266.aByteArrayArrayArray15[Player.level][local108][local122] = local14;
}
if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] != local14 && (Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Static55.level][local108 + 1][local122 - 1] & 0x4) == 0) {
if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122] != local14 && (Static12.tileSettings[Player.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Player.level][local108 + 1][local122 - 1] & 0x4) == 0) {
Static259.anIntArray514[local69] = 0x92000000 | 0x520000 | local108 + 1;
Static84.anIntArray209[local69] = local122 | 0x530000;
Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] = local14;
Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122] = local14;
local69 = local69 + 1 & 0xFFF;
}
}
local122--;
if (local108 + 1 < 104 && local14 != Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122]) {
if (local108 + 1 < 104 && local14 != Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122]) {
Static259.anIntArray514[local69] = local108 + 1 | 0x920000 | 0x53000000;
Static84.anIntArray209[local69] = local122 | 0x930000;
Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] = local14;
Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122] = local14;
local69 = local69 + 1 & 0xFFF;
}
local122--;
if (local122 >= 0) {
if (local108 - 1 >= 0 && Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] != local14 && (Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Static55.level][local108 - 1][local122 + 1] & 0x4) == 0) {
if (local108 - 1 >= 0 && Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] != local14 && (Static12.tileSettings[Player.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Player.level][local108 - 1][local122 + 1] & 0x4) == 0) {
Static259.anIntArray514[local69] = local108 - 1 | 0xD20000 | 0x12000000;
Static84.anIntArray209[local69] = local122 | 0xD30000;
Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] = local14;
Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] = local14;
local69 = local69 + 1 & 0xFFF;
}
if (local14 != Static266.aByteArrayArrayArray15[Static55.level][local108][local122]) {
if (local14 != Static266.aByteArrayArrayArray15[Player.level][local108][local122]) {
Static259.anIntArray514[local69] = local108 | 0xD20000 | 0x93000000;
Static84.anIntArray209[local69] = local122 | 0xD30000;
local69 = local69 + 1 & 0xFFF;
Static266.aByteArrayArrayArray15[Static55.level][local108][local122] = local14;
Static266.aByteArrayArrayArray15[Player.level][local108][local122] = local14;
}
if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] != local14 && (Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Static55.level][local108 + 1][local122 + 1] & 0x4) == 0) {
if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122] != local14 && (Static12.tileSettings[Player.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Player.level][local108 + 1][local122 + 1] & 0x4) == 0) {
Static259.anIntArray514[local69] = local108 + 1 | 0xD2000000 | 0x920000;
Static84.anIntArray209[local69] = local122 | 0x930000;
Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] = local14;
Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122] = local14;
local69 = local69 + 1 & 0xFFF;
}
}

10
client/src/main/java/Static256.java
View file

@ -6,17 +6,17 @@ public final class Static256 {
@OriginalMember(owner = "client!um", name = "a", descriptor = "(Z)V")
public static void method4392() {
Static11.anInt384 = 0;
Player.inTutorialIsland = 0;
@Pc(17) int local17 = Static225.originX + (PlayerList.self.xFine >> 7);
@Pc(25) int local25 = (PlayerList.self.zFine >> 7) + Static142.originZ;
if (local17 >= 3053 && local17 <= 3156 && local25 >= 3056 && local25 <= 3136) {
Static11.anInt384 = 1;
Player.inTutorialIsland = 1;
}
if (local17 >= 3072 && local17 <= 3118 && local25 >= 9492 && local25 <= 9535) {
Static11.anInt384 = 1;
Player.inTutorialIsland = 1;
}
if (Static11.anInt384 == 1 && local17 >= 3139 && local17 <= 3199 && local25 >= 3008 && local25 <= 3062) {
Static11.anInt384 = 0;
if (Player.inTutorialIsland == 1 && local17 >= 3139 && local17 <= 3199 && local25 >= 3008 && local25 <= 3062) {
Player.inTutorialIsland = 0;
}
}

5
client/src/main/java/Static26.java
View file

@ -10,10 +10,7 @@ public final class Static26 {
@OriginalMember(owner = "client!ca", name = "cb", descriptor = "Lclient!na;")
public static final JagString aClass100_160 = Static165.method3165();
@OriginalMember(owner = "client!ca", name = "eb", descriptor = "[I")
public static final int[] anIntArray67 = new int[100];
@OriginalMember(owner = "client!ca", name = "h", descriptor = "(I)V")
@OriginalMember(owner = "client!ca", name = "h", descriptor = "(I)V")
public static void setupLoadingScreenRegion() {
@Pc(10) int local10 = (Static138.renderX >> 10) + (Static225.originX >> 3);
@Pc(23) int local23 = (Static134.renderZ >> 10) + (Static142.originZ >> 3);

2
client/src/main/java/Static260.java
View file

@ -20,7 +20,7 @@ public final class Static260 {
if (Static233.anInt5217 >= 100) {
@Pc(30) int local30 = Static251.anInt5449 * 128 + 64;
@Pc(36) int local36 = Static265.anInt5765 * 128 + 64;
@Pc(44) int local44 = SceneGraph.getTileHeight(Static55.level, local30, local36) - Static57.anInt1744;
@Pc(44) int local44 = SceneGraph.getTileHeight(Player.level, local30, local36) - Static57.anInt1744;
@Pc(49) int local49 = local44 - Static5.anInt40;
@Pc(54) int local54 = local30 - Static138.renderX;
@Pc(59) int local59 = local36 - Static134.renderZ;

8
client/src/main/java/Static263.java
View file

@ -111,16 +111,16 @@ public final class Static263 {
@OriginalMember(owner = "client!vg", name = "a", descriptor = "(IILclient!fe;)V")
public static void method4514(@OriginalArg(0) int arg0, @OriginalArg(2) PathingEntity arg1) {
if (Static83.loop < arg1.anInt3395) {
if (client.loop < arg1.anInt3395) {
Static18.method553(arg1);
} else if (arg1.anInt3386 >= Static83.loop) {
} else if (arg1.anInt3386 >= client.loop) {
Static280.method4665(arg1);
} else {
Static104.method2247(arg1);
}
if (arg1.xFine < 128 || arg1.zFine < 128 || arg1.xFine >= 13184 || arg1.zFine >= 13184) {
arg1.seqId = -1;
arg1.anInt3432 = -1;
arg1.spotAnimId = -1;
arg1.anInt3395 = 0;
arg1.anInt3386 = 0;
arg1.xFine = arg1.movementQueueX[0] * 128 + arg1.getSize() * 64;
@ -128,7 +128,7 @@ public final class Static263 {
arg1.method2689();
}
if (arg1 == PlayerList.self && (arg1.xFine < 1536 || arg1.zFine < 1536 || arg1.xFine >= 11776 || arg1.zFine >= 11776)) {
arg1.anInt3432 = -1;
arg1.spotAnimId = -1;
arg1.anInt3395 = 0;
arg1.anInt3386 = 0;
arg1.seqId = -1;

4
client/src/main/java/Static264.java
View file

@ -22,8 +22,8 @@ public final class Static264 {
@OriginalMember(owner = "client!vh", name = "a", descriptor = "(ILclient!wa;)Lclient!bd;")
public static QuickChatPhrase method3568(@OriginalArg(1) Buffer arg0) {
@Pc(3) QuickChatPhrase local3 = new QuickChatPhrase();
local3.anInt439 = arg0.g2();
local3.aClass3_Sub2_Sub6_1 = QuickChatPhraseTypeList.get(local3.anInt439);
local3.id = arg0.g2();
local3.type = QuickChatPhraseTypeList.get(local3.id);
return local3;
}

5
client/src/main/java/Static267.java
View file

@ -13,9 +13,6 @@ public final class Static267 {
@OriginalMember(owner = "client!vl", name = "i", descriptor = "[I")
public static int[] anIntArray518 = new int[2];
@OriginalMember(owner = "client!vl", name = "j", descriptor = "I")
public static int anInt5774 = 0;
@OriginalMember(owner = "client!vl", name = "k", descriptor = "I")
public static int anInt5775 = 0;
@ -93,7 +90,7 @@ public final class Static267 {
Static1.anInt6++;
}
Static226.anInt5084 += arg0;
local60 = (arg0 + (Static83.loop & 0x1)) / 2;
local60 = (arg0 + (client.loop & 0x1)) / 2;
if (local60 <= 0) {
return;
}

2
client/src/main/java/Static27.java
View file

@ -8,7 +8,7 @@ public final class Static27 {
public static SoundBank aClass89_1;
@OriginalMember(owner = "client!cb", name = "I", descriptor = "[I")
public static final int[] anIntArray70 = new int[32];
public static final int[] updatedInventories = new int[32];
@OriginalMember(owner = "client!cb", name = "ab", descriptor = "Lclient!na;")
public static final JagString aClass100_164 = JagString.parse(" )2> <col=00ffff>");

13
client/src/main/java/Static271.java
View file

@ -10,19 +10,6 @@ public final class Static271 {
@OriginalMember(owner = "client!wc", name = "h", descriptor = "[[I")
public static final int[][] anIntArrayArray46 = new int[][] { { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, { 12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3 }, { 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }, { 3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12 } };
@OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!e;I)V")
public static void method4597(@OriginalArg(0) Player arg0) {
@Pc(10) AreaSound local10 = (AreaSound) Static93.aClass133_7.get(arg0.aClass100_364.encode37());
if (local10 == null) {
return;
}
if (local10.primaryStream != null) {
client.soundStream.removeSubStream(local10.primaryStream);
local10.primaryStream = null;
}
local10.unlink();
}
@OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!wa;I)V")
public static void method4598(@OriginalArg(0) Buffer arg0) {
if (client.uid != null) {

18
client/src/main/java/Static276.java
View file

@ -37,32 +37,32 @@ public final class Static276 {
public static void method4613(@OriginalArg(0) int arg0, @OriginalArg(2) JagString arg1) {
@Pc(7) JagString local7 = arg1.method3159().method3125();
@Pc(13) boolean local13 = false;
for (@Pc(15) int local15 = 0; local15 < Static267.anInt5774; local15++) {
@Pc(28) Player local28 = Static159.players[Static105.anIntArray256[local15]];
if (local28 != null && local28.aClass100_364 != null && local28.aClass100_364.equalsIgnoreCase(local7)) {
for (@Pc(15) int local15 = 0; local15 < PlayerList.size; local15++) {
@Pc(28) Player local28 = PlayerList.players[PlayerList.ids[local15]];
if (local28 != null && local28.username != null && local28.username.equalsIgnoreCase(local7)) {
local13 = true;
Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local28.movementQueueX[0], 1, 0, 2, local28.movementQueueZ[0], PlayerList.self.movementQueueX[0]);
if (arg0 == 1) {
Protocol.outboundBuffer.p1isaac(68);
Protocol.outboundBuffer.p2leadd(Static105.anIntArray256[local15]);
Protocol.outboundBuffer.p2leadd(PlayerList.ids[local15]);
} else if (arg0 == 4) {
Protocol.outboundBuffer.p1isaac(180);
Protocol.outboundBuffer.p2leadd(Static105.anIntArray256[local15]);
Protocol.outboundBuffer.p2leadd(PlayerList.ids[local15]);
} else if (arg0 == 5) {
Protocol.outboundBuffer.p1isaac(4);
Protocol.outboundBuffer.p2le(Static105.anIntArray256[local15]);
Protocol.outboundBuffer.p2le(PlayerList.ids[local15]);
} else if (arg0 == 6) {
Protocol.outboundBuffer.p1isaac(133);
Protocol.outboundBuffer.p2le(Static105.anIntArray256[local15]);
Protocol.outboundBuffer.p2le(PlayerList.ids[local15]);
} else if (arg0 == 7) {
Protocol.outboundBuffer.p1isaac(114);
Protocol.outboundBuffer.p2leadd(Static105.anIntArray256[local15]);
Protocol.outboundBuffer.p2leadd(PlayerList.ids[local15]);
}
break;
}
}
if (!local13) {
Static103.method2231(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.UNABLETOFIND, local7 }));
Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.UNABLETOFIND, local7 }));
}
}

7
client/src/main/java/Static277.java
View file

@ -37,11 +37,4 @@ public final class Static277 {
return local12 == 1003;
}
@OriginalMember(owner = "client!wi", name = "d", descriptor = "(II)V")
public static void method4641(@OriginalArg(1) int arg0) {
WorldMap.anInt4901 = -1;
WorldMap.anInt4901 = -1;
WorldMap.anInt919 = arg0;
WorldMap.method965();
}
}

31
client/src/main/java/Static278.java
View file

@ -13,14 +13,11 @@ public final class Static278 {
@OriginalMember(owner = "client!wj", name = "f", descriptor = "Lclient!na;")
public static final JagString aClass100_1103 = JagString.parse("ul");
@OriginalMember(owner = "client!wj", name = "l", descriptor = "I")
public static int anInt5867 = 0;
@OriginalMember(owner = "client!wj", name = "a", descriptor = "(I)V")
public static void method4645() {
while (true) {
if (Protocol.inboundBuffer.method2241(Protocol.length) >= 27) {
@Pc(14) int local14 = Protocol.inboundBuffer.method2238(15);
@Pc(14) int local14 = Protocol.inboundBuffer.gBits(15);
if (local14 != 32767) {
@Pc(19) boolean local19 = false;
if (Static175.npcs[local14] == null) {
@ -29,25 +26,25 @@ public final class Static278 {
}
@Pc(37) Npc local37 = Static175.npcs[local14];
Static33.anIntArray79[Static272.anInt5214++] = local14;
local37.anInt3430 = Static83.loop;
local37.lastSeenLoop = client.loop;
if (local37.type != null && local37.type.hasAreaSound()) {
Static91.method1877(local37);
}
@Pc(66) int local66 = Protocol.inboundBuffer.method2238(1);
@Pc(73) int local73 = Static56.anIntArray141[Protocol.inboundBuffer.method2238(3)];
@Pc(66) int local66 = Protocol.inboundBuffer.gBits(1);
@Pc(73) int local73 = Static56.anIntArray141[Protocol.inboundBuffer.gBits(3)];
if (local19) {
local37.anInt3400 = local37.anInt3381 = local73;
}
@Pc(86) int local86 = Protocol.inboundBuffer.method2238(1);
@Pc(86) int local86 = Protocol.inboundBuffer.gBits(1);
if (local86 == 1) {
Static44.anIntArray106[Static116.anInt2951++] = local14;
Protocol.extendedIds[Protocol.extendedCount++] = local14;
}
@Pc(105) int local105 = Protocol.inboundBuffer.method2238(5);
local37.method2698(NpcTypeList.get(Protocol.inboundBuffer.method2238(14)));
@Pc(105) int local105 = Protocol.inboundBuffer.gBits(5);
local37.method2698(NpcTypeList.get(Protocol.inboundBuffer.gBits(14)));
if (local105 > 15) {
local105 -= 32;
}
@Pc(124) int local124 = Protocol.inboundBuffer.method2238(5);
@Pc(124) int local124 = Protocol.inboundBuffer.gBits(5);
if (local124 > 15) {
local124 -= 32;
}
@ -59,12 +56,12 @@ public final class Static278 {
}
local37.method2683(local37.getSize(), PlayerList.self.movementQueueX[0] + local124, local105 + PlayerList.self.movementQueueZ[0], local66 == 1);
if (local37.type.hasAreaSound()) {
Static122.method2411(local37.movementQueueZ[0], null, 0, local37, local37.movementQueueX[0], Static55.level, null);
Static122.method2411(local37.movementQueueZ[0], null, 0, local37, local37.movementQueueX[0], Player.level, null);
}
continue;
}
}
Protocol.inboundBuffer.method2244();
Protocol.inboundBuffer.accessBytes();
return;
}
}
@ -219,11 +216,11 @@ public final class Static278 {
for (local19 = 0; local19 < Static143.aClass102Array1.length; local19++) {
Static143.aClass102Array1[local19] = null;
}
Static267.anInt5774 = 0;
PlayerList.size = 0;
Static272.anInt5214 = 0;
for (local19 = 0; local19 < 2048; local19++) {
Static159.players[local19] = null;
Static115.aClass3_Sub15Array1[local19] = null;
PlayerList.players[local19] = null;
PlayerList.appearanceCache[local19] = null;
}
for (local19 = 0; local19 < 32768; local19++) {
Static175.npcs[local19] = null;

4
client/src/main/java/Static280.java
View file

@ -12,9 +12,9 @@ public final class Static280 {
@OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!fe;B)V")
public static void method4665(@OriginalArg(0) PathingEntity arg0) {
if (Static83.loop == arg0.anInt3386 || arg0.seqId == -1 || arg0.anInt3420 != 0 || arg0.anInt3360 + 1 > SeqTypeList.get(arg0.seqId).anIntArray474[arg0.anInt3425]) {
if (client.loop == arg0.anInt3386 || arg0.seqId == -1 || arg0.anInt3420 != 0 || arg0.anInt3360 + 1 > SeqTypeList.get(arg0.seqId).anIntArray474[arg0.anInt3425]) {
@Pc(35) int local35 = arg0.anInt3386 - arg0.anInt3395;
@Pc(41) int local41 = Static83.loop - arg0.anInt3395;
@Pc(41) int local41 = client.loop - arg0.anInt3395;
@Pc(52) int local52 = arg0.anInt3380 * 128 + arg0.getSize() * 64;
@Pc(64) int local64 = arg0.anInt3428 * 128 + arg0.getSize() * 64;
@Pc(75) int local75 = arg0.anInt3416 * 128 + arg0.getSize() * 64;

8
client/src/main/java/Static31.java
View file

@ -19,10 +19,10 @@ public final class Static31 {
@OriginalMember(owner = "client!ch", name = "c", descriptor = "(I)V")
public static void method846() {
if (!SceneGraph.allLevelsAreVisible() && Static41.anInt1316 != Static55.level) {
Static127.method2463(Static55.level, Static52.anInt1695, Static80.centralZoneX, PlayerList.self.movementQueueZ[0], false, PlayerList.self.movementQueueX[0]);
} else if (Static55.level != Static107.anInt2875 && Static137.method2665(Static55.level)) {
Static107.anInt2875 = Static55.level;
if (!SceneGraph.allLevelsAreVisible() && Static41.anInt1316 != Player.level) {
Static127.method2463(Player.level, Static52.anInt1695, Static80.centralZoneX, PlayerList.self.movementQueueZ[0], false, PlayerList.self.movementQueueX[0]);
} else if (Player.level != Static107.anInt2875 && Static137.method2665(Player.level)) {
Static107.anInt2875 = Player.level;
Static269.method2218();
}
}

57
client/src/main/java/Static32.java
View file

@ -1,60 +1,3 @@
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static32 {
@OriginalMember(owner = "client!ci", name = "q", descriptor = "Lclient!ek;")
public static SoftwareIndexedSprite aClass36_Sub1_1 = null;
@OriginalMember(owner = "client!ci", name = "a", descriptor = "([I[ILclient!e;B[I)V")
public static void method865(@OriginalArg(0) int[] arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) Player arg2, @OriginalArg(4) int[] arg3) {
for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) {
@Pc(20) int local20 = arg1[local7];
@Pc(24) int local24 = arg3[local7];
@Pc(28) int local28 = arg0[local7];
@Pc(30) int local30 = 0;
while (local24 != 0 && local30 < arg2.aClass147Array3.length) {
if ((local24 & 0x1) != 0) {
if (local20 == -1) {
arg2.aClass147Array3[local30] = null;
} else {
@Pc(68) SeqType local68 = SeqTypeList.get(local20);
@Pc(71) int local71 = local68.anInt5347;
@Pc(76) Class147 local76 = arg2.aClass147Array3[local30];
if (local76 != null) {
if (local20 == local76.anInt5396) {
if (local71 == 0) {
local76 = arg2.aClass147Array3[local30] = null;
} else if (local71 == 1) {
local76.anInt5400 = 0;
local76.anInt5398 = 1;
local76.anInt5399 = 0;
local76.anInt5408 = local28;
local76.anInt5404 = 0;
SoundPlayer.playSeqSound(arg2.zFine, local68, arg2.xFine, arg2 == PlayerList.self, 0);
} else if (local71 == 2) {
local76.anInt5400 = 0;
}
} else if (local68.anInt5355 >= SeqTypeList.get(local76.anInt5396).anInt5355) {
local76 = arg2.aClass147Array3[local30] = null;
}
}
if (local76 == null) {
local76 = arg2.aClass147Array3[local30] = new Class147();
local76.anInt5396 = local20;
local76.anInt5398 = 1;
local76.anInt5404 = 0;
local76.anInt5408 = local28;
local76.anInt5399 = 0;
local76.anInt5400 = 0;
SoundPlayer.playSeqSound(arg2.zFine, local68, arg2.xFine, arg2 == PlayerList.self, 0);
}
}
}
local30++;
local24 >>>= 0x1;
}
}
}
}

12
client/src/main/java/Static34.java
View file

@ -95,14 +95,14 @@ public final class Static34 {
}
}
@Pc(156) int local156;
if (arg0.anInt3432 != -1 && Static83.loop >= arg0.anInt3359) {
local156 = SpotAnimTypeList.get(arg0.anInt3432).seqId;
if (arg0.spotAnimId != -1 && client.loop >= arg0.spotAnimStart) {
local156 = SpotAnimTypeList.get(arg0.spotAnimId).seqId;
if (local156 == -1) {
arg0.anInt3432 = -1;
arg0.spotAnimId = -1;
} else {
@Pc(165) SeqType local165 = SeqTypeList.get(local156);
if (local165 == null || local165.frames == null) {
arg0.anInt3432 = -1;
arg0.spotAnimId = -1;
} else {
if (arg0.anInt3399 < 0) {
arg0.anInt3399 = 0;
@ -115,7 +115,7 @@ public final class Static34 {
SoundPlayer.playSeqSound(arg0.zFine, local165, arg0.xFine, PlayerList.self == arg0, arg0.anInt3399);
}
if (arg0.anInt3399 >= local165.frames.length) {
arg0.anInt3432 = -1;
arg0.spotAnimId = -1;
}
arg0.anInt3418 = arg0.anInt3399 + 1;
if (local165.frames.length <= arg0.anInt3418) {
@ -126,7 +126,7 @@ public final class Static34 {
}
if (arg0.seqId != -1 && arg0.anInt3420 <= 1) {
local18 = SeqTypeList.get(arg0.seqId);
if (local18.anInt5363 == 1 && arg0.anInt3405 > 0 && Static83.loop >= arg0.anInt3395 && Static83.loop > arg0.anInt3386) {
if (local18.anInt5363 == 1 && arg0.anInt3405 > 0 && client.loop >= arg0.anInt3395 && client.loop > arg0.anInt3386) {
arg0.anInt3420 = 1;
return;
}

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