Skip to content

Commit dccd288

Browse files
PazazPazaz
committed
chore: Sources for class names, minor renaming
1 parent b96a42b commit dccd288

38 files changed

+157
-123
lines changed

‎client/src/main/java/client.java

+83-82
Large diffs are not rendered by default.

‎loader/src/main/java/loader.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
1+
import sign.signlink;
2+
13
import java.applet.Applet;
2-
import java.awt.Color;
3-
import java.awt.Font;
4-
import java.awt.FontMetrics;
5-
import java.awt.Graphics;
4+
import java.awt.*;
65
import java.io.InputStream;
76
import java.net.InetAddress;
87
import java.net.URL;
98
import java.security.MessageDigest;
109
import java.util.zip.ZipFile;
1110

12-
import sign.signlink;
13-
1411
public class loader extends Applet implements Runnable {
1512
private static final int swid = 789;
1613
private static final int shei = 532;

‎mapview/src/main/java/WorldmapFont.java

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
import java.awt.Color;
2-
import java.awt.Font;
3-
import java.awt.FontMetrics;
4-
import java.awt.Graphics;
5-
import java.awt.Image;
6-
import java.awt.image.PixelGrabber;
7-
81
import jagex2.client.GameShell;
92
import jagex2.graphics.Draw2D;
103
import org.openrs2.deob.annotation.OriginalArg;
114
import org.openrs2.deob.annotation.OriginalClass;
125
import org.openrs2.deob.annotation.OriginalMember;
136
import org.openrs2.deob.annotation.Pc;
147

8+
import java.awt.*;
9+
import java.awt.image.PixelGrabber;
10+
1511
@OriginalClass("mapview!g")
1612
public final class WorldmapFont extends Draw2D {
1713

‎mapview/src/main/java/mapview.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
import java.io.*;
2-
import java.net.URL;
3-
import java.security.MessageDigest;
4-
51
import jagex2.client.GameShell;
62
import jagex2.graphics.Draw2D;
73
import jagex2.graphics.Pix24;
@@ -14,6 +10,10 @@
1410
import org.openrs2.deob.annotation.OriginalMember;
1511
import org.openrs2.deob.annotation.Pc;
1612

13+
import java.io.*;
14+
import java.net.URL;
15+
import java.security.MessageDigest;
16+
1717
@OriginalClass("mapview!mapview")
1818
public final class mapview extends GameShell {
1919

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import java.applet.Applet;
1111
import java.awt.*;
1212
import java.awt.event.*;
13-
import java.net.InetAddress;
1413

14+
// name taken from rsc
1515
@OriginalClass("client!a")
1616
public class GameShell extends Applet implements Runnable, MouseListener, MouseMotionListener, KeyListener, FocusListener, WindowListener {
1717

‎runetek3/src/main/java/jagex2/client/InputTracking.java

+2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
import jagex2.io.Packet;
44
import org.openrs2.deob.annotation.OriginalArg;
5+
import org.openrs2.deob.annotation.OriginalClass;
56
import org.openrs2.deob.annotation.OriginalMember;
67
import org.openrs2.deob.annotation.Pc;
78

9+
@OriginalClass("client!e")
810
public class InputTracking {
911

1012
@OriginalMember(owner = "client!e", name = "e", descriptor = "Z")

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

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import java.awt.*;
99

10+
// name taken from rsc
1011
@OriginalClass("client!b")
1112
public class ViewBox extends Frame {
1213

‎runetek3/src/main/java/jagex2/config/ComType.java renamed to ‎runetek3/src/main/java/jagex2/config/Component.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
import org.openrs2.deob.annotation.OriginalMember;
1313
import org.openrs2.deob.annotation.Pc;
1414

15-
// Interface Component - doesn't quite belong under config...
15+
// rs3 has this as config.iftype.Component
1616
@OriginalClass("client!hc")
17-
public class ComType {
17+
public class Component {
1818

1919
public static final int TYPE_LAYER = 0;
2020
public static final int TYPE_UNUSED = 1; // TODO: decodes g2, gbool, center, font, shadowed, colour
@@ -33,7 +33,7 @@ public class ComType {
3333
public static final int BUTTON_CONTINUE = 6;
3434

3535
@OriginalMember(owner = "client!hc", name = "c", descriptor = "[Lclient!hc;")
36-
public static ComType[] instances;
36+
public static Component[] instances;
3737

3838
@OriginalMember(owner = "client!hc", name = "d", descriptor = "[I")
3939
public int[] invSlotObjId;
@@ -280,7 +280,7 @@ public static void unpack(@OriginalArg(3) Jagfile jag, @OriginalArg(0) Jagfile m
280280
@Pc(29) int layer = -1;
281281

282282
@Pc(32) int count = dat.g2();
283-
instances = new ComType[count];
283+
instances = new Component[count];
284284

285285
while (dat.pos < dat.data.length) {
286286
@Pc(45) int id = dat.g2();
@@ -289,7 +289,7 @@ public static void unpack(@OriginalArg(3) Jagfile jag, @OriginalArg(0) Jagfile m
289289
id = dat.g2();
290290
}
291291

292-
@Pc(62) ComType com = instances[id] = new ComType();
292+
@Pc(62) Component com = instances[id] = new Component();
293293
com.id = id;
294294
com.layer = layer;
295295
com.type = dat.g1();

‎runetek3/src/main/java/jagex2/config/FloType.java

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.openrs2.deob.annotation.OriginalMember;
88
import org.openrs2.deob.annotation.Pc;
99

10+
// name taken from rs3
1011
@OriginalClass("client!fc")
1112
public class FloType {
1213

‎runetek3/src/main/java/jagex2/config/IdkType.java

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.openrs2.deob.annotation.OriginalMember;
99
import org.openrs2.deob.annotation.Pc;
1010

11+
// name taken from rs3
1112
@OriginalClass("client!gc")
1213
public class IdkType {
1314

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

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.openrs2.deob.annotation.OriginalMember;
1010
import org.openrs2.deob.annotation.Pc;
1111

12+
// name taken from rs3
1213
@OriginalClass("client!ac")
1314
public class LocType {
1415

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

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.openrs2.deob.annotation.OriginalMember;
1010
import org.openrs2.deob.annotation.Pc;
1111

12+
// name taken from rs3
1213
@OriginalClass("client!bc")
1314
public class NpcType {
1415

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

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.openrs2.deob.annotation.OriginalMember;
1313
import org.openrs2.deob.annotation.Pc;
1414

15+
// name taken from rs3
1516
@OriginalClass("client!cc")
1617
public class ObjType {
1718

‎runetek3/src/main/java/jagex2/config/SeqType.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package jagex2.config;
22

3-
import jagex2.graphics.SeqFrame;
3+
import jagex2.graphics.AnimFrame;
44
import jagex2.io.Jagfile;
55
import jagex2.io.Packet;
66
import org.openrs2.deob.annotation.OriginalArg;
77
import org.openrs2.deob.annotation.OriginalClass;
88
import org.openrs2.deob.annotation.OriginalMember;
99
import org.openrs2.deob.annotation.Pc;
1010

11+
// name taken from rs3
1112
@OriginalClass("client!jc")
1213
public class SeqType {
1314

@@ -92,7 +93,7 @@ public void decode(@OriginalArg(1) Packet dat) {
9293

9394
this.delay[i] = dat.g2();
9495
if (this.delay[i] == 0) {
95-
this.delay[i] = SeqFrame.instances[this.frames[i]].delay;
96+
this.delay[i] = AnimFrame.instances[this.frames[i]].delay;
9697
}
9798

9899
if (this.delay[i] == 0) {

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

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.openrs2.deob.annotation.OriginalMember;
1010
import org.openrs2.deob.annotation.Pc;
1111

12+
// name derived from other types + spotanim.dat (it's been renamed in NXT)
1213
@OriginalClass("client!kc")
1314
public class SpotAnimType {
1415

‎runetek3/src/main/java/jagex2/config/VarpType.java

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.openrs2.deob.annotation.OriginalMember;
88
import org.openrs2.deob.annotation.Pc;
99

10+
// name derived from other types + varp.dat (rs3 has this as VarPlayerType)
1011
@OriginalClass("client!lc")
1112
public class VarpType {
1213

‎runetek3/src/main/java/jagex2/dash3d/World.java

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.openrs2.deob.annotation.OriginalMember;
1414
import org.openrs2.deob.annotation.Pc;
1515

16+
// name and packaging confirmed 100% in rs2/mapview applet strings
1617
@OriginalClass("client!c")
1718
public class World {
1819

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

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.openrs2.deob.annotation.OriginalMember;
1212
import org.openrs2.deob.annotation.Pc;
1313

14+
// name taken from rsc
1415
@OriginalClass("client!r")
1516
public class World3D {
1617

‎runetek3/src/main/java/jagex2/datastruct/HashTable.java

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.openrs2.deob.annotation.OriginalMember;
66
import org.openrs2.deob.annotation.Pc;
77

8+
// name taken from jaclib
89
@OriginalClass("client!t")
910
public class HashTable {
1011

‎runetek3/src/main/java/jagex2/datastruct/Hashable.java

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.openrs2.deob.annotation.OriginalClass;
44
import org.openrs2.deob.annotation.OriginalMember;
55

6+
// name taken from jaclib
67
@OriginalClass("client!db")
78
public class Hashable extends Linkable {
89

‎runetek3/src/main/java/jagex2/datastruct/JString.java

+4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
package jagex2.datastruct;
22

33
import org.openrs2.deob.annotation.OriginalArg;
4+
import org.openrs2.deob.annotation.OriginalClass;
45
import org.openrs2.deob.annotation.OriginalMember;
56
import org.openrs2.deob.annotation.Pc;
67

8+
// name and packaging confirmed 100% in rs2/mapview applet strings
9+
// later repackaged under jagex2/jstring
10+
@OriginalClass("client!vb")
711
public class JString {
812

913
@OriginalMember(owner = "client!vb", name = "f", descriptor = "[C")

‎runetek3/src/main/java/jagex2/datastruct/LinkList.java

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.openrs2.deob.annotation.OriginalMember;
66
import org.openrs2.deob.annotation.Pc;
77

8+
// name taken from jaclib
89
@OriginalClass("client!ob")
910
public class LinkList {
1011

‎runetek3/src/main/java/jagex2/datastruct/Linkable.java

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.openrs2.deob.annotation.OriginalClass;
44
import org.openrs2.deob.annotation.OriginalMember;
55

6+
// name and packaging confirmed 100% in rs2/mapview applet strings
67
@OriginalClass("client!u")
78
public class Linkable {
89

‎runetek3/src/main/java/jagex2/graphics/SeqBase.java renamed to ‎runetek3/src/main/java/jagex2/graphics/AnimBase.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
import org.openrs2.deob.annotation.OriginalMember;
88
import org.openrs2.deob.annotation.Pc;
99

10+
// name taken from runetek5
1011
@OriginalClass("client!f")
11-
public class SeqBase {
12+
public class AnimBase {
1213

1314
@OriginalMember(owner = "client!f", name = "a", descriptor = "[Lclient!f;")
14-
public static SeqBase[] instances;
15+
public static AnimBase[] instances;
1516

1617
@OriginalMember(owner = "client!f", name = "b", descriptor = "I")
1718
public int length;
@@ -30,7 +31,7 @@ public static void unpack(@OriginalArg(1) Jagfile models) {
3031

3132
@Pc(34) int total = head.g2();
3233
@Pc(37) int count = head.g2();
33-
instances = new SeqBase[count + 1];
34+
instances = new AnimBase[count + 1];
3435

3536
for (@Pc(50) int i = 0; i < total; i++) {
3637
@Pc(55) int id = head.g2();
@@ -50,7 +51,7 @@ public static void unpack(@OriginalArg(1) Jagfile models) {
5051
}
5152
}
5253

53-
instances[id] = new SeqBase();
54+
instances[id] = new AnimBase();
5455
instances[id].length = length;
5556
instances[id].types = transformTypes;
5657
instances[id].labels = groupLabels;

‎runetek3/src/main/java/jagex2/graphics/SeqFrame.java renamed to ‎runetek3/src/main/java/jagex2/graphics/AnimFrame.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@
77
import org.openrs2.deob.annotation.OriginalMember;
88
import org.openrs2.deob.annotation.Pc;
99

10+
// name taken from runetek5
1011
@OriginalClass("client!g")
11-
public class SeqFrame {
12+
public class AnimFrame {
1213

1314
@OriginalMember(owner = "client!g", name = "a", descriptor = "[Lclient!g;")
14-
public static SeqFrame[] instances;
15+
public static AnimFrame[] instances;
1516

1617
@OriginalMember(owner = "client!g", name = "b", descriptor = "I")
1718
public int delay;
1819

1920
@OriginalMember(owner = "client!g", name = "c", descriptor = "Lclient!f;")
20-
public SeqBase base;
21+
public AnimBase base;
2122

2223
@OriginalMember(owner = "client!g", name = "d", descriptor = "I")
2324
public int length;
@@ -43,7 +44,7 @@ public static void unpack(@OriginalArg(1) Jagfile models) {
4344

4445
@Pc(50) int total = head.g2();
4546
@Pc(53) int count = head.g2();
46-
instances = new SeqFrame[count + 1];
47+
instances = new AnimFrame[count + 1];
4748

4849
@Pc(61) int[] labels = new int[500];
4950
@Pc(64) int[] x = new int[500];
@@ -52,11 +53,11 @@ public static void unpack(@OriginalArg(1) Jagfile models) {
5253

5354
for (@Pc(72) int i = 0; i < total; i++) {
5455
@Pc(77) int id = head.g2();
55-
@Pc(85) SeqFrame frame = instances[id] = new SeqFrame();
56+
@Pc(85) AnimFrame frame = instances[id] = new AnimFrame();
5657
frame.delay = del.g1();
5758

5859
@Pc(92) int baseId = head.g2();
59-
@Pc(96) SeqBase base = SeqBase.instances[baseId];
60+
@Pc(96) AnimBase base = AnimBase.instances[baseId];
6061
frame.base = base;
6162

6263
@Pc(102) int groupCount = head.g1();

‎runetek3/src/main/java/jagex2/graphics/Model.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1180,8 +1180,8 @@ public void createLabelReferences() {
11801180
@OriginalMember(owner = "client!eb", name = "a", descriptor = "(II)V")
11811181
public void applyTransform(@OriginalArg(1) int id) {
11821182
if (this.labelVertices != null && id != -1) {
1183-
@Pc(11) SeqFrame transform = SeqFrame.instances[id];
1184-
@Pc(14) SeqBase skeleton = transform.base;
1183+
@Pc(11) AnimFrame transform = AnimFrame.instances[id];
1184+
@Pc(14) AnimBase skeleton = transform.base;
11851185
baseX = 0;
11861186
baseY = 0;
11871187
baseZ = 0;
@@ -1201,9 +1201,9 @@ public void applyTransforms(@OriginalArg(2) int primaryId, @OriginalArg(0) int s
12011201
if (mask == null || secondaryId == -1) {
12021202
this.applyTransform(primaryId);
12031203
} else {
1204-
@Pc(19) SeqFrame primary = SeqFrame.instances[primaryId];
1205-
@Pc(32) SeqFrame secondary = SeqFrame.instances[secondaryId];
1206-
@Pc(35) SeqBase skeleton = primary.base;
1204+
@Pc(19) AnimFrame primary = AnimFrame.instances[primaryId];
1205+
@Pc(32) AnimFrame secondary = AnimFrame.instances[secondaryId];
1206+
@Pc(35) AnimBase skeleton = primary.base;
12071207

12081208
baseX = 0;
12091209
baseY = 0;

‎runetek3/src/main/java/jagex2/graphics/Pix24.java

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.awt.*;
1111
import java.awt.image.PixelGrabber;
1212

13+
// name derived from Pix8
1314
@OriginalClass("client!hb")
1415
public class Pix24 extends Draw2D {
1516

‎runetek3/src/main/java/jagex2/graphics/Pix8.java

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.openrs2.deob.annotation.OriginalMember;
88
import org.openrs2.deob.annotation.Pc;
99

10+
// name and packaging confirmed 100% in rs2/mapview applet strings
1011
@OriginalClass("client!ib")
1112
public class Pix8 extends Draw2D {
1213

‎runetek3/src/main/java/jagex2/graphics/PixMap.java

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.awt.*;
88
import java.awt.image.*;
99

10+
// name taken from rsc
1011
@OriginalClass("client!qb")
1112
public class PixMap implements ImageProducer, ImageObserver {
1213

0 commit comments

Comments
 (0)