Skip to content

Commit fee58ff

Browse files
committed
chore: Removed flow obfuscation in most classes
1 parent b4c8aa9 commit fee58ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2356
-3843
lines changed

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

Lines changed: 1018 additions & 1038 deletions
Large diffs are not rendered by default.

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

Lines changed: 38 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,6 @@
2222

2323
public class GameShell extends Applet implements Runnable, MouseListener, MouseMotionListener, KeyListener, FocusListener, WindowListener {
2424

25-
@ObfuscatedName("JWWAIQPI.a")
26-
public int field938 = 8;
27-
28-
@ObfuscatedName("JWWAIQPI.b")
29-
public boolean field939 = false;
30-
31-
@ObfuscatedName("JWWAIQPI.c")
32-
public boolean field940 = false;
33-
34-
@ObfuscatedName("JWWAIQPI.d")
35-
public int field941 = 3;
36-
3725
@ObfuscatedName("JWWAIQPI.g")
3826
public int field944 = 20;
3927

@@ -131,37 +119,33 @@ public class GameShell extends Applet implements Runnable, MouseListener, MouseM
131119
public Graphics field951;
132120

133121
@ObfuscatedName("JWWAIQPI.a(III)V")
134-
public final void method266(int arg0, int arg1, int arg2) {
122+
public final void method266(int arg1, int arg2) {
135123
this.field949 = arg2;
136124
this.field950 = arg1;
137-
this.field954 = new ViewBox(this.field941, this.field950, this, this.field949);
138-
if (arg0 < 0) {
139-
this.field951 = this.method164(-756).getGraphics();
140-
this.field952 = new PixMap(this.field950, (byte) -12, this.method164(-756), this.field949);
141-
this.method142(this, 1);
142-
}
125+
this.field954 = new ViewBox(this.field950, this, this.field949);
126+
this.field951 = this.method164().getGraphics();
127+
this.field952 = new PixMap(this.field950, this.method164(), this.field949);
128+
this.method142(this, 1);
143129
}
144130

145131
@ObfuscatedName("JWWAIQPI.b(III)V")
146-
public final void method267(int arg0, int arg1, int arg2) {
132+
public final void method267(int arg0, int arg1) {
147133
this.field949 = arg0;
148-
if (arg2 == 2) {
149-
this.field950 = arg1;
150-
this.field951 = this.method164(-756).getGraphics();
151-
this.field952 = new PixMap(this.field950, (byte) -12, this.method164(-756), this.field949);
152-
this.method142(this, 1);
153-
}
134+
this.field950 = arg1;
135+
this.field951 = this.method164().getGraphics();
136+
this.field952 = new PixMap(this.field950, this.method164(), this.field949);
137+
this.method142(this, 1);
154138
}
155139

156140
public void run() {
157-
this.method164(-756).addMouseListener(this);
158-
this.method164(-756).addMouseMotionListener(this);
159-
this.method164(-756).addKeyListener(this);
160-
this.method164(-756).addFocusListener(this);
141+
this.method164().addMouseListener(this);
142+
this.method164().addMouseMotionListener(this);
143+
this.method164().addKeyListener(this);
144+
this.method164().addFocusListener(this);
161145
if (this.field954 != null) {
162146
this.field954.addWindowListener(this);
163147
}
164-
this.method165(0, true, "Loading...");
148+
this.method165(0, "Loading...");
165149
this.method86();
166150
int var1 = 0;
167151
int var2 = 256;
@@ -177,14 +161,14 @@ public void run() {
177161
do {
178162
if (this.field943 < 0) {
179163
if (this.field943 == -1) {
180-
this.method268(this.field939);
164+
this.method268();
181165
}
182166
return;
183167
}
184168
if (this.field943 > 0) {
185169
this.field943--;
186170
if (this.field943 == 0) {
187-
this.method268(this.field939);
171+
this.method268();
188172
return;
189173
}
190174
}
@@ -232,15 +216,15 @@ public void run() {
232216
this.field967 = this.field963;
233217
this.field968 = this.field964;
234218
this.field961 = 0;
235-
this.method113((byte) -111);
219+
this.method113();
236220
this.field971 = this.field972;
237221
var4 += var2;
238222
}
239223
var4 &= 0xFF;
240224
if (this.field944 > 0) {
241225
this.field947 = var2 * 1000 / (this.field944 * 256);
242226
}
243-
this.method152(818);
227+
this.method152();
244228
} while (!this.field948);
245229
System.out.println("ntime:" + var11);
246230
for (int var14 = 0; var14 < 10; var14++) {
@@ -256,10 +240,10 @@ public void run() {
256240
}
257241

258242
@ObfuscatedName("JWWAIQPI.a(Z)V")
259-
public final void method268(boolean arg0) {
243+
public final void method268() {
260244
this.field943 = -2;
261-
this.method40(277);
262-
if (arg0 || this.field954 == null) {
245+
this.method40();
246+
if (this.field954 == null) {
263247
return;
264248
}
265249
try {
@@ -273,10 +257,7 @@ public final void method268(boolean arg0) {
273257
}
274258

275259
@ObfuscatedName("JWWAIQPI.a(BI)V")
276-
public final void method269(byte arg0, int arg1) {
277-
if (arg0 != 103) {
278-
this.field938 = 388;
279-
}
260+
public final void method269(int arg1) {
280261
this.field944 = 1000 / arg1;
281262
}
282263

@@ -299,7 +280,7 @@ public final void destroy() {
299280
} catch (Exception var1) {
300281
}
301282
if (this.field943 == -1) {
302-
this.method268(this.field939);
283+
this.method268();
303284
}
304285
}
305286

@@ -308,15 +289,15 @@ public final void update(Graphics arg0) {
308289
this.field951 = arg0;
309290
}
310291
this.field955 = true;
311-
this.method82((byte) -99);
292+
this.method82();
312293
}
313294

314295
public final void paint(Graphics arg0) {
315296
if (this.field951 == null) {
316297
this.field951 = arg0;
317298
}
318299
this.field955 = true;
319-
this.method82((byte) -99);
300+
this.method82();
320301
}
321302

322303
public final void mousePressed(MouseEvent arg0) {
@@ -448,8 +429,6 @@ public final void keyPressed(KeyEvent arg0) {
448429
this.field970[this.field972] = var3;
449430
this.field972 = this.field972 + 1 & 0x7F;
450431
}
451-
if (Linkable.field1772) {
452-
}
453432
}
454433

455434
public final void keyReleased(KeyEvent arg0) {
@@ -495,10 +474,7 @@ public final void keyTyped(KeyEvent arg0) {
495474
}
496475

497476
@ObfuscatedName("JWWAIQPI.a(I)I")
498-
public final int method270(int arg0) {
499-
while (arg0 >= 0) {
500-
this.field942 = -9;
501-
}
477+
public final int method270() {
502478
int var2 = -1;
503479
if (this.field972 != this.field971) {
504480
var2 = this.field970[this.field971];
@@ -510,7 +486,7 @@ public final int method270(int arg0) {
510486
public final void focusGained(FocusEvent arg0) {
511487
this.field956 = true;
512488
this.field955 = true;
513-
this.method82((byte) -99);
489+
this.method82();
514490
}
515491

516492
public final void focusLost(FocusEvent arg0) {
@@ -547,36 +523,23 @@ public void method86() {
547523
}
548524

549525
@ObfuscatedName("JWWAIQPI.a(B)V")
550-
public void method113(byte arg0) {
551-
if (arg0 != -111) {
552-
this.field942 = -400;
553-
}
526+
public void method113() {
554527
}
555528

556529
@ObfuscatedName("JWWAIQPI.b(I)V")
557-
public void method40(int arg0) {
558-
int var2 = 41 / arg0;
530+
public void method40() {
559531
}
560532

561533
@ObfuscatedName("JWWAIQPI.c(I)V")
562-
public void method152(int arg0) {
563-
if (arg0 > 0) {
564-
;
565-
}
534+
public void method152() {
566535
}
567536

568537
@ObfuscatedName("JWWAIQPI.b(B)V")
569-
public void method82(byte arg0) {
570-
if (arg0 == -99) {
571-
;
572-
}
538+
public void method82() {
573539
}
574540

575541
@ObfuscatedName("JWWAIQPI.d(I)Ljava/awt/Component;")
576-
public Component method164(int arg0) {
577-
if (arg0 >= 0) {
578-
this.field941 = 329;
579-
}
542+
public Component method164() {
580543
return this.field954 == null ? this : this.field954;
581544
}
582545

@@ -588,11 +551,11 @@ public void method142(Runnable arg0, int arg1) {
588551
}
589552

590553
@ObfuscatedName("JWWAIQPI.a(IZLjava/lang/String;)V")
591-
public void method165(int arg0, boolean arg1, String arg2) {
554+
public void method165(int arg0, String arg2) {
592555
while (this.field951 == null) {
593-
this.field951 = this.method164(-756).getGraphics();
556+
this.field951 = this.method164().getGraphics();
594557
try {
595-
this.method164(-756).repaint();
558+
this.method164().repaint();
596559
} catch (Exception var10) {
597560
}
598561
try {
@@ -601,12 +564,9 @@ public void method165(int arg0, boolean arg1, String arg2) {
601564
}
602565
}
603566
Font var4 = new Font("Helvetica", 1, 13);
604-
FontMetrics var5 = this.method164(-756).getFontMetrics(var4);
605-
if (!arg1) {
606-
this.field938 = -145;
607-
}
567+
FontMetrics var5 = this.method164().getFontMetrics(var4);
608568
Font var6 = new Font("Helvetica", 0, 13);
609-
this.method164(-756).getFontMetrics(var6);
569+
this.method164().getFontMetrics(var6);
610570
if (this.field955) {
611571
this.field951.setColor(Color.black);
612572
this.field951.fillRect(0, 0, this.field949, this.field950);

src/main/java/jagex2/client/MouseTracking.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ public class MouseTracking implements Runnable {
1313
@ObfuscatedName("BORSVOPG.c")
1414
public Object field96 = new Object();
1515

16-
@ObfuscatedName("BORSVOPG.e")
17-
public int field98 = 8;
18-
1916
@ObfuscatedName("BORSVOPG.g")
2017
public int[] field100 = new int[500];
2118

@@ -25,10 +22,7 @@ public class MouseTracking implements Runnable {
2522
@ObfuscatedName("BORSVOPG.f")
2623
public int field99;
2724

28-
public MouseTracking(Client arg0, byte arg1) {
29-
if (arg1 != -116) {
30-
this.field98 = 294;
31-
}
25+
public MouseTracking(Client arg0) {
3226
this.field97 = arg0;
3327
}
3428

src/main/java/jagex2/client/ViewBox.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class ViewBox extends Frame {
1010

1111
public Insets insets;
1212

13-
public ViewBox(int arg0, int arg1, GameShell arg2, int arg3) {
13+
public ViewBox(int arg1, GameShell arg2, int arg3) {
1414
this.field876 = arg2;
1515
this.setTitle("Jagex");
1616
this.setResizable(false);

0 commit comments

Comments
 (0)