refactor: migrate audio-related packets to new packet system

src/main/java/org/runejs/client/message/handler/rs435/RS435HandlerRegistry.java

@@ -1,11 +1,20 @@
 package org.runejs.client.message.handler.rs435;
 
 import org.runejs.client.message.handler.MessageHandlerRegistry;
+import org.runejs.client.message.handler.rs435.audio.PlayQuickSongMessageHandler;
+import org.runejs.client.message.handler.rs435.audio.PlaySongMessageHandler;
+import org.runejs.client.message.handler.rs435.audio.PlaySoundMessageHandler;
+import org.runejs.client.message.inbound.audio.PlayQuickSongInboundMessage;
+import org.runejs.client.message.inbound.audio.PlaySongInboundMessage;
+import org.runejs.client.message.inbound.audio.PlaySoundInboundMessage;
 
 /**
  * A {@link MessageHandlerRegistry} for the RS revision 435 client.
  */
 public class RS435HandlerRegistry extends MessageHandlerRegistry {
     public RS435HandlerRegistry() {
+        register(PlaySongInboundMessage.class, new PlaySongMessageHandler());
+        register(PlayQuickSongInboundMessage.class, new PlayQuickSongMessageHandler());
+        register(PlaySoundInboundMessage.class, new PlaySoundMessageHandler());
     }
 }

src/main/java/org/runejs/client/message/handler/rs435/audio/PlayQuickSongMessageHandler.java

@@ -0,0 +1,12 @@
+package org.runejs.client.message.handler.rs435.audio;
+
+import org.runejs.client.message.handler.MessageHandler;
+import org.runejs.client.message.inbound.audio.PlayQuickSongInboundMessage;
+import org.runejs.client.sound.MusicSystem;
+
+public class PlayQuickSongMessageHandler implements MessageHandler<PlayQuickSongInboundMessage> {
+    @Override
+    public void handle(PlayQuickSongInboundMessage message) {
+        MusicSystem.playSoundJingle(message.songTimeout, message.songId);
+    }
+}

src/main/java/org/runejs/client/message/handler/rs435/audio/PlaySongMessageHandler.java

@@ -0,0 +1,12 @@
+package org.runejs.client.message.handler.rs435.audio;
+
+import org.runejs.client.message.handler.MessageHandler;
+import org.runejs.client.message.inbound.audio.PlaySongInboundMessage;
+import org.runejs.client.sound.MusicSystem;
+
+public class PlaySongMessageHandler implements MessageHandler<PlaySongInboundMessage> {
+    @Override
+    public void handle(PlaySongInboundMessage message) {
+        MusicSystem.playSong(message.songId);
+    }
+}

src/main/java/org/runejs/client/message/handler/rs435/audio/PlaySoundMessageHandler.java

@@ -0,0 +1,13 @@
+package org.runejs.client.message.handler.rs435.audio;
+
+import org.runejs.client.message.handler.MessageHandler;
+import org.runejs.client.message.inbound.audio.PlaySoundInboundMessage;
+import org.runejs.client.sound.SoundSystem;
+
+public class PlaySoundMessageHandler implements MessageHandler<PlaySoundInboundMessage> {
+    @Override
+    public void handle(PlaySoundInboundMessage message) {
+
+        SoundSystem.play(message.soundId, message.volume, message.delay);
+    }
+}

src/main/java/org/runejs/client/message/inbound/audio/PlayQuickSongInboundMessage.java

@@ -0,0 +1,26 @@
+package org.runejs.client.message.inbound.audio;
+
+import org.runejs.client.message.InboundMessage;
+
+/**
+ * A message sent from the client to the server to play a song
+ */
+public class PlayQuickSongInboundMessage implements InboundMessage {
+    /**
+     * The song id to play
+     */
+    public final int songId;
+
+    /**
+     * The song timeout.
+     */
+    public final int songTimeout;
+
+    /**
+     * Creates a new PlaySongInboundMessage
+     */
+    public PlayQuickSongInboundMessage(int songId, int songTimeout) {
+        this.songId = songId;
+        this.songTimeout = songTimeout;
+    }
+}

src/main/java/org/runejs/client/message/inbound/audio/PlaySongInboundMessage.java

@@ -0,0 +1,20 @@
+package org.runejs.client.message.inbound.audio;
+
+import org.runejs.client.message.InboundMessage;
+
+/**
+ * A message sent from the client to the server to play a song
+ */
+public class PlaySongInboundMessage implements InboundMessage {
+    /**
+     * The song id to play
+     */
+    public final int songId;
+
+    /**
+     * Creates a new PlaySongInboundMessage
+     */
+    public PlaySongInboundMessage(int songId) {
+        this.songId = songId;
+    }
+}

src/main/java/org/runejs/client/message/inbound/audio/PlaySoundInboundMessage.java

@@ -0,0 +1,32 @@
+package org.runejs.client.message.inbound.audio;
+
+import org.runejs.client.message.InboundMessage;
+
+/**
+ * A message sent from the client to the server to play a sound effect
+ */
+public class PlaySoundInboundMessage implements InboundMessage {
+    /**
+     * The sound id to play
+     */
+    public final int soundId;
+
+    /**
+     * The volume to play the sound at
+     */
+    public final int volume;
+
+    /**
+     * The delay to play the sound at
+     */
+    public final int delay;
+
+    /**
+     * Creates a new PlaySoundInboundMessage
+     */
+    public PlaySoundInboundMessage(int soundId, int volume, int delay) {
+        this.soundId = soundId;
+        this.volume = volume;
+        this.delay = delay;
+    }
+}

src/main/java/org/runejs/client/net/IncomingPackets.java

@@ -1,8 +1,10 @@
 package org.runejs.client.net;
 
+import org.runejs.client.*;
+import org.runejs.client.cache.def.*;
 import org.runejs.client.cache.media.gameInterface.GameInterface;
-import org.runejs.client.cache.media.gameInterface.InterfaceModelType;
 import org.runejs.client.cache.media.gameInterface.GameInterfaceType;
+import org.runejs.client.cache.media.gameInterface.InterfaceModelType;
 import org.runejs.client.frame.ChatBox;
 import org.runejs.client.frame.console.Console;
 import org.runejs.client.input.KeyFocusListener;
@@ -26,11 +28,8 @@
 import org.runejs.client.scene.tile.GenericTile;
 import org.runejs.client.scene.tile.Wall;
 import org.runejs.client.scene.tile.WallDecoration;
-import org.runejs.client.sound.MusicSystem;
 import org.runejs.client.sound.SoundSystem;
 import org.runejs.client.util.TextUtils;
-import org.runejs.client.*;
-import org.runejs.client.cache.def.*;
 
 public class IncomingPackets {
     public static int incomingPacketSize = 0;
@@ -675,23 +674,6 @@ public static boolean parseIncomingPackets() {
                 MovedStatics.lastContinueTextWidgetId = -1;
                 return true;
             }
-            if(opcode == PacketType.PLAY_SONG.getOpcode()) {
-                int songId = incomingPacketBuffer.getUnsignedShortLE();
-                if(songId == 65535)
-                    songId = -1;
-                MusicSystem.playSong(songId);
-                opcode = -1;
-                return true;
-            }
-            if(opcode == PacketType.PLAY_QUICK_SONG.getOpcode()) {
-                int songTimeout = incomingPacketBuffer.getMediumBE();
-                int songId = incomingPacketBuffer.getUnsignedShortBE();
-                if(songId == 65535)
-                    songId = -1;
-                MusicSystem.playSoundJingle(songTimeout, songId);
-                opcode = -1;
-                return true;
-            }
             if(opcode == PacketType.UPDATE_REFERENCE_POSITION.getOpcode()) {
                 OverlayDefinition.placementY = incomingPacketBuffer.getUnsignedByte();
                 MovedStatics.placementX = incomingPacketBuffer.getUnsignedByte();
@@ -758,14 +740,6 @@ public static boolean parseIncomingPackets() {
                 opcode = -1;
                 return true;
             }
-            if(opcode == PacketType.PLAY_SOUND.getOpcode()) {
-                int soundId = incomingPacketBuffer.getUnsignedShortBE();
-                int volume = incomingPacketBuffer.getUnsignedByte();
-                int delay = incomingPacketBuffer.getUnsignedShortBE();
-                SoundSystem.play(soundId, volume, delay);
-                opcode = -1;
-                return true;
-            }
             if(opcode == 237) { // show tab overlay widget
                 int i_68_ = incomingPacketBuffer.getUnsignedShortBE();
                 GameInterface.resetInterfaceAnimations(i_68_);

src/main/java/org/runejs/client/net/codec/runejs435/RuneJS435PacketCodec.java

@@ -2,6 +2,9 @@
 
 import org.runejs.client.net.PacketType;
 import org.runejs.client.net.codec.MessagePacketCodec;
+import org.runejs.client.net.codec.runejs435.decoder.audio.PlayQuickSongMessageDecoder;
+import org.runejs.client.net.codec.runejs435.decoder.audio.PlaySongMessageDecoder;
+import org.runejs.client.net.codec.runejs435.decoder.audio.PlaySoundMessageDecoder;
 
 /**
  * A {@link MessagePacketCodec} for the RuneJS customised 435 protocol.
@@ -18,5 +21,8 @@ private void registerEncoders() {
     }
 
     private void registerDecoders() {
+        register(PacketType.PLAY_SONG.getOpcode(), new PlaySongMessageDecoder());
+        register(PacketType.PLAY_QUICK_SONG.getOpcode(), new PlayQuickSongMessageDecoder());
+        register(PacketType.PLAY_SOUND.getOpcode(), new PlaySoundMessageDecoder());
     }
 }

src/main/java/org/runejs/client/net/codec/runejs435/decoder/audio/PlayQuickSongMessageDecoder.java

@@ -0,0 +1,19 @@
+package org.runejs.client.net.codec.runejs435.decoder.audio;
+
+import org.runejs.client.message.inbound.audio.PlaySongInboundMessage;
+import org.runejs.client.net.PacketBuffer;
+import org.runejs.client.net.codec.MessageDecoder;
+
+/**
+ * Decodes the PlayQuickSong message
+ */
+public class PlayQuickSongMessageDecoder implements MessageDecoder<PlaySongInboundMessage> {
+    @Override
+    public PlaySongInboundMessage decode(PacketBuffer buffer) {
+        int songId = buffer.getUnsignedShortLE();
+        if(songId == 65535)
+            songId = -1;
+
+        return new PlaySongInboundMessage(songId);
+    }
+}

src/main/java/org/runejs/client/net/codec/runejs435/decoder/audio/PlaySongMessageDecoder.java

@@ -0,0 +1,16 @@
+package org.runejs.client.net.codec.runejs435.decoder.audio;
+
+import org.runejs.client.message.inbound.audio.PlaySongInboundMessage;
+import org.runejs.client.net.PacketBuffer;
+import org.runejs.client.net.codec.MessageDecoder;
+
+public class PlaySongMessageDecoder implements MessageDecoder<PlaySongInboundMessage> {
+    @Override
+    public PlaySongInboundMessage decode(PacketBuffer buffer) {
+        int songId = buffer.getUnsignedShortLE();
+        if(songId == 65535)
+            songId = -1;
+
+        return new PlaySongInboundMessage(songId);
+    }
+}

src/main/java/org/runejs/client/net/codec/runejs435/decoder/audio/PlaySoundMessageDecoder.java

@@ -0,0 +1,19 @@
+package org.runejs.client.net.codec.runejs435.decoder.audio;
+
+import org.runejs.client.message.inbound.audio.PlaySoundInboundMessage;
+import org.runejs.client.net.PacketBuffer;
+import org.runejs.client.net.codec.MessageDecoder;
+
+/**
+ * Decodes the PlaySoundInboundMessage
+ */
+public class PlaySoundMessageDecoder implements MessageDecoder<PlaySoundInboundMessage> {
+    @Override
+    public PlaySoundInboundMessage decode(PacketBuffer buffer) {
+        int soundId = buffer.getUnsignedShortBE();
+        int volume = buffer.getUnsignedByte();
+        int delay = buffer.getUnsignedShortBE();
+
+        return new PlaySoundInboundMessage(soundId, volume, delay);
+    }
+}