Skip to content

Commit 77869d1

Browse files
PazazPazaz
committed
chore: Working on repackaging classes
Some placeholders used.
1 parent 37aa87f commit 77869d1

File tree

104 files changed

+351
-306
lines changed

Some content is hidden

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

104 files changed

+351
-306
lines changed

src/main/java/jagex3/client/JagException.java renamed to src/main/java/jagex3/callstack/JagException.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package jagex3.client;
1+
package jagex3.callstack;
22

33
import deob.ObfuscatedName;
4+
import jagex3.client.applet.SignLink;
45

56
import java.applet.Applet;
67
import java.io.*;

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

Lines changed: 38 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,54 @@
11
package jagex3.client;
22

33
import deob.ObfuscatedName;
4-
import jagex3.client.applet.*;
5-
import jagex3.client.chat.*;
6-
import jagex3.client.obfuscation.ReflectionChecker;
7-
import jagex3.client.ui.ClientInvCache;
8-
import jagex3.client.ui.IfType;
9-
import jagex3.client.ui.ServerActive;
10-
import jagex3.client.ui.SubInterface;
4+
import jagex3.callstack.JagException;
5+
import jagex3.client.applet.GameShellCache;
6+
import jagex3.client.applet.PrivilegedRequest;
7+
import jagex3.client.input.keyboard.ClientKeyboardListener;
8+
import jagex3.client.input.mouse.ClientMouseListener;
9+
import jagex3.client.input.mouse.MouseWheelInterface;
1110
import jagex3.config.*;
11+
import jagex3.config.iftype.IfType;
12+
import jagex3.config.iftype.ServerActive;
13+
import jagex3.constants.Text;
14+
import jagex3.constants.skills.Skills;
1215
import jagex3.dash3d.*;
13-
import jagex3.datastruct.*;
14-
import jagex3.graphics.*;
15-
import jagex3.io.ClientStream;
16-
import jagex3.io.DataFile;
16+
import jagex3.dash3d.player.PlayerModel;
17+
import jagex3.dash3d.player.RecolsRunescape;
18+
import jagex3.datastruct.ChatLinkList;
19+
import jagex3.datastruct.HashTable;
20+
import jagex3.datastruct.LinkList;
21+
import jagex3.datastruct.Linkable;
22+
import jagex3.friends.FriendChatUser;
23+
import jagex3.friends.PrivateChatFilter;
24+
import jagex3.friends.TimestampMessage;
25+
import jagex3.graphics.Pix2D;
26+
import jagex3.graphics.Pix32;
27+
import jagex3.graphics.Pix8;
28+
import jagex3.graphics.PixLoader;
1729
import jagex3.io.Packet;
1830
import jagex3.io.PacketBit;
31+
import jagex3.io.net.ClientStream;
32+
import jagex3.io.net.DataFile;
1933
import jagex3.javconfig.JavConfigParameter;
20-
import jagex3.javconfig.ModeGame;
21-
import jagex3.javconfig.ModeWhat;
34+
import jagex3.javconfig.mode.ModeGame;
35+
import jagex3.javconfig.mode.ModeWhat;
2236
import jagex3.js5.Js5Loader;
2337
import jagex3.js5.Js5Net;
2438
import jagex3.js5.Js5NetThread;
2539
import jagex3.js5.Js5WorkerRequest;
26-
import jagex3.jstring.JString;
27-
import jagex3.jstring.StringConstants;
28-
import jagex3.jstring.StringTools;
29-
import jagex3.jstring.Text;
30-
import jagex3.midi.MidiManager;
31-
import jagex3.midi.MidiPlayer;
32-
import jagex3.script.ClientScript;
33-
import jagex3.script.HookReq;
34-
import jagex3.script.ScriptRunner;
40+
import jagex3.jstring.*;
41+
import jagex3.midi2.MidiManager;
42+
import jagex3.midi2.MidiPlayer;
43+
import jagex3.movement.CollisionMap;
44+
import jagex3.namespace.NameSpace;
45+
import jagex3.obfuscation.Protocol;
46+
import jagex3.reflectionchecker.ReflectionChecker;
3547
import jagex3.sound.*;
36-
import jagex3.wordenc.Huffman;
37-
import jagex3.wordenc.WordPack;
48+
import jagex3.util.time.MonotonicTime;
49+
import jagex3.var.VarCache;
50+
import jagex3.wordfilter2.WordPack;
51+
import jagex3.wordfilter2.huffman.Huffman;
3852

3953
import java.awt.*;
4054
import java.io.IOException;

src/main/java/jagex3/dash3d/ClientBuild.java renamed to src/main/java/jagex3/client/ClientBuild.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
package jagex3.dash3d;
1+
package jagex3.client;
22

33
import deob.ObfuscatedName;
4-
import jagex3.client.Client;
54
import jagex3.config.FloType;
65
import jagex3.config.FluType;
76
import jagex3.config.LocType;
7+
import jagex3.dash3d.*;
8+
import jagex3.dash3d.util.RegionRotate;
89
import jagex3.io.Packet;
10+
import jagex3.movement.CollisionMap;
911
import jagex3.sound.BgSound;
1012

1113
// jag::oldscape::ClientBuild

src/main/java/jagex3/script/GoSubFrame.java renamed to src/main/java/jagex3/client/ClientGosubFrame.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package jagex3.script;
1+
package jagex3.client;
22

33
import deob.ObfuscatedName;
44

55
// jag::game::GoSubFrame, jag::oldscape::ClientGosubFrame
66
@ObfuscatedName("z")
7-
public class GoSubFrame {
7+
public class ClientGosubFrame {
88

99
@ObfuscatedName("z.r")
1010
public ClientScript script;

src/main/java/jagex3/client/ui/ClientInvCache.java renamed to src/main/java/jagex3/client/ClientInvCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package jagex3.client.ui;
1+
package jagex3.client;
22

33
import deob.ObfuscatedName;
44
import jagex3.datastruct.HashTable;

src/main/java/jagex3/script/ClientScript.java renamed to src/main/java/jagex3/client/ClientScript.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package jagex3.script;
1+
package jagex3.client;
22

33
import deob.ObfuscatedName;
4-
import jagex3.client.Client;
54
import jagex3.datastruct.Linkable2;
65
import jagex3.datastruct.LruCache;
76
import jagex3.io.Packet;

src/main/java/jagex3/client/chat/FriendListEntry.java renamed to src/main/java/jagex3/client/FriendListEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package jagex3.client.chat;
1+
package jagex3.client;
22

33
import deob.ObfuscatedName;
44

src/main/java/jagex3/client/applet/GameCanvas.java renamed to src/main/java/jagex3/client/GameCanvas.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package jagex3.client.applet;
1+
package jagex3.client;
22

33
import deob.ObfuscatedName;
44

src/main/java/jagex3/client/applet/GameShell.java renamed to src/main/java/jagex3/client/GameShell.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
package jagex3.client.applet;
1+
package jagex3.client;
22

33
import deob.ObfuscatedName;
44
import deob.Settings;
5-
import jagex3.client.JagException;
6-
import jagex3.client.SignLink;
7-
import jagex3.datastruct.*;
5+
import jagex3.callstack.JagException;
6+
import jagex3.client.applet.SignLink;
87
import jagex3.graphics.JavaPixMap;
98
import jagex3.graphics.JavaSafePixMap;
109
import jagex3.graphics.PixMap;
1110
import jagex3.jstring.StringTools;
11+
import jagex3.util.ThreadSleep;
12+
import jagex3.util.time.MonotonicTime;
13+
import jagex3.util.timer.MillisTimer;
14+
import jagex3.util.timer.NanoTimer;
15+
import jagex3.util.timer.Timer;
1216

1317
import java.applet.Applet;
1418
import java.awt.*;

‎src/main/java/jagex3/client/HTTPRequest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package jagex3.client;
22

33
import deob.ObfuscatedName;
4-
import jagex3.datastruct.MonotonicTime;
4+
import jagex3.client.applet.PrivilegedRequest;
5+
import jagex3.client.applet.SignLink;
56
import jagex3.io.Packet;
7+
import jagex3.util.time.MonotonicTime;
68

79
import java.io.DataInputStream;
810
import java.io.IOException;

0 commit comments

Comments
 (0)