chore: Flattening some packages

Pazaz · Pazaz · commit a8dc095aafa6 · 2026-01-27T16:37:48.000-05:00
diff --git a/src/main/java/jagex3/client/Client.java b/src/main/java/jagex3/client/Client.java
@@ -10,11 +10,9 @@
 import jagex3.config.*;
 import jagex3.config.iftype.IfType;
 import jagex3.config.iftype.ServerActive;
+import jagex3.constants.Skills;
 import jagex3.constants.Text;
-import jagex3.constants.skills.Skills;
 import jagex3.dash3d.*;
-import jagex3.dash3d.player.PlayerModel;
-import jagex3.dash3d.player.RecolsRunescape;
 import jagex3.datastruct.ChatLinkList;
 import jagex3.datastruct.HashTable;
 import jagex3.datastruct.LinkList;
@@ -26,29 +24,30 @@
 import jagex3.graphics.Pix32;
 import jagex3.graphics.Pix8;
 import jagex3.graphics.PixLoader;
+import jagex3.io.ClientStream;
+import jagex3.io.DataFile;
 import jagex3.io.Packet;
 import jagex3.io.PacketBit;
-import jagex3.io.net.ClientStream;
-import jagex3.io.net.DataFile;
 import jagex3.javconfig.JavConfigParameter;
-import jagex3.javconfig.mode.ModeGame;
-import jagex3.javconfig.mode.ModeWhat;
+import jagex3.javconfig.ModeGame;
+import jagex3.javconfig.ModeWhat;
 import jagex3.js5.Js5Loader;
 import jagex3.js5.Js5Net;
 import jagex3.js5.Js5NetThread;
 import jagex3.js5.Js5WorkerRequest;
-import jagex3.jstring.*;
+import jagex3.jstring.DisplayNameTools;
+import jagex3.jstring.JString;
+import jagex3.jstring.StringTools;
 import jagex3.midi2.MidiManager;
 import jagex3.midi2.MidiPlayer;
-import jagex3.movement.CollisionMap;
 import jagex3.namespace.NameSpace;
 import jagex3.obfuscation.Protocol;
 import jagex3.reflectionchecker.ReflectionChecker;
 import jagex3.sound.*;
-import jagex3.util.time.MonotonicTime;
+import jagex3.util.MonotonicTime;
 import jagex3.var.VarCache;
+import jagex3.wordfilter2.Huffman;
 import jagex3.wordfilter2.WordPack;
-import jagex3.wordfilter2.huffman.Huffman;
 
 import java.awt.*;
 import java.io.IOException;
diff --git a/src/main/java/jagex3/client/ClientBuild.java b/src/main/java/jagex3/client/ClientBuild.java
@@ -5,9 +5,7 @@
 import jagex3.config.FluType;
 import jagex3.config.LocType;
 import jagex3.dash3d.*;
-import jagex3.dash3d.util.RegionRotate;
 import jagex3.io.Packet;
-import jagex3.movement.CollisionMap;
 import jagex3.sound.BgSound;
 
 // jag::oldscape::ClientBuild
diff --git a/src/main/java/jagex3/client/GameShell.java b/src/main/java/jagex3/client/GameShell.java
@@ -8,11 +8,7 @@
 import jagex3.graphics.JavaSafePixMap;
 import jagex3.graphics.PixMap;
 import jagex3.jstring.StringTools;
-import jagex3.util.ThreadSleep;
-import jagex3.util.time.MonotonicTime;
-import jagex3.util.timer.MillisTimer;
-import jagex3.util.timer.NanoTimer;
-import jagex3.util.timer.Timer;
+import jagex3.util.*;
 
 import java.applet.Applet;
 import java.awt.*;
diff --git a/src/main/java/jagex3/client/HTTPRequest.java b/src/main/java/jagex3/client/HTTPRequest.java
@@ -4,7 +4,7 @@
 import jagex3.client.applet.PrivilegedRequest;
 import jagex3.client.applet.SignLink;
 import jagex3.io.Packet;
-import jagex3.util.time.MonotonicTime;
+import jagex3.util.MonotonicTime;
 
 import java.io.DataInputStream;
 import java.io.IOException;
diff --git a/src/main/java/jagex3/client/ScriptRunner.java b/src/main/java/jagex3/client/ScriptRunner.java
@@ -9,11 +9,11 @@
 import jagex3.config.iftype.IfType;
 import jagex3.config.iftype.ServerActive;
 import jagex3.constants.Text;
+import jagex3.dash3d.PixFont;
+import jagex3.dash3d.PixFontGeneric;
 import jagex3.friends.PrivateChatFilter;
 import jagex3.io.Packet;
 import jagex3.jstring.JString;
-import jagex3.jstring.PixFont;
-import jagex3.jstring.PixFontGeneric;
 import jagex3.jstring.StringTools;
 import jagex3.var.VarCache;
 import jagex3.wordfilter2.WordPack;
diff --git a/src/main/java/jagex3/client/TitleScreen.java b/src/main/java/jagex3/client/TitleScreen.java
@@ -4,15 +4,15 @@
 import jagex3.client.input.keyboard.ClientKeyboardListener;
 import jagex3.client.input.mouse.ClientMouseListener;
 import jagex3.constants.Text;
+import jagex3.dash3d.PixFont;
+import jagex3.dash3d.PixFontGeneric;
 import jagex3.graphics.Pix2D;
 import jagex3.graphics.Pix32;
 import jagex3.graphics.Pix8;
 import jagex3.graphics.PixLoader;
 import jagex3.io.Packet;
 import jagex3.js5.Js5Loader;
 import jagex3.js5.Js5Net;
-import jagex3.jstring.PixFont;
-import jagex3.jstring.PixFontGeneric;
 import jagex3.jstring.StringTools;
 import jagex3.midi2.MidiManager;
 
diff --git a/src/main/java/jagex3/client/applet/GameShellCache.java b/src/main/java/jagex3/client/applet/GameShellCache.java
@@ -2,10 +2,10 @@
 
 import deob.ObfuscatedName;
 import jagex3.callstack.JagException;
+import jagex3.io.BufferedRandomAccessFile;
+import jagex3.io.CacheUtil;
+import jagex3.io.FileOnDisk;
 import jagex3.io.Packet;
-import jagex3.io.net.CacheUtil;
-import jagex3.js5.io.BufferedRandomAccessFile;
-import jagex3.js5.io.FileOnDisk;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/jagex3/client/input/mouse/ClientMouseListener.java b/src/main/java/jagex3/client/input/mouse/ClientMouseListener.java
@@ -1,7 +1,7 @@
 package jagex3.client.input.mouse;
 
 import deob.ObfuscatedName;
-import jagex3.util.time.MonotonicTime;
+import jagex3.util.MonotonicTime;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/src/main/java/jagex3/config/ObjType.java b/src/main/java/jagex3/config/ObjType.java
@@ -5,14 +5,14 @@
 import jagex3.dash3d.ModelLit;
 import jagex3.dash3d.ModelUnlit;
 import jagex3.dash3d.Pix3D;
+import jagex3.dash3d.PixFontGeneric;
 import jagex3.datastruct.Linkable2;
 import jagex3.datastruct.LruCache;
 import jagex3.graphics.Pix2D;
 import jagex3.graphics.Pix32;
 import jagex3.io.Packet;
 import jagex3.js5.Js5;
 import jagex3.js5.Js5Loader;
-import jagex3.jstring.PixFontGeneric;
 
 // jag::oldscape::configdecoder::ObjType
 @ObfuscatedName("fj")
diff --git a/src/main/java/jagex3/config/iftype/IfType.java b/src/main/java/jagex3/config/iftype/IfType.java
@@ -7,14 +7,14 @@
 import jagex3.constants.Text;
 import jagex3.dash3d.ModelLit;
 import jagex3.dash3d.ModelUnlit;
-import jagex3.dash3d.player.PlayerModel;
+import jagex3.dash3d.PixFontGeneric;
+import jagex3.dash3d.PlayerModel;
 import jagex3.datastruct.Linkable;
 import jagex3.datastruct.LruCache;
 import jagex3.graphics.Pix32;
 import jagex3.graphics.PixLoader;
 import jagex3.io.Packet;
 import jagex3.js5.Js5;
-import jagex3.jstring.PixFontGeneric;
 
 // jag::oldscape::rs2lib::IfType
 @ObfuscatedName("eg")
diff --git a/src/main/java/jagex3/constants/Skills.java b/src/main/java/jagex3/constants/Skills.java
@@ -1,4 +1,4 @@
-package jagex3.constants.skills;
+package jagex3.constants;
 
 import deob.ObfuscatedName;
 
diff --git a/src/main/java/jagex3/constants/UnusedBN.java b/src/main/java/jagex3/constants/UnusedBN.java
@@ -1,4 +1,4 @@
-package jagex3.constants.skills;
+package jagex3.constants;
 
 import deob.ObfuscatedName;
 
diff --git a/src/main/java/jagex3/dash3d/ClientPlayer.java b/src/main/java/jagex3/dash3d/ClientPlayer.java
@@ -6,7 +6,6 @@
 import jagex3.config.ObjType;
 import jagex3.config.SeqType;
 import jagex3.config.SpotType;
-import jagex3.dash3d.player.PlayerModel;
 import jagex3.io.Packet;
 
 // jag::oldscape::ClientPlayer
diff --git a/src/main/java/jagex3/dash3d/CollisionMap.java b/src/main/java/jagex3/dash3d/CollisionMap.java
@@ -1,4 +1,4 @@
-package jagex3.movement;
+package jagex3.dash3d;
 
 import deob.ObfuscatedName;
 
diff --git a/src/main/java/jagex3/dash3d/PixFont.java b/src/main/java/jagex3/dash3d/PixFont.java
@@ -1,8 +1,9 @@
-package jagex3.jstring;
+package jagex3.dash3d;
 
 import deob.ObfuscatedName;
 import jagex3.graphics.Pix2D;
 import jagex3.graphics.Pix8;
+import jagex3.jstring.StringTools;
 
 import java.util.Random;
 
diff --git a/src/main/java/jagex3/dash3d/PixFontGeneric.java b/src/main/java/jagex3/dash3d/PixFontGeneric.java
@@ -1,4 +1,4 @@
-package jagex3.jstring;
+package jagex3.dash3d;
 
 import deob.ObfuscatedName;
 import jagex3.graphics.Pix2D;
diff --git a/src/main/java/jagex3/dash3d/PlayerModel.java b/src/main/java/jagex3/dash3d/PlayerModel.java
@@ -1,12 +1,10 @@
-package jagex3.dash3d.player;
+package jagex3.dash3d;
 
 import deob.ObfuscatedName;
 import jagex3.config.IdkType;
 import jagex3.config.NpcType;
 import jagex3.config.ObjType;
 import jagex3.config.SeqType;
-import jagex3.dash3d.ModelLit;
-import jagex3.dash3d.ModelUnlit;
 import jagex3.datastruct.LruCache;
 import jagex3.io.Packet;
 
diff --git a/src/main/java/jagex3/dash3d/RecolsRunescape.java b/src/main/java/jagex3/dash3d/RecolsRunescape.java
@@ -1,4 +1,4 @@
-package jagex3.dash3d.player;
+package jagex3.dash3d;
 
 import deob.ObfuscatedName;
 
diff --git a/src/main/java/jagex3/dash3d/RegionRotate.java b/src/main/java/jagex3/dash3d/RegionRotate.java
@@ -1,4 +1,4 @@
-package jagex3.dash3d.util;
+package jagex3.dash3d;
 
 import deob.ObfuscatedName;
 
diff --git a/src/main/java/jagex3/dash3d/UnusedCV.java b/src/main/java/jagex3/dash3d/UnusedCV.java
@@ -1,4 +1,4 @@
-package jagex3.dash3d.player;
+package jagex3.dash3d;
 
 import deob.ObfuscatedName;
 
diff --git a/src/main/java/jagex3/friends/TimestampMessage.java b/src/main/java/jagex3/friends/TimestampMessage.java
@@ -2,7 +2,7 @@
 
 import deob.ObfuscatedName;
 import jagex3.datastruct.ChatLinkable;
-import jagex3.util.time.MonotonicTime;
+import jagex3.util.MonotonicTime;
 
 @ObfuscatedName("dr")
 public class TimestampMessage extends ChatLinkable {
diff --git a/src/main/java/jagex3/graphics/PixLoader.java b/src/main/java/jagex3/graphics/PixLoader.java
@@ -1,9 +1,9 @@
 package jagex3.graphics;
 
 import deob.ObfuscatedName;
+import jagex3.dash3d.PixFontGeneric;
 import jagex3.io.Packet;
 import jagex3.js5.Js5;
-import jagex3.jstring.PixFontGeneric;
 
 // jag::oldscape::graphics::pixloader
 @ObfuscatedName("al")
diff --git a/src/main/java/jagex3/io/BZip2.java b/src/main/java/jagex3/io/BZip2.java
@@ -1,7 +1,6 @@
-package jagex3.js5.compress;
+package jagex3.io;
 
 import deob.ObfuscatedName;
-import jagex3.io.BZip2State;
 
 @ObfuscatedName("bu")
 public class BZip2 {
diff --git a/src/main/java/jagex3/io/BufferedRandomAccessFile.java b/src/main/java/jagex3/io/BufferedRandomAccessFile.java
@@ -1,4 +1,4 @@
-package jagex3.js5.io;
+package jagex3.io;
 
 import deob.ObfuscatedName;
 
diff --git a/src/main/java/jagex3/io/ByteArrayWrapper.java b/src/main/java/jagex3/io/ByteArrayWrapper.java
@@ -1,4 +1,4 @@
-package jagex3.io.wrap;
+package jagex3.io;
 
 import deob.ObfuscatedName;
 
diff --git a/src/main/java/jagex3/io/ByteBufferNode.java b/src/main/java/jagex3/io/ByteBufferNode.java
@@ -1,4 +1,4 @@
-package jagex3.io.wrap;
+package jagex3.io;
 
 import deob.ObfuscatedName;
 
diff --git a/src/main/java/jagex3/io/CacheUtil.java b/src/main/java/jagex3/io/CacheUtil.java
@@ -1,4 +1,4 @@
-package jagex3.io.net;
+package jagex3.io;
 
 import deob.ObfuscatedName;
 
diff --git a/src/main/java/jagex3/io/ClientStream.java b/src/main/java/jagex3/io/ClientStream.java
@@ -1,4 +1,4 @@
-package jagex3.io.net;
+package jagex3.io;
 
 import deob.ObfuscatedName;
 import jagex3.callstack.JagException;
diff --git a/src/main/java/jagex3/io/DataFile.java b/src/main/java/jagex3/io/DataFile.java
@@ -1,7 +1,6 @@
-package jagex3.io.net;
+package jagex3.io;
 
 import deob.ObfuscatedName;
-import jagex3.js5.io.BufferedRandomAccessFile;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/main/java/jagex3/io/FileOnDisk.java b/src/main/java/jagex3/io/FileOnDisk.java
@@ -1,4 +1,4 @@
-package jagex3.js5.io;
+package jagex3.io;
 
 import deob.ObfuscatedName;
 
diff --git a/src/main/java/jagex3/io/GZip.java b/src/main/java/jagex3/io/GZip.java
@@ -1,7 +1,6 @@
-package jagex3.js5.compress;
+package jagex3.io;
 
 import deob.ObfuscatedName;
-import jagex3.io.Packet;
 
 import java.util.zip.Inflater;
 
diff --git a/src/main/java/jagex3/io/UnusedAS.java b/src/main/java/jagex3/io/UnusedAS.java
@@ -1,4 +1,4 @@
-package jagex3.io.net;
+package jagex3.io;
 
 import deob.ObfuscatedName;
 
diff --git a/src/main/java/jagex3/javconfig/ModeGame.java b/src/main/java/jagex3/javconfig/ModeGame.java
@@ -1,7 +1,6 @@
-package jagex3.javconfig.mode;
+package jagex3.javconfig;
 
 import deob.ObfuscatedName;
-import jagex3.javconfig.modeprovider.ModeGameProvider;
 
 @ObfuscatedName("bp")
 public class ModeGame implements ModeGameProvider {
diff --git a/src/main/java/jagex3/javconfig/ModeGameProvider.java b/src/main/java/jagex3/javconfig/ModeGameProvider.java
@@ -1,4 +1,4 @@
-package jagex3.javconfig.modeprovider;
+package jagex3.javconfig;
 
 import deob.ObfuscatedName;
 
diff --git a/src/main/java/jagex3/javconfig/ModeWhat.java b/src/main/java/jagex3/javconfig/ModeWhat.java
@@ -1,4 +1,4 @@
-package jagex3.javconfig.mode;
+package jagex3.javconfig;
 
 import deob.ObfuscatedName;
 
diff --git a/src/main/java/jagex3/js5/Js5.java b/src/main/java/jagex3/js5/Js5.java
@@ -3,10 +3,10 @@
 import deob.ObfuscatedName;
 import jagex3.callstack.JagException;
 import jagex3.datastruct.IntHashTable;
+import jagex3.io.BZip2;
+import jagex3.io.ByteArrayWrapper;
+import jagex3.io.GZip;
 import jagex3.io.Packet;
-import jagex3.io.wrap.ByteArrayWrapper;
-import jagex3.js5.compress.BZip2;
-import jagex3.js5.compress.GZip;
 import jagex3.jstring.StringTools;
 
 // jag::oldscape::jagex3::Js5
diff --git a/src/main/java/jagex3/js5/Js5Loader.java b/src/main/java/jagex3/js5/Js5Loader.java
@@ -3,9 +3,9 @@
 import deob.ObfuscatedName;
 import jagex3.client.GameShell;
 import jagex3.datastruct.LinkList;
+import jagex3.io.ByteArrayWrapper;
+import jagex3.io.DataFile;
 import jagex3.io.Packet;
-import jagex3.io.net.DataFile;
-import jagex3.io.wrap.ByteArrayWrapper;
 
 import java.util.zip.CRC32;
 
diff --git a/src/main/java/jagex3/js5/Js5Net.java b/src/main/java/jagex3/js5/Js5Net.java
@@ -3,9 +3,9 @@
 import deob.ObfuscatedName;
 import jagex3.datastruct.HashTable;
 import jagex3.datastruct.LinkList2;
+import jagex3.io.ClientStream;
 import jagex3.io.Packet;
-import jagex3.io.net.ClientStream;
-import jagex3.util.time.MonotonicTime;
+import jagex3.util.MonotonicTime;
 
 import java.io.IOException;
 import java.util.zip.CRC32;
diff --git a/src/main/java/jagex3/js5/Js5NetThread.java b/src/main/java/jagex3/js5/Js5NetThread.java
diff --git a/src/main/java/jagex3/js5/Js5WorkerRequest.java b/src/main/java/jagex3/js5/Js5WorkerRequest.java
diff --git a/src/main/java/jagex3/sound/PcmPlayer.java b/src/main/java/jagex3/sound/PcmPlayer.java
diff --git a/src/main/java/jagex3/util/MillisTimer.java b/src/main/java/jagex3/util/MillisTimer.java
diff --git a/src/main/java/jagex3/util/MonotonicTime.java b/src/main/java/jagex3/util/MonotonicTime.java
diff --git a/src/main/java/jagex3/util/NanoTimer.java b/src/main/java/jagex3/util/NanoTimer.java
diff --git a/src/main/java/jagex3/util/Timer.java b/src/main/java/jagex3/util/Timer.java
diff --git a/src/main/java/jagex3/wordfilter2/Huffman.java b/src/main/java/jagex3/wordfilter2/Huffman.java
diff --git a/src/main/java/jagex3/wordfilter2/WordPack.java b/src/main/java/jagex3/wordfilter2/WordPack.java
