Skip to content

Commit f090143

Browse files
PazazPazaz
committed
chore: Reordered some uncaptured fields
1 parent 6d131db commit f090143

File tree

1 file changed

+121
-88
lines changed

1 file changed

+121
-88
lines changed

‎src/main/java/jagex3/client/Client.java‎

Lines changed: 121 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ public class Client extends GameShell {
102102
@ObfuscatedName("dm.ai")
103103
public static MouseTracking mouseTracking;
104104

105+
// guessing placement
106+
@ObfuscatedName("az.lu")
107+
public static MouseWheelInterface mouseWheel;
108+
105109
@ObfuscatedName("client.aj")
106110
public static int lastWriteX = 0;
107111

@@ -220,6 +224,10 @@ public class Client extends GameShell {
220224
@ObfuscatedName("client.cm")
221225
public static int js5Errors = 0;
222226

227+
// placement based on rs3
228+
@ObfuscatedName("r.pa")
229+
public static DataFile masterIndex;
230+
223231
@ObfuscatedName("client.cw")
224232
public static int loginStep = 0;
225233

@@ -439,6 +447,10 @@ public class Client extends GameShell {
439447
@ObfuscatedName("client.fv")
440448
public static int worldUpdateNum = 0;
441449

450+
// guessing placement
451+
@ObfuscatedName("dl.ns")
452+
public static Pix32 minimap;
453+
442454
@ObfuscatedName("al.fu")
443455
public static Pix32 compass;
444456

@@ -622,6 +634,10 @@ public class Client extends GameShell {
622634
@ObfuscatedName("cv.hg")
623635
public static IfType hoveredSlotParent;
624636

637+
// guessing placement
638+
@ObfuscatedName("l.jy")
639+
public static IfType hoveredCom;
640+
625641
@ObfuscatedName("client.hq")
626642
public static int objDragSlot = 0;
627643

@@ -661,9 +677,17 @@ public class Client extends GameShell {
661677
@ObfuscatedName("client.im")
662678
public static Packet[] playerAppearanceBuffer = new Packet[2048];
663679

680+
// placement based on rs3
681+
@ObfuscatedName("al.in")
682+
public static int minusedlevel;
683+
664684
@ObfuscatedName("client.ik")
665685
public static int selfSlot = -1;
666686

687+
// placement based on rs3
688+
@ObfuscatedName("cr.ii")
689+
public static ClientPlayer localPlayer;
690+
667691
@ObfuscatedName("client.iy")
668692
public static int membersAccount = 0;
669693

@@ -685,18 +709,6 @@ public class Client extends GameShell {
685709
@ObfuscatedName("client.il")
686710
public static int[] ANGLE_TO_DIR = new int[] { 768, 1024, 1280, 512, 1536, 256, 0, 1792 };
687711

688-
@ObfuscatedName("an.ix")
689-
public static int objSelectedLayerId;
690-
691-
@ObfuscatedName("cr.ii")
692-
public static ClientPlayer localPlayer;
693-
694-
@ObfuscatedName("al.in")
695-
public static int minusedlevel;
696-
697-
@ObfuscatedName("ag.iz")
698-
public static int objLayerId;
699-
700712
@ObfuscatedName("client.ir")
701713
public static LinkList[][][] groundObj = new LinkList[4][104][104];
702714

@@ -730,6 +742,18 @@ public class Client extends GameShell {
730742
@ObfuscatedName("client.jp")
731743
public static int menuNumEntries = 0;
732744

745+
@ObfuscatedName("ca.jf")
746+
public static int menuX;
747+
748+
@ObfuscatedName("bk.ji")
749+
public static int menuY;
750+
751+
@ObfuscatedName("al.jt")
752+
public static int menuWidth;
753+
754+
@ObfuscatedName("m.jd")
755+
public static int menuHeight;
756+
733757
@ObfuscatedName("client.jg")
734758
public static int[] menuParamB = new int[500];
735759

@@ -754,6 +778,10 @@ public class Client extends GameShell {
754778
@ObfuscatedName("client.jx")
755779
public static int minimenuMouseOverY = -1;
756780

781+
// guessing placement
782+
@ObfuscatedName("at.jq")
783+
public static IfType tooltipCom;
784+
757785
@ObfuscatedName("client.ju")
758786
public static int tooltipNum = 0;
759787

@@ -763,35 +791,31 @@ public class Client extends GameShell {
763791
@ObfuscatedName("client.jo")
764792
public static int useMode = 0;
765793

766-
@ObfuscatedName("client.jh")
767-
public static boolean targetMode = false;
768-
769-
@ObfuscatedName("client.jw")
770-
public static int targetSub = -1;
794+
// guessing placement
795+
@ObfuscatedName("ag.iz")
796+
public static int objLayerId;
771797

772-
@ObfuscatedName("ca.jf")
773-
public static int menuX;
798+
// guessing placement
799+
@ObfuscatedName("an.ix")
800+
public static int objSelectedLayerId;
774801

775-
@ObfuscatedName("l.jy")
776-
public static IfType hoveredCom;
802+
// guessing placement
803+
@ObfuscatedName("ag.jb")
804+
public static int objSelectedSlot;
777805

778-
@ObfuscatedName("m.jd")
779-
public static int menuHeight;
806+
@ObfuscatedName("client.jh")
807+
public static boolean targetMode = false;
780808

809+
// guessing placement
781810
@ObfuscatedName("m.jv")
782811
public static int targetCom;
783812

784-
@ObfuscatedName("al.jt")
785-
public static int menuWidth;
786-
787-
@ObfuscatedName("ag.jb")
788-
public static int objSelectedSlot;
789-
790-
@ObfuscatedName("at.jq")
791-
public static IfType tooltipCom;
813+
// guessing placement
814+
@ObfuscatedName("ak.kt")
815+
public static int targetMask;
792816

793-
@ObfuscatedName("bk.ji")
794-
public static int menuY;
817+
@ObfuscatedName("client.jw")
818+
public static int targetSub = -1;
795819

796820
@ObfuscatedName("client.kn")
797821
public static String targetVerb = null;
@@ -838,6 +862,18 @@ public class Client extends GameShell {
838862
@ObfuscatedName("client.kx")
839863
public static IfType dragParent = null;
840864

865+
// guessing placement
866+
@ObfuscatedName("dz.lj")
867+
public static IfType[] dragChildren;
868+
869+
// guessing placement
870+
@ObfuscatedName("client.lh")
871+
public static int dragChildY;
872+
873+
// guessing placement
874+
@ObfuscatedName("m.la")
875+
public static int dragChildX;
876+
841877
@ObfuscatedName("client.kk")
842878
public static int dragPickupX = 0;
843879

@@ -868,8 +904,9 @@ public class Client extends GameShell {
868904
@ObfuscatedName("client.kh")
869905
public static boolean dragAlive = false;
870906

871-
@ObfuscatedName("ak.kt")
872-
public static int targetMask;
907+
// placement based on rs3
908+
@ObfuscatedName("cv.ll")
909+
public static int dragTime;
873910

874911
@ObfuscatedName("client.lg")
875912
public static int transmitNum = 1;
@@ -925,21 +962,6 @@ public class Client extends GameShell {
925962
@ObfuscatedName("client.lz")
926963
public static HashTable serverActive = new HashTable(512);
927964

928-
@ObfuscatedName("cv.ll")
929-
public static int dragTime;
930-
931-
@ObfuscatedName("dz.lj")
932-
public static IfType[] dragChildren;
933-
934-
@ObfuscatedName("client.lh")
935-
public static int dragChildY;
936-
937-
@ObfuscatedName("m.la")
938-
public static int dragChildX;
939-
940-
@ObfuscatedName("az.lu")
941-
public static MouseWheelInterface mouseWheel;
942-
943965
@ObfuscatedName("client.mw")
944966
public static int componentDrawCount = 0;
945967

@@ -991,6 +1013,10 @@ public class Client extends GameShell {
9911013
@ObfuscatedName("client.mf")
9921014
public static int publicChatFilter = 0;
9931015

1016+
// placement based on rs3
1017+
@ObfuscatedName("au.mg")
1018+
public static PrivateChatFilter privateChatFilter;
1019+
9941020
@ObfuscatedName("client.mz")
9951021
public static int tradeChatFilter = 0;
9961022

@@ -1000,15 +1026,28 @@ public class Client extends GameShell {
10001026
@ObfuscatedName("client.ml")
10011027
public static int privateMessageCount = 0;
10021028

1029+
// placement based on rs3
1030+
@ObfuscatedName("df.nr")
1031+
public static byte chatMinKick;
1032+
1033+
// placement based on rs3
1034+
@ObfuscatedName("cz.ny")
1035+
public static byte chatRank;
1036+
1037+
// placement based on rs3
1038+
@ObfuscatedName("eh.nd")
1039+
public static FriendChatUser[] friendChatList;
1040+
1041+
// placement based on rs3
1042+
@ObfuscatedName("cv.nm")
1043+
public static int friendChatCount;
1044+
10031045
@ObfuscatedName("client.mk")
10041046
public static int keypresses = 0;
10051047

10061048
@ObfuscatedName("client.mb")
10071049
public static int[] keypressKeychars = new int[128];
10081050

1009-
@ObfuscatedName("au.mg")
1010-
public static PrivateChatFilter privateChatFilter;
1011-
10121051
@ObfuscatedName("client.ne")
10131052
public static int[] keypressKeycodes = new int[128];
10141053

@@ -1054,21 +1093,6 @@ public class Client extends GameShell {
10541093
@ObfuscatedName("client.nf")
10551094
public static int waveVolume = 127;
10561095

1057-
@ObfuscatedName("cz.ny")
1058-
public static byte chatRank;
1059-
1060-
@ObfuscatedName("cv.nm")
1061-
public static int friendChatCount;
1062-
1063-
@ObfuscatedName("df.nr")
1064-
public static byte chatMinKick;
1065-
1066-
@ObfuscatedName("dl.ns")
1067-
public static Pix32 minimap;
1068-
1069-
@ObfuscatedName("eh.nd")
1070-
public static FriendChatUser[] friendChatList;
1071-
10721096
@ObfuscatedName("client.oz")
10731097
public static int ambientVolume = 127;
10741098

@@ -1099,48 +1123,60 @@ public class Client extends GameShell {
10991123
@ObfuscatedName("client.oj")
11001124
public static int[] camShakeAxis = new int[5];
11011125

1126+
// placement based on rs3
1127+
@ObfuscatedName("be.ox")
1128+
public static int cutsceneSrcLocalTileX;
1129+
1130+
// placement based on rs3
11021131
@ObfuscatedName("br.om")
11031132
public static int cutsceneSrcLocalTileZ;
11041133

1134+
// placement based on rs3
1135+
@ObfuscatedName("dq.oq")
1136+
public static int cutsceneSrcHeight;
1137+
1138+
// placement based on rs3
11051139
@ObfuscatedName("co.op")
11061140
public static int cutsceneMoveAcceleration;
11071141

1142+
@ObfuscatedName("du.oh")
1143+
public static int cutsceneMoveSpeed;
1144+
1145+
// placement based on rs3
11081146
@ObfuscatedName("ct.or")
11091147
public static int cutsceneDstLocalTileX;
11101148

1111-
@ObfuscatedName("cq.oc")
1112-
public static Mixer soundMixer;
1149+
// placement based on rs3
1150+
@ObfuscatedName("bp.og")
1151+
public static int cutsceneDstLocalTileZ;
11131152

1153+
// placement based on rs3
11141154
@ObfuscatedName("cq.ob")
11151155
public static int cutsceneDstHeight;
11161156

1157+
// placement based on rs3
11171158
@ObfuscatedName("df.ou")
11181159
public static int cutsceneRotateAcceleration;
11191160

1161+
// placement based on rs3
11201162
@ObfuscatedName("de.oy")
11211163
public static int cutsceneRotateSpeed;
11221164

1165+
// guessing placement
1166+
@ObfuscatedName("cq.oc")
1167+
public static Mixer soundMixer;
1168+
1169+
// guessing placement
11231170
@ObfuscatedName("ev.od")
11241171
public static Decimator soundDecimator;
11251172

1126-
@ObfuscatedName("l.on")
1127-
public static PcmPlayer midiPcmPlayer;
1128-
1129-
@ObfuscatedName("be.ox")
1130-
public static int cutsceneSrcLocalTileX;
1131-
1132-
@ObfuscatedName("bp.og")
1133-
public static int cutsceneDstLocalTileZ;
1134-
1135-
@ObfuscatedName("dq.oq")
1136-
public static int cutsceneSrcHeight;
1137-
1138-
@ObfuscatedName("du.oh")
1139-
public static int cutsceneMoveSpeed;
1140-
11411173
@ObfuscatedName("dr.oi")
11421174
public static PcmPlayer soundPcmPlayer;
11431175

1176+
// guessing placement
1177+
@ObfuscatedName("l.on")
1178+
public static PcmPlayer midiPcmPlayer;
1179+
11441180
@ObfuscatedName("client.pk")
11451181
public static int[] camShakeRan = new int[5];
11461182

@@ -1177,9 +1213,6 @@ public class Client extends GameShell {
11771213
@ObfuscatedName("client.pz")
11781214
public static int genderButton2 = -1;
11791215

1180-
@ObfuscatedName("r.pa")
1181-
public static DataFile masterIndex;
1182-
11831216
// placement relative to other clients
11841217
public static void setHighMemory() {
11851218
World.lowMem = false;

0 commit comments

Comments
 (0)