fix: Debugging 1.1 compatibility

2004Scape · Jan 16, 2024 · 0c897bb · 0c897bb
1 parent 3c21655
commit 0c897bb
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 26 deletions.
diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java
@@ -1232,33 +1232,40 @@ public static void main(@OriginalArg(0) String[] args) {
 		try {
 			System.out.println("RS2 user client - release #" + signlink.clientversion);
 
+            System.out.println("1");
 			if (args.length > 0) {
 				nodeId = Integer.parseInt(args[0]);
 			} else {
 				nodeId = 10;
 			}
 
+            System.out.println("1");
 			if (args.length > 1) {
 				portOffset = Integer.parseInt(args[1]);
 			} else {
 				portOffset = 0;
 			}
 
+            System.out.println("1");
 			if (args.length > 2 && args[2].equals("lowmem")) {
 				setLowMemory();
 			} else {
 				setHighMemory();
 			}
 
+            System.out.println("1");
 			members = args.length <= 3 || !args[3].equals("free");
 
+            System.out.println("1");
 			String vendor = System.getProperties().getProperty("java.vendor");
 			if (vendor.toLowerCase().indexOf("sun") != -1 || vendor.toLowerCase().indexOf("apple") != -1) {
 				signlink.sunjava = true;
 			}
 
+            System.out.println("1");
 			signlink.startpriv(InetAddress.getByName("w1.225.2004scape.org"));
 
+            System.out.println("1");
 			@Pc(82) client c = new client();
 			c.initApplication(789, 532);
 		} catch (@Pc(89) Exception _ex) {

diff --git a/client/src/main/java/jagex2/client/GameShell.java b/client/src/main/java/jagex2/client/GameShell.java
@@ -85,12 +85,16 @@ public class GameShell extends Applet implements Runnable, MouseListener, MouseM
 
 	@OriginalMember(owner = "client!a", name = "a", descriptor = "(III)V")
 	protected final void initApplication(@OriginalArg(1) int width, @OriginalArg(0) int height) {
+        System.out.println("1");
 		this.screenWidth = width;
 		this.screenHeight = height;
-		// this.setPreferredSize(new Dimension(this.screenWidth, this.screenHeight));
+        System.out.println("1");
 		this.frame = new ViewBox(this, this.screenWidth, this.screenHeight);
+        System.out.println("1");
 		this.graphics = this.getBaseComponent().getGraphics();
+        System.out.println("1");
 		this.drawArea = new PixMap(this.getBaseComponent(), this.screenWidth, this.screenHeight);
+        System.out.println("1");
 		this.startThread(this, 1);
 	}
 

diff --git a/client/src/main/java/jagex2/client/ViewBox.java b/client/src/main/java/jagex2/client/ViewBox.java
@@ -18,16 +18,17 @@ public ViewBox(@OriginalArg(2) GameShell shell, @OriginalArg(3) int width, @Orig
 		this.setTitle("Jagex");
 		this.setResizable(false);
 
-		this.setLayout(new BorderLayout());
-		this.add(shell);
-		this.pack();
-
-		// for compatibility with Java < 1.4
-		Insets insets = this.getInsets();
-		this.setSize(width + insets.left + insets.bottom, height + insets.top + insets.bottom);
-		this.setVisible(true);
-
+        this.show();
 		this.toFront();
+        this.resize(width + 8, height + 28);
+	}
+
+	@OriginalMember(owner = "client!b", name = "getGraphics", descriptor = "()Ljava/awt/Graphics;")
+	@Override
+	public Graphics getGraphics() {
+		@Pc(2) Graphics g = super.getGraphics();
+		g.translate(4, 24);
+		return g;
 	}
 
 	@OriginalMember(owner = "client!b", name = "update", descriptor = "(Ljava/awt/Graphics;)V")

diff --git a/client/src/main/java/sign/signlink.java b/client/src/main/java/sign/signlink.java
@@ -146,11 +146,11 @@ public static void startpriv(@OriginalArg(0) InetAddress address) {
 	public static String findcachedir() {
 		@Pc(50) String[] paths = new String[] {
 			// prioritize home directories
-			System.getProperty("user.home"),
+			// System.getProperty("user.home"),
 			// System.getenv("HOME"), System.getenv("HOMEDRIVE") + System.getenv("HOMEPATH"), System.getenv("USERPROFILE"),
 			// System.getenv("user.home"), "~",
 			// fall back to OS-specific paths
-			"c:", "c:/windows", "c:/winnt", "d:/windows", "d:/winnt", "e:/windows", "e:/winnt", "f:/windows", "f:/winnt",
+            "c:/windows/", "c:/winnt/", "d:/windows/", "d:/winnt/", "e:/windows/", "e:/winnt/", "f:/windows/", "f:/winnt/", "c:/", "~/",
 			// fall back to temporary cache directories (RAM or browser cache)
 			"/tmp", ""
 		};
@@ -161,10 +161,6 @@ public static String findcachedir() {
 				@Pc(59) String path = paths[i];
 				@Pc(67) File file;
 
-				if (path == null) {
-					continue;
-				}
-
 				if (path.length() > 0) {
 					file = new File(path);
 
@@ -173,17 +169,10 @@ public static String findcachedir() {
 					}
 				}
 
-				file = new File(path + "/" + dir);
-				if ((!file.exists() && !file.mkdir()) || !file.canWrite()) {
-					continue;
+				file = new File(path + dir);
+				if (file.exists() || file.mkdir()) {
+				    return path + dir + "/";
 				}
-
-				file = new File(path + "/" + dir + "/" + signlink.clientversion);
-				if ((!file.exists() && !file.mkdir()) || !file.canWrite()) {
-					continue;
-				}
-
-				return path + "/" + dir + "/" + signlink.clientversion + "/";
 			} catch (@Pc(102) Exception ignored) {
 			}
 		}