Skip to content

Commit 2cc1c67

Browse files
PazazPazaz
committed
chore: Identified all client class methods
1 parent 4ead044 commit 2cc1c67

17 files changed

Lines changed: 1010 additions & 1005 deletions

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

Lines changed: 773 additions & 800 deletions
Large diffs are not rendered by default.

‎src/main/java/jagex2/client/GameShell.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public void initApplication(int arg1, int arg2) {
124124
this.field954 = new ViewBox(this.field950, this, this.field949);
125125
this.graphics = this.getBaseComponent().getGraphics();
126126
this.field952 = new PixMap(this.field950, this.getBaseComponent(), this.field949);
127-
this.method142(this, 1);
127+
this.startThread(this, 1);
128128
}
129129

130130
@ObfuscatedName("JWWAIQPI.b(III)V")
@@ -133,7 +133,7 @@ public void method267(int arg0, int arg1) {
133133
this.field950 = arg1;
134134
this.graphics = this.getBaseComponent().getGraphics();
135135
this.field952 = new PixMap(this.field950, this.getBaseComponent(), this.field949);
136-
this.method142(this, 1);
136+
this.startThread(this, 1);
137137
}
138138

139139
public void run() {
@@ -241,7 +241,7 @@ public void run() {
241241
@ObfuscatedName("JWWAIQPI.a(Z)V")
242242
public void method268() {
243243
this.field943 = -2;
244-
this.method40();
244+
this.unload();
245245
if (this.field954 == null) {
246246
return;
247247
}
@@ -288,15 +288,15 @@ public void update(Graphics arg0) {
288288
this.graphics = arg0;
289289
}
290290
this.field955 = true;
291-
this.method82();
291+
this.refresh();
292292
}
293293

294294
public void paint(Graphics arg0) {
295295
if (this.graphics == null) {
296296
this.graphics = arg0;
297297
}
298298
this.field955 = true;
299-
this.method82();
299+
this.refresh();
300300
}
301301

302302
public void mousePressed(MouseEvent arg0) {
@@ -485,7 +485,7 @@ public int pollKey() {
485485
public void focusGained(FocusEvent arg0) {
486486
this.field956 = true;
487487
this.field955 = true;
488-
this.method82();
488+
this.refresh();
489489
}
490490

491491
public void focusLost(FocusEvent arg0) {
@@ -526,15 +526,15 @@ public void update() {
526526
}
527527

528528
@ObfuscatedName("JWWAIQPI.b(I)V")
529-
public void method40() {
529+
public void unload() {
530530
}
531531

532532
@ObfuscatedName("JWWAIQPI.c(I)V")
533533
public void draw() {
534534
}
535535

536536
@ObfuscatedName("JWWAIQPI.b(B)V")
537-
public void method82() {
537+
public void refresh() {
538538
}
539539

540540
@ObfuscatedName("JWWAIQPI.d(I)Ljava/awt/Component;")
@@ -543,7 +543,7 @@ public Component getBaseComponent() {
543543
}
544544

545545
@ObfuscatedName("JWWAIQPI.a(Ljava/lang/Runnable;I)V")
546-
public void method142(Runnable arg0, int arg1) {
546+
public void startThread(Runnable arg0, int arg1) {
547547
Thread var3 = new Thread(arg0);
548548
var3.start();
549549
var3.setPriority(arg1);

‎src/main/java/jagex2/config/Component.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ public static void unpack(PixFont[] fonts, Jagfile interfaces, Jagfile media) {
587587
}
588588

589589
@ObfuscatedName("EWIXBTLV.a(ZI)V")
590-
public static void method209(int arg1) {
590+
public static void unloadCom(int arg1) {
591591
if (arg1 == -1) {
592592
return;
593593
}

‎src/main/java/jagex2/config/LocType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ public boolean method570(int arg1) {
575575
}
576576

577577
@ObfuscatedName("YMYTDPVW.a(Z)V")
578-
public static void method571() {
578+
public static void unload() {
579579
field1633 = null;
580580
field1616 = null;
581581
field1612 = null;

‎src/main/java/jagex2/config/NpcType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public void method470(Packet arg1) {
220220
}
221221

222222
@ObfuscatedName("SLDUQHOR.a(Z)V")
223-
public static void method471() {
223+
public static void unload() {
224224
field1438 = null;
225225
field1453 = null;
226226
field1458 = null;

‎src/main/java/jagex2/config/ObjType.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ public static Pix32 method230(int arg1, int arg2, int arg3) {
509509
if (arg1 == 0) {
510510
Pix32 var4 = (Pix32) field828.get((long) arg3);
511511
if (var4 != null && var4.ohi != arg2 && var4.ohi != -1) {
512-
var4.method604();
512+
var4.unlink();
513513
var4 = null;
514514
}
515515
if (var4 != null) {
@@ -635,7 +635,7 @@ public static Pix32 method230(int arg1, int arg2, int arg3) {
635635
}
636636

637637
@ObfuscatedName("GSCQQEUA.a(Z)V")
638-
public static void method231() {
638+
public static void unload() {
639639
field819 = null;
640640
field828 = null;
641641
field824 = null;

‎src/main/java/jagex2/dash3d/ClientEntity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public abstract class ClientEntity extends ModelSource {
171171
public String chatMessage;
172172

173173
@ObfuscatedName("LRUWCBNN.a(I)V")
174-
public void method350() {
174+
public void clearRoute() {
175175
this.field1180 = 0;
176176
this.field1160 = 0;
177177
}

‎src/main/java/jagex2/dash3d/Model.java‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,10 @@ public class Model extends ModelSource {
174174
public static int[] field1256 = new int[1000];
175175

176176
@ObfuscatedName("LZYQDKJV.Ib")
177-
public static int[] field1257 = Pix3D.sinTable;
177+
public static int[] sinTable = Pix3D.sinTable;
178178

179179
@ObfuscatedName("LZYQDKJV.Jb")
180-
public static int[] field1258 = Pix3D.cosTable;
180+
public static int[] cosTable = Pix3D.cosTable;
181181

182182
@ObfuscatedName("LZYQDKJV.Kb")
183183
public static int[] field1259 = Pix3D.colourTable;
@@ -201,19 +201,19 @@ public class Model extends ModelSource {
201201
public static int field1251;
202202

203203
@ObfuscatedName("LZYQDKJV.Eb")
204-
public static int field1253;
204+
public static int mouseX;
205205

206206
@ObfuscatedName("LZYQDKJV.Fb")
207-
public static int field1254;
207+
public static int mouseY;
208208

209209
@ObfuscatedName("LZYQDKJV.Gb")
210-
public static int field1255;
210+
public static int pickedCount;
211211

212212
@ObfuscatedName("LZYQDKJV.hb")
213213
public static OnDemandProvider field1230;
214214

215215
@ObfuscatedName("LZYQDKJV.Db")
216-
public static boolean field1252;
216+
public static boolean checkHover;
217217

218218
@ObfuscatedName("LZYQDKJV.gb")
219219
public static Metadata[] field1229;
@@ -225,7 +225,7 @@ public class Model extends ModelSource {
225225
public int[][] field1226;
226226

227227
@ObfuscatedName("LZYQDKJV.a(Z)V")
228-
public static void method355() {
228+
public static void unload() {
229229
field1229 = null;
230230
field1231 = null;
231231
field1232 = null;
@@ -242,8 +242,8 @@ public static void method355() {
242242
field1243 = null;
243243
field1244 = null;
244244
field1245 = null;
245-
field1257 = null;
246-
field1258 = null;
245+
sinTable = null;
246+
cosTable = null;
247247
field1259 = null;
248248
field1260 = null;
249249
}
@@ -1202,22 +1202,22 @@ public void method369(int arg0, int[] arg1, int arg2, int arg3, int arg4) {
12021202
int var24 = (arg3 & 0xFF) * 8;
12031203
int var25 = (arg4 & 0xFF) * 8;
12041204
if (var25 != 0) {
1205-
int var26 = field1257[var25];
1206-
int var27 = field1258[var25];
1205+
int var26 = sinTable[var25];
1206+
int var27 = cosTable[var25];
12071207
int var28 = this.field1197[var22] * var26 + this.field1196[var22] * var27 >> 16;
12081208
this.field1197[var22] = this.field1197[var22] * var27 - this.field1196[var22] * var26 >> 16;
12091209
this.field1196[var22] = var28;
12101210
}
12111211
if (var23 != 0) {
1212-
int var29 = field1257[var23];
1213-
int var30 = field1258[var23];
1212+
int var29 = sinTable[var23];
1213+
int var30 = cosTable[var23];
12141214
int var31 = this.field1197[var22] * var30 - this.field1198[var22] * var29 >> 16;
12151215
this.field1198[var22] = this.field1198[var22] * var30 + this.field1197[var22] * var29 >> 16;
12161216
this.field1197[var22] = var31;
12171217
}
12181218
if (var24 != 0) {
1219-
int var32 = field1257[var24];
1220-
int var33 = field1258[var24];
1219+
int var32 = sinTable[var24];
1220+
int var33 = cosTable[var24];
12211221
int var34 = this.field1198[var22] * var32 + this.field1196[var22] * var33 >> 16;
12221222
this.field1198[var22] = this.field1198[var22] * var33 - this.field1196[var22] * var32 >> 16;
12231223
this.field1196[var22] = var34;
@@ -1281,8 +1281,8 @@ public void method370(boolean arg0) {
12811281

12821282
@ObfuscatedName("LZYQDKJV.b(II)V")
12831283
public void method371(int arg0) {
1284-
int var3 = field1257[arg0];
1285-
int var4 = field1258[arg0];
1284+
int var3 = sinTable[arg0];
1285+
int var4 = cosTable[arg0];
12861286
for (int var5 = 0; var5 < this.field1195; var5++) {
12871287
int var7 = this.field1197[var5] * var4 - this.field1198[var5] * var3 >> 16;
12881288
this.field1198[var5] = this.field1198[var5] * var4 + this.field1197[var5] * var3 >> 16;
@@ -1485,14 +1485,14 @@ public static final int method379(int arg0, int arg1, int arg2) {
14851485
public void method380(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6) {
14861486
int var8 = Pix3D.centerX;
14871487
int var9 = Pix3D.centerY;
1488-
int var10 = field1257[arg0];
1489-
int var11 = field1258[arg0];
1490-
int var12 = field1257[arg1];
1491-
int var13 = field1258[arg1];
1492-
int var14 = field1257[arg2];
1493-
int var15 = field1258[arg2];
1494-
int var16 = field1257[arg3];
1495-
int var17 = field1258[arg3];
1488+
int var10 = sinTable[arg0];
1489+
int var11 = cosTable[arg0];
1490+
int var12 = sinTable[arg1];
1491+
int var13 = cosTable[arg1];
1492+
int var14 = sinTable[arg2];
1493+
int var15 = cosTable[arg2];
1494+
int var16 = sinTable[arg3];
1495+
int var17 = cosTable[arg3];
14961496
int var18 = arg5 * var16 + arg6 * var17 >> 16;
14971497
for (int var19 = 0; var19 < this.field1195; var19++) {
14981498
int var20 = this.field1196[var19];
@@ -1568,7 +1568,7 @@ public void method381(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5
15681568
var23 = true;
15691569
}
15701570
boolean var24 = false;
1571-
if (arg8 > 0 && field1252) {
1571+
if (arg8 > 0 && checkHover) {
15721572
int var25 = var11 - var12;
15731573
if (var25 <= 50) {
15741574
var25 = 50;
@@ -1591,11 +1591,11 @@ public void method381(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5
15911591
var29 = var19 / var13;
15921592
var28 = var21 / var25;
15931593
}
1594-
int var30 = field1253 - Pix3D.centerX;
1595-
int var31 = field1254 - Pix3D.centerY;
1594+
int var30 = mouseX - Pix3D.centerX;
1595+
int var31 = mouseY - Pix3D.centerY;
15961596
if (var30 > var26 && var30 < var27 && var31 > var28 && var31 < var29) {
15971597
if (this.field1227) {
1598-
field1256[field1255++] = arg8;
1598+
field1256[pickedCount++] = arg8;
15991599
} else {
16001600
var24 = true;
16011601
}
@@ -1606,8 +1606,8 @@ public void method381(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5
16061606
int var34 = 0;
16071607
int var35 = 0;
16081608
if (arg0 != 0) {
1609-
var34 = field1257[arg0];
1610-
var35 = field1258[arg0];
1609+
var34 = sinTable[arg0];
1610+
var35 = cosTable[arg0];
16111611
}
16121612
for (int var36 = 0; var36 < this.field1195; var36++) {
16131613
int var37 = this.field1196[var36];
@@ -1663,8 +1663,8 @@ public void method382(boolean arg0, boolean arg1, int arg2) {
16631663
int var36 = (field1235[var30] + field1235[var31] + field1235[var32]) / 3 + this.field1221;
16641664
field1240[var36][field1239[var36]++] = var5;
16651665
} else {
1666-
if (arg1 && this.method385(field1253, field1254, field1234[var30], field1234[var31], field1234[var32], var33, var34, var35)) {
1667-
field1256[field1255++] = arg2;
1666+
if (arg1 && this.method385(mouseX, mouseY, field1234[var30], field1234[var31], field1234[var32], var33, var34, var35)) {
1667+
field1256[pickedCount++] = arg2;
16681668
arg1 = false;
16691669
}
16701670
if ((field1234[var32] - field1234[var31]) * (var33 - var34) - (field1234[var30] - field1234[var31]) * (var35 - var34) > 0) {

‎src/main/java/jagex2/dash3d/World3D.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public World3D(int[][][] arg0, int arg1, int arg2, int arg3) {
207207
}
208208

209209
@ObfuscatedName("KJCMXHNO.a(Z)V")
210-
public static void method273() {
210+
public static void unload() {
211211
field1039 = null;
212212
field1050 = null;
213213
field1051 = null;
@@ -533,7 +533,7 @@ public boolean method287(int arg0, int arg1, int arg2, int arg3, int arg4, int a
533533
}
534534

535535
@ObfuscatedName("KJCMXHNO.a(I)V")
536-
public void method288() {
536+
public void clearLocChanges() {
537537
for (int var3 = 0; var3 < this.field1020; var3++) {
538538
Sprite var4 = this.field1021[var3];
539539
this.method289(var4);
@@ -959,10 +959,10 @@ public static void init(int arg0, int[] arg2, int arg3, int arg4, int arg5) {
959959
boolean[][][][] var6 = new boolean[9][32][53][53];
960960
for (int var7 = 128; var7 <= 384; var7 += 32) {
961961
for (int var15 = 0; var15 < 2048; var15 += 64) {
962-
field1035 = Model.field1257[var7];
963-
field1036 = Model.field1258[var7];
964-
field1037 = Model.field1257[var15];
965-
field1038 = Model.field1258[var15];
962+
field1035 = Model.sinTable[var7];
963+
field1036 = Model.cosTable[var7];
964+
field1037 = Model.sinTable[var15];
965+
field1038 = Model.cosTable[var15];
966966
int var16 = (var7 - 128) / 32;
967967
int var17 = var15 / 64;
968968
for (int var18 = -26; var18 <= 26; var18++) {
@@ -1038,7 +1038,7 @@ public void method312(int arg1, int arg2) {
10381038
}
10391039

10401040
@ObfuscatedName("KJCMXHNO.a(IIIIIII)V")
1041-
public void method313(int arg0, int arg1, int arg3, int arg4, int arg5, int arg6) {
1041+
public void draw(int arg0, int arg1, int arg3, int arg4, int arg5, int arg6) {
10421042
if (arg0 < 0) {
10431043
arg0 = 0;
10441044
} else if (arg0 >= this.field1015 * 128) {
@@ -1050,10 +1050,10 @@ public void method313(int arg0, int arg1, int arg3, int arg4, int arg5, int arg6
10501050
arg4 = this.field1016 * 128 - 1;
10511051
}
10521052
field1025++;
1053-
field1035 = Model.field1257[arg6];
1054-
field1036 = Model.field1258[arg6];
1055-
field1037 = Model.field1257[arg5];
1056-
field1038 = Model.field1258[arg5];
1053+
field1035 = Model.sinTable[arg6];
1054+
field1036 = Model.cosTable[arg6];
1055+
field1037 = Model.sinTable[arg5];
1056+
field1038 = Model.cosTable[arg5];
10571057
field1069 = field1068[(arg6 - 128) / 32][arg5 / 64];
10581058
field1032 = arg0;
10591059
field1033 = arg3;

‎src/main/java/jagex2/datastruct/HashTable.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public Linkable method259(long arg0) {
3434
@ObfuscatedName("JLFXAIRK.a(ILZUOIJLRD;J)V")
3535
public void method260(Linkable arg1, long arg2) {
3636
if (arg1.field1771 != null) {
37-
arg1.method604();
37+
arg1.unlink();
3838
}
3939
Linkable var5 = this.field900[(int) (arg2 & (long) (this.field899 - 1))];
4040
arg1.field1771 = var5.field1771;

0 commit comments

Comments
 (0)