chore: Sources for class names, minor renaming

2004Scape · May 9, 2024 · dccd288 · dccd288
1 parent b96a42b
commit dccd288
Show file tree

Hide file tree

Showing 38 changed files with 157 additions and 123 deletions.
diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java
diff --git a/loader/src/main/java/loader.java b/loader/src/main/java/loader.java
@@ -1,16 +1,13 @@
+import sign.signlink;
+
 import java.applet.Applet;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
+import java.awt.*;
 import java.io.InputStream;
 import java.net.InetAddress;
 import java.net.URL;
 import java.security.MessageDigest;
 import java.util.zip.ZipFile;
 
-import sign.signlink;
-
 public class loader extends Applet implements Runnable {
 	private static final int swid = 789;
 	private static final int shei = 532;

diff --git a/mapview/src/main/java/WorldmapFont.java b/mapview/src/main/java/WorldmapFont.java
@@ -1,17 +1,13 @@
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Image;
-import java.awt.image.PixelGrabber;
-
 import jagex2.client.GameShell;
 import jagex2.graphics.Draw2D;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.awt.*;
+import java.awt.image.PixelGrabber;
+
 @OriginalClass("mapview!g")
 public final class WorldmapFont extends Draw2D {
 

diff --git a/mapview/src/main/java/mapview.java b/mapview/src/main/java/mapview.java
@@ -1,7 +1,3 @@
-import java.io.*;
-import java.net.URL;
-import java.security.MessageDigest;
-
 import jagex2.client.GameShell;
 import jagex2.graphics.Draw2D;
 import jagex2.graphics.Pix24;
@@ -14,6 +10,10 @@
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.io.*;
+import java.net.URL;
+import java.security.MessageDigest;
+
 @OriginalClass("mapview!mapview")
 public final class mapview extends GameShell {
 

diff --git a/runetek3/src/main/java/jagex2/client/GameShell.java b/runetek3/src/main/java/jagex2/client/GameShell.java
@@ -10,8 +10,8 @@
 import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
-import java.net.InetAddress;
 
+// name taken from rsc
 @OriginalClass("client!a")
 public class GameShell extends Applet implements Runnable, MouseListener, MouseMotionListener, KeyListener, FocusListener, WindowListener {
 

diff --git a/runetek3/src/main/java/jagex2/client/InputTracking.java b/runetek3/src/main/java/jagex2/client/InputTracking.java
@@ -2,9 +2,11 @@
 
 import jagex2.io.Packet;
 import org.openrs2.deob.annotation.OriginalArg;
+import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+@OriginalClass("client!e")
 public class InputTracking {
 
 	@OriginalMember(owner = "client!e", name = "e", descriptor = "Z")

diff --git a/runetek3/src/main/java/jagex2/client/ViewBox.java b/runetek3/src/main/java/jagex2/client/ViewBox.java
@@ -7,6 +7,7 @@
 
 import java.awt.*;
 
+// name taken from rsc
 @OriginalClass("client!b")
 public class ViewBox extends Frame {
 

diff --git a/.../src/main/java/jagex2/config/ComType.java → ...rc/main/java/jagex2/config/Component.java b/.../src/main/java/jagex2/config/ComType.java → ...rc/main/java/jagex2/config/Component.java
@@ -12,9 +12,9 @@
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
-// Interface Component - doesn't quite belong under config...
+// rs3 has this as config.iftype.Component
 @OriginalClass("client!hc")
-public class ComType {
+public class Component {
 
 	public static final int TYPE_LAYER = 0;
 	public static final int TYPE_UNUSED = 1; // TODO: decodes g2, gbool, center, font, shadowed, colour
@@ -33,7 +33,7 @@ public class ComType {
 	public static final int BUTTON_CONTINUE = 6;
 
 	@OriginalMember(owner = "client!hc", name = "c", descriptor = "[Lclient!hc;")
-	public static ComType[] instances;
+	public static Component[] instances;
 
 	@OriginalMember(owner = "client!hc", name = "d", descriptor = "[I")
 	public int[] invSlotObjId;
@@ -280,7 +280,7 @@ public static void unpack(@OriginalArg(3) Jagfile jag, @OriginalArg(0) Jagfile m
 		@Pc(29) int layer = -1;
 
 		@Pc(32) int count = dat.g2();
-		instances = new ComType[count];
+		instances = new Component[count];
 
 		while (dat.pos < dat.data.length) {
 			@Pc(45) int id = dat.g2();
@@ -289,7 +289,7 @@ public static void unpack(@OriginalArg(3) Jagfile jag, @OriginalArg(0) Jagfile m
 				id = dat.g2();
 			}
 
-			@Pc(62) ComType com = instances[id] = new ComType();
+			@Pc(62) Component com = instances[id] = new Component();
 			com.id = id;
 			com.layer = layer;
 			com.type = dat.g1();

diff --git a/runetek3/src/main/java/jagex2/config/FloType.java b/runetek3/src/main/java/jagex2/config/FloType.java
@@ -7,6 +7,7 @@
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+// name taken from rs3
 @OriginalClass("client!fc")
 public class FloType {
 

diff --git a/runetek3/src/main/java/jagex2/config/IdkType.java b/runetek3/src/main/java/jagex2/config/IdkType.java
@@ -8,6 +8,7 @@
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+// name taken from rs3
 @OriginalClass("client!gc")
 public class IdkType {
 

diff --git a/runetek3/src/main/java/jagex2/config/LocType.java b/runetek3/src/main/java/jagex2/config/LocType.java
@@ -9,6 +9,7 @@
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+// name taken from rs3
 @OriginalClass("client!ac")
 public class LocType {
 

diff --git a/runetek3/src/main/java/jagex2/config/NpcType.java b/runetek3/src/main/java/jagex2/config/NpcType.java
@@ -9,6 +9,7 @@
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+// name taken from rs3
 @OriginalClass("client!bc")
 public class NpcType {
 

diff --git a/runetek3/src/main/java/jagex2/config/ObjType.java b/runetek3/src/main/java/jagex2/config/ObjType.java
@@ -12,6 +12,7 @@
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+// name taken from rs3
 @OriginalClass("client!cc")
 public class ObjType {
 

diff --git a/runetek3/src/main/java/jagex2/config/SeqType.java b/runetek3/src/main/java/jagex2/config/SeqType.java
@@ -1,13 +1,14 @@
 package jagex2.config;
 
-import jagex2.graphics.SeqFrame;
+import jagex2.graphics.AnimFrame;
 import jagex2.io.Jagfile;
 import jagex2.io.Packet;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+// name taken from rs3
 @OriginalClass("client!jc")
 public class SeqType {
 
@@ -92,7 +93,7 @@ public void decode(@OriginalArg(1) Packet dat) {
 
 					this.delay[i] = dat.g2();
 					if (this.delay[i] == 0) {
-						this.delay[i] = SeqFrame.instances[this.frames[i]].delay;
+						this.delay[i] = AnimFrame.instances[this.frames[i]].delay;
 					}
 
 					if (this.delay[i] == 0) {

diff --git a/runetek3/src/main/java/jagex2/config/SpotAnimType.java b/runetek3/src/main/java/jagex2/config/SpotAnimType.java
@@ -9,6 +9,7 @@
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+// name derived from other types + spotanim.dat (it's been renamed in NXT)
 @OriginalClass("client!kc")
 public class SpotAnimType {
 

diff --git a/runetek3/src/main/java/jagex2/config/VarpType.java b/runetek3/src/main/java/jagex2/config/VarpType.java
@@ -7,6 +7,7 @@
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+// name derived from other types + varp.dat (rs3 has this as VarPlayerType)
 @OriginalClass("client!lc")
 public class VarpType {
 

diff --git a/runetek3/src/main/java/jagex2/dash3d/World.java b/runetek3/src/main/java/jagex2/dash3d/World.java
@@ -13,6 +13,7 @@
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+// name and packaging confirmed 100% in rs2/mapview applet strings
 @OriginalClass("client!c")
 public class World {
 

diff --git a/runetek3/src/main/java/jagex2/dash3d/World3D.java b/runetek3/src/main/java/jagex2/dash3d/World3D.java
@@ -11,6 +11,7 @@
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+// name taken from rsc
 @OriginalClass("client!r")
 public class World3D {
 

diff --git a/runetek3/src/main/java/jagex2/datastruct/HashTable.java b/runetek3/src/main/java/jagex2/datastruct/HashTable.java
@@ -5,6 +5,7 @@
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+// name taken from jaclib
 @OriginalClass("client!t")
 public class HashTable {
 

diff --git a/runetek3/src/main/java/jagex2/datastruct/Hashable.java b/runetek3/src/main/java/jagex2/datastruct/Hashable.java
@@ -3,6 +3,7 @@
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 
+// name taken from jaclib
 @OriginalClass("client!db")
 public class Hashable extends Linkable {
 

diff --git a/runetek3/src/main/java/jagex2/datastruct/JString.java b/runetek3/src/main/java/jagex2/datastruct/JString.java
@@ -1,9 +1,13 @@
 package jagex2.datastruct;
 
 import org.openrs2.deob.annotation.OriginalArg;
+import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+// name and packaging confirmed 100% in rs2/mapview applet strings
+// later repackaged under jagex2/jstring
+@OriginalClass("client!vb")
 public class JString {
 
 	@OriginalMember(owner = "client!vb", name = "f", descriptor = "[C")

diff --git a/runetek3/src/main/java/jagex2/datastruct/LinkList.java b/runetek3/src/main/java/jagex2/datastruct/LinkList.java
@@ -5,6 +5,7 @@
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+// name taken from jaclib
 @OriginalClass("client!ob")
 public class LinkList {
 

diff --git a/runetek3/src/main/java/jagex2/datastruct/Linkable.java b/runetek3/src/main/java/jagex2/datastruct/Linkable.java
@@ -3,6 +3,7 @@
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 
+// name and packaging confirmed 100% in rs2/mapview applet strings
 @OriginalClass("client!u")
 public class Linkable {
 

diff --git a/...rc/main/java/jagex2/graphics/SeqBase.java → ...c/main/java/jagex2/graphics/AnimBase.java b/...rc/main/java/jagex2/graphics/SeqBase.java → ...c/main/java/jagex2/graphics/AnimBase.java
@@ -7,11 +7,12 @@
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+// name taken from runetek5
 @OriginalClass("client!f")
-public class SeqBase {
+public class AnimBase {
 
 	@OriginalMember(owner = "client!f", name = "a", descriptor = "[Lclient!f;")
-	public static SeqBase[] instances;
+	public static AnimBase[] instances;
 
 	@OriginalMember(owner = "client!f", name = "b", descriptor = "I")
 	public int length;
@@ -30,7 +31,7 @@ public static void unpack(@OriginalArg(1) Jagfile models) {
 
 		@Pc(34) int total = head.g2();
 		@Pc(37) int count = head.g2();
-		instances = new SeqBase[count + 1];
+		instances = new AnimBase[count + 1];
 
 		for (@Pc(50) int i = 0; i < total; i++) {
 			@Pc(55) int id = head.g2();
@@ -50,7 +51,7 @@ public static void unpack(@OriginalArg(1) Jagfile models) {
 				}
 			}
 
-			instances[id] = new SeqBase();
+			instances[id] = new AnimBase();
 			instances[id].length = length;
 			instances[id].types = transformTypes;
 			instances[id].labels = groupLabels;

diff --git a/...c/main/java/jagex2/graphics/SeqFrame.java → .../main/java/jagex2/graphics/AnimFrame.java b/...c/main/java/jagex2/graphics/SeqFrame.java → .../main/java/jagex2/graphics/AnimFrame.java
@@ -7,17 +7,18 @@
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+// name taken from runetek5
 @OriginalClass("client!g")
-public class SeqFrame {
+public class AnimFrame {
 
 	@OriginalMember(owner = "client!g", name = "a", descriptor = "[Lclient!g;")
-	public static SeqFrame[] instances;
+	public static AnimFrame[] instances;
 
 	@OriginalMember(owner = "client!g", name = "b", descriptor = "I")
 	public int delay;
 
 	@OriginalMember(owner = "client!g", name = "c", descriptor = "Lclient!f;")
-	public SeqBase base;
+	public AnimBase base;
 
 	@OriginalMember(owner = "client!g", name = "d", descriptor = "I")
 	public int length;
@@ -43,7 +44,7 @@ public static void unpack(@OriginalArg(1) Jagfile models) {
 
 		@Pc(50) int total = head.g2();
 		@Pc(53) int count = head.g2();
-		instances = new SeqFrame[count + 1];
+		instances = new AnimFrame[count + 1];
 
 		@Pc(61) int[] labels = new int[500];
 		@Pc(64) int[] x = new int[500];
@@ -52,11 +53,11 @@ public static void unpack(@OriginalArg(1) Jagfile models) {
 
 		for (@Pc(72) int i = 0; i < total; i++) {
 			@Pc(77) int id = head.g2();
-			@Pc(85) SeqFrame frame = instances[id] = new SeqFrame();
+			@Pc(85) AnimFrame frame = instances[id] = new AnimFrame();
 			frame.delay = del.g1();
 
 			@Pc(92) int baseId = head.g2();
-			@Pc(96) SeqBase base = SeqBase.instances[baseId];
+			@Pc(96) AnimBase base = AnimBase.instances[baseId];
 			frame.base = base;
 
 			@Pc(102) int groupCount = head.g1();

diff --git a/runetek3/src/main/java/jagex2/graphics/Model.java b/runetek3/src/main/java/jagex2/graphics/Model.java
@@ -1180,8 +1180,8 @@ public void createLabelReferences() {
 	@OriginalMember(owner = "client!eb", name = "a", descriptor = "(II)V")
 	public void applyTransform(@OriginalArg(1) int id) {
 		if (this.labelVertices != null && id != -1) {
-			@Pc(11) SeqFrame transform = SeqFrame.instances[id];
-			@Pc(14) SeqBase skeleton = transform.base;
+			@Pc(11) AnimFrame transform = AnimFrame.instances[id];
+			@Pc(14) AnimBase skeleton = transform.base;
 			baseX = 0;
 			baseY = 0;
 			baseZ = 0;
@@ -1201,9 +1201,9 @@ public void applyTransforms(@OriginalArg(2) int primaryId, @OriginalArg(0) int s
 		if (mask == null || secondaryId == -1) {
 			this.applyTransform(primaryId);
 		} else {
-			@Pc(19) SeqFrame primary = SeqFrame.instances[primaryId];
-			@Pc(32) SeqFrame secondary = SeqFrame.instances[secondaryId];
-			@Pc(35) SeqBase skeleton = primary.base;
+			@Pc(19) AnimFrame primary = AnimFrame.instances[primaryId];
+			@Pc(32) AnimFrame secondary = AnimFrame.instances[secondaryId];
+			@Pc(35) AnimBase skeleton = primary.base;
 
 			baseX = 0;
 			baseY = 0;

diff --git a/runetek3/src/main/java/jagex2/graphics/Pix24.java b/runetek3/src/main/java/jagex2/graphics/Pix24.java
@@ -10,6 +10,7 @@
 import java.awt.*;
 import java.awt.image.PixelGrabber;
 
+// name derived from Pix8
 @OriginalClass("client!hb")
 public class Pix24 extends Draw2D {
 

diff --git a/runetek3/src/main/java/jagex2/graphics/Pix8.java b/runetek3/src/main/java/jagex2/graphics/Pix8.java
@@ -7,6 +7,7 @@
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+// name and packaging confirmed 100% in rs2/mapview applet strings
 @OriginalClass("client!ib")
 public class Pix8 extends Draw2D {
 

diff --git a/runetek3/src/main/java/jagex2/graphics/PixMap.java b/runetek3/src/main/java/jagex2/graphics/PixMap.java
@@ -7,6 +7,7 @@
 import java.awt.*;
 import java.awt.image.*;
 
+// name taken from rsc
 @OriginalClass("client!qb")
 public class PixMap implements ImageProducer, ImageObserver {