Skip to content

Commit 8ae9dca

Browse files
PazazPazaz
committed
fix: Modern OS fixes
- No harddcoded window insets - Right-clicking on modern JVMs
1 parent 0f3a5df commit 8ae9dca

14 files changed

Lines changed: 89 additions & 113 deletions

File tree

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

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
package jagex2.client;
22

3-
import java.awt.Color;
4-
import java.awt.Font;
5-
import java.awt.Graphics;
6-
import java.io.DataInputStream;
7-
import java.io.IOException;
8-
import java.math.BigInteger;
9-
import java.net.InetAddress;
10-
import java.net.Socket;
11-
import java.net.URL;
12-
import java.util.zip.CRC32;
13-
14-
import deob.*;
3+
import deob.ObfuscatedName;
154
import jagex2.config.*;
5+
import jagex2.config.Component;
166
import jagex2.dash3d.*;
177
import jagex2.datastruct.JString;
188
import jagex2.datastruct.LinkList;
@@ -24,6 +14,15 @@
2414
import jagex2.wordenc.WordPack;
2515
import sign.signlink;
2616

17+
import java.awt.*;
18+
import java.io.DataInputStream;
19+
import java.io.IOException;
20+
import java.math.BigInteger;
21+
import java.net.InetAddress;
22+
import java.net.Socket;
23+
import java.net.URL;
24+
import java.util.zip.CRC32;
25+
2726
@ObfuscatedName("client")
2827
public class Client extends GameShell {
2928

@@ -6812,11 +6811,10 @@ public void method491(int arg0) {
68126811

68136812
@ObfuscatedName("client.c(I)Ljava/awt/Component;")
68146813
public final java.awt.Component method11(int arg0) {
6815-
this.field1428 += arg0;
6816-
if (signlink.mainapp == null) {
6817-
return super.field18 == null ? this : super.field18;
6818-
} else {
6814+
if (signlink.mainapp != null) {
68196815
return signlink.mainapp;
6816+
} else {
6817+
return this;
68206818
}
68216819
}
68226820

@@ -9622,7 +9620,7 @@ public final void method532(int arg0, int arg1, int arg2) {
96229620

96239621
public static final void main(String[] arg0) {
96249622
try {
9625-
System.out.println("RS2 user client - release #" + 254);
9623+
System.out.println("RS2 user client - release #" + signlink.clientversion);
96269624
if (arg0.length == 5) {
96279625
field1239 = Integer.parseInt(arg0[0]);
96289626
field1240 = Integer.parseInt(arg0[1]);

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

Lines changed: 42 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
11
package jagex2.client;
22

3-
import deob.*;
3+
import deob.ObfuscatedName;
44
import jagex2.datastruct.Linkable;
55
import jagex2.graphics.Pix32;
66
import jagex2.graphics.PixMap;
77

88
import java.applet.Applet;
9-
import java.awt.Color;
10-
import java.awt.Component;
11-
import java.awt.Font;
12-
import java.awt.FontMetrics;
13-
import java.awt.Graphics;
14-
import java.awt.event.FocusEvent;
15-
import java.awt.event.FocusListener;
16-
import java.awt.event.KeyEvent;
17-
import java.awt.event.KeyListener;
18-
import java.awt.event.MouseEvent;
19-
import java.awt.event.MouseListener;
20-
import java.awt.event.MouseMotionListener;
21-
import java.awt.event.WindowEvent;
22-
import java.awt.event.WindowListener;
9+
import java.awt.*;
10+
import java.awt.event.*;
2311

2412
@ObfuscatedName("a")
2513
public class GameShell extends Applet implements Runnable, MouseListener, MouseMotionListener, KeyListener, FocusListener, WindowListener {
@@ -137,14 +125,14 @@ public class GameShell extends Applet implements Runnable, MouseListener, MouseM
137125

138126
@ObfuscatedName("a.a(IIB)V")
139127
public final void method1(int arg0, int arg1, byte arg2) {
140-
if (arg2 != 7) {
141-
return;
142-
}
128+
this.setPreferredSize(new Dimension(arg0, arg1));
129+
143130
this.field13 = arg0;
144131
this.field14 = arg1;
145132
this.field18 = new ViewBox(false, this.field14, this, this.field13);
146133
this.field15 = this.method11(0).getGraphics();
147134
this.field16 = new PixMap(true, this.method11(0), this.field13, this.field14);
135+
148136
this.method12(this, 1);
149137
}
150138

@@ -334,31 +322,51 @@ public final void paint(Graphics arg0) {
334322
public final void mousePressed(MouseEvent arg0) {
335323
int var2 = arg0.getX();
336324
int var3 = arg0.getY();
337-
if (this.field18 != null) {
338-
var2 -= 4;
339-
var3 -= 22;
340-
}
325+
341326
this.field21 = 0;
342327
this.field26 = var2;
343328
this.field27 = var3;
344329
this.field28 = System.currentTimeMillis();
345-
if (arg0.isMetaDown()) {
346-
this.field25 = 2;
347-
this.field22 = 2;
348-
} else {
349-
this.field25 = 1;
350-
this.field22 = 1;
351-
}
352-
if (InputTracking.field151) {
353-
InputTracking.method49(var2, (byte) 9, var3, arg0.isMetaDown() ? 1 : 0);
330+
331+
try {
332+
if (arg0.getButton() == MouseEvent.BUTTON3) {
333+
this.field25 = 2;
334+
this.field22 = 2;
335+
} else {
336+
this.field25 = 1;
337+
this.field22 = 1;
338+
}
339+
340+
if (InputTracking.field151) {
341+
InputTracking.method49(var2, (byte) 9, var3, arg0.getButton() == MouseEvent.BUTTON3 ? 1 : 0);
342+
}
343+
} catch (NoSuchMethodError ex) {
344+
if (arg0.isMetaDown()) {
345+
this.field25 = 2;
346+
this.field22 = 2;
347+
} else {
348+
this.field25 = 1;
349+
this.field22 = 1;
350+
}
351+
352+
if (InputTracking.field151) {
353+
InputTracking.method49(var2, (byte) 9, var3, arg0.isMetaDown() ? 1 : 0);
354+
}
354355
}
355356
}
356357

357358
public final void mouseReleased(MouseEvent arg0) {
358359
this.field21 = 0;
359360
this.field22 = 0;
360-
if (InputTracking.field151) {
361-
InputTracking.method50(arg0.isMetaDown() ? 1 : 0, (byte) 2);
361+
362+
try {
363+
if (InputTracking.field151) {
364+
InputTracking.method50(arg0.getButton() == MouseEvent.BUTTON3 ? 1 : 0, (byte) 2);
365+
}
366+
} catch (NoSuchMethodError ex) {
367+
if (InputTracking.field151) {
368+
InputTracking.method50(arg0.isMetaDown() ? 1 : 0, (byte) 2);
369+
}
362370
}
363371
}
364372

@@ -383,10 +391,6 @@ public final void mouseExited(MouseEvent arg0) {
383391
public final void mouseDragged(MouseEvent arg0) {
384392
int var2 = arg0.getX();
385393
int var3 = arg0.getY();
386-
if (this.field18 != null) {
387-
var2 -= 4;
388-
var3 -= 22;
389-
}
390394
this.field21 = 0;
391395
this.field23 = var2;
392396
this.field24 = var3;
@@ -398,10 +402,6 @@ public final void mouseDragged(MouseEvent arg0) {
398402
public final void mouseMoved(MouseEvent arg0) {
399403
int var2 = arg0.getX();
400404
int var3 = arg0.getY();
401-
if (this.field18 != null) {
402-
var2 -= 4;
403-
var3 -= 22;
404-
}
405405
this.field21 = 0;
406406
this.field23 = var2;
407407
this.field24 = var3;
@@ -601,10 +601,7 @@ public void method10(int arg0) {
601601

602602
@ObfuscatedName("a.c(I)Ljava/awt/Component;")
603603
public Component method11(int arg0) {
604-
if (arg0 != 0) {
605-
this.field1 = 353;
606-
}
607-
return this.field18 == null ? this : this.field18;
604+
return this;
608605
}
609606

610607
@ObfuscatedName("a.a(Ljava/lang/Runnable;I)V")

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

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package jagex2.client;
22

33
import deob.ObfuscatedName;
4+
import sign.signlink;
45

5-
import java.awt.Frame;
6-
import java.awt.Graphics;
6+
import java.awt.*;
77

88
@ObfuscatedName("b")
99
public class ViewBox extends Frame {
@@ -13,21 +13,17 @@ public class ViewBox extends Frame {
1313

1414
public ViewBox(boolean arg0, int arg1, GameShell arg2, int arg3) {
1515
this.field38 = arg2;
16-
this.setTitle("Jagex");
16+
this.setTitle("RS2 user client - release #" + signlink.clientversion);
1717
this.setResizable(false);
18-
if (arg0) {
19-
for (int var5 = 1; var5 > 0; var5++) {
20-
}
21-
}
22-
this.show();
23-
this.toFront();
24-
this.resize(arg3 + 8, arg1 + 28);
25-
}
2618

27-
public Graphics getGraphics() {
28-
Graphics var1 = super.getGraphics();
29-
var1.translate(4, 24);
30-
return var1;
19+
BorderLayout manager = new BorderLayout();
20+
this.setLayout(manager);
21+
22+
this.add(this.field38, BorderLayout.CENTER);
23+
this.pack();
24+
25+
this.setVisible(true);
26+
this.toFront();
3127
}
3228

3329
public final void update(Graphics arg0) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package jagex2.config;
22

33
import deob.ObfuscatedName;
4-
import jagex2.dash3d.Model;
5-
import jagex2.io.OnDemand;
64
import jagex2.dash3d.AnimFrame;
5+
import jagex2.dash3d.Model;
76
import jagex2.datastruct.LruCache;
87
import jagex2.io.JagFile;
8+
import jagex2.io.OnDemand;
99
import jagex2.io.Packet;
1010

1111
@ObfuscatedName("ec")

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package jagex2.config;
22

33
import deob.ObfuscatedName;
4-
import jagex2.datastruct.LruCache;
5-
import jagex2.dash3d.Model;
64
import jagex2.dash3d.AnimFrame;
5+
import jagex2.dash3d.Model;
6+
import jagex2.datastruct.LruCache;
77
import jagex2.io.JagFile;
88
import jagex2.io.Packet;
99

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package jagex2.config;
22

33
import deob.ObfuscatedName;
4-
import jagex2.datastruct.LruCache;
54
import jagex2.dash3d.Model;
6-
import jagex2.graphics.Pix3D;
5+
import jagex2.datastruct.LruCache;
76
import jagex2.graphics.Pix2D;
87
import jagex2.graphics.Pix32;
8+
import jagex2.graphics.Pix3D;
99
import jagex2.io.JagFile;
1010
import jagex2.io.Packet;
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package jagex2.config;
22

33
import deob.ObfuscatedName;
4-
import jagex2.datastruct.LruCache;
54
import jagex2.dash3d.Model;
5+
import jagex2.datastruct.LruCache;
66
import jagex2.io.JagFile;
77
import jagex2.io.Packet;
88

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package jagex2.dash3d;
22

3-
import deob.*;
3+
import deob.ObfuscatedName;
44
import jagex2.datastruct.LinkList;
55
import jagex2.graphics.Pix2D;
66
import jagex2.graphics.Pix3D;

‎src/main/java/jagex2/graphics/Pix2D.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jagex2.graphics;
22

3-
import jagex2.datastruct.DoublyLinkable;
43
import deob.ObfuscatedName;
4+
import jagex2.datastruct.DoublyLinkable;
55

66
@ObfuscatedName("hb")
77
public class Pix2D extends DoublyLinkable {

‎src/main/java/jagex2/graphics/Pix32.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package jagex2.graphics;
22

33
import deob.ObfuscatedName;
4-
import jagex2.io.Packet;
54
import jagex2.io.JagFile;
5+
import jagex2.io.Packet;
66

7-
import java.awt.Component;
8-
import java.awt.Image;
9-
import java.awt.MediaTracker;
10-
import java.awt.Toolkit;
7+
import java.awt.*;
118
import java.awt.image.PixelGrabber;
129

1310
@ObfuscatedName("jb")

0 commit comments

Comments
 (0)