Skip to content

Commit 7cf3216

Browse files
PazazPazaz
committed
chore: Identified a few fields
1 parent f0ceae4 commit 7cf3216

File tree

2 files changed

+51
-50
lines changed

2 files changed

+51
-50
lines changed

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

Lines changed: 50 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public class Client extends GameShell {
136136
public static Packet tempP = new Packet(new byte[5000]);
137137

138138
@ObfuscatedName("g.bu")
139-
public static PrivilegedRequest field170;
139+
public static PrivilegedRequest lastAddress;
140140

141141
@ObfuscatedName("client.bq")
142142
public static int loadingStep = 0;
@@ -738,10 +738,10 @@ public class Client extends GameShell {
738738
public static int minimenuMouseOverY = -1;
739739

740740
@ObfuscatedName("client.ju")
741-
public static int field1995 = 0;
741+
public static int tooltipNum = 0;
742742

743743
@ObfuscatedName("client.ja")
744-
public static int field2076 = 50;
744+
public static int tooltipRedraw = 50;
745745

746746
@ObfuscatedName("client.jo")
747747
public static int useMode = 0;
@@ -771,7 +771,7 @@ public class Client extends GameShell {
771771
public static int objSelectedSlot;
772772

773773
@ObfuscatedName("at.jq")
774-
public static IfType field654; // todo
774+
public static IfType tooltipCom;
775775

776776
@ObfuscatedName("bk.ji")
777777
public static int menuY;
@@ -912,13 +912,13 @@ public class Client extends GameShell {
912912
public static int dragTime;
913913

914914
@ObfuscatedName("dz.lj")
915-
public static IfType[] field1516; // todo
915+
public static IfType[] dragChildren;
916916

917917
@ObfuscatedName("client.lh")
918-
public static int field2106; // todo
918+
public static int dragChildY;
919919

920920
@ObfuscatedName("m.la")
921-
public static int field44; // todo
921+
public static int dragChildX;
922922

923923
@ObfuscatedName("az.lu")
924924
public static MouseWheelInterface mouseWheel;
@@ -6260,12 +6260,12 @@ public static void addPlayerOptions(ClientPlayer player, int arg1, int arg2, int
62606260
@ObfuscatedName("fg.fj(IIIIIIIII)V")
62616261
public static void drawInterface(int id, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7) {
62626262
if (IfType.openInterface(id)) {
6263-
field1516 = null;
6263+
dragChildren = null;
62646264
drawLayer(IfType.list[id], -1, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
62656265

6266-
if (field1516 != null) {
6267-
drawLayer(field1516, 0xabcdabcd, arg1, arg2, arg3, arg4, field44, field2106, arg7);
6268-
field1516 = null;
6266+
if (dragChildren != null) {
6267+
drawLayer(dragChildren, 0xabcdabcd, arg1, arg2, arg3, arg4, dragChildX, dragChildY, arg7);
6268+
dragChildren = null;
62696269
}
62706270
} else if (arg7 == -1) {
62716271
for (int i = 0; i < 100; i++) {
@@ -6316,9 +6316,9 @@ public static void drawLayer(IfType[] children, int layerid, int x, int y, int w
63166316

63176317
if (dragComponent == com) {
63186318
if (layerid != 0xabcdabcd && !com.draggablebehavior) {
6319-
field1516 = children;
6320-
field44 = childX;
6321-
field2106 = childY;
6319+
dragChildren = children;
6320+
dragChildX = childX;
6321+
dragChildY = childY;
63226322
continue;
63236323
}
63246324

@@ -6797,12 +6797,11 @@ public static void drawLayer(IfType[] children, int layerid, int x, int y, int w
67976797
slot++;
67986798
}
67996799
}
6800-
} else if (com.type == 8 && field654 == com && field2076 == field1995) {
6800+
} else if (com.type == 8 && tooltipCom == com && tooltipRedraw == tooltipNum) {
68016801
// tooltip
68026802
int var217 = 0;
68036803
int var218 = 0;
68046804

6805-
// todo: inlined method?
68066805
PixFontGeneric var219 = p12;
68076806
String var220 = com.text;
68086807
String var221 = substituteVars(var220, com);
@@ -6921,10 +6920,10 @@ public static String substituteVars(String text, IfType com) {
69216920
}
69226921

69236922
String var5 = "";
6924-
if (field170 != null) {
6925-
var5 = StringTools.formatIPv4(field170.intArg);
6926-
if (field170.result != null) {
6927-
var5 = (String) field170.result;
6923+
if (lastAddress != null) {
6924+
var5 = StringTools.formatIPv4(lastAddress.intArg);
6925+
if (lastAddress.result != null) {
6926+
var5 = (String) lastAddress.result;
69286927
}
69296928
}
69306929

@@ -7505,7 +7504,7 @@ public static void loopLayer(IfType[] arg0, int arg1, int arg2, int arg3, int ar
75057504
}
75067505

75077506
if (var9.type == 8 && ClientMouseListener.mouseX >= var12 && ClientMouseListener.mouseY >= var13 && ClientMouseListener.mouseX < var14 && ClientMouseListener.mouseY < var15) {
7508-
field654 = var9;
7507+
tooltipCom = var9;
75097508
}
75107509

75117510
if (var9.scrollHeight > var9.height) {
@@ -7739,9 +7738,9 @@ public static void animateLayer(IfType[] children, int layer) {
77397738
}
77407739
}
77417740

7742-
if (com.field1827 != 0 && !com.v3) {
7743-
int var9 = com.field1827 >> 16;
7744-
int var10 = com.field1827 << 16 >> 16;
7741+
if (com.modelSpin != 0 && !com.v3) {
7742+
int var9 = com.modelSpin >> 16;
7743+
int var10 = com.modelSpin << 16 >> 16;
77457744
int var11 = worldUpdateNum * var9;
77467745
int var12 = worldUpdateNum * var10;
77477746

@@ -9004,11 +9003,10 @@ public static void gameLoop() {
90049003
}
90059004
}
90069005

9007-
// todo: inlined method?
9008-
IfType var444 = hoveredCom;
9009-
IfType var445 = field654;
9006+
IfType hovered = hoveredCom;
9007+
IfType tooltip = tooltipCom;
90109008
hoveredCom = null;
9011-
field654 = null;
9009+
tooltipCom = null;
90129010
dropComponent = null;
90139011
dragging = false;
90149012
dragParentFound = false;
@@ -9099,32 +9097,32 @@ public static void gameLoop() {
90999097

91009098
mouseLoop();
91019099

9102-
if (hoveredCom != var444) {
9103-
if (var444 != null) {
9104-
componentUpdated(var444);
9100+
if (hoveredCom != hovered) {
9101+
if (hovered != null) {
9102+
componentUpdated(hovered);
91059103
}
91069104
if (hoveredCom != null) {
91079105
componentUpdated(hoveredCom);
91089106
}
91099107
}
91109108

9111-
if (field654 != var445 && field2076 == field1995) {
9112-
if (var445 != null) {
9113-
componentUpdated(var445);
9109+
if (tooltipCom != tooltip && tooltipRedraw == tooltipNum) {
9110+
if (tooltip != null) {
9111+
componentUpdated(tooltip);
91149112
}
9115-
if (field654 != null) {
9116-
componentUpdated(field654);
9113+
if (tooltipCom != null) {
9114+
componentUpdated(tooltipCom);
91179115
}
91189116
}
91199117

9120-
if (field654 == null) {
9121-
if (field1995 > 0) {
9122-
field1995--;
9118+
if (tooltipCom == null) {
9119+
if (tooltipNum > 0) {
9120+
tooltipNum--;
91239121
}
9124-
} else if (field1995 < field2076) {
9125-
field1995++;
9126-
if (field2076 == field1995) {
9127-
componentUpdated(field654);
9122+
} else if (tooltipNum < tooltipRedraw) {
9123+
tooltipNum++;
9124+
if (tooltipRedraw == tooltipNum) {
9125+
componentUpdated(tooltipCom);
91289126
}
91299127
}
91309128

@@ -9134,8 +9132,8 @@ public static void gameLoop() {
91349132
cinemaCamera();
91359133
}
91369134

9137-
for (int var504 = 0; var504 < 5; var504++) {
9138-
int var10002 = camShakeCycle[var504]++;
9135+
for (int i = 0; i < 5; i++) {
9136+
camShakeCycle[i]++;
91399137
}
91409138

91419139
int mouseIdle = ClientMouseListener.getIdleTimer();
@@ -9151,6 +9149,7 @@ public static void gameLoop() {
91519149
macroCameraCycle++;
91529150
if (macroCameraCycle > 500) {
91539151
macroCameraCycle = 0;
9152+
91549153
int var509 = (int) (Math.random() * 8.0D);
91559154
if ((var509 & 0x1) == 1) {
91569155
macroCameraX += macroCameraXModifier;
@@ -9187,6 +9186,7 @@ public static void gameLoop() {
91879186
macroMinimapCycle++;
91889187
if (macroMinimapCycle > 500) {
91899188
macroMinimapCycle = 0;
9189+
91909190
int var510 = (int) (Math.random() * 8.0D);
91919191
if ((var510 & 0x1) == 1) {
91929192
macroMinimapAngle += macroMinimapAngleModifier;
@@ -9222,7 +9222,7 @@ public static void gameLoop() {
92229222
out.pos = 0;
92239223
noTimeoutCycle = 0;
92249224
}
9225-
} catch (IOException var518) {
9225+
} catch (IOException ex) {
92269226
lostCon();
92279227
}
92289228
}
@@ -9572,8 +9572,8 @@ public static boolean tcpIn() {
95729572

95739573
if (ptype == 241) {
95749574
// LAST_LOGIN_INFO
9575-
int var139 = in.g4_alt1();
9576-
field170 = GameShell.signLink.dnsreq(var139);
9575+
int ip = in.g4_alt1();
9576+
lastAddress = GameShell.signLink.dnsreq(ip);
95779577

95789578
ptype = -1;
95799579
return true;
@@ -10124,11 +10124,12 @@ public static boolean tcpIn() {
1012410124
}
1012510125

1012610126
if (ptype == 217) {
10127+
// IF_SETROTATESPEED (unofficial name)
1012710128
int var258 = in.g4_alt1();
1012810129
int var259 = in.g2_alt3();
1012910130
int var260 = in.g2_alt3();
1013010131
IfType var261 = IfType.get(var258);
10131-
var261.field1827 = (var259 << 16) + var260;
10132+
var261.modelSpin = (var259 << 16) + var260;
1013210133

1013310134
ptype = -1;
1013410135
return true;

‎src/main/java/jagex3/client/ui/IfType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public class IfType extends Linkable {
205205
public int modelZoom = 100;
206206

207207
@ObfuscatedName("eg.bl")
208-
public int field1827 = 0;
208+
public int modelSpin = 0;
209209

210210
@ObfuscatedName("eg.bt")
211211
public boolean orthog = false;

0 commit comments

Comments
 (0)