Skip to content

Commit 36469b3

Browse files
PazazPazaz
committed
chore: Renaming more fields
1 parent 7cf3216 commit 36469b3

21 files changed

+1003
-969
lines changed

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

Lines changed: 137 additions & 130 deletions
Large diffs are not rendered by default.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class SignLink implements Runnable {
2121
public static String javaVersion;
2222

2323
@ObfuscatedName("ak.l")
24-
public AudioSource field376;
24+
public AudioSource audio;
2525

2626
@ObfuscatedName("ak.m")
2727
public PrivilegedRequest current = null;
@@ -156,8 +156,8 @@ public final PrivilegedRequest urlreq(URL arg0) {
156156
}
157157

158158
@ObfuscatedName("ak.q(I)Lw;")
159-
public final AudioSource method440() {
160-
return this.field376;
159+
public final AudioSource getAudio() {
160+
return this.audio;
161161
}
162162

163163
public static void flushEvents(SignLink handler, Object source) {

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

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class TitleScreen {
5555
public static boolean mute = false;
5656

5757
@ObfuscatedName("g.w")
58-
public static int[] field139 = new int[256];
58+
public static int[] flameLineOffset = new int[256];
5959

6060
@ObfuscatedName("g.e")
6161
public static int[] flameGradient;
@@ -91,13 +91,13 @@ public class TitleScreen {
9191
public static int flameCycle0 = 0;
9292

9393
@ObfuscatedName("g.ad")
94-
public static int field128 = 0;
94+
public static int flameSparks = 0;
9595

9696
@ObfuscatedName("g.ac")
97-
public static int field147 = 0;
97+
public static int flameCycle = 0;
9898

9999
@ObfuscatedName("g.aa")
100-
public static int field148 = 0;
100+
public static int loopCycle = 0;
101101

102102
// jag::oldscape::TitleScreen::m_loadPos
103103
@ObfuscatedName("g.as")
@@ -131,8 +131,9 @@ public class TitleScreen {
131131
@ObfuscatedName("g.ah")
132132
public static String loginPass = "";
133133

134+
// // jag::oldscape::TitleScreen::m_loginSelect
134135
@ObfuscatedName("g.ay")
135-
public static int field150 = 0;
136+
public static int loginSelect = 0;
136137

137138
// jag::oldscape::TitleScreen::m_charList
138139
@ObfuscatedName("g.al")
@@ -229,12 +230,12 @@ public static void close() {
229230

230231
// todo: inlined method (MidiManager.stop?)
231232
MidiManager.state = 1;
232-
MidiManager.field1118 = null;
233-
MidiManager.field349 = -1;
234-
MidiManager.field1121 = -1;
235-
MidiManager.field1120 = 0;
236-
MidiManager.field1625 = false;
237-
MidiManager.field1152 = 2;
233+
MidiManager.midis = null;
234+
MidiManager.pendingGroupId = -1;
235+
MidiManager.pendingFileId = -1;
236+
MidiManager.pendingVolume = 0;
237+
MidiManager.pendingLoop = false;
238+
MidiManager.fadeOutRate = 2;
238239

239240
Js5Net.sendLoginLogoutPacket(true);
240241
open = false;
@@ -265,7 +266,7 @@ public static void loop(GameShell app) {
265266
return;
266267
}
267268

268-
field147++;
269+
flameCycle++;
269270

270271
if (Client.state != 10) {
271272
return;
@@ -296,37 +297,37 @@ public static void loop(GameShell app) {
296297
short var12 = 291;
297298
if (var8 == 1 && var9 >= var11 - 75 && var9 <= var11 + 75 && var10 >= var12 - 20 && var10 <= var12 + 20) {
298299
loginscreen = 3;
299-
field150 = 0;
300+
loginSelect = 0;
300301
}
301302
short var13 = 462;
302303
if (var8 == 1 && var9 >= var13 - 75 && var9 <= var13 + 75 && var10 >= var12 - 20 && var10 <= var12 + 20) {
303304
loginMes1 = Text.PLEASELOGIN1;
304305
loginMes2 = Text.PLEASELOGIN2;
305306
loginMes3 = Text.PLEASELOGIN3;
306307
loginscreen = 2;
307-
field150 = 0;
308+
loginSelect = 0;
308309
}
309310
} else if (loginscreen == 2) {
310311
short var14 = 231;
311312
int var26 = var14 + 30;
312313
if (var8 == 1 && var10 >= var26 - 15 && var10 < var26) {
313-
field150 = 0;
314+
loginSelect = 0;
314315
}
315316
var26 += 15;
316317
if (var8 == 1 && var10 >= var26 - 15 && var10 < var26) {
317-
field150 = 1;
318+
loginSelect = 1;
318319
}
319320
var26 += 15;
320321
short var15 = 302;
321322
short var16 = 321;
322323
if (var8 == 1 && var9 >= var15 - 75 && var9 <= var15 + 75 && var10 >= var16 - 20 && var10 <= var16 + 20) {
323324
loginUser = loginUser.trim();
324325
if (loginUser.length() == 0) {
325-
loginMes(Text.field978, Text.field979, Text.field980);
326+
loginMes(Text.LOGIN_USER_LENGTH_A, Text.LOGIN_USER_LENGTH_B, Text.LOGIN_USER_LENGTH_C);
326327
return;
327328
}
328329
if (loginPass.length() == 0) {
329-
loginMes(Text.field981, Text.field982, Text.field983);
330+
loginMes(Text.LOGIN_PASS_LENGTH_A, Text.LOGIN_PASS_LENGTH_B, Text.LOGIN_PASS_LENGTH_C);
330331
return;
331332
}
332333
loginMes(Text.CONNECTING1, Text.CONNECTING2, Text.CONNECTING3);
@@ -350,31 +351,31 @@ public static void loop(GameShell app) {
350351
}
351352
}
352353

353-
if (field150 == 0) {
354+
if (loginSelect == 0) {
354355
if (ClientKeyboardListener.code == 85 && loginUser.length() > 0) {
355356
loginUser = loginUser.substring(0, loginUser.length() - 1);
356357
}
357358
if (ClientKeyboardListener.code == 84 || ClientKeyboardListener.code == 80) {
358-
field150 = 1;
359+
loginSelect = 1;
359360
}
360361
if (var21 && loginUser.length() < 320) {
361362
loginUser += ClientKeyboardListener.ch;
362363
}
363-
} else if (field150 == 1) {
364+
} else if (loginSelect == 1) {
364365
if (ClientKeyboardListener.code == 85 && loginPass.length() > 0) {
365366
loginPass = loginPass.substring(0, loginPass.length() - 1);
366367
}
367368
if (ClientKeyboardListener.code == 84 || ClientKeyboardListener.code == 80) {
368-
field150 = 0;
369+
loginSelect = 0;
369370
}
370371
if (Client.modewhere == 2 && ClientKeyboardListener.code == 84) {
371372
loginUser = loginUser.trim();
372373
if (loginUser.length() == 0) {
373-
loginMes(Text.field978, Text.field979, Text.field980);
374+
loginMes(Text.LOGIN_USER_LENGTH_A, Text.LOGIN_USER_LENGTH_B, Text.LOGIN_USER_LENGTH_C);
374375
break;
375376
}
376377
if (loginPass.length() == 0) {
377-
loginMes(Text.field981, Text.field982, Text.field983);
378+
loginMes(Text.LOGIN_PASS_LENGTH_A, Text.LOGIN_PASS_LENGTH_B, Text.LOGIN_PASS_LENGTH_C);
378379
break;
379380
}
380381
loginMes(Text.CONNECTING1, Text.CONNECTING2, Text.CONNECTING3);
@@ -482,14 +483,14 @@ public static void draw(PixFontGeneric arg0, PixFontGeneric arg1) {
482483
for (user = loginUser; arg0.stringWid(user) > var16; user = user.substring(1)) {
483484
}
484485

485-
arg0.drawString(PixFont.escape(user) + (field150 == 0 & Client.loopCycle % 40 < 20 ? StringConstants.TAG_COLOUR(16776960) + StringConstants.PIPE : ""), 312, y, 16777215, 0);
486+
arg0.drawString(PixFont.escape(user) + (loginSelect == 0 & Client.loopCycle % 40 < 20 ? StringConstants.TAG_COLOUR(16776960) + StringConstants.PIPE : ""), 312, y, 16777215, 0);
486487
y += 15;
487488

488489
// todo: inlined method?
489490
String var19 = Text.PASSWORDPROMPT;
490491
String var20 = loginPass;
491492
String var21 = StringTools.getRepeatedCharacter('*', var20.length());
492-
arg0.drawString(var19 + var21 + (field150 == 1 & Client.loopCycle % 40 < 20 ? StringConstants.TAG_COLOUR(16776960) + StringConstants.PIPE : ""), 274, y, 16777215, 0);
493+
arg0.drawString(var19 + var21 + (loginSelect == 1 & Client.loopCycle % 40 < 20 ? StringConstants.TAG_COLOUR(16776960) + StringConstants.PIPE : ""), 274, y, 16777215, 0);
493494
y += 15;
494495

495496
int x = 302;
@@ -524,8 +525,8 @@ public static void draw(PixFontGeneric arg0, PixFontGeneric arg1) {
524525
}
525526
}
526527

527-
if (field147 > 0) {
528-
int var28 = field147;
528+
if (flameCycle > 0) {
529+
int var28 = flameCycle;
529530

530531
short var29 = 256;
531532
flameCycle0 += var28 * 128;
@@ -579,25 +580,25 @@ public static void draw(PixFontGeneric arg0, PixFontGeneric arg1) {
579580
}
580581

581582
for (int var41 = 0; var41 < var29 - var28; var41++) {
582-
field139[var41] = field139[var28 + var41];
583+
flameLineOffset[var41] = flameLineOffset[var28 + var41];
583584
}
584585

585586
for (int var42 = var29 - var28; var42 < var29; var42++) {
586-
field139[var42] = (int) (Math.sin((double) field148 / 14.0D) * 16.0D + Math.sin((double) field148 / 15.0D) * 14.0D + Math.sin((double) field148 / 16.0D) * 12.0D);
587-
field148++;
587+
flameLineOffset[var42] = (int) (Math.sin((double) loopCycle / 14.0D) * 16.0D + Math.sin((double) loopCycle / 15.0D) * 14.0D + Math.sin((double) loopCycle / 16.0D) * 12.0D);
588+
loopCycle++;
588589
}
589590

590-
field128 += var28 * 381703395;
591+
flameSparks += var28;
591592
int var43 = ((Client.loopCycle & 0x1) + var28) / 2;
592593

593594
if (var43 > 0) {
594-
for (int var44 = 0; var44 < field128 * 1196724044; var44++) {
595+
for (int var44 = 0; var44 < flameSparks * 100; var44++) {
595596
int var45 = (int) (Math.random() * 124.0D) + 2;
596597
int var46 = (int) (Math.random() * 128.0D) + 128;
597598
flameBuffer2[(var46 << 7) + var45] = 192;
598599
}
599600

600-
field128 = 0;
601+
flameSparks = 0;
601602

602603
int var47 = 0;
603604
label286:
@@ -640,7 +641,7 @@ public static void draw(PixFontGeneric arg0, PixFontGeneric arg1) {
640641
var47++;
641642
}
642643
}
643-
field147 = 0;
644+
flameCycle = 0;
644645
}
645646

646647
short var55 = 256;
@@ -676,7 +677,7 @@ public static void draw(PixFontGeneric arg0, PixFontGeneric arg1) {
676677
int var59 = 0;
677678
int var60 = 6885;
678679
for (int var61 = 1; var61 < var55 - 1; var61++) {
679-
int var62 = (var55 - var61) * field139[var61] / var55;
680+
int var62 = (var55 - var61) * flameLineOffset[var61] / var55;
680681
int var63 = var62 + 22;
681682
if (var63 < 0) {
682683
var63 = 0;
@@ -702,7 +703,7 @@ public static void draw(PixFontGeneric arg0, PixFontGeneric arg1) {
702703
int var70 = 0;
703704
int var71 = 7546;
704705
for (int var72 = 1; var72 < var55 - 1; var72++) {
705-
int var73 = (var55 - var72) * field139[var72] / var55;
706+
int var73 = (var55 - var72) * flameLineOffset[var72] / var55;
706707
int var74 = 103 - var73;
707708
int var75 = var71 + var73;
708709
for (int var76 = 0; var76 < var74; var76++) {

‎src/main/java/jagex3/client/chat/ChatFilterPrivacy.java‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎src/main/java/jagex3/client/chat/FriendListEntry.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ public class FriendListEntry {
99
public String name;
1010

1111
@ObfuscatedName("q.d")
12-
public String field177;
12+
public String previousName;
1313

1414
@ObfuscatedName("q.l")
15-
public int field174;
15+
public int worldId;
1616

1717
@ObfuscatedName("q.m")
18-
public int field175;
18+
public int rank;
1919

2020
@ObfuscatedName("q.c")
21-
public boolean field172;
21+
public boolean referrer;
2222

2323
@ObfuscatedName("q.n")
24-
public boolean field176;
24+
public boolean referred;
2525
}

‎src/main/java/jagex3/client/chat/PrivateChatFilter.java‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package jagex3.client.chat;
2+
3+
import deob.ObfuscatedName;
4+
5+
@ObfuscatedName("bb")
6+
public class PrivateChatFilter {
7+
8+
@ObfuscatedName("bb.r")
9+
public static final PrivateChatFilter field1104 = new PrivateChatFilter(0);
10+
11+
@ObfuscatedName("bb.d")
12+
public static final PrivateChatFilter FRIENDS = new PrivateChatFilter(1);
13+
14+
@ObfuscatedName("bb.l")
15+
public static final PrivateChatFilter field1105 = new PrivateChatFilter(2);
16+
17+
@ObfuscatedName("bb.m")
18+
public final int index;
19+
20+
@ObfuscatedName("be.r(I)[Lbb;")
21+
public static PrivateChatFilter[] values() {
22+
return new PrivateChatFilter[] { field1105, field1104, FRIENDS};
23+
}
24+
25+
public PrivateChatFilter(int arg0) {
26+
this.index = arg0;
27+
}
28+
29+
public static PrivateChatFilter get(int id) {
30+
PrivateChatFilter[] all = PrivateChatFilter.values();
31+
for (int i = 0; i < all.length; i++) {
32+
PrivateChatFilter privacy = all[i];
33+
if (privacy.index == id) {
34+
return privacy;
35+
}
36+
}
37+
return null;
38+
}
39+
}

‎src/main/java/jagex3/client/chat/TimestampMessage.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
public class TimestampMessage extends ChatLinkable {
99

1010
@ObfuscatedName("dr.l")
11-
public String field1584;
11+
public String message;
1212

1313
@ObfuscatedName("dr.m")
14-
public short field1583;
14+
public short worldId;
1515

1616
public TimestampMessage(String arg0, int arg1) {
1717
MonotonicTime.currentTime();
18-
this.field1584 = arg0;
19-
this.field1583 = (short) arg1;
18+
this.message = arg0;
19+
this.worldId = (short) arg1;
2020
}
2121
}

0 commit comments

Comments
 (0)