diff --git a/cache/src/main/kotlin/net/rsprox/cache/type/OldSchoolNpcType.kt b/cache/src/main/kotlin/net/rsprox/cache/type/OldSchoolNpcType.kt
index 43e5a06ce..973536458 100644
--- a/cache/src/main/kotlin/net/rsprox/cache/type/OldSchoolNpcType.kt
+++ b/cache/src/main/kotlin/net/rsprox/cache/type/OldSchoolNpcType.kt
@@ -141,6 +141,24 @@ public class OldSchoolNpcType(
                         }
                     }
             }
+            61 -> {
+                val count = buffer.g1()
+                this.model =
+                    buildList(count) {
+                        for (i in 0..<count) {
+                            add(buffer.g4())
+                        }
+                    }
+            }
+            62 -> {
+                val count = buffer.g1()
+                this.headmodel =
+                    buildList(count) {
+                        for (i in 0..<count) {
+                            add(buffer.g4())
+                        }
+                    }
+            }
             74 -> this.stat[0] = buffer.g2()
             75 -> this.stat[1] = buffer.g2()
             76 -> this.stat[2] = buffer.g2()
diff --git a/cache/src/main/kotlin/net/rsprox/cache/type/ParamTypeHelper.kt b/cache/src/main/kotlin/net/rsprox/cache/type/ParamTypeHelper.kt
index be80ff812..f2e6e0221 100644
--- a/cache/src/main/kotlin/net/rsprox/cache/type/ParamTypeHelper.kt
+++ b/cache/src/main/kotlin/net/rsprox/cache/type/ParamTypeHelper.kt
@@ -9,13 +9,13 @@ internal object ParamTypeHelper {
     ) {
         val count = buffer.g1()
         for (i in 0..<count) {
-            val isString = buffer.g1() == 1
+            val type = buffer.g1()
             val id = buffer.g3()
             val value =
-                if (isString) {
-                    buffer.gjstr()
-                } else {
-                    buffer.g4()
+                when (type) {
+                    1 -> buffer.gjstr()
+                    2 -> buffer.g8()
+                    else -> buffer.g4()
                 }
             params[id] = value
         }
diff --git a/processor/src/main/kotlin/net/rsprox/processor/state/BinarySessionState.kt b/processor/src/main/kotlin/net/rsprox/processor/state/BinarySessionState.kt
index f453053f2..7e640ac72 100644
--- a/processor/src/main/kotlin/net/rsprox/processor/state/BinarySessionState.kt
+++ b/processor/src/main/kotlin/net/rsprox/processor/state/BinarySessionState.kt
@@ -2,9 +2,9 @@ package net.rsprox.processor.state
 
 import net.rsprot.protocol.message.IncomingMessage
 import net.rsprox.protocol.common.CoordGrid
-import net.rsprox.protocol.game.outgoing.model.map.RebuildLogin
-import net.rsprox.protocol.game.outgoing.model.map.RebuildNormal
-import net.rsprox.protocol.game.outgoing.model.map.RebuildRegion
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildNormalV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV1
 import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
 import net.rsprox.protocol.game.outgoing.model.misc.client.ServerTickEnd
 import net.rsprox.protocol.game.outgoing.model.zone.header.UpdateZoneFullFollows
@@ -40,7 +40,10 @@ public data class BinarySessionState(
      *
      * This method is mainly used for zone prots where limited coord information is available. (3-bit coordinate offset)
      */
-    public fun absCoord(xInZone: Int, zInZone: Int): CoordGrid {
+    public fun absCoord(
+        xInZone: Int,
+        zInZone: Int,
+    ): CoordGrid {
         val zoneBase = CoordGrid(updateZone.level, buildArea.x + updateZone.x, buildArea.z + updateZone.z)
         val coord = CoordGrid(zoneBase.level, zoneBase.x + xInZone, zoneBase.z + zInZone)
         return absCoord(buildArea, regionZones, coord)
@@ -51,19 +54,19 @@ public data class BinarySessionState(
             is ServerTickEnd -> {
                 return copy(currentTick = currentTick + 1)
             }
-            is RebuildNormal -> {
+            is RebuildNormalV1 -> {
                 val buildAreaX = (message.zoneX - 6) shl 3
                 val buildAreaZ = (message.zoneZ - 6) shl 3
                 val buildArea = CoordGrid(0, buildAreaX, buildAreaZ)
                 return copy(buildArea = buildArea, regionZones = null)
             }
-            is RebuildRegion -> {
+            is RebuildRegionV1 -> {
                 val buildAreaX = (message.zoneX - 6) shl 3
                 val buildAreaZ = (message.zoneZ - 6) shl 3
                 val buildArea = CoordGrid(0, buildAreaX, buildAreaZ)
                 return copy(buildArea = buildArea, regionZones = message.buildArea)
             }
-            is RebuildLogin -> {
+            is RebuildLoginV1 -> {
                 val localIndex = message.playerInfoInitBlock.localPlayerIndex
                 val buildAreaX = (message.zoneX - 6) shl 3
                 val buildAreaZ = (message.zoneZ - 6) shl 3
@@ -96,7 +99,11 @@ public data class BinarySessionState(
                 regionZones = null,
             )
 
-        private fun absCoord(buildArea: CoordGrid, regionZones: BuildArea?, coord: CoordGrid): CoordGrid {
+        private fun absCoord(
+            buildArea: CoordGrid,
+            regionZones: BuildArea?,
+            coord: CoordGrid,
+        ): CoordGrid {
             if (regionZones == null || coord.x < 6400) {
                 return coord
             }
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
index e24a94401..d08041fd4 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v223.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v223.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc1Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc1Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2()
         val x = buffer.g2Alt1()
         val z = buffer.g2Alt3()
         val controlKey = buffer.g1() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
index 891624cc1..f4bc49aa8 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v223.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v223.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc2Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc2Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val controlKey = buffer.g1() == 1
         val id = buffer.g2Alt2()
         val x = buffer.g2Alt3()
         val z = buffer.g2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
index 99b6e1ced..43f517207 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v223.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v223.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc3Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc3Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val controlKey = buffer.g1Alt1() == 1
         val z = buffer.g2Alt1()
         val id = buffer.g2Alt3()
         val x = buffer.g2Alt3()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
index b24c7d0dd..a52d732a3 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v223.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v223.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc4Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc4Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2Alt3()
         val x = buffer.g2Alt2()
         val id = buffer.g2Alt2()
         val controlKey = buffer.g1Alt1() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
index d1035ad0e..384ef1577 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v223.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v223.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc5Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc5Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2Alt3()
         val id = buffer.g2Alt2()
         val x = buffer.g2Alt2()
         val controlKey = buffer.g1Alt2() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
index 398c41e3c..71dbf3c1e 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v223.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v223.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc1Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc1Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt2()
         val controlKey = buffer.g1() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             1,
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
index 5dbdae7ef..1092ddfb9 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v223.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v223.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc2Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc2Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt3()
         val controlKey = buffer.g1() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             2,
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
index ef095fcfb..ae13635ae 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v223.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v223.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc3Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc3Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt3()
         val controlKey = buffer.g1Alt3() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             3,
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
index 517d4e33f..b41c11294 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v223.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v223.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc4Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc4Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt1() == 1
         val index = buffer.g2Alt1()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             4,
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
index 19164638f..2b3300356 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v223.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v223.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc5Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc5Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt2()
         val controlKey = buffer.g1Alt1() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             5,
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj1Decoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
index 66df4d7b8..a0beecb82 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v223.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v223.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj1Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj1Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2Alt1()
         val z = buffer.g2Alt3()
         val controlKey = buffer.g1Alt1() == 1
         val x = buffer.g2Alt1()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj2Decoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
index 0af0f567c..6c893ca11 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v223.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v223.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj2Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj2Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2Alt3()
         val controlKey = buffer.g1Alt2() == 1
         val x = buffer.g2Alt3()
         val z = buffer.g2Alt1()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj3Decoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
index fcc4840d1..2488004d3 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v223.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v223.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj3Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj3Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val z = buffer.g2Alt2()
         val controlKey = buffer.g1Alt1() == 1
         val x = buffer.g2Alt2()
         val id = buffer.g2Alt2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj4Decoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
index 9408d3809..aa2b49eb3 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v223.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v223.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj4Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj4Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1Alt3() == 1
         val x = buffer.g2Alt3()
         val z = buffer.g2Alt3()
         val id = buffer.g2Alt2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj5Decoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
index 934866f8d..03a49bc60 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v223.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v223.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj5Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj5Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1Alt1() == 1
         val id = buffer.g2Alt3()
         val z = buffer.g2()
         val x = buffer.g2Alt1()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
index c8a9227a0..30e1aa303 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
@@ -4,20 +4,20 @@ import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprot.protocol.util.gCombinedIdAlt3
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModel
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModelV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v223.game.outgoing.decoder.prot.GameServerProt
 
-internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModel> {
+internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModelV1> {
     override val prot: ClientProt = GameServerProt.IF_SETMODEL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): IfSetModel {
+    ): IfSetModelV1 {
         val combinedId = buffer.gCombinedIdAlt3()
         val model = buffer.g2Alt2()
-        return IfSetModel(
+        return IfSetModelV1(
             combinedId.interfaceId,
             combinedId.componentId,
             model,
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
index 3b649924b..1eb139f70 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
@@ -5,20 +5,20 @@ import net.rsprot.buffer.bitbuffer.toBitBuf
 import net.rsprot.crypto.xtea.XteaKey
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.map.RebuildRegion
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV1
 import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
 import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.getWorld
 import net.rsprox.protocol.v223.game.outgoing.decoder.prot.GameServerProt
 
-internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
+internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegionV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_REGION
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): RebuildRegion {
+    ): RebuildRegionV1 {
         val reload = buffer.g1Alt3() == 1
         val zoneZ = buffer.g2Alt3()
         val zoneX = buffer.g2()
@@ -44,7 +44,7 @@ internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
         val world = session.getWorld(-1)
         world.baseX = (zoneX - 6) * 8
         world.baseZ = (zoneZ - 6) * 8
-        return RebuildRegion(
+        return RebuildRegionV1(
             zoneX,
             zoneZ,
             reload,
diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
index c20566c95..117f21f67 100644
--- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
+++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
@@ -10,9 +10,9 @@ import net.rsprox.protocol.ProxyMessageDecoder
 import net.rsprox.protocol.common.CoordGrid
 import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
 import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.GenericWorldEntityInfoClient
-import net.rsprox.protocol.game.outgoing.model.map.RebuildLogin
-import net.rsprox.protocol.game.outgoing.model.map.RebuildNormal
-import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessage
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildNormalV1
+import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessageV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.allocateWorld
 import net.rsprox.protocol.session.getWorld
@@ -23,13 +23,13 @@ import net.rsprox.protocol.v223.game.outgoing.model.info.playerinfo.PlayerInfoCl
 internal class StaticRebuildDecoder(
     private val huffmanCodec: HuffmanCodec,
     private val cache: CacheProvider,
-) : ProxyMessageDecoder<StaticRebuildMessage> {
+) : ProxyMessageDecoder<StaticRebuildMessageV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_NORMAL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): StaticRebuildMessage {
+    ): StaticRebuildMessageV1 {
         val playerInfoInitBlock =
             if (buffer.isReadable(MINIMUM_REBUILD_LOGIN_CAPACITY)) {
                 buffer.buffer
@@ -69,7 +69,7 @@ internal class StaticRebuildDecoder(
             }
         return if (playerInfoInitBlock != null) {
             val message =
-                RebuildLogin(
+                RebuildLoginV1(
                     zoneX,
                     zoneZ,
                     worldArea,
@@ -94,7 +94,7 @@ internal class StaticRebuildDecoder(
             val world = session.getWorld(-1)
             world.baseX = (zoneX - 6) * 8
             world.baseZ = (zoneZ - 6) * 8
-            RebuildNormal(
+            RebuildNormalV1(
                 zoneX,
                 zoneZ,
                 worldArea,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
index 32a34c8c4..ac24b7544 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v224.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v224.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc1Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc1Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val controlKey = buffer.g1Alt1() == 1
         val z = buffer.g2Alt2()
         val x = buffer.g2Alt2()
         val id = buffer.g2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
index 9627be123..1eb2fb570 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v224.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v224.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc2Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc2Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2Alt2()
         val z = buffer.g2()
         val controlKey = buffer.g1Alt3() == 1
         val id = buffer.g2Alt1()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
index 1ef77938b..8c05f7004 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v224.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v224.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc3Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc3Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2Alt3()
         val id = buffer.g2Alt2()
         val controlKey = buffer.g1Alt3() == 1
         val x = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
index 5f6d6a641..fdb3b7232 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v224.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v224.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc4Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc4Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val controlKey = buffer.g1Alt1() == 1
         val id = buffer.g2Alt1()
         val x = buffer.g2Alt2()
         val z = buffer.g2Alt1()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
index aabda89a0..868a57c02 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v224.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v224.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc5Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc5Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2Alt2()
         val z = buffer.g2Alt2()
         val id = buffer.g2Alt2()
         val controlKey = buffer.g1Alt2() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
index 0692d1411..3f8fbd783 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v224.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v224.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc1Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc1Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1() == 1
         val index = buffer.g2Alt2()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             1,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
index 615867794..99329a656 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v224.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v224.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc2Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc2Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt2()
         val controlKey = buffer.g1() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             2,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
index 901f4f428..1eae28d58 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v224.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v224.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc3Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc3Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt1()
         val controlKey = buffer.g1Alt3() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             3,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
index 00de266d7..9133fe3ca 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v224.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v224.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc4Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc4Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt2() == 1
         val index = buffer.g2Alt2()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             4,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
index 5fc28836a..3c64e3dc1 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v224.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v224.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc5Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc5Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt3() == 1
         val index = buffer.g2()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             5,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj1Decoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
index 503831fea..fe21f4088 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v224.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v224.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj1Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj1Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2()
         val z = buffer.g2()
         val x = buffer.g2()
         val controlKey = buffer.g1Alt2() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj2Decoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
index 4b94faa59..f40f365a2 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v224.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v224.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj2Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj2Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2Alt3()
         val x = buffer.g2Alt1()
         val z = buffer.g2()
         val controlKey = buffer.g1Alt3() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj3Decoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
index 7ae2f291c..cc2261901 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v224.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v224.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj3Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj3Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2Alt2()
         val controlKey = buffer.g1Alt1() == 1
         val z = buffer.g2Alt1()
         val x = buffer.g2Alt2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj4Decoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
index b6090159b..1d1b7df06 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v224.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v224.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj4Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj4Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1Alt2() == 1
         val id = buffer.g2Alt1()
         val z = buffer.g2Alt2()
         val x = buffer.g2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj5Decoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
index 4857343a2..63e34e7bc 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v224.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v224.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj5Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj5Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1Alt2() == 1
         val x = buffer.g2()
         val id = buffer.g2Alt1()
         val z = buffer.g2Alt2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
index f13d1466b..898df0387 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
@@ -4,20 +4,20 @@ import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprot.protocol.util.gCombinedIdAlt3
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModel
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModelV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v224.game.outgoing.decoder.prot.GameServerProt
 
-internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModel> {
+internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModelV1> {
     override val prot: ClientProt = GameServerProt.IF_SETMODEL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): IfSetModel {
+    ): IfSetModelV1 {
         val combinedId = buffer.gCombinedIdAlt3()
         val model = buffer.g2()
-        return IfSetModel(
+        return IfSetModelV1(
             combinedId.interfaceId,
             combinedId.componentId,
             model,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
index a28a7dca5..36fbd51c3 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
@@ -5,20 +5,20 @@ import net.rsprot.buffer.bitbuffer.toBitBuf
 import net.rsprot.crypto.xtea.XteaKey
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.map.RebuildRegion
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV1
 import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
 import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.getWorld
 import net.rsprox.protocol.v224.game.outgoing.decoder.prot.GameServerProt
 
-internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
+internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegionV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_REGION
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): RebuildRegion {
+    ): RebuildRegionV1 {
         val zoneZ = buffer.g2Alt2()
         val reload = buffer.g1Alt1() == 1
         val zoneX = buffer.g2Alt2()
@@ -44,7 +44,7 @@ internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
         val world = session.getWorld(-1)
         world.baseX = (zoneX - 6) * 8
         world.baseZ = (zoneZ - 6) * 8
-        return RebuildRegion(
+        return RebuildRegionV1(
             zoneX,
             zoneZ,
             reload,
diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
index 76191d323..c235fb83e 100644
--- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
+++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
@@ -10,9 +10,9 @@ import net.rsprox.protocol.ProxyMessageDecoder
 import net.rsprox.protocol.common.CoordGrid
 import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
 import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.GenericWorldEntityInfoClient
-import net.rsprox.protocol.game.outgoing.model.map.RebuildLogin
-import net.rsprox.protocol.game.outgoing.model.map.RebuildNormal
-import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessage
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildNormalV1
+import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessageV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.allocateWorld
 import net.rsprox.protocol.session.getWorld
@@ -23,13 +23,13 @@ import net.rsprox.protocol.v224.game.outgoing.model.info.playerinfo.PlayerInfoCl
 internal class StaticRebuildDecoder(
     private val huffmanCodec: HuffmanCodec,
     private val cache: CacheProvider,
-) : ProxyMessageDecoder<StaticRebuildMessage> {
+) : ProxyMessageDecoder<StaticRebuildMessageV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_NORMAL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): StaticRebuildMessage {
+    ): StaticRebuildMessageV1 {
         val playerInfoInitBlock =
             if (buffer.isReadable(MINIMUM_REBUILD_LOGIN_CAPACITY)) {
                 buffer.buffer
@@ -69,7 +69,7 @@ internal class StaticRebuildDecoder(
             }
         return if (playerInfoInitBlock != null) {
             val message =
-                RebuildLogin(
+                RebuildLoginV1(
                     zoneX,
                     zoneZ,
                     worldArea,
@@ -94,7 +94,7 @@ internal class StaticRebuildDecoder(
             val world = session.getWorld(-1)
             world.baseX = (zoneX - 6) * 8
             world.baseZ = (zoneZ - 6) * 8
-            RebuildNormal(
+            RebuildNormalV1(
                 zoneX,
                 zoneZ,
                 worldArea,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
index 7255a16b5..d3d03a0e6 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v225.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v225.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc1Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc1Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2Alt2()
         val id = buffer.g2()
         val z = buffer.g2()
         val controlKey = buffer.g1Alt3() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
index 37594bc99..95257111f 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v225.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v225.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc2Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc2Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2()
         val id = buffer.g2Alt2()
         val controlKey = buffer.g1Alt2() == 1
         val x = buffer.g2Alt1()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
index f1ffc4efd..2b3ae430e 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v225.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v225.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc3Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc3Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2()
         val id = buffer.g2Alt1()
         val controlKey = buffer.g1Alt3() == 1
         val x = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
index fc629bbee..49dc10f4e 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v225.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v225.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc4Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc4Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2()
         val x = buffer.g2Alt1()
         val controlKey = buffer.g1Alt2() == 1
         val id = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
index eec0e97d8..c4126b451 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v225.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v225.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc5Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc5Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2Alt2()
         val controlKey = buffer.g1() == 1
         val x = buffer.g2Alt1()
         val id = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
index 33addbcac..135abcc5c 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v225.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v225.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc1Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc1Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt3()
         val controlKey = buffer.g1Alt2() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             1,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
index cfd13a847..56287bac0 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v225.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v225.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc2Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc2Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1() == 1
         val index = buffer.g2Alt1()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             2,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
index 67462dcbf..d26988747 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v225.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v225.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc3Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc3Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt2() == 1
         val index = buffer.g2Alt3()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             3,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
index 3ece0efa2..0ece73854 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v225.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v225.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc4Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc4Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1() == 1
         val index = buffer.g2()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             4,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
index 12ba80cee..e99e8ff9c 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v225.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v225.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc5Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc5Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt2()
         val controlKey = buffer.g1Alt1() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             5,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj1Decoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
index e28898b53..4f9c33429 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v225.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v225.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj1Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj1Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val x = buffer.g2Alt2()
         val z = buffer.g2Alt1()
         val id = buffer.g2Alt3()
         val controlKey = buffer.g1Alt3() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj2Decoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
index 2cafd590e..9cc2b7e9d 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v225.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v225.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj2Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj2Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2Alt1()
         val z = buffer.g2Alt1()
         val x = buffer.g2Alt1()
         val controlKey = buffer.g1Alt2() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj3Decoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
index 6ae80bafb..037568f5c 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v225.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v225.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj3Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj3Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1Alt2() == 1
         val id = buffer.g2()
         val x = buffer.g2Alt2()
         val z = buffer.g2Alt3()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj4Decoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
index 191409e45..9ee6ea222 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v225.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v225.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj4Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj4Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1Alt1() == 1
         val x = buffer.g2Alt2()
         val z = buffer.g2Alt2()
         val id = buffer.g2Alt2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj5Decoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
index 0ce09d583..34c3606fe 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v225.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v225.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj5Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj5Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2()
         val x = buffer.g2()
         val z = buffer.g2Alt3()
         val controlKey = buffer.g1Alt3() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
index ccd4bfdda..db6b6f5b0 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
@@ -4,20 +4,20 @@ import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprot.protocol.util.gCombinedId
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModel
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModelV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v225.game.outgoing.decoder.prot.GameServerProt
 
-internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModel> {
+internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModelV1> {
     override val prot: ClientProt = GameServerProt.IF_SETMODEL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): IfSetModel {
+    ): IfSetModelV1 {
         val combinedId = buffer.gCombinedId()
         val model = buffer.g2Alt1()
-        return IfSetModel(
+        return IfSetModelV1(
             combinedId.interfaceId,
             combinedId.componentId,
             model,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
index 626a68cff..2159df73b 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
@@ -5,20 +5,20 @@ import net.rsprot.buffer.bitbuffer.toBitBuf
 import net.rsprot.crypto.xtea.XteaKey
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.map.RebuildRegion
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV1
 import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
 import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.getWorld
 import net.rsprox.protocol.v225.game.outgoing.decoder.prot.GameServerProt
 
-internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
+internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegionV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_REGION
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): RebuildRegion {
+    ): RebuildRegionV1 {
         val zoneZ = buffer.g2()
         val zoneX = buffer.g2()
         val reload = buffer.g1Alt2() == 1
@@ -44,7 +44,7 @@ internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
         val world = session.getWorld(-1)
         world.baseX = (zoneX - 6) * 8
         world.baseZ = (zoneZ - 6) * 8
-        return RebuildRegion(
+        return RebuildRegionV1(
             zoneX,
             zoneZ,
             reload,
diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
index c1588a33a..dab1956b8 100644
--- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
+++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
@@ -10,9 +10,9 @@ import net.rsprox.protocol.ProxyMessageDecoder
 import net.rsprox.protocol.common.CoordGrid
 import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
 import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.GenericWorldEntityInfoClient
-import net.rsprox.protocol.game.outgoing.model.map.RebuildLogin
-import net.rsprox.protocol.game.outgoing.model.map.RebuildNormal
-import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessage
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildNormalV1
+import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessageV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.allocateWorld
 import net.rsprox.protocol.session.getWorld
@@ -23,13 +23,13 @@ import net.rsprox.protocol.v225.game.outgoing.model.info.playerinfo.PlayerInfoCl
 internal class StaticRebuildDecoder(
     private val huffmanCodec: HuffmanCodec,
     private val cache: CacheProvider,
-) : ProxyMessageDecoder<StaticRebuildMessage> {
+) : ProxyMessageDecoder<StaticRebuildMessageV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_NORMAL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): StaticRebuildMessage {
+    ): StaticRebuildMessageV1 {
         val playerInfoInitBlock =
             if (buffer.isReadable(MINIMUM_REBUILD_LOGIN_CAPACITY)) {
                 buffer.buffer
@@ -69,7 +69,7 @@ internal class StaticRebuildDecoder(
             }
         return if (playerInfoInitBlock != null) {
             val message =
-                RebuildLogin(
+                RebuildLoginV1(
                     zoneX,
                     zoneZ,
                     worldArea,
@@ -94,7 +94,7 @@ internal class StaticRebuildDecoder(
             val world = session.getWorld(-1)
             world.baseX = (zoneX - 6) * 8
             world.baseZ = (zoneZ - 6) * 8
-            RebuildNormal(
+            RebuildNormalV1(
                 zoneX,
                 zoneZ,
                 worldArea,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
index b522cf9d3..ada40b311 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
@@ -2,22 +2,22 @@ package net.rsprox.protocol.v226.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v226.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc1Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc1Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2Alt1()
         val z = buffer.g2Alt3()
         val controlKey = buffer.g1Alt3() == 1
         val id = buffer.g2Alt1()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
index 5b4abafd9..1d0460b91 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
@@ -2,22 +2,22 @@ package net.rsprox.protocol.v226.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v226.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc2Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc2Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val controlKey = buffer.g1() == 1
         val id = buffer.g2Alt1()
         val x = buffer.g2Alt2()
         val z = buffer.g2Alt1()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
index 026111898..bb273acb3 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
@@ -2,22 +2,22 @@ package net.rsprox.protocol.v226.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v226.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc3Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc3Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val controlKey = buffer.g1Alt2() == 1
         val id = buffer.g2Alt2()
         val z = buffer.g2Alt2()
         val x = buffer.g2Alt3()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
index ba20879be..fb338b45d 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
@@ -2,22 +2,22 @@ package net.rsprox.protocol.v226.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v226.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc4Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc4Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2Alt2()
         val id = buffer.g2Alt1()
         val controlKey = buffer.g1() == 1
         val x = buffer.g2Alt3()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
index db7d443dc..7f7c2dac9 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
@@ -2,22 +2,22 @@ package net.rsprox.protocol.v226.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v226.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc5Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc5Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2Alt3()
         val controlKey = buffer.g1Alt3() == 1
         val id = buffer.g2Alt3()
         val z = buffer.g2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
index 27a3328d0..141695b5d 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
@@ -2,20 +2,20 @@ package net.rsprox.protocol.v226.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v226.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc1Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc1Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1() == 1
         val index = buffer.g2()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             1,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
index 34dd97d8e..e7a910bc1 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
@@ -2,20 +2,20 @@ package net.rsprox.protocol.v226.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v226.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc2Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc2Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1() == 1
         val index = buffer.g2Alt1()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             2,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
index fe7cd9745..fe6cce2d3 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
@@ -2,20 +2,20 @@ package net.rsprox.protocol.v226.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v226.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc3Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc3Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1() == 1
         val index = buffer.g2()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             3,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
index f3d8bde5a..49fae3b18 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
@@ -2,20 +2,20 @@ package net.rsprox.protocol.v226.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v226.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc4Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc4Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt2()
         val controlKey = buffer.g1Alt1() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             4,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
index 8032f9205..ba78684d1 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
@@ -2,20 +2,20 @@ package net.rsprox.protocol.v226.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v226.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc5Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc5Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt1() == 1
         val index = buffer.g2Alt3()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             5,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj1Decoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
index 3170ca45a..1bd7b8e80 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
@@ -2,22 +2,22 @@ package net.rsprox.protocol.v226.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v226.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj1Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj1Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2()
         val controlKey = buffer.g1() == 1
         val z = buffer.g2()
         val x = buffer.g2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj2Decoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
index c10d1d4c6..93d10d572 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
@@ -2,22 +2,22 @@ package net.rsprox.protocol.v226.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v226.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj2Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj2Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2Alt1()
         val controlKey = buffer.g1Alt1() == 1
         val z = buffer.g2Alt1()
         val x = buffer.g2Alt1()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj3Decoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
index 95136268a..e50780af6 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
@@ -2,22 +2,22 @@ package net.rsprox.protocol.v226.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v226.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj3Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj3Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2Alt3()
         val controlKey = buffer.g1Alt1() == 1
         val z = buffer.g2Alt2()
         val x = buffer.g2Alt1()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj4Decoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
index e97f0cdc2..c27e68894 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
@@ -2,22 +2,22 @@ package net.rsprox.protocol.v226.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v226.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj4Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj4Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val z = buffer.g2Alt1()
         val controlKey = buffer.g1Alt3() == 1
         val x = buffer.g2Alt2()
         val id = buffer.g2Alt1()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj5Decoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
index f5c60b687..93d6815ac 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
@@ -2,22 +2,22 @@ package net.rsprox.protocol.v226.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v226.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj5Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj5Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2()
         val z = buffer.g2Alt1()
         val x = buffer.g2Alt3()
         val controlKey = buffer.g1Alt1() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
index 6701899dc..1abfd4024 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
@@ -4,20 +4,20 @@ import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprot.protocol.util.gCombinedIdAlt1
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModel
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModelV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v226.game.outgoing.decoder.prot.GameServerProt
 
-internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModel> {
+internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModelV1> {
     override val prot: ClientProt = GameServerProt.IF_SETMODEL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): IfSetModel {
+    ): IfSetModelV1 {
         val model = buffer.g2Alt3()
         val combinedId = buffer.gCombinedIdAlt1()
-        return IfSetModel(
+        return IfSetModelV1(
             combinedId.interfaceId,
             combinedId.componentId,
             model,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
index 867303dfd..285250af3 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
@@ -5,20 +5,20 @@ import net.rsprot.buffer.bitbuffer.toBitBuf
 import net.rsprot.crypto.xtea.XteaKey
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.map.RebuildRegion
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV1
 import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
 import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.getWorld
 import net.rsprox.protocol.v226.game.outgoing.decoder.prot.GameServerProt
 
-internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
+internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegionV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_REGION
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): RebuildRegion {
+    ): RebuildRegionV1 {
         val zoneZ = buffer.g2Alt3()
         val zoneX = buffer.g2Alt3()
         val reload = buffer.g1Alt2() == 1
@@ -44,7 +44,7 @@ internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
         val world = session.getWorld(-1)
         world.baseX = (zoneX - 6) * 8
         world.baseZ = (zoneZ - 6) * 8
-        return RebuildRegion(
+        return RebuildRegionV1(
             zoneX,
             zoneZ,
             reload,
diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
index 56c8612a8..ff1b7dcff 100644
--- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
+++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
@@ -10,9 +10,9 @@ import net.rsprox.protocol.ProxyMessageDecoder
 import net.rsprox.protocol.common.CoordGrid
 import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
 import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.GenericWorldEntityInfoClient
-import net.rsprox.protocol.game.outgoing.model.map.RebuildLogin
-import net.rsprox.protocol.game.outgoing.model.map.RebuildNormal
-import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessage
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildNormalV1
+import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessageV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.allocateWorld
 import net.rsprox.protocol.session.getWorld
@@ -23,13 +23,13 @@ import net.rsprox.protocol.v226.game.outgoing.model.info.playerinfo.PlayerInfoCl
 internal class StaticRebuildDecoder(
     private val huffmanCodec: HuffmanCodec,
     private val cache: CacheProvider,
-) : ProxyMessageDecoder<StaticRebuildMessage> {
+) : ProxyMessageDecoder<StaticRebuildMessageV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_NORMAL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): StaticRebuildMessage {
+    ): StaticRebuildMessageV1 {
         val playerInfoInitBlock =
             if (buffer.isReadable(MINIMUM_REBUILD_LOGIN_CAPACITY)) {
                 buffer.buffer
@@ -69,7 +69,7 @@ internal class StaticRebuildDecoder(
             }
         return if (playerInfoInitBlock != null) {
             val message =
-                RebuildLogin(
+                RebuildLoginV1(
                     zoneX,
                     zoneZ,
                     worldArea,
@@ -94,7 +94,7 @@ internal class StaticRebuildDecoder(
             val world = session.getWorld(-1)
             world.baseX = (zoneX - 6) * 8
             world.baseZ = (zoneZ - 6) * 8
-            RebuildNormal(
+            RebuildNormalV1(
                 zoneX,
                 zoneZ,
                 worldArea,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
index d469f97f3..b3aff8d89 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v227.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v227.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc1Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc1Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2Alt2()
         val controlKey = buffer.g1() == 1
         val z = buffer.g2()
         val x = buffer.g2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
index 812f56cf2..b38ae8bc3 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v227.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v227.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc2Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc2Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2Alt3()
         val controlKey = buffer.g1Alt1() == 1
         val x = buffer.g2Alt1()
         val z = buffer.g2Alt3()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
index ec8c80d1c..f08100781 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v227.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v227.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc3Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc3Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2()
         val controlKey = buffer.g1Alt3() == 1
         val id = buffer.g2Alt1()
         val z = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
index 335be77cb..72945a2e7 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v227.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v227.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc4Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc4Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2Alt3()
         val z = buffer.g2Alt1()
         val x = buffer.g2()
         val controlKey = buffer.g1() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
index 0917a750c..53fe492b5 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v227.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v227.game.incoming.decoder.prot.GameClientProt
 
-internal class OpLoc5Decoder : ProxyMessageDecoder<OpLoc> {
+internal class OpLoc5Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val controlKey = buffer.g1Alt3() == 1
         val id = buffer.g2Alt2()
         val x = buffer.g2()
         val z = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
index faceb1017..c14a4306d 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v227.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v227.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc1Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc1Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1() == 1
         val index = buffer.g2Alt1()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             1,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
index 173c2b9b6..46df5ebd8 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v227.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v227.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc2Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc2Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2()
         val controlKey = buffer.g1Alt2() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             2,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
index 5fdc940e3..8697923bd 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v227.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v227.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc3Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc3Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt1()
         val controlKey = buffer.g1Alt2() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             3,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
index 9128a5cb4..e92e046c6 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v227.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v227.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc4Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc4Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2()
         val controlKey = buffer.g1Alt1() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             4,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
index 21c491f62..5f7bc524b 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v227.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v227.game.incoming.decoder.prot.GameClientProt
 
-internal class OpNpc5Decoder : ProxyMessageDecoder<OpNpc> {
+internal class OpNpc5Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt1()
         val controlKey = buffer.g1Alt1() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             5,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj1Decoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
index 3e5429c72..9b4cfbee0 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v227.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v227.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj1Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj1Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val z = buffer.g2()
         val controlKey = buffer.g1Alt3() == 1
         val x = buffer.g2Alt3()
         val id = buffer.g2Alt2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj2Decoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
index a99ae6232..7302c48bb 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v227.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v227.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj2Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj2Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val z = buffer.g2Alt2()
         val id = buffer.g2Alt3()
         val x = buffer.g2()
         val controlKey = buffer.g1() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj3Decoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
index 408117564..d442f4848 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v227.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v227.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj3Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj3Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1Alt2() == 1
         val x = buffer.g2Alt2()
         val z = buffer.g2Alt2()
         val id = buffer.g2Alt3()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj4Decoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
index b27c78f48..a07fa9996 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v227.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v227.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj4Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj4Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val z = buffer.g2Alt3()
         val id = buffer.g2Alt2()
         val x = buffer.g2()
         val controlKey = buffer.g1Alt2() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj5Decoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
index 81289f05e..441c15195 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v227.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v227.game.incoming.decoder.prot.GameClientProt
 
-internal class OpObj5Decoder : ProxyMessageDecoder<OpObj> {
+internal class OpObj5Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val z = buffer.g2Alt2()
         val id = buffer.g2()
         val x = buffer.g2()
         val controlKey = buffer.g1Alt1() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
index f64f308b5..24f32c9fc 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
@@ -4,20 +4,20 @@ import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprot.protocol.util.gCombinedIdAlt1
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModel
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModelV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v227.game.outgoing.decoder.prot.GameServerProt
 
-internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModel> {
+internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModelV1> {
     override val prot: ClientProt = GameServerProt.IF_SETMODEL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): IfSetModel {
+    ): IfSetModelV1 {
         val combinedId = buffer.gCombinedIdAlt1()
         val model = buffer.g2Alt1()
-        return IfSetModel(
+        return IfSetModelV1(
             combinedId.interfaceId,
             combinedId.componentId,
             model,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
index b4927281f..18e3d460c 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
@@ -5,20 +5,20 @@ import net.rsprot.buffer.bitbuffer.toBitBuf
 import net.rsprot.crypto.xtea.XteaKey
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.map.RebuildRegion
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV1
 import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
 import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.getWorld
 import net.rsprox.protocol.v227.game.outgoing.decoder.prot.GameServerProt
 
-internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
+internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegionV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_REGION
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): RebuildRegion {
+    ): RebuildRegionV1 {
         val zoneX = buffer.g2Alt2()
         val reload = buffer.g1Alt3() == 1
         val zoneZ = buffer.g2Alt2()
@@ -44,7 +44,7 @@ internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
         val world = session.getWorld(-1)
         world.baseX = (zoneX - 6) * 8
         world.baseZ = (zoneZ - 6) * 8
-        return RebuildRegion(
+        return RebuildRegionV1(
             zoneX,
             zoneZ,
             reload,
diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
index 3e27825c7..f2a932d93 100644
--- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
+++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
@@ -10,9 +10,9 @@ import net.rsprox.protocol.ProxyMessageDecoder
 import net.rsprox.protocol.common.CoordGrid
 import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
 import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.GenericWorldEntityInfoClient
-import net.rsprox.protocol.game.outgoing.model.map.RebuildLogin
-import net.rsprox.protocol.game.outgoing.model.map.RebuildNormal
-import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessage
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildNormalV1
+import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessageV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.allocateWorld
 import net.rsprox.protocol.session.getWorld
@@ -23,13 +23,13 @@ import net.rsprox.protocol.v227.game.outgoing.model.info.playerinfo.PlayerInfoCl
 internal class StaticRebuildDecoder(
     private val huffmanCodec: HuffmanCodec,
     private val cache: CacheProvider,
-) : ProxyMessageDecoder<StaticRebuildMessage> {
+) : ProxyMessageDecoder<StaticRebuildMessageV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_NORMAL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): StaticRebuildMessage {
+    ): StaticRebuildMessageV1 {
         val playerInfoInitBlock =
             if (buffer.isReadable(MINIMUM_REBUILD_LOGIN_CAPACITY)) {
                 buffer.buffer
@@ -69,7 +69,7 @@ internal class StaticRebuildDecoder(
             }
         return if (playerInfoInitBlock != null) {
             val message =
-                RebuildLogin(
+                RebuildLoginV1(
                     zoneX,
                     zoneZ,
                     worldArea,
@@ -94,7 +94,7 @@ internal class StaticRebuildDecoder(
             val world = session.getWorld(-1)
             world.baseX = (zoneX - 6) * 8
             world.baseZ = (zoneZ - 6) * 8
-            RebuildNormal(
+            RebuildNormalV1(
                 zoneX,
                 zoneZ,
                 worldArea,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
index 4d73faf9d..9c07c365c 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v228.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v228.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc1Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc1Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2Alt3()
         val controlKey = buffer.g1() == 1
         val id = buffer.g2Alt3()
         val x = buffer.g2Alt3()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
index 3001723ef..4bbb9e972 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v228.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v228.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc2Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc2Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2Alt1()
         val id = buffer.g2Alt3()
         val x = buffer.g2()
         val controlKey = buffer.g1() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
index 2c0f117cf..6d8a701a8 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v228.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v228.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc3Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc3Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2Alt3()
         val x = buffer.g2Alt3()
         val controlKey = buffer.g1Alt2() == 1
         val z = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
index 0f390b732..a569b887d 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v228.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v228.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc4Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc4Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2()
         val id = buffer.g2()
         val z = buffer.g2Alt1()
         val controlKey = buffer.g1Alt3() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
index 1f5d248cb..fbcb55fdc 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v228.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v228.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc5Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc5Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val controlKey = buffer.g1Alt1() == 1
         val x = buffer.g2Alt2()
         val z = buffer.g2Alt3()
         val id = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
index f8e190f71..c0bca9e07 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v228.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v228.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc1Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc1Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt1() == 1
         val index = buffer.g2Alt2()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             1,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
index 3bb225d6b..7cae0b5eb 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v228.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v228.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc2Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc2Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt3()
         val controlKey = buffer.g1Alt2() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             2,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
index 6121a9f01..ffb4e8b1a 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v228.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v228.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc3Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc3Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt3()
         val controlKey = buffer.g1Alt2() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             3,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
index d255e159a..d7f2b60ab 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v228.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v228.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc4Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc4Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1() == 1
         val index = buffer.g2()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             4,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
index 6542bb3ca..181ec358c 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v228.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v228.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc5Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc5Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2()
         val controlKey = buffer.g1Alt3() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             5,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj1Decoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
index 9e691076d..c1cc176fc 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v228.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v228.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj1Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj1Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val x = buffer.g2Alt2()
         val id = buffer.g2Alt1()
         val z = buffer.g2Alt2()
         val controlKey = buffer.g1Alt1() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj2Decoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
index cede02ba3..ec2b2d0c3 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v228.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v228.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj2Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj2Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2Alt3()
         val x = buffer.g2Alt3()
         val z = buffer.g2()
         val controlKey = buffer.g1() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj3Decoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
index 3320658ed..60b39c6d0 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v228.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v228.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj3Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj3Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1() == 1
         val x = buffer.g2()
         val id = buffer.g2()
         val z = buffer.g2Alt2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj4Decoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
index 827621af9..6077c0cc5 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v228.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v228.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj4Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj4Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val z = buffer.g2Alt3()
         val id = buffer.g2Alt3()
         val x = buffer.g2Alt2()
         val controlKey = buffer.g1Alt2() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj5Decoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
index 53e287604..260811b4d 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v228.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v228.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj5Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj5Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1Alt3() == 1
         val z = buffer.g2()
         val x = buffer.g2Alt1()
         val id = buffer.g2Alt2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
index dbe6723b2..38b40e9bc 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
@@ -4,20 +4,20 @@ import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprot.protocol.util.gCombinedId
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModel
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModelV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v228.game.outgoing.decoder.prot.GameServerProt
 
-internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModel> {
+internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModelV1> {
     override val prot: ClientProt = GameServerProt.IF_SETMODEL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): IfSetModel {
+    ): IfSetModelV1 {
         val combinedId = buffer.gCombinedId()
         val model = buffer.g2Alt3()
-        return IfSetModel(
+        return IfSetModelV1(
             combinedId.interfaceId,
             combinedId.componentId,
             model,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
index 23bd528a2..b0a83e7eb 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
@@ -5,20 +5,20 @@ import net.rsprot.buffer.bitbuffer.toBitBuf
 import net.rsprot.crypto.xtea.XteaKey
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.map.RebuildRegion
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV1
 import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
 import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.getWorld
 import net.rsprox.protocol.v228.game.outgoing.decoder.prot.GameServerProt
 
-internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
+internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegionV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_REGION
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): RebuildRegion {
+    ): RebuildRegionV1 {
         val zoneX = buffer.g2Alt1()
         val zoneZ = buffer.g2()
         val reload = buffer.g1Alt1() == 1
@@ -44,7 +44,7 @@ internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
         val world = session.getWorld(-1)
         world.baseX = (zoneX - 6) * 8
         world.baseZ = (zoneZ - 6) * 8
-        return RebuildRegion(
+        return RebuildRegionV1(
             zoneX,
             zoneZ,
             reload,
diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
index 60902d526..cc300ab2a 100644
--- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
+++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
@@ -10,9 +10,9 @@ import net.rsprox.protocol.ProxyMessageDecoder
 import net.rsprox.protocol.common.CoordGrid
 import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
 import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.GenericWorldEntityInfoClient
-import net.rsprox.protocol.game.outgoing.model.map.RebuildLogin
-import net.rsprox.protocol.game.outgoing.model.map.RebuildNormal
-import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessage
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildNormalV1
+import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessageV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.allocateWorld
 import net.rsprox.protocol.session.getWorld
@@ -23,13 +23,13 @@ import net.rsprox.protocol.v228.game.outgoing.model.info.playerinfo.PlayerInfoCl
 internal class StaticRebuildDecoder(
     private val huffmanCodec: HuffmanCodec,
     private val cache: CacheProvider,
-) : ProxyMessageDecoder<StaticRebuildMessage> {
+) : ProxyMessageDecoder<StaticRebuildMessageV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_NORMAL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): StaticRebuildMessage {
+    ): StaticRebuildMessageV1 {
         val playerInfoInitBlock =
             if (buffer.isReadable(MINIMUM_REBUILD_LOGIN_CAPACITY)) {
                 buffer.buffer
@@ -69,7 +69,7 @@ internal class StaticRebuildDecoder(
             }
         return if (playerInfoInitBlock != null) {
             val message =
-                RebuildLogin(
+                RebuildLoginV1(
                     zoneX,
                     zoneZ,
                     worldArea,
@@ -94,7 +94,7 @@ internal class StaticRebuildDecoder(
             val world = session.getWorld(-1)
             world.baseX = (zoneX - 6) * 8
             world.baseZ = (zoneZ - 6) * 8
-            RebuildNormal(
+            RebuildNormalV1(
                 zoneX,
                 zoneZ,
                 worldArea,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
index 0eb648878..a9fe96882 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v229.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v229.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc1Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc1Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2Alt2()
         val id = buffer.g2()
         val controlKey = buffer.g1Alt3() == 1
         val z = buffer.g2Alt1()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
index 74e7387c1..40461e530 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v229.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v229.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc2Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc2Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2Alt2()
         val x = buffer.g2()
         val id = buffer.g2Alt3()
         val controlKey = buffer.g1() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
index 1c44a091c..838393dfb 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v229.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v229.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc3Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc3Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2Alt2()
         val z = buffer.g2()
         val id = buffer.g2Alt2()
         val controlKey = buffer.g1() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
index fa6081105..e255ea9f7 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v229.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v229.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc4Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc4Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2()
         val controlKey = buffer.g1Alt2() == 1
         val z = buffer.g2Alt2()
         val id = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
index 5b6888110..40fd56ecf 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v229.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v229.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc5Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc5Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2Alt2()
         val controlKey = buffer.g1Alt3() == 1
         val id = buffer.g2Alt3()
         val z = buffer.g2Alt1()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
index 9a5412c3f..fa0d0bd58 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v229.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v229.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc1Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc1Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt1() == 1
         val index = buffer.g2Alt3()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             1,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
index e834986a8..e8b06f66f 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v229.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v229.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc2Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc2Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt3()
         val controlKey = buffer.g1() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             2,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
index eeeb55cf8..6dc56c47a 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v229.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v229.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc3Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc3Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt3()
         val controlKey = buffer.g1Alt1() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             3,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
index 26b878983..4d793d6cb 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v229.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v229.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc4Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc4Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt2() == 1
         val index = buffer.g2Alt3()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             4,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
index 81ea23d21..f338857f0 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v229.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v229.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc5Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc5Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt3()
         val controlKey = buffer.g1() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             5,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj1Decoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
index 1395d3ffa..a20ceb663 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v229.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v229.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj1Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj1Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2Alt2()
         val controlKey = buffer.g1Alt2() == 1
         val z = buffer.g2()
         val x = buffer.g2Alt2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj2Decoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
index aadad96f3..8f6203c2a 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v229.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v229.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj2Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj2Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val x = buffer.g2Alt3()
         val id = buffer.g2Alt3()
         val controlKey = buffer.g1Alt2() == 1
         val z = buffer.g2Alt3()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj3Decoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
index cd50df1d8..c905ec613 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v229.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v229.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj3Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj3Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1Alt1() == 1
         val x = buffer.g2Alt2()
         val z = buffer.g2Alt3()
         val id = buffer.g2Alt1()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj4Decoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
index a89e2fccd..27d933979 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v229.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v229.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj4Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj4Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val x = buffer.g2Alt2()
         val controlKey = buffer.g1() == 1
         val id = buffer.g2Alt2()
         val z = buffer.g2Alt1()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj5Decoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
index c202e6613..77fa6661d 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v229.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v229.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj5Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj5Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val z = buffer.g2()
         val controlKey = buffer.g1Alt2() == 1
         val x = buffer.g2Alt1()
         val id = buffer.g2Alt1()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
index f70f272a2..7c8712db9 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
@@ -4,20 +4,20 @@ import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprot.protocol.util.gCombinedId
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModel
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModelV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v229.game.outgoing.decoder.prot.GameServerProt
 
-internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModel> {
+internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModelV1> {
     override val prot: ClientProt = GameServerProt.IF_SETMODEL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): IfSetModel {
+    ): IfSetModelV1 {
         val combinedId = buffer.gCombinedId()
         val model = buffer.g2()
-        return IfSetModel(
+        return IfSetModelV1(
             combinedId.interfaceId,
             combinedId.componentId,
             model,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
index c4a053f48..339bae931 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
@@ -5,20 +5,20 @@ import net.rsprot.buffer.bitbuffer.toBitBuf
 import net.rsprot.crypto.xtea.XteaKey
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.map.RebuildRegion
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV1
 import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
 import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.getWorld
 import net.rsprox.protocol.v229.game.outgoing.decoder.prot.GameServerProt
 
-internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
+internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegionV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_REGION
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): RebuildRegion {
+    ): RebuildRegionV1 {
         val reload = buffer.g1Alt3() == 1
         val zoneZ = buffer.g2Alt2()
         val zoneX = buffer.g2Alt1()
@@ -44,7 +44,7 @@ internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
         val world = session.getWorld(-1)
         world.baseX = (zoneX - 6) * 8
         world.baseZ = (zoneZ - 6) * 8
-        return RebuildRegion(
+        return RebuildRegionV1(
             zoneX,
             zoneZ,
             reload,
diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
index 22676497c..9bb6d1612 100644
--- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
+++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
@@ -10,9 +10,9 @@ import net.rsprox.protocol.ProxyMessageDecoder
 import net.rsprox.protocol.common.CoordGrid
 import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
 import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.GenericWorldEntityInfoClient
-import net.rsprox.protocol.game.outgoing.model.map.RebuildLogin
-import net.rsprox.protocol.game.outgoing.model.map.RebuildNormal
-import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessage
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildNormalV1
+import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessageV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.allocateWorld
 import net.rsprox.protocol.session.getWorld
@@ -23,13 +23,13 @@ import net.rsprox.protocol.v229.game.outgoing.model.info.playerinfo.PlayerInfoCl
 internal class StaticRebuildDecoder(
     private val huffmanCodec: HuffmanCodec,
     private val cache: CacheProvider,
-) : ProxyMessageDecoder<StaticRebuildMessage> {
+) : ProxyMessageDecoder<StaticRebuildMessageV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_NORMAL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): StaticRebuildMessage {
+    ): StaticRebuildMessageV1 {
         val playerInfoInitBlock =
             if (buffer.isReadable(MINIMUM_REBUILD_LOGIN_CAPACITY)) {
                 buffer.buffer
@@ -69,7 +69,7 @@ internal class StaticRebuildDecoder(
             }
         return if (playerInfoInitBlock != null) {
             val message =
-                RebuildLogin(
+                RebuildLoginV1(
                     zoneX,
                     zoneZ,
                     worldArea,
@@ -94,7 +94,7 @@ internal class StaticRebuildDecoder(
             val world = session.getWorld(-1)
             world.baseX = (zoneX - 6) * 8
             world.baseZ = (zoneZ - 6) * 8
-            RebuildNormal(
+            RebuildNormalV1(
                 zoneX,
                 zoneZ,
                 worldArea,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
index dbd6dbe41..cb6fcf83f 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v230.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v230.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc1Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc1Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2Alt3()
         val z = buffer.g2Alt3()
         val x = buffer.g2Alt3()
         val controlKey = buffer.g1() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
index c4be53ebf..f5caa7e89 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v230.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v230.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc2Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc2Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2Alt2()
         val x = buffer.g2Alt3()
         val controlKey = buffer.g1Alt2() == 1
         val z = buffer.g2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
index 629f5b544..704cb5e05 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v230.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v230.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc3Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc3Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2()
         val controlKey = buffer.g1Alt3() == 1
         val z = buffer.g2Alt3()
         val id = buffer.g2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
index 8f981943e..c401f5754 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v230.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v230.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc4Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc4Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2()
         val id = buffer.g2Alt3()
         val controlKey = buffer.g1Alt2() == 1
         val x = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
index 667a41e15..d8ce7223b 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v230.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v230.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc5Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc5Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2Alt2()
         val z = buffer.g2Alt3()
         val controlKey = buffer.g1Alt2() == 1
         val x = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
index 919662e8a..d5fcdf4ae 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v230.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v230.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc1Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc1Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt2() == 1
         val index = buffer.g2Alt2()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             1,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
index 3fa39dd86..e80ca2c7d 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v230.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v230.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc2Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc2Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt3() == 1
         val index = buffer.g2()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             2,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
index 420f1c046..a025b6749 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v230.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v230.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc3Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc3Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1() == 1
         val index = buffer.g2Alt2()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             3,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
index 17c4115f7..f4d682623 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v230.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v230.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc4Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc4Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt1() == 1
         val index = buffer.g2Alt2()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             4,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
index a09306429..11cc6e6b1 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v230.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v230.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc5Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc5Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt3() == 1
         val index = buffer.g2Alt3()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             5,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj1Decoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
index e8f3f8fa4..a9bcc4e91 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v230.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v230.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj1Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj1Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2Alt2()
         val z = buffer.g2Alt1()
         val x = buffer.g2Alt1()
         val controlKey = buffer.g1Alt1() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj2Decoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
index 9ca61b25d..277527774 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v230.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v230.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj2Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj2Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1Alt3() == 1
         val z = buffer.g2Alt2()
         val x = buffer.g2Alt2()
         val id = buffer.g2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj3Decoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
index fa47639fc..cefb15564 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v230.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v230.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj3Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj3Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1Alt2() == 1
         val id = buffer.g2Alt2()
         val x = buffer.g2Alt2()
         val z = buffer.g2Alt1()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj4Decoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
index fbf6fadef..9dcaed5cc 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v230.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v230.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj4Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj4Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val x = buffer.g2Alt3()
         val controlKey = buffer.g1Alt3() == 1
         val z = buffer.g2Alt2()
         val id = buffer.g2Alt3()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj5Decoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
index d7cb3b51c..d19f95252 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v230.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v230.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj5Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj5Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2Alt1()
         val z = buffer.g2()
         val x = buffer.g2()
         val controlKey = buffer.g1Alt3() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
index 4fb624ca9..fb49268b3 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
@@ -4,20 +4,20 @@ import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprot.protocol.util.gCombinedIdAlt1
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModel
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModelV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v230.game.outgoing.decoder.prot.GameServerProt
 
-internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModel> {
+internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModelV1> {
     override val prot: ClientProt = GameServerProt.IF_SETMODEL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): IfSetModel {
+    ): IfSetModelV1 {
         val model = buffer.g2Alt2()
         val combinedId = buffer.gCombinedIdAlt1()
-        return IfSetModel(
+        return IfSetModelV1(
             combinedId.interfaceId,
             combinedId.componentId,
             model,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
index 04598d6f1..c5b0aa151 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
@@ -5,20 +5,20 @@ import net.rsprot.buffer.bitbuffer.toBitBuf
 import net.rsprot.crypto.xtea.XteaKey
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.map.RebuildRegion
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV1
 import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
 import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.getWorld
 import net.rsprox.protocol.v230.game.outgoing.decoder.prot.GameServerProt
 
-internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
+internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegionV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_REGION
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): RebuildRegion {
+    ): RebuildRegionV1 {
         val zoneX = buffer.g2Alt1()
         val zoneZ = buffer.g2Alt3()
         val reload = buffer.g1() == 1
@@ -44,7 +44,7 @@ internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
         val world = session.getWorld(-1)
         world.baseX = (zoneX - 6) * 8
         world.baseZ = (zoneZ - 6) * 8
-        return RebuildRegion(
+        return RebuildRegionV1(
             zoneX,
             zoneZ,
             reload,
diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
index 2451e9030..e21c3f4a9 100644
--- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
+++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
@@ -10,9 +10,9 @@ import net.rsprox.protocol.ProxyMessageDecoder
 import net.rsprox.protocol.common.CoordGrid
 import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
 import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.GenericWorldEntityInfoClient
-import net.rsprox.protocol.game.outgoing.model.map.RebuildLogin
-import net.rsprox.protocol.game.outgoing.model.map.RebuildNormal
-import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessage
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildNormalV1
+import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessageV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.allocateWorld
 import net.rsprox.protocol.session.getWorld
@@ -23,13 +23,13 @@ import net.rsprox.protocol.v230.game.outgoing.model.info.playerinfo.PlayerInfoCl
 internal class StaticRebuildDecoder(
     private val huffmanCodec: HuffmanCodec,
     private val cache: CacheProvider,
-) : ProxyMessageDecoder<StaticRebuildMessage> {
+) : ProxyMessageDecoder<StaticRebuildMessageV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_NORMAL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): StaticRebuildMessage {
+    ): StaticRebuildMessageV1 {
         val playerInfoInitBlock =
             if (buffer.isReadable(MINIMUM_REBUILD_LOGIN_CAPACITY)) {
                 buffer.buffer
@@ -69,7 +69,7 @@ internal class StaticRebuildDecoder(
             }
         return if (playerInfoInitBlock != null) {
             val message =
-                RebuildLogin(
+                RebuildLoginV1(
                     zoneX,
                     zoneZ,
                     worldArea,
@@ -94,7 +94,7 @@ internal class StaticRebuildDecoder(
             val world = session.getWorld(-1)
             world.baseX = (zoneX - 6) * 8
             world.baseZ = (zoneZ - 6) * 8
-            RebuildNormal(
+            RebuildNormalV1(
                 zoneX,
                 zoneZ,
                 worldArea,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
index 00dc77698..b889fc4b6 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v231.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v231.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc1Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc1Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2Alt3()
         val z = buffer.g2Alt1()
         val x = buffer.g2Alt3()
         val controlKey = buffer.g1Alt2() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
index 2b8477435..11aa9a9a5 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v231.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v231.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc2Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc2Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2Alt1()
         val id = buffer.g2Alt1()
         val controlKey = buffer.g1Alt2() == 1
         val x = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
index eacbe28b9..a5a66fa11 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v231.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v231.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc3Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc3Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2Alt1()
         val z = buffer.g2Alt3()
         val controlKey = buffer.g1Alt3() == 1
         val x = buffer.g2Alt1()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
index 67bf87eb4..f5e5eec19 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v231.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v231.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc4Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc4Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2()
         val x = buffer.g2Alt2()
         val controlKey = buffer.g1() == 1
         val z = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
index ca6fc79cf..79d3cdd23 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v231.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v231.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc5Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc5Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2Alt2()
         val controlKey = buffer.g1Alt2() == 1
         val id = buffer.g2Alt3()
         val x = buffer.g2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
index fa43dccab..81762dbbc 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v231.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v231.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc1Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc1Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt3() == 1
         val index = buffer.g2()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             1,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
index 9a68353f1..12c1e1cf7 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v231.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v231.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc2Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc2Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt1() == 1
         val index = buffer.g2Alt1()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             2,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
index 52de292f3..5ded94106 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v231.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v231.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc3Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc3Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt1() == 1
         val index = buffer.g2()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             3,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
index a53ed598b..85e86f7a5 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v231.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v231.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc4Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc4Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt1()
         val controlKey = buffer.g1Alt1() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             4,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
index 965a6fac5..b3faa56e2 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v231.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v231.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc5Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc5Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt1() == 1
         val index = buffer.g2Alt2()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             5,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj1Decoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
index 8062c842a..0f6ae8dd4 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v231.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v231.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj1Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj1Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val x = buffer.g2Alt2()
         val controlKey = buffer.g1() == 1
         val z = buffer.g2()
         val id = buffer.g2Alt1()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj2Decoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
index bbe376e54..045994152 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v231.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v231.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj2Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj2Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val x = buffer.g2()
         val controlKey = buffer.g1Alt3() == 1
         val z = buffer.g2()
         val id = buffer.g2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj3Decoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
index 84455e725..d922ef9bf 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v231.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v231.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj3Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj3Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1Alt3() == 1
         val x = buffer.g2()
         val z = buffer.g2()
         val id = buffer.g2Alt1()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj4Decoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
index 4cf82f1a5..1b21e5d53 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v231.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v231.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj4Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj4Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2Alt2()
         val controlKey = buffer.g1Alt2() == 1
         val z = buffer.g2Alt2()
         val x = buffer.g2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj5Decoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
index c1630e8c4..fb7cece39 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v231.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v231.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj5Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj5Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val x = buffer.g2Alt1()
         val id = buffer.g2()
         val z = buffer.g2Alt2()
         val controlKey = buffer.g1Alt1() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
index 082e9576a..ef038a1cc 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
@@ -4,20 +4,20 @@ import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprot.protocol.util.gCombinedIdAlt1
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModel
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModelV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v231.game.outgoing.decoder.prot.GameServerProt
 
-internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModel> {
+internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModelV1> {
     override val prot: ClientProt = GameServerProt.IF_SETMODEL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): IfSetModel {
+    ): IfSetModelV1 {
         val model = buffer.g2()
         val combinedId = buffer.gCombinedIdAlt1()
-        return IfSetModel(
+        return IfSetModelV1(
             combinedId.interfaceId,
             combinedId.componentId,
             model,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
index 0806dc492..449c0301b 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
@@ -5,20 +5,20 @@ import net.rsprot.buffer.bitbuffer.toBitBuf
 import net.rsprot.crypto.xtea.XteaKey
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.map.RebuildRegion
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV1
 import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
 import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.getWorld
 import net.rsprox.protocol.v231.game.outgoing.decoder.prot.GameServerProt
 
-internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
+internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegionV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_REGION
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): RebuildRegion {
+    ): RebuildRegionV1 {
         val reload = buffer.g1Alt1() == 1
         val zoneX = buffer.g2Alt3()
         val zoneZ = buffer.g2()
@@ -44,7 +44,7 @@ internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
         val world = session.getWorld(-1)
         world.baseX = (zoneX - 6) * 8
         world.baseZ = (zoneZ - 6) * 8
-        return RebuildRegion(
+        return RebuildRegionV1(
             zoneX,
             zoneZ,
             reload,
diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
index 341ca6496..1e1419c55 100644
--- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
+++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
@@ -10,9 +10,9 @@ import net.rsprox.protocol.ProxyMessageDecoder
 import net.rsprox.protocol.common.CoordGrid
 import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
 import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.GenericWorldEntityInfoClient
-import net.rsprox.protocol.game.outgoing.model.map.RebuildLogin
-import net.rsprox.protocol.game.outgoing.model.map.RebuildNormal
-import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessage
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildNormalV1
+import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessageV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.allocateWorld
 import net.rsprox.protocol.session.getWorld
@@ -23,13 +23,13 @@ import net.rsprox.protocol.v231.game.outgoing.model.info.playerinfo.PlayerInfoCl
 internal class StaticRebuildDecoder(
     private val huffmanCodec: HuffmanCodec,
     private val cache: CacheProvider,
-) : ProxyMessageDecoder<StaticRebuildMessage> {
+) : ProxyMessageDecoder<StaticRebuildMessageV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_NORMAL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): StaticRebuildMessage {
+    ): StaticRebuildMessageV1 {
         val playerInfoInitBlock =
             if (buffer.isReadable(MINIMUM_REBUILD_LOGIN_CAPACITY)) {
                 buffer.buffer
@@ -69,7 +69,7 @@ internal class StaticRebuildDecoder(
             }
         return if (playerInfoInitBlock != null) {
             val message =
-                RebuildLogin(
+                RebuildLoginV1(
                     zoneX,
                     zoneZ,
                     worldArea,
@@ -94,7 +94,7 @@ internal class StaticRebuildDecoder(
             val world = session.getWorld(-1)
             world.baseX = (zoneX - 6) * 8
             world.baseZ = (zoneZ - 6) * 8
-            RebuildNormal(
+            RebuildNormalV1(
                 zoneX,
                 zoneZ,
                 worldArea,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
index 1332d27c1..db6b9640b 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v232.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v232.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc1Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc1Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2()
         val controlKey = buffer.g1Alt2() == 1
         val x = buffer.g2Alt1()
         val z = buffer.g2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
index 354089a13..3a3c3201a 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v232.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v232.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc2Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc2Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2Alt2()
         val id = buffer.g2()
         val z = buffer.g2Alt2()
         val controlKey = buffer.g1Alt1() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
index 84147bf3f..d89fbd824 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v232.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v232.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc3Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc3Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2Alt1()
         val controlKey = buffer.g1Alt1() == 1
         val x = buffer.g2Alt3()
         val id = buffer.g2Alt3()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
index 6588d57e2..f4a026aff 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v232.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v232.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc4Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc4Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2()
         val x = buffer.g2()
         val controlKey = buffer.g1() == 1
         val z = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
index e991ba8bd..68be8be00 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v232.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v232.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc5Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc5Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2()
         val controlKey = buffer.g1Alt2() == 1
         val z = buffer.g2Alt3()
         val x = buffer.g2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
index b743cbcaf..96aaf1e4a 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v232.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v232.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc1Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc1Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt1()
         val controlKey = buffer.g1Alt3() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             1,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
index 32cfcf59f..2f3117a96 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v232.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v232.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc2Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc2Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1() == 1
         val index = buffer.g2Alt3()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             2,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
index 08ec5e63e..3584746b6 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v232.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v232.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc3Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc3Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt1()
         val controlKey = buffer.g1Alt3() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             3,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
index b37a5c609..5e145e02d 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v232.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v232.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc4Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc4Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt2()
         val controlKey = buffer.g1Alt3() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             4,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
index 308201b10..5521e194d 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v232.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v232.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc5Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc5Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt1()
         val controlKey = buffer.g1Alt1() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             5,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj1Decoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
index 7483d3233..628d31605 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v232.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v232.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj1Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj1Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1Alt1() == 1
         val z = buffer.g2Alt1()
         val id = buffer.g2Alt1()
         val x = buffer.g2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj2Decoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
index 1641229c3..858745581 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v232.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v232.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj2Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj2Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val x = buffer.g2Alt2()
         val z = buffer.g2Alt1()
         val controlKey = buffer.g1() == 1
         val id = buffer.g2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj3Decoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
index 355d61943..21728e99c 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v232.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v232.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj3Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj3Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val z = buffer.g2Alt2()
         val controlKey = buffer.g1() == 1
         val x = buffer.g2Alt3()
         val id = buffer.g2Alt2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj4Decoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
index b63573526..45b9db8e6 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v232.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v232.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj4Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj4Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val x = buffer.g2Alt1()
         val controlKey = buffer.g1Alt3() == 1
         val z = buffer.g2Alt1()
         val id = buffer.g2Alt1()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj5Decoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
index d11fafcde..793e044ce 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v232.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v232.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj5Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj5Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val z = buffer.g2()
         val id = buffer.g2Alt1()
         val x = buffer.g2Alt2()
         val controlKey = buffer.g1Alt2() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
index 67a34cdd8..5f4cbdf83 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
@@ -4,20 +4,20 @@ import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprot.protocol.util.gCombinedIdAlt1
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModel
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModelV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v232.game.outgoing.decoder.prot.GameServerProt
 
-internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModel> {
+internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModelV1> {
     override val prot: ClientProt = GameServerProt.IF_SETMODEL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): IfSetModel {
+    ): IfSetModelV1 {
         val model = buffer.g2Alt1()
         val combinedId = buffer.gCombinedIdAlt1()
-        return IfSetModel(
+        return IfSetModelV1(
             combinedId.interfaceId,
             combinedId.componentId,
             model,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
index d38627f0a..0888aad29 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
@@ -5,20 +5,20 @@ import net.rsprot.buffer.bitbuffer.toBitBuf
 import net.rsprot.crypto.xtea.XteaKey
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.map.RebuildRegion
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV1
 import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
 import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.getWorld
 import net.rsprox.protocol.v232.game.outgoing.decoder.prot.GameServerProt
 
-internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
+internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegionV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_REGION
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): RebuildRegion {
+    ): RebuildRegionV1 {
         val zoneZ = buffer.g2Alt2()
         val reload = buffer.g1() == 1
         val zoneX = buffer.g2Alt3()
@@ -44,7 +44,7 @@ internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
         val world = session.getWorld(-1)
         world.baseX = (zoneX - 6) * 8
         world.baseZ = (zoneZ - 6) * 8
-        return RebuildRegion(
+        return RebuildRegionV1(
             zoneX,
             zoneZ,
             reload,
diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
index 40ddaa547..9b9be4edb 100644
--- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
+++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
@@ -10,9 +10,9 @@ import net.rsprox.protocol.ProxyMessageDecoder
 import net.rsprox.protocol.common.CoordGrid
 import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
 import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.GenericWorldEntityInfoClient
-import net.rsprox.protocol.game.outgoing.model.map.RebuildLogin
-import net.rsprox.protocol.game.outgoing.model.map.RebuildNormal
-import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessage
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildNormalV1
+import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessageV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.allocateWorld
 import net.rsprox.protocol.session.getWorld
@@ -23,13 +23,13 @@ import net.rsprox.protocol.v232.game.outgoing.model.info.playerinfo.PlayerInfoCl
 internal class StaticRebuildDecoder(
     private val huffmanCodec: HuffmanCodec,
     private val cache: CacheProvider,
-) : ProxyMessageDecoder<StaticRebuildMessage> {
+) : ProxyMessageDecoder<StaticRebuildMessageV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_NORMAL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): StaticRebuildMessage {
+    ): StaticRebuildMessageV1 {
         val playerInfoInitBlock =
             if (buffer.isReadable(MINIMUM_REBUILD_LOGIN_CAPACITY)) {
                 buffer.buffer
@@ -69,7 +69,7 @@ internal class StaticRebuildDecoder(
             }
         return if (playerInfoInitBlock != null) {
             val message =
-                RebuildLogin(
+                RebuildLoginV1(
                     zoneX,
                     zoneZ,
                     worldArea,
@@ -94,7 +94,7 @@ internal class StaticRebuildDecoder(
             val world = session.getWorld(-1)
             world.baseX = (zoneX - 6) * 8
             world.baseZ = (zoneZ - 6) * 8
-            RebuildNormal(
+            RebuildNormalV1(
                 zoneX,
                 zoneZ,
                 worldArea,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
index 0e3c30a76..64efc460c 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v233.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v233.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc1Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc1Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2Alt2()
         val x = buffer.g2()
         val controlKey = buffer.g1Alt3() == 1
         val id = buffer.g2Alt1()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
index 6046671af..a81f482b7 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v233.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v233.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc2Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc2Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val controlKey = buffer.g1Alt1() == 1
         val x = buffer.g2()
         val id = buffer.g2Alt2()
         val z = buffer.g2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
index a3def439f..961accd7d 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v233.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v233.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc3Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc3Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2()
         val id = buffer.g2Alt1()
         val x = buffer.g2()
         val controlKey = buffer.g1Alt1() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
index 6ab0d4343..d13a6855f 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v233.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v233.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc4Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc4Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val controlKey = buffer.g1() == 1
         val x = buffer.g2()
         val z = buffer.g2()
         val id = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
index 4f9fdea86..d3b6c5dbe 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v233.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v233.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc5Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc5Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2()
         val z = buffer.g2Alt2()
         val id = buffer.g2()
         val controlKey = buffer.g1Alt1() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
index 34488cdb0..fb5c98871 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v233.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v233.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc1Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc1Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt2()
         val controlKey = buffer.g1Alt3() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             1,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
index b050b9e5f..e88f947e4 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v233.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v233.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc2Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc2Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt2()
         val controlKey = buffer.g1Alt2() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             2,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
index 10115c92e..f21af7e88 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v233.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v233.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc3Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc3Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt1()
         val controlKey = buffer.g1Alt3() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             3,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
index 7bcf84295..797a23737 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v233.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v233.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc4Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc4Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt3() == 1
         val index = buffer.g2Alt2()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             4,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
index 95370e9e6..65eb8af19 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v233.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v233.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc5Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc5Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2()
         val controlKey = buffer.g1Alt2() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             5,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj1Decoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
index 4f5a111cc..ce6fda428 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v233.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v233.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj1Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj1Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1() == 1
         val id = buffer.g2Alt3()
         val x = buffer.g2()
         val z = buffer.g2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj2Decoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
index 8c8c1ca48..c5714488f 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v233.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v233.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj2Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj2Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1Alt2() == 1
         val x = buffer.g2()
         val z = buffer.g2()
         val id = buffer.g2Alt2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj3Decoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
index 93c96f41f..2cbb4374e 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v233.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v233.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj3Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj3Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val x = buffer.g2Alt1()
         val controlKey = buffer.g1Alt1() == 1
         val id = buffer.g2Alt3()
         val z = buffer.g2Alt2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj4Decoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
index 6c6b46a8f..27208723d 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v233.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v233.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj4Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj4Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2Alt3()
         val x = buffer.g2()
         val z = buffer.g2()
         val controlKey = buffer.g1() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj5Decoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
index ed631c9be..ccf657421 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v233.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v233.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj5Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj5Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val z = buffer.g2Alt3()
         val controlKey = buffer.g1Alt3() == 1
         val id = buffer.g2()
         val x = buffer.g2Alt2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
index f2bd559b7..f8b6c049c 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
@@ -4,20 +4,20 @@ import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprot.protocol.util.gCombinedIdAlt1
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModel
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModelV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v233.game.outgoing.decoder.prot.GameServerProt
 
-internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModel> {
+internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModelV1> {
     override val prot: ClientProt = GameServerProt.IF_SETMODEL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): IfSetModel {
+    ): IfSetModelV1 {
         val model = buffer.g2Alt2()
         val combinedId = buffer.gCombinedIdAlt1()
-        return IfSetModel(
+        return IfSetModelV1(
             combinedId.interfaceId,
             combinedId.componentId,
             model,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
index 029123082..53289940a 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
@@ -5,20 +5,20 @@ import net.rsprot.buffer.bitbuffer.toBitBuf
 import net.rsprot.crypto.xtea.XteaKey
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.map.RebuildRegion
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV1
 import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
 import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.getWorld
 import net.rsprox.protocol.v233.game.outgoing.decoder.prot.GameServerProt
 
-internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
+internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegionV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_REGION
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): RebuildRegion {
+    ): RebuildRegionV1 {
         val zoneX = buffer.g2Alt1()
         val zoneZ = buffer.g2Alt2()
         val reload = buffer.g1Alt3() == 1
@@ -44,7 +44,7 @@ internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
         val world = session.getWorld(-1)
         world.baseX = (zoneX - 6) * 8
         world.baseZ = (zoneZ - 6) * 8
-        return RebuildRegion(
+        return RebuildRegionV1(
             zoneX,
             zoneZ,
             reload,
diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
index 6455384fc..7414721f2 100644
--- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
+++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
@@ -9,9 +9,9 @@ import net.rsprox.cache.api.CacheProvider
 import net.rsprox.protocol.ProxyMessageDecoder
 import net.rsprox.protocol.common.CoordGrid
 import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
-import net.rsprox.protocol.game.outgoing.model.map.RebuildLogin
-import net.rsprox.protocol.game.outgoing.model.map.RebuildNormal
-import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessage
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildNormalV1
+import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessageV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.allocateWorld
 import net.rsprox.protocol.session.getWorld
@@ -23,13 +23,13 @@ import net.rsprox.protocol.v233.game.outgoing.model.info.worldentityinfo.WorldEn
 internal class StaticRebuildDecoder(
     private val huffmanCodec: HuffmanCodec,
     private val cache: CacheProvider,
-) : ProxyMessageDecoder<StaticRebuildMessage> {
+) : ProxyMessageDecoder<StaticRebuildMessageV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_NORMAL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): StaticRebuildMessage {
+    ): StaticRebuildMessageV1 {
         val playerInfoInitBlock =
             if (buffer.isReadable(MINIMUM_REBUILD_LOGIN_CAPACITY)) {
                 buffer.buffer
@@ -69,7 +69,7 @@ internal class StaticRebuildDecoder(
             }
         return if (playerInfoInitBlock != null) {
             val message =
-                RebuildLogin(
+                RebuildLoginV1(
                     zoneX,
                     zoneZ,
                     worldArea,
@@ -94,7 +94,7 @@ internal class StaticRebuildDecoder(
             val world = session.getWorld(-1)
             world.baseX = (zoneX - 6) * 8
             world.baseZ = (zoneZ - 6) * 8
-            RebuildNormal(
+            RebuildNormalV1(
                 zoneX,
                 zoneZ,
                 worldArea,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
index 8d53a1997..192c77fdc 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v234.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v234.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc1Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc1Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2Alt2()
         val id = buffer.g2Alt2()
         val controlKey = buffer.g1Alt1() == 1
         val z = buffer.g2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
index cd9d5c07a..cf9ed0bba 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v234.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v234.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc2Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc2Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2Alt1()
         val z = buffer.g2()
         val controlKey = buffer.g1Alt1() == 1
         val x = buffer.g2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
index aabd542f3..f85951d53 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v234.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v234.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc3Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc3Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2Alt3()
         val controlKey = buffer.g1Alt2() == 1
         val id = buffer.g2Alt3()
         val z = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
index 25b141a1e..e35deb750 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v234.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v234.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc4Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc4Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2Alt2()
         val controlKey = buffer.g1Alt3() == 1
         val x = buffer.g2Alt1()
         val z = buffer.g2Alt1()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
index 2cf6ff0f0..4368832f2 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v234.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v234.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc5Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc5Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2Alt1()
         val z = buffer.g2Alt3()
         val x = buffer.g2Alt1()
         val controlKey = buffer.g1Alt1() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
index bc35b679e..f44959c38 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v234.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v234.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc1Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc1Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2()
         val controlKey = buffer.g1Alt1() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             1,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
index ae558e038..2e39111c6 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v234.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v234.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc2Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc2Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1() == 1
         val index = buffer.g2Alt2()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             2,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
index 4863ec69c..fec66d628 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v234.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v234.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc3Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc3Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt2() == 1
         val index = buffer.g2Alt1()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             3,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
index 37530291b..02eae2524 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v234.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v234.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc4Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc4Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt2() == 1
         val index = buffer.g2Alt3()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             4,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
index 3978b3bbd..412490788 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v234.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v234.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc5Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc5Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt2() == 1
         val index = buffer.g2Alt1()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             5,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj1Decoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
index 706ea0fe6..6d82a3abc 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v234.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v234.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj1Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj1Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1Alt1() == 1
         val z = buffer.g2Alt3()
         val x = buffer.g2Alt1()
         val id = buffer.g2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj2Decoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
index 5909f4ef3..96c5aa73c 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v234.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v234.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj2Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj2Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val z = buffer.g2Alt1()
         val controlKey = buffer.g1() == 1
         val id = buffer.g2()
         val x = buffer.g2Alt1()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj3Decoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
index ebdeb135e..8daae22ee 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v234.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v234.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj3Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj3Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1() == 1
         val z = buffer.g2Alt3()
         val id = buffer.g2Alt1()
         val x = buffer.g2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj4Decoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
index c09f4ff74..a5786503e 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v234.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v234.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj4Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj4Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1Alt1() == 1
         val z = buffer.g2Alt3()
         val id = buffer.g2Alt3()
         val x = buffer.g2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj5Decoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
index dfa97e99f..d8fb17ebb 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v234.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v234.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj5Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj5Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val x = buffer.g2Alt3()
         val controlKey = buffer.g1() == 1
         val id = buffer.g2Alt3()
         val z = buffer.g2Alt3()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
index 1448a2e9c..efe254895 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
@@ -4,20 +4,20 @@ import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprot.protocol.util.gCombinedIdAlt3
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModel
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModelV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v234.game.outgoing.decoder.prot.GameServerProt
 
-internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModel> {
+internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModelV1> {
     override val prot: ClientProt = GameServerProt.IF_SETMODEL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): IfSetModel {
+    ): IfSetModelV1 {
         val model = buffer.g2Alt1()
         val combinedId = buffer.gCombinedIdAlt3()
-        return IfSetModel(
+        return IfSetModelV1(
             combinedId.interfaceId,
             combinedId.componentId,
             model,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
index 703820efa..bb6357e27 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
@@ -5,20 +5,20 @@ import net.rsprot.buffer.bitbuffer.toBitBuf
 import net.rsprot.crypto.xtea.XteaKey
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.map.RebuildRegion
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV1
 import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
 import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.getWorld
 import net.rsprox.protocol.v234.game.outgoing.decoder.prot.GameServerProt
 
-internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
+internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegionV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_REGION
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): RebuildRegion {
+    ): RebuildRegionV1 {
         val reload = buffer.g1() == 1
         val zoneX = buffer.g2Alt2()
         val zoneZ = buffer.g2()
@@ -44,7 +44,7 @@ internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
         val world = session.getWorld(-1)
         world.baseX = (zoneX - 6) * 8
         world.baseZ = (zoneZ - 6) * 8
-        return RebuildRegion(
+        return RebuildRegionV1(
             zoneX,
             zoneZ,
             reload,
diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
index 5873ff778..14ba0ee5c 100644
--- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
+++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
@@ -9,9 +9,9 @@ import net.rsprox.cache.api.CacheProvider
 import net.rsprox.protocol.ProxyMessageDecoder
 import net.rsprox.protocol.common.CoordGrid
 import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
-import net.rsprox.protocol.game.outgoing.model.map.RebuildLogin
-import net.rsprox.protocol.game.outgoing.model.map.RebuildNormal
-import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessage
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildNormalV1
+import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessageV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.allocateWorld
 import net.rsprox.protocol.session.getWorld
@@ -23,13 +23,13 @@ import net.rsprox.protocol.v234.game.outgoing.model.info.worldentityinfo.WorldEn
 internal class StaticRebuildDecoder(
     private val huffmanCodec: HuffmanCodec,
     private val cache: CacheProvider,
-) : ProxyMessageDecoder<StaticRebuildMessage> {
+) : ProxyMessageDecoder<StaticRebuildMessageV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_NORMAL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): StaticRebuildMessage {
+    ): StaticRebuildMessageV1 {
         val playerInfoInitBlock =
             if (buffer.isReadable(MINIMUM_REBUILD_LOGIN_CAPACITY)) {
                 buffer.buffer
@@ -69,7 +69,7 @@ internal class StaticRebuildDecoder(
             }
         return if (playerInfoInitBlock != null) {
             val message =
-                RebuildLogin(
+                RebuildLoginV1(
                     zoneX,
                     zoneZ,
                     worldArea,
@@ -94,7 +94,7 @@ internal class StaticRebuildDecoder(
             val world = session.getWorld(-1)
             world.baseX = (zoneX - 6) * 8
             world.baseZ = (zoneZ - 6) * 8
-            RebuildNormal(
+            RebuildNormalV1(
                 zoneX,
                 zoneZ,
                 worldArea,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
index b70ecfb4f..9caecce51 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v235.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v235.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc1Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc1Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2Alt2()
         val z = buffer.g2Alt1()
         val controlKey = buffer.g1Alt2() == 1
         val id = buffer.g2Alt3()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
index c6042de5d..eba4ef10c 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v235.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v235.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc2Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc2Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2Alt3()
         val z = buffer.g2Alt3()
         val controlKey = buffer.g1Alt3() == 1
         val id = buffer.g2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
index 3787b46c1..24bc35d14 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v235.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v235.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc3Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc3Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2Alt1()
         val id = buffer.g2Alt1()
         val x = buffer.g2Alt3()
         val controlKey = buffer.g1Alt3() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
index 91cee1987..1d88fd666 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v235.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v235.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc4Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc4Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2Alt2()
         val id = buffer.g2Alt1()
         val z = buffer.g2Alt2()
         val controlKey = buffer.g1Alt2() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
index e9609b87b..69bd57de0 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v235.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v235.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc5Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc5Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2()
         val controlKey = buffer.g1Alt1() == 1
         val z = buffer.g2Alt2()
         val id = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
index e76d61e8a..c5a97ef00 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v235.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v235.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc1Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc1Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1Alt1() == 1
         val index = buffer.g2Alt1()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             1,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
index 7a0ad2474..570cb019c 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v235.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v235.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc2Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc2Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2()
         val controlKey = buffer.g1Alt2() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             2,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
index 8c3ed71fd..fd817b1de 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v235.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v235.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc3Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc3Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val controlKey = buffer.g1() == 1
         val index = buffer.g2Alt1()
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             3,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
index 850fd82b6..4c2f8efb0 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v235.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v235.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc4Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc4Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt3()
         val controlKey = buffer.g1() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             4,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
index 7fad88775..9491b0c14 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v235.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v235.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc5Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc5Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt2()
         val controlKey = buffer.g1Alt2() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             5,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj1Decoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
index 31dc5247d..ad2b2c1dd 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v235.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v235.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj1Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj1Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val controlKey = buffer.g1Alt3() == 1
         val x = buffer.g2Alt2()
         val z = buffer.g2()
         val id = buffer.g2Alt2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj2Decoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
index 34477691b..63f28fd4c 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v235.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v235.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj2Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj2Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val z = buffer.g2Alt3()
         val x = buffer.g2()
         val controlKey = buffer.g1Alt1() == 1
         val id = buffer.g2Alt3()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj3Decoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
index 7597f5d66..22cce41e1 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v235.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v235.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj3Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj3Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val x = buffer.g2Alt2()
         val controlKey = buffer.g1Alt2() == 1
         val id = buffer.g2Alt3()
         val z = buffer.g2Alt1()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj4Decoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
index e5bcb5e8b..97b87ee97 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v235.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v235.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj4Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj4Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val z = buffer.g2()
         val controlKey = buffer.g1Alt2() == 1
         val id = buffer.g2()
         val x = buffer.g2Alt3()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj5Decoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
index 3965a2c03..cd7dc23e5 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v235.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v235.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj5Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj5Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2Alt1()
         val x = buffer.g2Alt3()
         val z = buffer.g2Alt2()
         val controlKey = buffer.g1Alt3() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
index 7736c5a32..3085cb0f3 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
@@ -4,20 +4,20 @@ import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprot.protocol.util.gCombinedId
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModel
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModelV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v235.game.outgoing.decoder.prot.GameServerProt
 
-internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModel> {
+internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModelV1> {
     override val prot: ClientProt = GameServerProt.IF_SETMODEL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): IfSetModel {
+    ): IfSetModelV1 {
         val model = buffer.g2Alt3()
         val combinedId = buffer.gCombinedId()
-        return IfSetModel(
+        return IfSetModelV1(
             combinedId.interfaceId,
             combinedId.componentId,
             model,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
index c5a676147..d19fce14a 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
@@ -5,20 +5,20 @@ import net.rsprot.buffer.bitbuffer.toBitBuf
 import net.rsprot.crypto.xtea.XteaKey
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.map.RebuildRegion
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV1
 import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
 import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.getWorld
 import net.rsprox.protocol.v235.game.outgoing.decoder.prot.GameServerProt
 
-internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
+internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegionV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_REGION
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): RebuildRegion {
+    ): RebuildRegionV1 {
         val zoneZ = buffer.g2()
         val reload = buffer.g1Alt1() == 1
         val zoneX = buffer.g2Alt2()
@@ -44,7 +44,7 @@ internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
         val world = session.getWorld(-1)
         world.baseX = (zoneX - 6) * 8
         world.baseZ = (zoneZ - 6) * 8
-        return RebuildRegion(
+        return RebuildRegionV1(
             zoneX,
             zoneZ,
             reload,
diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
index dd81f8c7f..1293c7081 100644
--- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
+++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
@@ -9,9 +9,9 @@ import net.rsprox.cache.api.CacheProvider
 import net.rsprox.protocol.ProxyMessageDecoder
 import net.rsprox.protocol.common.CoordGrid
 import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
-import net.rsprox.protocol.game.outgoing.model.map.RebuildLogin
-import net.rsprox.protocol.game.outgoing.model.map.RebuildNormal
-import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessage
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildNormalV1
+import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessageV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.allocateWorld
 import net.rsprox.protocol.session.getWorld
@@ -23,13 +23,13 @@ import net.rsprox.protocol.v235.game.outgoing.model.info.worldentityinfo.WorldEn
 internal class StaticRebuildDecoder(
     private val huffmanCodec: HuffmanCodec,
     private val cache: CacheProvider,
-) : ProxyMessageDecoder<StaticRebuildMessage> {
+) : ProxyMessageDecoder<StaticRebuildMessageV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_NORMAL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): StaticRebuildMessage {
+    ): StaticRebuildMessageV1 {
         val playerInfoInitBlock =
             if (buffer.isReadable(MINIMUM_REBUILD_LOGIN_CAPACITY)) {
                 buffer.buffer
@@ -69,7 +69,7 @@ internal class StaticRebuildDecoder(
             }
         return if (playerInfoInitBlock != null) {
             val message =
-                RebuildLogin(
+                RebuildLoginV1(
                     zoneX,
                     zoneZ,
                     worldArea,
@@ -94,7 +94,7 @@ internal class StaticRebuildDecoder(
             val world = session.getWorld(-1)
             world.baseX = (zoneX - 6) * 8
             world.baseZ = (zoneZ - 6) * 8
-            RebuildNormal(
+            RebuildNormalV1(
                 zoneX,
                 zoneZ,
                 worldArea,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
index ed746e7d2..692c94810 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v236.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v236.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc1Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc1Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val controlKey = buffer.g1Alt1() == 1
         val z = buffer.g2Alt3()
         val id = buffer.g2()
         val x = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
index 676510bc2..773052492 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v236.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v236.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc2Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc2Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val x = buffer.g2()
         val id = buffer.g2Alt3()
         val z = buffer.g2()
         val controlKey = buffer.g1() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
index abf9eed52..d804dc139 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v236.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v236.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc3Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc3Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2Alt2()
         val z = buffer.g2Alt1()
         val x = buffer.g2()
         val controlKey = buffer.g1Alt2() == 1
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
index c950f0323..a97998800 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v236.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v236.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc4Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc4Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val z = buffer.g2()
         val controlKey = buffer.g1() == 1
         val id = buffer.g2Alt1()
         val x = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
index 7f9a9559f..f551722ba 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/locs/OpLoc5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v236.game.incoming.decoder.codec.locs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v236.game.incoming.decoder.prot.GameClientProt
 
-public class OpLoc5Decoder : ProxyMessageDecoder<OpLoc> {
+public class OpLoc5Decoder : ProxyMessageDecoder<OpLocV1> {
     override val prot: ClientProt = GameClientProt.OPLOC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpLoc {
+    ): OpLocV1 {
         val id = buffer.g2Alt3()
         val z = buffer.g2Alt1()
         val controlKey = buffer.g1() == 1
         val x = buffer.g2Alt2()
-        return OpLoc(
+        return OpLocV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
index 983f9bfc1..5a2f41728 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc1Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v236.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v236.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc1Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc1Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt1()
         val controlKey = buffer.g1Alt1() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             1,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
index b396deda7..1ff1c6925 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc2Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v236.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v236.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc2Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc2Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2()
         val controlKey = buffer.g1Alt2() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             2,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
index 179c0742b..b19a09917 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc3Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v236.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v236.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc3Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc3Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt1()
         val controlKey = buffer.g1Alt1() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             3,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
index 1078f3a4d..d5c7d199d 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc4Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v236.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v236.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc4Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc4Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt1()
         val controlKey = buffer.g1Alt2() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             4,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
index cac1fd598..b62ab5faa 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/npcs/OpNpc5Decoder.kt
@@ -3,20 +3,20 @@ package net.rsprox.protocol.v236.game.incoming.decoder.codec.npcs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v236.game.incoming.decoder.prot.GameClientProt
 
-public class OpNpc5Decoder : ProxyMessageDecoder<OpNpc> {
+public class OpNpc5Decoder : ProxyMessageDecoder<OpNpcV1> {
     override val prot: ClientProt = GameClientProt.OPNPC5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpNpc {
+    ): OpNpcV1 {
         val index = buffer.g2Alt1()
         val controlKey = buffer.g1Alt3() == 1
-        return OpNpc(
+        return OpNpcV1(
             index,
             controlKey,
             5,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj1Decoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
index 1b74fa8c7..297298dd6 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj1Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v236.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v236.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj1Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj1Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ1
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2()
         val x = buffer.g2Alt1()
         val z = buffer.g2()
         val controlKey = buffer.g1Alt3() == 1
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj2Decoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
index f719620c7..bdda43b9a 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj2Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v236.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v236.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj2Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj2Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ2
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val x = buffer.g2Alt2()
         val controlKey = buffer.g1Alt1() == 1
         val z = buffer.g2Alt1()
         val id = buffer.g2Alt1()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj3Decoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
index e14de2c2b..3f7bca328 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj3Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v236.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v236.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj3Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj3Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ3
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val id = buffer.g2Alt1()
         val z = buffer.g2Alt2()
         val controlKey = buffer.g1Alt2() == 1
         val x = buffer.g2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj4Decoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
index 2838a537a..a8ac687c8 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj4Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v236.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v236.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj4Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj4Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ4
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val z = buffer.g2Alt1()
         val controlKey = buffer.g1Alt2() == 1
         val id = buffer.g2()
         val x = buffer.g2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj5Decoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
index 854802955..d0bfee215 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/incoming/decoder/codec/objs/OpObj5Decoder.kt
@@ -3,22 +3,22 @@ package net.rsprox.protocol.v236.game.incoming.decoder.codec.objs
 import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v236.game.incoming.decoder.prot.GameClientProt
 
-public class OpObj5Decoder : ProxyMessageDecoder<OpObj> {
+public class OpObj5Decoder : ProxyMessageDecoder<OpObjV1> {
     override val prot: ClientProt = GameClientProt.OPOBJ5
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): OpObj {
+    ): OpObjV1 {
         val z = buffer.g2Alt3()
         val controlKey = buffer.g1Alt2() == 1
         val x = buffer.g2Alt1()
         val id = buffer.g2Alt2()
-        return OpObj(
+        return OpObjV1(
             id,
             x,
             z,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
index db9cd500c..11e67a7b7 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/interfaces/IfSetModelDecoder.kt
@@ -4,20 +4,20 @@ import net.rsprot.buffer.JagByteBuf
 import net.rsprot.protocol.ClientProt
 import net.rsprot.protocol.util.gCombinedIdAlt3
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModel
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModelV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.v236.game.outgoing.decoder.prot.GameServerProt
 
-internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModel> {
+internal class IfSetModelDecoder : ProxyMessageDecoder<IfSetModelV1> {
     override val prot: ClientProt = GameServerProt.IF_SETMODEL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): IfSetModel {
+    ): IfSetModelV1 {
         val model = buffer.g2Alt1()
         val combinedId = buffer.gCombinedIdAlt3()
-        return IfSetModel(
+        return IfSetModelV1(
             combinedId.interfaceId,
             combinedId.componentId,
             model,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
index fd4a1cca9..ce779e128 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/map/RebuildRegionDecoder.kt
@@ -5,20 +5,20 @@ import net.rsprot.buffer.bitbuffer.toBitBuf
 import net.rsprot.crypto.xtea.XteaKey
 import net.rsprot.protocol.ClientProt
 import net.rsprox.protocol.ProxyMessageDecoder
-import net.rsprox.protocol.game.outgoing.model.map.RebuildRegion
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV1
 import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
 import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.getWorld
 import net.rsprox.protocol.v236.game.outgoing.decoder.prot.GameServerProt
 
-internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
+internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegionV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_REGION
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): RebuildRegion {
+    ): RebuildRegionV1 {
         val zoneZ = buffer.g2()
         val zoneX = buffer.g2Alt3()
         val reload = buffer.g1Alt3() == 1
@@ -44,7 +44,7 @@ internal class RebuildRegionDecoder : ProxyMessageDecoder<RebuildRegion> {
         val world = session.getWorld(-1)
         world.baseX = (zoneX - 6) * 8
         world.baseZ = (zoneZ - 6) * 8
-        return RebuildRegion(
+        return RebuildRegionV1(
             zoneX,
             zoneZ,
             reload,
diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
index 4db6cb2d7..aca42ccf7 100644
--- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
+++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/map/StaticRebuildDecoder.kt
@@ -9,9 +9,9 @@ import net.rsprox.cache.api.CacheProvider
 import net.rsprox.protocol.ProxyMessageDecoder
 import net.rsprox.protocol.common.CoordGrid
 import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
-import net.rsprox.protocol.game.outgoing.model.map.RebuildLogin
-import net.rsprox.protocol.game.outgoing.model.map.RebuildNormal
-import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessage
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildNormalV1
+import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessageV1
 import net.rsprox.protocol.session.Session
 import net.rsprox.protocol.session.allocateWorld
 import net.rsprox.protocol.session.getWorld
@@ -23,13 +23,13 @@ import net.rsprox.protocol.v236.game.outgoing.model.info.worldentityinfo.WorldEn
 internal class StaticRebuildDecoder(
     private val huffmanCodec: HuffmanCodec,
     private val cache: CacheProvider,
-) : ProxyMessageDecoder<StaticRebuildMessage> {
+) : ProxyMessageDecoder<StaticRebuildMessageV1> {
     override val prot: ClientProt = GameServerProt.REBUILD_NORMAL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): StaticRebuildMessage {
+    ): StaticRebuildMessageV1 {
         val playerInfoInitBlock =
             if (buffer.isReadable(MINIMUM_REBUILD_LOGIN_CAPACITY)) {
                 buffer.buffer
@@ -69,7 +69,7 @@ internal class StaticRebuildDecoder(
             }
         return if (playerInfoInitBlock != null) {
             val message =
-                RebuildLogin(
+                RebuildLoginV1(
                     zoneX,
                     zoneZ,
                     worldArea,
@@ -94,7 +94,7 @@ internal class StaticRebuildDecoder(
             val world = session.getWorld(-1)
             world.baseX = (zoneX - 6) * 8
             world.baseZ = (zoneZ - 6) * 8
-            RebuildNormal(
+            RebuildNormalV1(
                 zoneX,
                 zoneZ,
                 worldArea,
diff --git a/protocol/osrs-237/build.gradle.kts b/protocol/osrs-237/build.gradle.kts
new file mode 100644
index 000000000..f47018b25
--- /dev/null
+++ b/protocol/osrs-237/build.gradle.kts
@@ -0,0 +1,14 @@
+dependencies {
+    implementation(platform(rootProject.libs.netty.bom))
+    implementation(rootProject.libs.netty.buffer)
+    implementation(rootProject.libs.netty.transport)
+    implementation(rootProject.libs.netty.handler)
+    implementation(rootProject.libs.rsprot.buffer)
+    implementation(rootProject.libs.rsprot.compression)
+    implementation(rootProject.libs.rsprot.protocol)
+    implementation(rootProject.libs.rsprot.crypto)
+    implementation(platform(rootProject.libs.log4j.bom))
+    implementation(rootProject.libs.bundles.log4j)
+    implementation(projects.protocol)
+    implementation(projects.cache.cacheApi)
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/ClientPacketDecoderServiceV237.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/ClientPacketDecoderServiceV237.kt
new file mode 100644
index 000000000..06568db82
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/ClientPacketDecoderServiceV237.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.compression.HuffmanCodec
+import net.rsprot.protocol.message.IncomingMessage
+import net.rsprox.protocol.ClientPacketDecoder
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.ClientMessageDecoderRepository
+
+public class ClientPacketDecoderServiceV237(
+    huffmanCodec: HuffmanCodec,
+) : ClientPacketDecoder {
+    @OptIn(ExperimentalStdlibApi::class)
+    private val repository = ClientMessageDecoderRepository.build(huffmanCodec)
+
+    override fun decode(
+        opcode: Int,
+        payload: JagByteBuf,
+        session: Session,
+    ): IncomingMessage {
+        return repository
+            .getDecoder(opcode)
+            .decode(payload, session)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/GameClientProtProviderV237.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/GameClientProtProviderV237.kt
new file mode 100644
index 000000000..7effdca21
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/GameClientProtProviderV237.kt
@@ -0,0 +1,16 @@
+package net.rsprox.protocol.v237
+
+import net.rsprox.protocol.ProtProvider
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+import kotlin.enums.EnumEntries
+
+public data object GameClientProtProviderV237 : ProtProvider<GameClientProt> {
+    override fun get(opcode: Int): GameClientProt {
+        return GameClientProt.entries.firstOrNull { it.opcode == opcode }
+            ?: throw IllegalArgumentException("Unknown game client prot: $opcode")
+    }
+
+    override fun allProts(): EnumEntries<GameClientProt> {
+        return GameClientProt.entries
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/GameServerProtProviderV237.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/GameServerProtProviderV237.kt
new file mode 100644
index 000000000..e90adb13b
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/GameServerProtProviderV237.kt
@@ -0,0 +1,16 @@
+package net.rsprox.protocol.v237
+
+import net.rsprox.protocol.ProtProvider
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+import kotlin.enums.EnumEntries
+
+public data object GameServerProtProviderV237 : ProtProvider<GameServerProt> {
+    override fun get(opcode: Int): GameServerProt {
+        return GameServerProt.entries.firstOrNull { it.opcode == opcode }
+            ?: throw IllegalArgumentException("Unknown game server prot: $opcode")
+    }
+
+    override fun allProts(): EnumEntries<GameServerProt> {
+        return GameServerProt.entries
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/ServerPacketDecoderServiceV237.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/ServerPacketDecoderServiceV237.kt
new file mode 100644
index 000000000..7f9c05443
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/ServerPacketDecoderServiceV237.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.compression.HuffmanCodec
+import net.rsprot.protocol.message.IncomingMessage
+import net.rsprox.cache.api.CacheProvider
+import net.rsprox.protocol.ServerPacketDecoder
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.ServerMessageDecoderRepository
+
+public class ServerPacketDecoderServiceV237(
+    huffmanCodec: HuffmanCodec,
+    cache: CacheProvider,
+) : ServerPacketDecoder {
+    @OptIn(ExperimentalStdlibApi::class)
+    private val repository =
+        ServerMessageDecoderRepository.build(
+            huffmanCodec,
+            cache,
+        )
+
+    override fun decode(
+        opcode: Int,
+        payload: JagByteBuf,
+        session: Session,
+    ): IncomingMessage {
+        return repository
+            .getDecoder(opcode)
+            .decode(payload, session)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/If1ButtonDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/If1ButtonDecoder.kt
new file mode 100644
index 000000000..2fd9c5485
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/If1ButtonDecoder.kt
@@ -0,0 +1,23 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.buttons
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprot.protocol.util.gCombinedId
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.buttons.If1Button
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class If1ButtonDecoder : ProxyMessageDecoder<If1Button> {
+    override val prot: ClientProt = GameClientProt.IF_BUTTON
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): If1Button {
+        val combinedId = buffer.gCombinedId()
+        return If1Button(combinedId)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/IfButtonDDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/IfButtonDDecoder.kt
new file mode 100644
index 000000000..10d534d35
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/IfButtonDDecoder.kt
@@ -0,0 +1,33 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.buttons
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt2
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.buttons.IfButtonD
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class IfButtonDDecoder : ProxyMessageDecoder<IfButtonD> {
+    override val prot: ClientProt = GameClientProt.IF_BUTTOND
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfButtonD {
+        val targetSub = buffer.g2Alt2()
+        val selectedSub = buffer.g2Alt2()
+        val selectedCombinedId = buffer.gCombinedIdAlt2()
+        val targetCombinedId = buffer.gCombinedIdAlt2()
+        val selectedObj = buffer.g2Alt1()
+        val targetObj = buffer.g2Alt2()
+        return IfButtonD(
+            selectedCombinedId,
+            selectedSub,
+            selectedObj,
+            targetCombinedId,
+            targetSub,
+            targetObj,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/IfButtonTDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/IfButtonTDecoder.kt
new file mode 100644
index 000000000..e22e7178e
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/IfButtonTDecoder.kt
@@ -0,0 +1,34 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.buttons
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedId
+import net.rsprot.protocol.util.gCombinedIdAlt1
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.buttons.IfButtonT
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class IfButtonTDecoder : ProxyMessageDecoder<IfButtonT> {
+    override val prot: ClientProt = GameClientProt.IF_BUTTONT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfButtonT {
+        val selectedSub = buffer.g2()
+        val targetObj = buffer.g2()
+        val targetCombinedId = buffer.gCombinedId()
+        val targetSub = buffer.g2()
+        val selectedObj = buffer.g2()
+        val selectedCombinedId = buffer.gCombinedIdAlt1()
+        return IfButtonT(
+            selectedCombinedId,
+            selectedSub,
+            selectedObj,
+            targetCombinedId,
+            targetSub,
+            targetObj,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/IfButtonXDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/IfButtonXDecoder.kt
new file mode 100644
index 000000000..847e40908
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/IfButtonXDecoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.buttons
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprot.protocol.util.gCombinedId
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.buttons.If3Button
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class IfButtonXDecoder : ProxyMessageDecoder<If3Button> {
+    override val prot: ClientProt = GameClientProt.IF_BUTTONX
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): If3Button {
+        val combinedId = buffer.gCombinedId()
+        val sub = buffer.g2()
+        val obj = buffer.g2()
+        val op = buffer.g1()
+        return If3Button(
+            combinedId,
+            sub,
+            obj,
+            op,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/IfRunScriptDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/IfRunScriptDecoder.kt
new file mode 100644
index 000000000..b7e44b271
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/IfRunScriptDecoder.kt
@@ -0,0 +1,34 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.buttons
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.buffer.extensions.toByteArray
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt2
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.buttons.IfRunScript
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class IfRunScriptDecoder : ProxyMessageDecoder<IfRunScript> {
+    override val prot: ClientProt = GameClientProt.IF_RUNSCRIPT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfRunScript {
+        // Function is method(int combinedId, int sub, int obj, int script, Object[] args)
+        // The order of argument does not seem to change (based on two revisions)
+        val sub = buffer.g2Alt3()
+        val combinedId = buffer.gCombinedIdAlt2()
+        val script = buffer.g4Alt1()
+        val obj = buffer.g2Alt3()
+        val bytes = buffer.buffer.toByteArray()
+        return IfRunScript(
+            combinedId,
+            sub,
+            obj,
+            script,
+            bytes,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/IfSubOpDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/IfSubOpDecoder.kt
new file mode 100644
index 000000000..3e901c69f
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/buttons/IfSubOpDecoder.kt
@@ -0,0 +1,33 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.buttons
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprot.protocol.util.gCombinedId
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.buttons.IfSubOp
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class IfSubOpDecoder : ProxyMessageDecoder<IfSubOp> {
+    override val prot: ClientProt = GameClientProt.IF_SUBOP
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSubOp {
+        val combinedId = buffer.gCombinedId()
+        val sub = buffer.g2()
+        val obj = buffer.g2()
+        val op = buffer.g1()
+        val subop = buffer.g1()
+        return IfSubOp(
+            combinedId,
+            sub,
+            obj,
+            op,
+            subop,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/clan/AffinedClanSettingsAddBannedFromChannelDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/clan/AffinedClanSettingsAddBannedFromChannelDecoder.kt
new file mode 100644
index 000000000..9c6431eec
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/clan/AffinedClanSettingsAddBannedFromChannelDecoder.kt
@@ -0,0 +1,29 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.clan
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.clan.AffinedClanSettingsAddBannedFromChannel
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class AffinedClanSettingsAddBannedFromChannelDecoder :
+    ProxyMessageDecoder<AffinedClanSettingsAddBannedFromChannel> {
+    override val prot: ClientProt = GameClientProt.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): AffinedClanSettingsAddBannedFromChannel {
+        val clanId = buffer.g1()
+        val memberIndex = buffer.g2()
+        val name = buffer.gjstr()
+        return AffinedClanSettingsAddBannedFromChannel(
+            name,
+            clanId,
+            memberIndex,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/clan/AffinedClanSettingsSetMutedFromChannelDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/clan/AffinedClanSettingsSetMutedFromChannelDecoder.kt
new file mode 100644
index 000000000..34526a42e
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/clan/AffinedClanSettingsSetMutedFromChannelDecoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.clan
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.clan.AffinedClanSettingsSetMutedFromChannel
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class AffinedClanSettingsSetMutedFromChannelDecoder :
+    ProxyMessageDecoder<AffinedClanSettingsSetMutedFromChannel> {
+    override val prot: ClientProt = GameClientProt.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): AffinedClanSettingsSetMutedFromChannel {
+        val clanId = buffer.g1()
+        val memberIndex = buffer.g2()
+        val muted = buffer.g1() == 1
+        val name = buffer.gjstr()
+        return AffinedClanSettingsSetMutedFromChannel(
+            name,
+            clanId,
+            memberIndex,
+            muted,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/clan/ClanChannelFullRequestDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/clan/ClanChannelFullRequestDecoder.kt
new file mode 100644
index 000000000..6e613f486
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/clan/ClanChannelFullRequestDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.clan
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.clan.ClanChannelFullRequest
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class ClanChannelFullRequestDecoder : ProxyMessageDecoder<ClanChannelFullRequest> {
+    override val prot: ClientProt = GameClientProt.CLANCHANNEL_FULL_REQUEST
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ClanChannelFullRequest {
+        val clanId = buffer.g1s()
+        return ClanChannelFullRequest(clanId)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/clan/ClanChannelKickUserDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/clan/ClanChannelKickUserDecoder.kt
new file mode 100644
index 000000000..23bbbeb04
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/clan/ClanChannelKickUserDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.clan
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.clan.ClanChannelKickUser
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class ClanChannelKickUserDecoder : ProxyMessageDecoder<ClanChannelKickUser> {
+    override val prot: ClientProt = GameClientProt.CLANCHANNEL_KICKUSER
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ClanChannelKickUser {
+        val clanId = buffer.g1()
+        val memberIndex = buffer.g2()
+        val name = buffer.gjstr()
+        return ClanChannelKickUser(
+            name,
+            clanId,
+            memberIndex,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/clan/ClanSettingsFullRequestDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/clan/ClanSettingsFullRequestDecoder.kt
new file mode 100644
index 000000000..43a4333e4
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/clan/ClanSettingsFullRequestDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.clan
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.clan.ClanSettingsFullRequest
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class ClanSettingsFullRequestDecoder : ProxyMessageDecoder<ClanSettingsFullRequest> {
+    override val prot: ClientProt = GameClientProt.CLANSETTINGS_FULL_REQUEST
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ClanSettingsFullRequest {
+        val clanId = buffer.g1s()
+        return ClanSettingsFullRequest(clanId)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventAppletFocusDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventAppletFocusDecoder.kt
new file mode 100644
index 000000000..5cbdb3bc6
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventAppletFocusDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.events
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.events.EventAppletFocus
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class EventAppletFocusDecoder : ProxyMessageDecoder<EventAppletFocus> {
+    override val prot: ClientProt = GameClientProt.EVENT_APPLET_FOCUS
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): EventAppletFocus {
+        val inFocus = buffer.g1() == 1
+        return EventAppletFocus(inFocus)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventCameraPositionDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventCameraPositionDecoder.kt
new file mode 100644
index 000000000..367a65c10
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventCameraPositionDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.events
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.events.EventCameraPosition
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class EventCameraPositionDecoder : ProxyMessageDecoder<EventCameraPosition> {
+    override val prot: ClientProt = GameClientProt.EVENT_CAMERA_POSITION
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): EventCameraPosition {
+        val angleX = buffer.g2Alt1()
+        val angleY = buffer.g2Alt1()
+        return EventCameraPosition(
+            angleX,
+            angleY,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventKeyboardDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventKeyboardDecoder.kt
new file mode 100644
index 000000000..9b422a03d
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventKeyboardDecoder.kt
@@ -0,0 +1,33 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.events
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.events.EventKeyboard
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class EventKeyboardDecoder : ProxyMessageDecoder<EventKeyboard> {
+    override val prot: ClientProt = GameClientProt.EVENT_KEYBOARD
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): EventKeyboard {
+        val count = buffer.readableBytes() / 4
+        val keys = ByteArray(count)
+        var lastTransmittedKeyPress: Int = -1
+        for (i in 0..<count) {
+            val delta = buffer.g3Alt1()
+            val key = buffer.g1Alt2()
+            if (i == 0) {
+                lastTransmittedKeyPress = delta
+            }
+            keys[i] = key.toByte()
+        }
+        return EventKeyboard(
+            lastTransmittedKeyPress,
+            EventKeyboard.KeySequence(keys),
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventMouseClickV1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventMouseClickV1Decoder.kt
new file mode 100644
index 000000000..ae6b3cb2d
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventMouseClickV1Decoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.events
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.events.EventMouseClickV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class EventMouseClickV1Decoder : ProxyMessageDecoder<EventMouseClickV1> {
+    override val prot: ClientProt = GameClientProt.EVENT_MOUSE_CLICK_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): EventMouseClickV1 {
+        val packed = buffer.g2()
+        val rightClick = packed and 0x1 != 0
+        val lastTransmittedMouseClick = packed ushr 1
+        val x = buffer.g2()
+        val y = buffer.g2()
+        return EventMouseClickV1(
+            lastTransmittedMouseClick,
+            rightClick,
+            x,
+            y,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventMouseClickV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventMouseClickV2Decoder.kt
new file mode 100644
index 000000000..e96a37acc
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventMouseClickV2Decoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.events
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.events.EventMouseClickV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class EventMouseClickV2Decoder : ProxyMessageDecoder<EventMouseClickV2> {
+    override val prot: ClientProt = GameClientProt.EVENT_MOUSE_CLICK_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): EventMouseClickV2 {
+        val y = buffer.g2Alt1()
+        val code = buffer.g1Alt2()
+        val packed = buffer.g2Alt1()
+        val x = buffer.g2()
+        val rightClick = packed and 0x1 != 0
+        val lastTransmittedMouseClick = packed ushr 1
+        return EventMouseClickV2(
+            lastTransmittedMouseClick,
+            code,
+            rightClick,
+            x,
+            y,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventMouseMoveDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventMouseMoveDecoder.kt
new file mode 100644
index 000000000..ab8e86603
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventMouseMoveDecoder.kt
@@ -0,0 +1,96 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.events
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.events.EventMouseMove
+import net.rsprox.protocol.game.incoming.model.events.util.MouseMovements
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Suppress("DuplicatedCode")
+@Consistent
+public class EventMouseMoveDecoder : ProxyMessageDecoder<EventMouseMove> {
+    override val prot: ClientProt = GameClientProt.EVENT_MOUSE_MOVE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): EventMouseMove {
+        val stepExcess = buffer.g1()
+        val endExcess = buffer.g1()
+        val array = threadLocalArray.get()
+        var count = 0
+        while (buffer.isReadable) {
+            var packed = buffer.g1()
+            var x: Int
+            var y: Int
+            var timeSinceLastMovement: Int
+            var delta: Boolean
+            if (packed and 0xE0 == 0xE0) {
+                timeSinceLastMovement = packed and 0x1f shl 8 or buffer.g1()
+                val packed = buffer.g4()
+                if (packed == Int.MIN_VALUE) {
+                    x = -1
+                    y = -1
+                } else {
+                    x = packed and 0xFFFF
+                    y = packed ushr 16 and 0xFFFF
+                }
+                delta = false
+            } else if (packed and 0xC0 == 0xC0) {
+                timeSinceLastMovement = packed and 0x3f
+
+                val packed = buffer.g4()
+                if (packed == Int.MIN_VALUE) {
+                    x = -1
+                    y = -1
+                } else {
+                    x = packed and 0xFFFF
+                    y = packed ushr 16 and 0xFFFF
+                }
+                delta = false
+            } else if (packed and 0x80 == 0x80) {
+                timeSinceLastMovement = packed and 0x7f
+                x = buffer.g1() - 128
+                y = buffer.g1() - 128
+                delta = true
+            } else {
+                packed = (packed shl 8) or (buffer.g1())
+                timeSinceLastMovement = (packed ushr 12) and 0x7
+                x = ((packed shr 6) and 0x3F) - 32
+                y = (packed and 0x3F) - 32
+                delta = true
+            }
+            val change =
+                MouseMovements.MousePosChange.pack(
+                    timeSinceLastMovement,
+                    x,
+                    y,
+                    delta,
+                )
+            array[count++] = change
+        }
+        val slice = array.copyOf(count)
+        return EventMouseMove(
+            stepExcess,
+            endExcess,
+            MouseMovements(slice),
+        )
+    }
+
+    private companion object {
+        /**
+         * Utilizing a thread-local initial long array, as the number of
+         * mouse movements is unknown (relies on remaining bytes in buffer,
+         * which in turn uses compression methods so each entry can be 2-4 bytes).
+         * As Netty's threads decode this, a thread-local implementation is
+         * perfectly safe to utilize, and will save us some memory in return.
+         */
+        private val threadLocalArray =
+            ThreadLocal.withInitial {
+                LongArray(128)
+            }
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventMouseScrollDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventMouseScrollDecoder.kt
new file mode 100644
index 000000000..5df90d257
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventMouseScrollDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.events
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.events.EventMouseScroll
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class EventMouseScrollDecoder : ProxyMessageDecoder<EventMouseScroll> {
+    override val prot: ClientProt = GameClientProt.EVENT_MOUSE_SCROLL
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): EventMouseScroll {
+        val rotation = buffer.g2s()
+        return EventMouseScroll(rotation)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventNativeMouseMoveDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventNativeMouseMoveDecoder.kt
new file mode 100644
index 000000000..5f64b0083
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/events/EventNativeMouseMoveDecoder.kt
@@ -0,0 +1,93 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.events
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.events.EventNativeMouseMove
+import net.rsprox.protocol.game.incoming.model.events.util.MouseMovements
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Suppress("DuplicatedCode")
+@Consistent
+public class EventNativeMouseMoveDecoder : ProxyMessageDecoder<EventNativeMouseMove> {
+    override val prot: ClientProt = GameClientProt.EVENT_NATIVE_MOUSE_MOVE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): EventNativeMouseMove {
+        val stepExcess = buffer.g1()
+        val endExcess = buffer.g1()
+        val array = threadLocalArray.get()
+        var count = 0
+        while (buffer.isReadable) {
+            var packed = buffer.g1()
+            var x: Int
+            var y: Int
+            var timeSinceLastMovement: Int
+            var delta: Boolean
+            if (packed and 0xE0 == 0xE0) {
+                timeSinceLastMovement = packed and 0x1f shl 8 or buffer.g1()
+                y = buffer.g2s()
+                x = buffer.g2s()
+                delta = false
+                if (x == 0 && y == -0x8000) {
+                    x = -1
+                    y = -1
+                }
+            } else if (packed and 0xC0 == 0xC0) {
+                timeSinceLastMovement = packed and 0x3f
+                y = buffer.g2s()
+                x = buffer.g2s()
+                delta = false
+                if (x == 0 && y == -0x8000) {
+                    x = -1
+                    y = -1
+                }
+            } else if (packed and 0x80 == 0x80) {
+                timeSinceLastMovement = packed and 0x7f
+                x = buffer.g1() - 128
+                y = buffer.g1() - 128
+                delta = true
+            } else {
+                packed = (packed shl 8) or (buffer.g1())
+                timeSinceLastMovement = (packed ushr 12) and 0x7
+                x = ((packed shr 6) and 0x3F) - 32
+                y = (packed and 0x3F) - 32
+                delta = true
+            }
+            val lastMouseButton = buffer.g1()
+            val change =
+                MouseMovements.MousePosChange.pack(
+                    timeSinceLastMovement,
+                    x,
+                    y,
+                    delta,
+                    lastMouseButton,
+                )
+            array[count++] = change
+        }
+        val slice = array.copyOf(count)
+        return EventNativeMouseMove(
+            stepExcess,
+            endExcess,
+            MouseMovements(slice),
+        )
+    }
+
+    private companion object {
+        /**
+         * Utilizing a thread-local initial long array, as the number of
+         * mouse movements is unknown (relies on remaining bytes in buffer,
+         * which in turn uses compression methods so each entry can be 2-4 bytes).
+         * As Netty's threads decode this, a thread-local implementation is
+         * perfectly safe to utilize, and will save us some memory in return.
+         */
+        private val threadLocalArray =
+            ThreadLocal.withInitial {
+                LongArray(128)
+            }
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/friendchat/FriendChatJoinLeaveDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/friendchat/FriendChatJoinLeaveDecoder.kt
new file mode 100644
index 000000000..5a149e60f
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/friendchat/FriendChatJoinLeaveDecoder.kt
@@ -0,0 +1,27 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.friendchat
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.friendchat.FriendChatJoinLeave
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class FriendChatJoinLeaveDecoder : ProxyMessageDecoder<FriendChatJoinLeave> {
+    override val prot: ClientProt = GameClientProt.FRIENDCHAT_JOIN_LEAVE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): FriendChatJoinLeave {
+        val name =
+            if (!buffer.isReadable) {
+                null
+            } else {
+                buffer.gjstr()
+            }
+        return FriendChatJoinLeave(name)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/friendchat/FriendChatKickDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/friendchat/FriendChatKickDecoder.kt
new file mode 100644
index 000000000..67ecf73da
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/friendchat/FriendChatKickDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.friendchat
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.friendchat.FriendChatKick
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class FriendChatKickDecoder : ProxyMessageDecoder<FriendChatKick> {
+    override val prot: ClientProt = GameClientProt.FRIENDCHAT_KICK
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): FriendChatKick {
+        val name = buffer.gjstr()
+        return FriendChatKick(name)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/friendchat/FriendChatSetRankDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/friendchat/FriendChatSetRankDecoder.kt
new file mode 100644
index 000000000..1ac57f5b4
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/friendchat/FriendChatSetRankDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.friendchat
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.friendchat.FriendChatSetRank
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class FriendChatSetRankDecoder : ProxyMessageDecoder<FriendChatSetRank> {
+    override val prot: ClientProt = GameClientProt.FRIENDCHAT_SETRANK
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): FriendChatSetRank {
+        val name = buffer.gjstr()
+        val rank = buffer.g1()
+        return FriendChatSetRank(
+            name,
+            rank,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc1V1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc1V1Decoder.kt
new file mode 100644
index 000000000..7415bb9c0
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc1V1Decoder.kt
@@ -0,0 +1,29 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.locs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpLoc1V1Decoder : ProxyMessageDecoder<OpLocV1> {
+    override val prot: ClientProt = GameClientProt.OPLOC1_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpLocV1 {
+        val z = buffer.g2Alt3()
+        val controlKey = buffer.g1Alt1() == 1
+        val x = buffer.g2()
+        val id = buffer.g2Alt3()
+        return OpLocV1(
+            id,
+            x,
+            z,
+            controlKey,
+            1,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc1V2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc1V2Decoder.kt
new file mode 100644
index 000000000..0c1ca5eea
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc1V2Decoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.locs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpLoc1V2Decoder : ProxyMessageDecoder<OpLocV2> {
+    override val prot: ClientProt = GameClientProt.OPLOC1_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpLocV2 {
+        val z = buffer.g2Alt1()
+        val subop = buffer.g1Alt2()
+        val id = buffer.g2Alt1()
+        val controlKey = buffer.g1Alt3() == 1
+        val x = buffer.g2()
+        return OpLocV2(
+            id,
+            x,
+            z,
+            controlKey,
+            1,
+            subop,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc2V1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc2V1Decoder.kt
new file mode 100644
index 000000000..155cb46c8
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc2V1Decoder.kt
@@ -0,0 +1,29 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.locs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpLoc2V1Decoder : ProxyMessageDecoder<OpLocV1> {
+    override val prot: ClientProt = GameClientProt.OPLOC2_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpLocV1 {
+        val controlKey = buffer.g1Alt2() == 1
+        val x = buffer.g2Alt2()
+        val z = buffer.g2Alt3()
+        val id = buffer.g2Alt3()
+        return OpLocV1(
+            id,
+            x,
+            z,
+            controlKey,
+            2,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc2V2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc2V2Decoder.kt
new file mode 100644
index 000000000..d5e044249
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc2V2Decoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.locs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpLoc2V2Decoder : ProxyMessageDecoder<OpLocV2> {
+    override val prot: ClientProt = GameClientProt.OPLOC2_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpLocV2 {
+        val id = buffer.g2Alt2()
+        val z = buffer.g2Alt3()
+        val x = buffer.g2Alt2()
+        val subop = buffer.g1Alt1()
+        val controlKey = buffer.g1Alt2() == 1
+        return OpLocV2(
+            id,
+            x,
+            z,
+            controlKey,
+            2,
+            subop,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc3V1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc3V1Decoder.kt
new file mode 100644
index 000000000..414bed14f
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc3V1Decoder.kt
@@ -0,0 +1,29 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.locs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpLoc3V1Decoder : ProxyMessageDecoder<OpLocV1> {
+    override val prot: ClientProt = GameClientProt.OPLOC3_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpLocV1 {
+        val z = buffer.g2()
+        val x = buffer.g2Alt1()
+        val id = buffer.g2()
+        val controlKey = buffer.g1Alt3() == 1
+        return OpLocV1(
+            id,
+            x,
+            z,
+            controlKey,
+            3,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc3V2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc3V2Decoder.kt
new file mode 100644
index 000000000..0578620b2
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc3V2Decoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.locs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpLoc3V2Decoder : ProxyMessageDecoder<OpLocV2> {
+    override val prot: ClientProt = GameClientProt.OPLOC3_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpLocV2 {
+        val z = buffer.g2Alt3()
+        val controlKey = buffer.g1() == 1
+        val x = buffer.g2Alt2()
+        val id = buffer.g2Alt1()
+        val subop = buffer.g1Alt1()
+        return OpLocV2(
+            id,
+            x,
+            z,
+            controlKey,
+            3,
+            subop,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc4V1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc4V1Decoder.kt
new file mode 100644
index 000000000..41035c1db
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc4V1Decoder.kt
@@ -0,0 +1,29 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.locs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpLoc4V1Decoder : ProxyMessageDecoder<OpLocV1> {
+    override val prot: ClientProt = GameClientProt.OPLOC4_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpLocV1 {
+        val id = buffer.g2Alt3()
+        val z = buffer.g2Alt1()
+        val controlKey = buffer.g1() == 1
+        val x = buffer.g2()
+        return OpLocV1(
+            id,
+            x,
+            z,
+            controlKey,
+            4,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc4V2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc4V2Decoder.kt
new file mode 100644
index 000000000..eeb6306d6
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc4V2Decoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.locs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpLoc4V2Decoder : ProxyMessageDecoder<OpLocV2> {
+    override val prot: ClientProt = GameClientProt.OPLOC4_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpLocV2 {
+        val subop = buffer.g1Alt2()
+        val x = buffer.g2Alt2()
+        val controlKey = buffer.g1Alt1() == 1
+        val id = buffer.g2Alt3()
+        val z = buffer.g2Alt2()
+        return OpLocV2(
+            id,
+            x,
+            z,
+            controlKey,
+            4,
+            subop,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc5V1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc5V1Decoder.kt
new file mode 100644
index 000000000..a203c3a99
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc5V1Decoder.kt
@@ -0,0 +1,29 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.locs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpLoc5V1Decoder : ProxyMessageDecoder<OpLocV1> {
+    override val prot: ClientProt = GameClientProt.OPLOC5_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpLocV1 {
+        val id = buffer.g2Alt3()
+        val controlKey = buffer.g1Alt3() == 1
+        val z = buffer.g2Alt2()
+        val x = buffer.g2Alt3()
+        return OpLocV1(
+            id,
+            x,
+            z,
+            controlKey,
+            5,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc5V2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc5V2Decoder.kt
new file mode 100644
index 000000000..2cc5bdbb7
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc5V2Decoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.locs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpLoc5V2Decoder : ProxyMessageDecoder<OpLocV2> {
+    override val prot: ClientProt = GameClientProt.OPLOC5_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpLocV2 {
+        val id = buffer.g2Alt1()
+        val x = buffer.g2Alt3()
+        val z = buffer.g2Alt3()
+        val subop = buffer.g1Alt3()
+        val controlKey = buffer.g1() == 1
+        return OpLocV2(
+            id,
+            x,
+            z,
+            controlKey,
+            5,
+            subop,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc6Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc6Decoder.kt
new file mode 100644
index 000000000..d0175dcdb
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLoc6Decoder.kt
@@ -0,0 +1,20 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.locs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.locs.OpLoc6
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpLoc6Decoder : ProxyMessageDecoder<OpLoc6> {
+    override val prot: ClientProt = GameClientProt.OPLOC6
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpLoc6 {
+        val id = buffer.g2()
+        return OpLoc6(id)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLocTDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLocTDecoder.kt
new file mode 100644
index 000000000..a2368b8b5
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/locs/OpLocTDecoder.kt
@@ -0,0 +1,35 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.locs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt1
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.locs.OpLocT
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpLocTDecoder : ProxyMessageDecoder<OpLocT> {
+    override val prot: ClientProt = GameClientProt.OPLOCT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpLocT {
+        val id = buffer.g2Alt2()
+        val controlKey = buffer.g1Alt3() == 1
+        val z = buffer.g2Alt3()
+        val selectedSub = buffer.g2Alt3()
+        val selectedObj = buffer.g2Alt3()
+        val selectedCombinedId = buffer.gCombinedIdAlt1()
+        val x = buffer.g2()
+        return OpLocT(
+            id,
+            x,
+            z,
+            controlKey,
+            selectedCombinedId,
+            selectedSub,
+            selectedObj,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/messaging/MessagePrivateDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/messaging/MessagePrivateDecoder.kt
new file mode 100644
index 000000000..e35372b52
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/messaging/MessagePrivateDecoder.kt
@@ -0,0 +1,29 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.messaging
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.compression.HuffmanCodec
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.messaging.MessagePrivate
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+internal class MessagePrivateDecoder(
+    private val huffmanCodec: HuffmanCodec,
+) : ProxyMessageDecoder<MessagePrivate> {
+    override val prot: ClientProt = GameClientProt.MESSAGE_PRIVATE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MessagePrivate {
+        val name = buffer.gjstr()
+        val message = huffmanCodec.decode(buffer)
+        return MessagePrivate(
+            name,
+            message,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/messaging/MessagePublicDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/messaging/MessagePublicDecoder.kt
new file mode 100644
index 000000000..e76eeb4cf
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/messaging/MessagePublicDecoder.kt
@@ -0,0 +1,66 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.messaging
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.compression.HuffmanCodec
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.messaging.MessagePublic
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+internal class MessagePublicDecoder(
+    private val huffmanCodec: HuffmanCodec,
+) : ProxyMessageDecoder<MessagePublic> {
+    override val prot: ClientProt = GameClientProt.MESSAGE_PUBLIC
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MessagePublic {
+        val type = buffer.g1()
+        val colour = buffer.g1()
+        val effect = buffer.g1()
+        val patternArray =
+            if (colour in 13..20) {
+                ByteArray(colour - 12) {
+                    buffer.g1().toByte()
+                }
+            } else {
+                null
+            }
+        val hasTrailingByte = type == CLAN_MAIN_CHANNEL_TYPE
+        val huffmanSlice =
+            if (hasTrailingByte) {
+                buffer.buffer.readSlice(buffer.readableBytes() - 1)
+            } else {
+                buffer.buffer
+            }
+        val message = huffmanCodec.decode(huffmanSlice)
+        val clanType =
+            if (hasTrailingByte) {
+                buffer.g1()
+            } else {
+                -1
+            }
+        val pattern =
+            if (patternArray != null) {
+                MessagePublic.MessageColourPattern(patternArray)
+            } else {
+                null
+            }
+        return MessagePublic(
+            type,
+            colour,
+            effect,
+            message,
+            pattern,
+            clanType,
+        )
+    }
+
+    private companion object {
+        private const val CLAN_MAIN_CHANNEL_TYPE: Int = 3
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/ConnectionTelemetryDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/ConnectionTelemetryDecoder.kt
new file mode 100644
index 000000000..0d21260bd
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/ConnectionTelemetryDecoder.kt
@@ -0,0 +1,42 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.client.ConnectionTelemetry
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class ConnectionTelemetryDecoder : ProxyMessageDecoder<ConnectionTelemetry> {
+    override val prot: ClientProt = GameClientProt.CONNECTION_TELEMETRY
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ConnectionTelemetry {
+        val connectionLostDuration = buffer.g2()
+        val loginDuration = buffer.g2()
+        val unusedDuration = buffer.g2()
+        check(unusedDuration == 0) {
+            "Unknown duration detected: $unusedDuration"
+        }
+        val clientState = buffer.g2()
+        val unused1 = buffer.g2()
+        check(unused1 == 0) {
+            "Unused1 property value detected: $unused1"
+        }
+        val loginCount = buffer.g2()
+        val unused2 = buffer.g2()
+        check(unused2 == 0) {
+            "Unused2 property value detected: $unused2"
+        }
+        return ConnectionTelemetry(
+            connectionLostDuration,
+            loginDuration,
+            clientState,
+            loginCount,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/DetectModifiedClientDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/DetectModifiedClientDecoder.kt
new file mode 100644
index 000000000..cf608c6c2
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/DetectModifiedClientDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.client.DetectModifiedClient
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class DetectModifiedClientDecoder : ProxyMessageDecoder<DetectModifiedClient> {
+    override val prot: ClientProt = GameClientProt.DETECT_MODIFIED_CLIENT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): DetectModifiedClient {
+        val code = buffer.g4()
+        return DetectModifiedClient(code)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/IdleDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/IdleDecoder.kt
new file mode 100644
index 000000000..7801de6b2
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/IdleDecoder.kt
@@ -0,0 +1,19 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.client.Idle
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class IdleDecoder : ProxyMessageDecoder<Idle> {
+    override val prot: ClientProt = GameClientProt.IDLE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): Idle = Idle
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/MapBuildCompleteDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/MapBuildCompleteDecoder.kt
new file mode 100644
index 000000000..ca2229328
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/MapBuildCompleteDecoder.kt
@@ -0,0 +1,19 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.client.MapBuildComplete
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class MapBuildCompleteDecoder : ProxyMessageDecoder<MapBuildComplete> {
+    override val prot: ClientProt = GameClientProt.MAP_BUILD_COMPLETE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MapBuildComplete = MapBuildComplete
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/MembershipPromotionEligibilityDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/MembershipPromotionEligibilityDecoder.kt
new file mode 100644
index 000000000..ec20c820c
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/MembershipPromotionEligibilityDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.client.MembershipPromotionEligibility
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class MembershipPromotionEligibilityDecoder : ProxyMessageDecoder<MembershipPromotionEligibility> {
+    override val prot: ClientProt = GameClientProt.MEMBERSHIP_PROMOTION_ELIGIBILITY
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MembershipPromotionEligibility {
+        val eligibleForIntroductoryPrice = buffer.g1()
+        val eligibleForTrialPurchase = buffer.g1()
+        return MembershipPromotionEligibility(
+            eligibleForIntroductoryPrice,
+            eligibleForTrialPurchase,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/NoTimeoutDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/NoTimeoutDecoder.kt
new file mode 100644
index 000000000..7453ccaaa
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/NoTimeoutDecoder.kt
@@ -0,0 +1,19 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.client.NoTimeout
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class NoTimeoutDecoder : ProxyMessageDecoder<NoTimeout> {
+    override val prot: ClientProt = GameClientProt.NO_TIMEOUT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): NoTimeout = NoTimeout
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/RSevenStatusDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/RSevenStatusDecoder.kt
new file mode 100644
index 000000000..fd142ba71
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/RSevenStatusDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.client.RSevenStatus
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class RSevenStatusDecoder : ProxyMessageDecoder<RSevenStatus> {
+    override val prot: ClientProt = GameClientProt.RSEVEN_STATUS
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): RSevenStatus {
+        val packed = buffer.g1()
+        return RSevenStatus(packed)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/ReflectionCheckReplyDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/ReflectionCheckReplyDecoder.kt
new file mode 100644
index 000000000..ed8f89803
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/ReflectionCheckReplyDecoder.kt
@@ -0,0 +1,135 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.buffer.extensions.checkCRC32
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.client.ReflectionCheckReply
+import net.rsprox.protocol.game.incoming.model.misc.client.ReflectionCheckReply.ErrorResult
+import net.rsprox.protocol.reflection.ReflectionCheck
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.session.getReflectionChecks
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+import java.io.IOException
+import java.io.InvalidClassException
+import java.io.OptionalDataException
+import java.io.StreamCorruptedException
+import java.lang.reflect.InvocationTargetException
+
+@Consistent
+internal class ReflectionCheckReplyDecoder : ProxyMessageDecoder<ReflectionCheckReply> {
+    override val prot: ClientProt = GameClientProt.REFLECTION_CHECK_REPLY
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ReflectionCheckReply {
+        val id = buffer.g4()
+        val checks = session.getReflectionChecks().remove(id)
+        checkNotNull(checks) {
+            "Unable to link reflection check reply to request: $id"
+        }
+        val results = ArrayList<ReflectionCheckReply.ReflectionCheckResult<*>>(checks.size)
+        for (check in checks) {
+            val opcode = buffer.g1s()
+            if (opcode < 0) {
+                results +=
+                    if (opcode <= -10) {
+                        val throwable = getExecutionThrowableClass(opcode)
+                        ErrorResult(
+                            check,
+                            ErrorResult.ThrowableResultType.ExecutionThrowable(throwable),
+                        )
+                    } else {
+                        val throwable = getConstructionThrowableClass(opcode)
+                        ErrorResult(
+                            check,
+                            ErrorResult.ThrowableResultType.ConstructionThrowable(throwable),
+                        )
+                    }
+                continue
+            }
+            when (check) {
+                is ReflectionCheck.GetFieldValue -> {
+                    val result = buffer.g4()
+                    results += ReflectionCheckReply.GetFieldValueResult(check, result)
+                }
+                is ReflectionCheck.SetFieldValue -> {
+                    results += ReflectionCheckReply.SetFieldValueResult(check)
+                }
+                is ReflectionCheck.GetFieldModifiers -> {
+                    val modifiers = buffer.g4()
+                    results += ReflectionCheckReply.GetFieldModifiersResult(check, modifiers)
+                }
+                is ReflectionCheck.InvokeMethod -> {
+                    results +=
+                        when (opcode) {
+                            0 -> ReflectionCheckReply.InvokeMethodResult(check, ReflectionCheckReply.NullReturnValue)
+                            1 ->
+                                ReflectionCheckReply.InvokeMethodResult(
+                                    check,
+                                    ReflectionCheckReply.NumberReturnValue(buffer.g8()),
+                                )
+                            2 ->
+                                ReflectionCheckReply.InvokeMethodResult(
+                                    check,
+                                    ReflectionCheckReply.StringReturnValue(buffer.gjstr()),
+                                )
+                            4 -> ReflectionCheckReply.InvokeMethodResult(check, ReflectionCheckReply.UnknownReturnValue)
+                            else -> throw IllegalStateException("Unknown opcode for method invocation: $opcode")
+                        }
+                }
+                is ReflectionCheck.GetMethodModifiers -> {
+                    val modifiers = buffer.g4()
+                    results += ReflectionCheckReply.GetMethodModifiersResult(check, modifiers)
+                }
+            }
+        }
+        buffer.readerIndex(buffer.writerIndex())
+        if (!buffer.buffer.checkCRC32()) {
+            throw IllegalStateException("CRC mismatch!")
+        }
+        return ReflectionCheckReply(
+            id,
+            results,
+        )
+    }
+
+    /**
+     * Gets the throwable class corresponding to each opcode during the reflection check execution.
+     * @param opcode the opcode value
+     * @return the throwable class corresponding to that opcode
+     */
+    private fun getExecutionThrowableClass(opcode: Int): Class<out Throwable> =
+        when (opcode) {
+            -10 -> ClassNotFoundException::class.java
+            -11 -> InvalidClassException::class.java
+            -12 -> StreamCorruptedException::class.java
+            -13 -> OptionalDataException::class.java
+            -14 -> IllegalAccessException::class.java
+            -15 -> IllegalArgumentException::class.java
+            -16 -> InvocationTargetException::class.java
+            -17 -> SecurityException::class.java
+            -18 -> IOException::class.java
+            -19 -> NullPointerException::class.java
+            -20 -> Exception::class.java
+            -21 -> Throwable::class.java
+            else -> throw IllegalArgumentException("Unknown execution throwable opcode: $opcode")
+        }
+
+    /**
+     * Gets the throwable class corresponding to each opcode during the reflection check construction.
+     * @param opcode the opcode value
+     * @return the throwable class corresponding to that opcode
+     */
+    private fun getConstructionThrowableClass(opcode: Int): Class<out Throwable> =
+        when (opcode) {
+            -1 -> ClassNotFoundException::class.java
+            -2 -> SecurityException::class.java
+            -3 -> NullPointerException::class.java
+            -4 -> Exception::class.java
+            -5 -> Throwable::class.java
+            else -> throw IllegalArgumentException("Unknown construction throwable opcode: $opcode")
+        }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/SendPingReplyDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/SendPingReplyDecoder.kt
new file mode 100644
index 000000000..9d03ea111
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/SendPingReplyDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.client.SendPingReply
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class SendPingReplyDecoder : ProxyMessageDecoder<SendPingReply> {
+    override val prot: ClientProt = GameClientProt.SEND_PING_REPLY
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): SendPingReply {
+        val value1 = buffer.g4Alt3()
+        val value2 = buffer.g4Alt1()
+        val fps = buffer.g1Alt3()
+        val gcPercentTime = buffer.g1Alt3()
+        return SendPingReply(
+            fps,
+            gcPercentTime,
+            value1,
+            value2,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/SoundJingleEndDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/SoundJingleEndDecoder.kt
new file mode 100644
index 000000000..f076d8af7
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/SoundJingleEndDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.client.SoundJingleEnd
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class SoundJingleEndDecoder : ProxyMessageDecoder<SoundJingleEnd> {
+    override val prot: ClientProt = GameClientProt.SOUND_JINGLEEND
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): SoundJingleEnd {
+        val jingle = buffer.g4()
+        return SoundJingleEnd(jingle)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/WindowStatusDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/WindowStatusDecoder.kt
new file mode 100644
index 000000000..66b96ffad
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/client/WindowStatusDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.client.WindowStatus
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class WindowStatusDecoder : ProxyMessageDecoder<WindowStatus> {
+    override val prot: ClientProt = GameClientProt.WINDOW_STATUS
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): WindowStatus {
+        val windowMode = buffer.g1()
+        val frameWidth = buffer.g2()
+        val frameHeight = buffer.g2()
+        return WindowStatus(
+            windowMode,
+            frameWidth,
+            frameHeight,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/BugReportDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/BugReportDecoder.kt
new file mode 100644
index 000000000..9d507ac33
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/BugReportDecoder.kt
@@ -0,0 +1,34 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.user.BugReport
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class BugReportDecoder : ProxyMessageDecoder<BugReport> {
+    override val prot: ClientProt = GameClientProt.BUG_REPORT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): BugReport {
+        val description = buffer.gjstr()
+        val type = buffer.g1Alt3()
+        val instructions = buffer.gjstr()
+        check(description.length <= 500) {
+            "Bug report description length cannot exceed 500 characters."
+        }
+        check(instructions.length <= 500) {
+            "Bug report instructions length cannot exceed 500 characters."
+        }
+        return BugReport(
+            type,
+            description,
+            instructions,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/ClickWorldMapDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/ClickWorldMapDecoder.kt
new file mode 100644
index 000000000..57c0a2994
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/ClickWorldMapDecoder.kt
@@ -0,0 +1,21 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.game.incoming.model.misc.user.ClickWorldMap
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class ClickWorldMapDecoder : ProxyMessageDecoder<ClickWorldMap> {
+    override val prot: ClientProt = GameClientProt.CLICKWORLDMAP
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ClickWorldMap {
+        val packed = buffer.g4()
+        return ClickWorldMap(CoordGrid(packed))
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/ClientCheatDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/ClientCheatDecoder.kt
new file mode 100644
index 000000000..4051fa56f
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/ClientCheatDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.user.ClientCheat
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class ClientCheatDecoder : ProxyMessageDecoder<ClientCheat> {
+    override val prot: ClientProt = GameClientProt.CLIENT_CHEAT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ClientCheat {
+        val command = buffer.gjstr()
+        return ClientCheat(command)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/CloseModalDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/CloseModalDecoder.kt
new file mode 100644
index 000000000..c5899ab64
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/CloseModalDecoder.kt
@@ -0,0 +1,19 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.user.CloseModal
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class CloseModalDecoder : ProxyMessageDecoder<CloseModal> {
+    override val prot: ClientProt = GameClientProt.CLOSE_MODAL
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): CloseModal = CloseModal
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/HiscoreRequestDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/HiscoreRequestDecoder.kt
new file mode 100644
index 000000000..1a1495e74
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/HiscoreRequestDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.user.HiscoreRequest
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class HiscoreRequestDecoder : ProxyMessageDecoder<HiscoreRequest> {
+    override val prot: ClientProt = GameClientProt.HISCORE_REQUEST
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): HiscoreRequest {
+        val requestId = buffer.g1()
+        val type = buffer.g1()
+        val name = buffer.gjstr()
+        return HiscoreRequest(
+            type,
+            requestId,
+            name,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/IfCrmViewClickDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/IfCrmViewClickDecoder.kt
new file mode 100644
index 000000000..4444c61c0
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/IfCrmViewClickDecoder.kt
@@ -0,0 +1,33 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt3
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.user.IfCrmViewClick
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class IfCrmViewClickDecoder : ProxyMessageDecoder<IfCrmViewClick> {
+    override val prot: ClientProt = GameClientProt.IF_CRMVIEW_CLICK
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfCrmViewClick {
+        val sub = buffer.g2Alt3()
+        val combinedId = buffer.gCombinedIdAlt3()
+        val behaviour1 = buffer.g4Alt2()
+        val behaviour2 = buffer.g4()
+        val behaviour3 = buffer.g4Alt3()
+        val serverTarget = buffer.g4()
+        return IfCrmViewClick(
+            serverTarget,
+            combinedId,
+            sub,
+            behaviour1,
+            behaviour2,
+            behaviour3,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/MoveGameClickDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/MoveGameClickDecoder.kt
new file mode 100644
index 000000000..3300dc277
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/MoveGameClickDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.user.MoveGameClick
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class MoveGameClickDecoder : ProxyMessageDecoder<MoveGameClick> {
+    override val prot: ClientProt = GameClientProt.MOVE_GAMECLICK
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MoveGameClick {
+        val keyCombination = buffer.g1()
+        val x = buffer.g2Alt3()
+        val z = buffer.g2Alt1()
+        return MoveGameClick(
+            x,
+            z,
+            keyCombination,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/MoveMinimapClickDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/MoveMinimapClickDecoder.kt
new file mode 100644
index 000000000..0887d16ed
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/MoveMinimapClickDecoder.kt
@@ -0,0 +1,59 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.user.MoveMinimapClick
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class MoveMinimapClickDecoder : ProxyMessageDecoder<MoveMinimapClick> {
+    override val prot: ClientProt = GameClientProt.MOVE_MINIMAPCLICK
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MoveMinimapClick {
+        // The x, z and keyCombination get scrambled between revisions
+        val keyCombination = buffer.g1()
+        val x = buffer.g2Alt3()
+        val z = buffer.g2Alt1()
+
+        // The arguments below are consistent across revisions
+        val minimapWidth = buffer.g1()
+        val minimapHeight = buffer.g1()
+        val cameraAngleY = buffer.g2()
+        val checkpoint1 = buffer.g1()
+        check(checkpoint1 == 57) {
+            "Invalid checkpoint 1: $checkpoint1"
+        }
+        val checkpoint2 = buffer.g1()
+        check(checkpoint2 == 0) {
+            "Invalid checkpoint 2: $checkpoint2"
+        }
+        val checkpoint3 = buffer.g1()
+        check(checkpoint3 == 0) {
+            "Invalid checkpoint 3: $checkpoint3"
+        }
+        val checkpoint4 = buffer.g1()
+        check(checkpoint4 == 89) {
+            "Invalid checkpoint 4: $checkpoint4"
+        }
+        val fineX = buffer.g2()
+        val fineZ = buffer.g2()
+        val checkpoint5 = buffer.g1()
+        check(checkpoint5 == 63) {
+            "Invalid checkpoint 5: $checkpoint5"
+        }
+        return MoveMinimapClick(
+            x,
+            z,
+            keyCombination,
+            minimapWidth,
+            minimapHeight,
+            cameraAngleY,
+            fineX,
+            fineZ,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/OculusLeaveDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/OculusLeaveDecoder.kt
new file mode 100644
index 000000000..87ca7cad9
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/OculusLeaveDecoder.kt
@@ -0,0 +1,19 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.user.OculusLeave
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class OculusLeaveDecoder : ProxyMessageDecoder<OculusLeave> {
+    override val prot: ClientProt = GameClientProt.OCULUS_LEAVE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OculusLeave = OculusLeave
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/SendSnapshotDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/SendSnapshotDecoder.kt
new file mode 100644
index 000000000..53a8aef31
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/SendSnapshotDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.user.SendSnapshot
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class SendSnapshotDecoder : ProxyMessageDecoder<SendSnapshot> {
+    override val prot: ClientProt = GameClientProt.SEND_SNAPSHOT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): SendSnapshot {
+        val name = buffer.gjstr()
+        val ruleId = buffer.g1()
+        val mute = buffer.g1() == 1
+        return SendSnapshot(
+            name,
+            ruleId,
+            mute,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/SetChatFilterSettingsDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/SetChatFilterSettingsDecoder.kt
new file mode 100644
index 000000000..9c1ad9d34
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/SetChatFilterSettingsDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.user.SetChatFilterSettings
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class SetChatFilterSettingsDecoder : ProxyMessageDecoder<SetChatFilterSettings> {
+    override val prot: ClientProt = GameClientProt.SET_CHATFILTERSETTINGS
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): SetChatFilterSettings {
+        val publicChatFilter = buffer.g1()
+        val privateChatFilter = buffer.g1()
+        val tradeChatFilter = buffer.g1()
+        return SetChatFilterSettings(
+            publicChatFilter,
+            privateChatFilter,
+            tradeChatFilter,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/SetHeadingDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/SetHeadingDecoder.kt
new file mode 100644
index 000000000..3bc8581b5
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/SetHeadingDecoder.kt
@@ -0,0 +1,20 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.user.SetHeading
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class SetHeadingDecoder : ProxyMessageDecoder<SetHeading> {
+    override val prot: ClientProt = GameClientProt.SET_HEADING
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): SetHeading {
+        val heading = buffer.g1Alt3()
+        return SetHeading(heading)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/TeleportDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/TeleportDecoder.kt
new file mode 100644
index 000000000..f013aca5e
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/misc/user/TeleportDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.misc.user.Teleport
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class TeleportDecoder : ProxyMessageDecoder<Teleport> {
+    override val prot: ClientProt = GameClientProt.TELEPORT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): Teleport {
+        val z = buffer.g2()
+        val x = buffer.g2Alt1()
+        val oculusSyncValue = buffer.g4Alt1()
+        val level = buffer.g1()
+        return Teleport(
+            oculusSyncValue,
+            x,
+            z,
+            level,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc1V1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc1V1Decoder.kt
new file mode 100644
index 000000000..d22002dfd
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc1V1Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpNpc1V1Decoder : ProxyMessageDecoder<OpNpcV1> {
+    override val prot: ClientProt = GameClientProt.OPNPC1_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpNpcV1 {
+        val index = buffer.g2Alt3()
+        val controlKey = buffer.g1Alt1() == 1
+        return OpNpcV1(
+            index,
+            controlKey,
+            1,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc1V2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc1V2Decoder.kt
new file mode 100644
index 000000000..d11436def
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc1V2Decoder.kt
@@ -0,0 +1,27 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpNpc1V2Decoder : ProxyMessageDecoder<OpNpcV2> {
+    override val prot: ClientProt = GameClientProt.OPNPC1_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpNpcV2 {
+        val index = buffer.g2Alt1()
+        val controlKey = buffer.g1Alt2() == 1
+        val subop = buffer.g1()
+        return OpNpcV2(
+            index,
+            controlKey,
+            1,
+            subop,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc2V1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc2V1Decoder.kt
new file mode 100644
index 000000000..3f3f7f01b
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc2V1Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpNpc2V1Decoder : ProxyMessageDecoder<OpNpcV1> {
+    override val prot: ClientProt = GameClientProt.OPNPC2_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpNpcV1 {
+        val index = buffer.g2()
+        val controlKey = buffer.g1() == 1
+        return OpNpcV1(
+            index,
+            controlKey,
+            2,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc2V2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc2V2Decoder.kt
new file mode 100644
index 000000000..802c46aaa
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc2V2Decoder.kt
@@ -0,0 +1,27 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpNpc2V2Decoder : ProxyMessageDecoder<OpNpcV2> {
+    override val prot: ClientProt = GameClientProt.OPNPC2_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpNpcV2 {
+        val controlKey = buffer.g1Alt1() == 1
+        val subop = buffer.g1Alt1()
+        val index = buffer.g2Alt3()
+        return OpNpcV2(
+            index,
+            controlKey,
+            2,
+            subop,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc3V1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc3V1Decoder.kt
new file mode 100644
index 000000000..a15741826
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc3V1Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpNpc3V1Decoder : ProxyMessageDecoder<OpNpcV1> {
+    override val prot: ClientProt = GameClientProt.OPNPC3_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpNpcV1 {
+        val controlKey = buffer.g1() == 1
+        val index = buffer.g2Alt1()
+        return OpNpcV1(
+            index,
+            controlKey,
+            3,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc3V2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc3V2Decoder.kt
new file mode 100644
index 000000000..463d01067
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc3V2Decoder.kt
@@ -0,0 +1,27 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpNpc3V2Decoder : ProxyMessageDecoder<OpNpcV2> {
+    override val prot: ClientProt = GameClientProt.OPNPC3_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpNpcV2 {
+        val controlKey = buffer.g1Alt2() == 1
+        val subop = buffer.g1Alt1()
+        val index = buffer.g2Alt3()
+        return OpNpcV2(
+            index,
+            controlKey,
+            3,
+            subop,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc4V1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc4V1Decoder.kt
new file mode 100644
index 000000000..2878ca2b9
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc4V1Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpNpc4V1Decoder : ProxyMessageDecoder<OpNpcV1> {
+    override val prot: ClientProt = GameClientProt.OPNPC4_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpNpcV1 {
+        val controlKey = buffer.g1Alt2() == 1
+        val index = buffer.g2()
+        return OpNpcV1(
+            index,
+            controlKey,
+            4,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc4V2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc4V2Decoder.kt
new file mode 100644
index 000000000..4ca8af720
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc4V2Decoder.kt
@@ -0,0 +1,27 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpNpc4V2Decoder : ProxyMessageDecoder<OpNpcV2> {
+    override val prot: ClientProt = GameClientProt.OPNPC4_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpNpcV2 {
+        val subop = buffer.g1Alt2()
+        val index = buffer.g2Alt1()
+        val controlKey = buffer.g1Alt2() == 1
+        return OpNpcV2(
+            index,
+            controlKey,
+            4,
+            subop,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc5V1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc5V1Decoder.kt
new file mode 100644
index 000000000..259ed2063
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc5V1Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpNpc5V1Decoder : ProxyMessageDecoder<OpNpcV1> {
+    override val prot: ClientProt = GameClientProt.OPNPC5_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpNpcV1 {
+        val index = buffer.g2Alt2()
+        val controlKey = buffer.g1Alt3() == 1
+        return OpNpcV1(
+            index,
+            controlKey,
+            5,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc5V2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc5V2Decoder.kt
new file mode 100644
index 000000000..5502a623a
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc5V2Decoder.kt
@@ -0,0 +1,27 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpNpc5V2Decoder : ProxyMessageDecoder<OpNpcV2> {
+    override val prot: ClientProt = GameClientProt.OPNPC5_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpNpcV2 {
+        val subop = buffer.g1Alt2()
+        val index = buffer.g2Alt2()
+        val controlKey = buffer.g1Alt3() == 1
+        return OpNpcV2(
+            index,
+            controlKey,
+            5,
+            subop,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc6Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc6Decoder.kt
new file mode 100644
index 000000000..e6369979a
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpc6Decoder.kt
@@ -0,0 +1,20 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpc6
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpNpc6Decoder : ProxyMessageDecoder<OpNpc6> {
+    override val prot: ClientProt = GameClientProt.OPNPC6
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpNpc6 {
+        val id = buffer.g2Alt1()
+        return OpNpc6(id)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpcTDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpcTDecoder.kt
new file mode 100644
index 000000000..fa9bbc7bb
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/npcs/OpNpcTDecoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt3
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcT
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpNpcTDecoder : ProxyMessageDecoder<OpNpcT> {
+    override val prot: ClientProt = GameClientProt.OPNPCT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpNpcT {
+        val index = buffer.g2Alt3()
+        val selectedObj = buffer.g2Alt3()
+        val selectedCombinedId = buffer.gCombinedIdAlt3()
+        val selectedSub = buffer.g2Alt1()
+        val controlKey = buffer.g1Alt1() == 1
+        return OpNpcT(
+            index,
+            controlKey,
+            selectedCombinedId,
+            selectedSub,
+            selectedObj,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj1V1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj1V1Decoder.kt
new file mode 100644
index 000000000..59a1440be
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj1V1Decoder.kt
@@ -0,0 +1,29 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.objs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpObj1V1Decoder : ProxyMessageDecoder<OpObjV1> {
+    override val prot: ClientProt = GameClientProt.OPOBJ1_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpObjV1 {
+        val x = buffer.g2Alt3()
+        val z = buffer.g2Alt2()
+        val id = buffer.g2Alt2()
+        val controlKey = buffer.g1Alt2() == 1
+        return OpObjV1(
+            id,
+            x,
+            z,
+            controlKey,
+            1,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj1V2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj1V2Decoder.kt
new file mode 100644
index 000000000..9136c150e
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj1V2Decoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.objs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpObj1V2Decoder : ProxyMessageDecoder<OpObjV2> {
+    override val prot: ClientProt = GameClientProt.OPOBJ1_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpObjV2 {
+        val subop = buffer.g1Alt1()
+        val controlKey = buffer.g1Alt1() == 1
+        val z = buffer.g2Alt1()
+        val id = buffer.g2Alt1()
+        val x = buffer.g2Alt1()
+        return OpObjV2(
+            id,
+            x,
+            z,
+            controlKey,
+            1,
+            subop,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj2V1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj2V1Decoder.kt
new file mode 100644
index 000000000..35932da4b
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj2V1Decoder.kt
@@ -0,0 +1,29 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.objs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpObj2V1Decoder : ProxyMessageDecoder<OpObjV1> {
+    override val prot: ClientProt = GameClientProt.OPOBJ2_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpObjV1 {
+        val id = buffer.g2Alt1()
+        val controlKey = buffer.g1Alt2() == 1
+        val z = buffer.g2Alt3()
+        val x = buffer.g2Alt1()
+        return OpObjV1(
+            id,
+            x,
+            z,
+            controlKey,
+            2,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj2V2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj2V2Decoder.kt
new file mode 100644
index 000000000..5ab0fdf6b
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj2V2Decoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.objs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpObj2V2Decoder : ProxyMessageDecoder<OpObjV2> {
+    override val prot: ClientProt = GameClientProt.OPOBJ2_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpObjV2 {
+        val controlKey = buffer.g1() == 1
+        val id = buffer.g2()
+        val x = buffer.g2Alt1()
+        val subop = buffer.g1Alt3()
+        val z = buffer.g2()
+        return OpObjV2(
+            id,
+            x,
+            z,
+            controlKey,
+            2,
+            subop,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj3V1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj3V1Decoder.kt
new file mode 100644
index 000000000..e9462a012
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj3V1Decoder.kt
@@ -0,0 +1,29 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.objs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpObj3V1Decoder : ProxyMessageDecoder<OpObjV1> {
+    override val prot: ClientProt = GameClientProt.OPOBJ3_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpObjV1 {
+        val controlKey = buffer.g1() == 1
+        val z = buffer.g2Alt2()
+        val id = buffer.g2Alt2()
+        val x = buffer.g2Alt3()
+        return OpObjV1(
+            id,
+            x,
+            z,
+            controlKey,
+            3,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj3V2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj3V2Decoder.kt
new file mode 100644
index 000000000..4213a2345
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj3V2Decoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.objs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpObj3V2Decoder : ProxyMessageDecoder<OpObjV2> {
+    override val prot: ClientProt = GameClientProt.OPOBJ3_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpObjV2 {
+        val subop = buffer.g1Alt2()
+        val controlKey = buffer.g1() == 1
+        val x = buffer.g2Alt3()
+        val z = buffer.g2Alt3()
+        val id = buffer.g2Alt1()
+        return OpObjV2(
+            id,
+            x,
+            z,
+            controlKey,
+            3,
+            subop,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj4V1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj4V1Decoder.kt
new file mode 100644
index 000000000..7d47fb351
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj4V1Decoder.kt
@@ -0,0 +1,29 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.objs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpObj4V1Decoder : ProxyMessageDecoder<OpObjV1> {
+    override val prot: ClientProt = GameClientProt.OPOBJ4_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpObjV1 {
+        val controlKey = buffer.g1Alt1() == 1
+        val z = buffer.g2Alt1()
+        val x = buffer.g2()
+        val id = buffer.g2()
+        return OpObjV1(
+            id,
+            x,
+            z,
+            controlKey,
+            4,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj4V2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj4V2Decoder.kt
new file mode 100644
index 000000000..e8e70b5a4
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj4V2Decoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.objs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpObj4V2Decoder : ProxyMessageDecoder<OpObjV2> {
+    override val prot: ClientProt = GameClientProt.OPOBJ4_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpObjV2 {
+        val subop = buffer.g1Alt3()
+        val x = buffer.g2Alt1()
+        val z = buffer.g2()
+        val controlKey = buffer.g1Alt2() == 1
+        val id = buffer.g2()
+        return OpObjV2(
+            id,
+            x,
+            z,
+            controlKey,
+            4,
+            subop,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj5V1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj5V1Decoder.kt
new file mode 100644
index 000000000..41c68b3a2
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj5V1Decoder.kt
@@ -0,0 +1,29 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.objs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpObj5V1Decoder : ProxyMessageDecoder<OpObjV1> {
+    override val prot: ClientProt = GameClientProt.OPOBJ5_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpObjV1 {
+        val id = buffer.g2Alt1()
+        val x = buffer.g2Alt1()
+        val controlKey = buffer.g1Alt3() == 1
+        val z = buffer.g2()
+        return OpObjV1(
+            id,
+            x,
+            z,
+            controlKey,
+            5,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj5V2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj5V2Decoder.kt
new file mode 100644
index 000000000..649acec81
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj5V2Decoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.objs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpObj5V2Decoder : ProxyMessageDecoder<OpObjV2> {
+    override val prot: ClientProt = GameClientProt.OPOBJ5_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpObjV2 {
+        val controlKey = buffer.g1Alt2() == 1
+        val z = buffer.g2Alt1()
+        val x = buffer.g2Alt1()
+        val id = buffer.g2()
+        val subop = buffer.g1Alt1()
+        return OpObjV2(
+            id,
+            x,
+            z,
+            controlKey,
+            5,
+            subop,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj6Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj6Decoder.kt
new file mode 100644
index 000000000..7baa8cda6
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObj6Decoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.objs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.objs.OpObj6
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpObj6Decoder : ProxyMessageDecoder<OpObj6> {
+    override val prot: ClientProt = GameClientProt.OPOBJ6
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpObj6 {
+        val z = buffer.g2()
+        val id = buffer.g2()
+        val x = buffer.g2Alt1()
+        return OpObj6(
+            id,
+            x,
+            z,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObjTDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObjTDecoder.kt
new file mode 100644
index 000000000..469860795
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/objs/OpObjTDecoder.kt
@@ -0,0 +1,35 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.objs
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt2
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.objs.OpObjT
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpObjTDecoder : ProxyMessageDecoder<OpObjT> {
+    override val prot: ClientProt = GameClientProt.OPOBJT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpObjT {
+        val selectedSub = buffer.g2Alt3()
+        val id = buffer.g2Alt3()
+        val z = buffer.g2Alt3()
+        val selectedCombinedId = buffer.gCombinedIdAlt2()
+        val x = buffer.g2()
+        val selectedObj = buffer.g2Alt3()
+        val controlKey = buffer.g1Alt1() == 1
+        return OpObjT(
+            id,
+            x,
+            z,
+            controlKey,
+            selectedCombinedId,
+            selectedSub,
+            selectedObj,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer1Decoder.kt
new file mode 100644
index 000000000..6b614cdf2
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer1Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.players
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.players.OpPlayer
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpPlayer1Decoder : ProxyMessageDecoder<OpPlayer> {
+    override val prot: ClientProt = GameClientProt.OPPLAYER1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpPlayer {
+        val controlKey = buffer.g1Alt1() == 1
+        val index = buffer.g2Alt1()
+        return OpPlayer(
+            index,
+            controlKey,
+            1,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer2Decoder.kt
new file mode 100644
index 000000000..8b4cc7371
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer2Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.players
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.players.OpPlayer
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpPlayer2Decoder : ProxyMessageDecoder<OpPlayer> {
+    override val prot: ClientProt = GameClientProt.OPPLAYER2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpPlayer {
+        val controlKey = buffer.g1Alt3() == 1
+        val index = buffer.g2Alt3()
+        return OpPlayer(
+            index,
+            controlKey,
+            2,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer3Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer3Decoder.kt
new file mode 100644
index 000000000..639aebcc5
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer3Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.players
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.players.OpPlayer
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpPlayer3Decoder : ProxyMessageDecoder<OpPlayer> {
+    override val prot: ClientProt = GameClientProt.OPPLAYER3
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpPlayer {
+        val controlKey = buffer.g1Alt3() == 1
+        val index = buffer.g2Alt1()
+        return OpPlayer(
+            index,
+            controlKey,
+            3,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer4Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer4Decoder.kt
new file mode 100644
index 000000000..a3e9938bb
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer4Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.players
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.players.OpPlayer
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpPlayer4Decoder : ProxyMessageDecoder<OpPlayer> {
+    override val prot: ClientProt = GameClientProt.OPPLAYER4
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpPlayer {
+        val index = buffer.g2Alt2()
+        val controlKey = buffer.g1() == 1
+        return OpPlayer(
+            index,
+            controlKey,
+            4,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer5Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer5Decoder.kt
new file mode 100644
index 000000000..beab43834
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer5Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.players
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.players.OpPlayer
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpPlayer5Decoder : ProxyMessageDecoder<OpPlayer> {
+    override val prot: ClientProt = GameClientProt.OPPLAYER5
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpPlayer {
+        val index = buffer.g2Alt2()
+        val controlKey = buffer.g1Alt2() == 1
+        return OpPlayer(
+            index,
+            controlKey,
+            5,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer6Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer6Decoder.kt
new file mode 100644
index 000000000..eef07132f
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer6Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.players
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.players.OpPlayer
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpPlayer6Decoder : ProxyMessageDecoder<OpPlayer> {
+    override val prot: ClientProt = GameClientProt.OPPLAYER6
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpPlayer {
+        val index = buffer.g2Alt1()
+        val controlKey = buffer.g1Alt1() == 1
+        return OpPlayer(
+            index,
+            controlKey,
+            6,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer7Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer7Decoder.kt
new file mode 100644
index 000000000..a59732297
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer7Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.players
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.players.OpPlayer
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpPlayer7Decoder : ProxyMessageDecoder<OpPlayer> {
+    override val prot: ClientProt = GameClientProt.OPPLAYER7
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpPlayer {
+        val controlKey = buffer.g1() == 1
+        val index = buffer.g2Alt2()
+        return OpPlayer(
+            index,
+            controlKey,
+            7,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer8Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer8Decoder.kt
new file mode 100644
index 000000000..1949c77f2
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayer8Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.players
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.players.OpPlayer
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpPlayer8Decoder : ProxyMessageDecoder<OpPlayer> {
+    override val prot: ClientProt = GameClientProt.OPPLAYER8
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpPlayer {
+        val controlKey = buffer.g1Alt1() == 1
+        val index = buffer.g2Alt1()
+        return OpPlayer(
+            index,
+            controlKey,
+            8,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayerTDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayerTDecoder.kt
new file mode 100644
index 000000000..b21b63023
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/players/OpPlayerTDecoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.players
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt2
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.players.OpPlayerT
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpPlayerTDecoder : ProxyMessageDecoder<OpPlayerT> {
+    override val prot: ClientProt = GameClientProt.OPPLAYERT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpPlayerT {
+        val selectedObj = buffer.g2Alt2()
+        val selectedSub = buffer.g2Alt1()
+        val controlKey = buffer.g1Alt2() == 1
+        val selectedCombinedId = buffer.gCombinedIdAlt2()
+        val index = buffer.g2()
+        return OpPlayerT(
+            index,
+            controlKey,
+            selectedCombinedId,
+            selectedSub,
+            selectedObj,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePCountDialogDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePCountDialogDecoder.kt
new file mode 100644
index 000000000..557ee9529
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePCountDialogDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.resumed
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.resumed.ResumePCountDialog
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class ResumePCountDialogDecoder : ProxyMessageDecoder<ResumePCountDialog> {
+    override val prot: ClientProt = GameClientProt.RESUME_P_COUNTDIALOG
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ResumePCountDialog {
+        val count = buffer.g4()
+        return ResumePCountDialog(count)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePCountDialogLongDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePCountDialogLongDecoder.kt
new file mode 100644
index 000000000..c3cb953be
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePCountDialogLongDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.resumed
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.resumed.ResumePCountDialogLong
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class ResumePCountDialogLongDecoder : ProxyMessageDecoder<ResumePCountDialogLong> {
+    override val prot: ClientProt = GameClientProt.RESUME_P_COUNTDIALOG_LONG
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ResumePCountDialogLong {
+        val count = buffer.g8()
+        return ResumePCountDialogLong(count)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePNameDialogDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePNameDialogDecoder.kt
new file mode 100644
index 000000000..7e1d91c62
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePNameDialogDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.resumed
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.resumed.ResumePNameDialog
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class ResumePNameDialogDecoder : ProxyMessageDecoder<ResumePNameDialog> {
+    override val prot: ClientProt = GameClientProt.RESUME_P_NAMEDIALOG
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ResumePNameDialog {
+        val name = buffer.gjstr()
+        return ResumePNameDialog(name)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePObjDialogDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePObjDialogDecoder.kt
new file mode 100644
index 000000000..187af4897
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePObjDialogDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.resumed
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.resumed.ResumePObjDialog
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class ResumePObjDialogDecoder : ProxyMessageDecoder<ResumePObjDialog> {
+    override val prot: ClientProt = GameClientProt.RESUME_P_OBJDIALOG
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ResumePObjDialog {
+        val obj = buffer.g2()
+        return ResumePObjDialog(obj)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePStringDialogDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePStringDialogDecoder.kt
new file mode 100644
index 000000000..5a728dd32
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePStringDialogDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.resumed
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.resumed.ResumePStringDialog
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class ResumePStringDialogDecoder : ProxyMessageDecoder<ResumePStringDialog> {
+    override val prot: ClientProt = GameClientProt.RESUME_P_STRINGDIALOG
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ResumePStringDialog {
+        val string = buffer.gjstr()
+        return ResumePStringDialog(string)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePauseButtonDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePauseButtonDecoder.kt
new file mode 100644
index 000000000..cf00a535a
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/resumed/ResumePauseButtonDecoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.resumed
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt2
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.resumed.ResumePauseButton
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class ResumePauseButtonDecoder : ProxyMessageDecoder<ResumePauseButton> {
+    override val prot: ClientProt = GameClientProt.RESUME_PAUSEBUTTON
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ResumePauseButton {
+        val sub = buffer.g2()
+        val combinedId = buffer.gCombinedIdAlt2()
+        return ResumePauseButton(
+            combinedId,
+            sub,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/social/FriendListAddDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/social/FriendListAddDecoder.kt
new file mode 100644
index 000000000..557646762
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/social/FriendListAddDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.social
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.social.FriendListAdd
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class FriendListAddDecoder : ProxyMessageDecoder<FriendListAdd> {
+    override val prot: ClientProt = GameClientProt.FRIENDLIST_ADD
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): FriendListAdd {
+        val name = buffer.gjstr()
+        return FriendListAdd(name)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/social/FriendListDelDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/social/FriendListDelDecoder.kt
new file mode 100644
index 000000000..7a031b4f6
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/social/FriendListDelDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.social
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.social.FriendListDel
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class FriendListDelDecoder : ProxyMessageDecoder<FriendListDel> {
+    override val prot: ClientProt = GameClientProt.FRIENDLIST_DEL
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): FriendListDel {
+        val name = buffer.gjstr()
+        return FriendListDel(name)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/social/IgnoreListAddDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/social/IgnoreListAddDecoder.kt
new file mode 100644
index 000000000..e6de36d80
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/social/IgnoreListAddDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.social
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.social.IgnoreListAdd
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class IgnoreListAddDecoder : ProxyMessageDecoder<IgnoreListAdd> {
+    override val prot: ClientProt = GameClientProt.IGNORELIST_ADD
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IgnoreListAdd {
+        val name = buffer.gjstr()
+        return IgnoreListAdd(name)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/social/IgnoreListDelDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/social/IgnoreListDelDecoder.kt
new file mode 100644
index 000000000..1bec92c8c
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/social/IgnoreListDelDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.social
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.social.IgnoreListDel
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+@Consistent
+public class IgnoreListDelDecoder : ProxyMessageDecoder<IgnoreListDel> {
+    override val prot: ClientProt = GameClientProt.IGNORELIST_DEL
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IgnoreListDel {
+        val name = buffer.gjstr()
+        return IgnoreListDel(name)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity1Decoder.kt
new file mode 100644
index 000000000..cb0c062a9
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity1Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.worldentities
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.worldentities.OpWorldEntity
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpWorldEntity1Decoder : ProxyMessageDecoder<OpWorldEntity> {
+    override val prot: ClientProt = GameClientProt.OPWORLDENTITY1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpWorldEntity {
+        val controlKey = buffer.g1Alt3() == 1
+        val index = buffer.g2Alt2()
+        return OpWorldEntity(
+            index,
+            controlKey,
+            1,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity2Decoder.kt
new file mode 100644
index 000000000..a7a8c81e9
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity2Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.worldentities
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.worldentities.OpWorldEntity
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpWorldEntity2Decoder : ProxyMessageDecoder<OpWorldEntity> {
+    override val prot: ClientProt = GameClientProt.OPWORLDENTITY2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpWorldEntity {
+        val controlKey = buffer.g1Alt2() == 1
+        val index = buffer.g2()
+        return OpWorldEntity(
+            index,
+            controlKey,
+            2,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity3Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity3Decoder.kt
new file mode 100644
index 000000000..cd425c8e7
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity3Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.worldentities
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.worldentities.OpWorldEntity
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpWorldEntity3Decoder : ProxyMessageDecoder<OpWorldEntity> {
+    override val prot: ClientProt = GameClientProt.OPWORLDENTITY3
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpWorldEntity {
+        val index = buffer.g2Alt2()
+        val controlKey = buffer.g1() == 1
+        return OpWorldEntity(
+            index,
+            controlKey,
+            3,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity4Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity4Decoder.kt
new file mode 100644
index 000000000..17ea580ef
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity4Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.worldentities
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.worldentities.OpWorldEntity
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpWorldEntity4Decoder : ProxyMessageDecoder<OpWorldEntity> {
+    override val prot: ClientProt = GameClientProt.OPWORLDENTITY4
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpWorldEntity {
+        val index = buffer.g2Alt1()
+        val controlKey = buffer.g1() == 1
+        return OpWorldEntity(
+            index,
+            controlKey,
+            4,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity5Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity5Decoder.kt
new file mode 100644
index 000000000..aa4a7b3c6
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity5Decoder.kt
@@ -0,0 +1,25 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.worldentities
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.worldentities.OpWorldEntity
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpWorldEntity5Decoder : ProxyMessageDecoder<OpWorldEntity> {
+    override val prot: ClientProt = GameClientProt.OPWORLDENTITY5
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpWorldEntity {
+        val controlKey = buffer.g1Alt1() == 1
+        val index = buffer.g2Alt1()
+        return OpWorldEntity(
+            index,
+            controlKey,
+            5,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity6Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity6Decoder.kt
new file mode 100644
index 000000000..9e24c6a63
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntity6Decoder.kt
@@ -0,0 +1,20 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.worldentities
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.worldentities.OpWorldEntity6
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpWorldEntity6Decoder : ProxyMessageDecoder<OpWorldEntity6> {
+    override val prot: ClientProt = GameClientProt.OPWORLDENTITY6
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpWorldEntity6 {
+        val id = buffer.g2()
+        return OpWorldEntity6(id)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntityTDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntityTDecoder.kt
new file mode 100644
index 000000000..44164aa5a
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/codec/worldentities/OpWorldEntityTDecoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.codec.worldentities
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt3
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.incoming.model.worldentities.OpWorldEntityT
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.incoming.decoder.prot.GameClientProt
+
+public class OpWorldEntityTDecoder : ProxyMessageDecoder<OpWorldEntityT> {
+    override val prot: ClientProt = GameClientProt.OPWORLDENTITYT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OpWorldEntityT {
+        val index = buffer.g2Alt1()
+        val selectedObj = buffer.g2Alt3()
+        val selectedSub = buffer.g2Alt1()
+        val controlKey = buffer.g1Alt2() == 1
+        val selectedCombinedId = buffer.gCombinedIdAlt3()
+        return OpWorldEntityT(
+            index,
+            controlKey,
+            selectedCombinedId,
+            selectedSub,
+            selectedObj,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/prot/ClientMessageDecoderRepository.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/prot/ClientMessageDecoderRepository.kt
new file mode 100644
index 000000000..90f74c36e
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/prot/ClientMessageDecoderRepository.kt
@@ -0,0 +1,216 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.prot
+
+import net.rsprot.compression.HuffmanCodec
+import net.rsprot.protocol.ProtRepository
+import net.rsprox.protocol.MessageDecoderRepository
+import net.rsprox.protocol.MessageDecoderRepositoryBuilder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.buttons.*
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.clan.AffinedClanSettingsAddBannedFromChannelDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.clan.AffinedClanSettingsSetMutedFromChannelDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.clan.ClanChannelFullRequestDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.clan.ClanChannelKickUserDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.clan.ClanSettingsFullRequestDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.events.*
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.friendchat.FriendChatJoinLeaveDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.friendchat.FriendChatKickDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.friendchat.FriendChatSetRankDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.locs.OpLoc1V1Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.locs.OpLoc1V2Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.locs.OpLoc2V1Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.locs.OpLoc2V2Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.locs.OpLoc3V1Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.locs.OpLoc3V2Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.locs.OpLoc4V1Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.locs.OpLoc4V2Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.locs.OpLoc5V1Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.locs.OpLoc5V2Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.locs.OpLoc6Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.locs.OpLocTDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.messaging.MessagePrivateDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.messaging.MessagePublicDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.client.*
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.client.ReflectionCheckReplyDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user.BugReportDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user.ClickWorldMapDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user.ClientCheatDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user.CloseModalDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user.HiscoreRequestDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user.IfCrmViewClickDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user.MoveGameClickDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user.MoveMinimapClickDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user.OculusLeaveDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user.SendSnapshotDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user.SetChatFilterSettingsDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user.SetHeadingDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.misc.user.TeleportDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs.OpNpc1V1Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs.OpNpc1V2Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs.OpNpc2V1Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs.OpNpc2V2Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs.OpNpc3V1Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs.OpNpc3V2Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs.OpNpc4V1Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs.OpNpc4V2Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs.OpNpc5V1Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs.OpNpc5V2Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs.OpNpc6Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.npcs.OpNpcTDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.objs.OpObj1V1Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.objs.OpObj1V2Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.objs.OpObj2V1Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.objs.OpObj2V2Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.objs.OpObj3V1Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.objs.OpObj3V2Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.objs.OpObj4V1Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.objs.OpObj4V2Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.objs.OpObj5V1Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.objs.OpObj5V2Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.objs.OpObj6Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.objs.OpObjTDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.players.OpPlayer1Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.players.OpPlayer2Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.players.OpPlayer3Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.players.OpPlayer4Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.players.OpPlayer5Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.players.OpPlayer6Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.players.OpPlayer7Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.players.OpPlayer8Decoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.players.OpPlayerTDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.resumed.ResumePCountDialogDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.resumed.ResumePCountDialogLongDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.resumed.ResumePNameDialogDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.resumed.ResumePObjDialogDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.resumed.ResumePStringDialogDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.resumed.ResumePauseButtonDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.social.FriendListAddDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.social.FriendListDelDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.social.IgnoreListAddDecoder
+import net.rsprox.protocol.v237.game.incoming.decoder.codec.social.IgnoreListDelDecoder
+
+internal object ClientMessageDecoderRepository {
+    @ExperimentalStdlibApi
+    fun build(huffmanCodec: HuffmanCodec): MessageDecoderRepository<GameClientProt> {
+        val protRepository = ProtRepository.of<GameClientProt>()
+        val builder =
+            MessageDecoderRepositoryBuilder(
+                protRepository,
+            ).apply {
+                bind(If1ButtonDecoder())
+                bind(IfButtonXDecoder())
+                bind(IfSubOpDecoder())
+                bind(IfButtonDDecoder())
+                bind(IfButtonTDecoder())
+                bind(IfRunScriptDecoder())
+
+                bind(OpNpc1V1Decoder())
+                bind(OpNpc2V1Decoder())
+                bind(OpNpc3V1Decoder())
+                bind(OpNpc4V1Decoder())
+                bind(OpNpc5V1Decoder())
+                bind(OpNpc1V2Decoder())
+                bind(OpNpc2V2Decoder())
+                bind(OpNpc3V2Decoder())
+                bind(OpNpc4V2Decoder())
+                bind(OpNpc5V2Decoder())
+                bind(OpNpc6Decoder())
+                bind(OpNpcTDecoder())
+
+                bind(OpLoc1V1Decoder())
+                bind(OpLoc2V1Decoder())
+                bind(OpLoc3V1Decoder())
+                bind(OpLoc4V1Decoder())
+                bind(OpLoc5V1Decoder())
+                bind(OpLoc1V2Decoder())
+                bind(OpLoc2V2Decoder())
+                bind(OpLoc3V2Decoder())
+                bind(OpLoc4V2Decoder())
+                bind(OpLoc5V2Decoder())
+                bind(OpLoc6Decoder())
+                bind(OpLocTDecoder())
+
+                bind(OpObj1V1Decoder())
+                bind(OpObj2V1Decoder())
+                bind(OpObj3V1Decoder())
+                bind(OpObj4V1Decoder())
+                bind(OpObj5V1Decoder())
+                bind(OpObj1V2Decoder())
+                bind(OpObj2V2Decoder())
+                bind(OpObj3V2Decoder())
+                bind(OpObj4V2Decoder())
+                bind(OpObj5V2Decoder())
+                bind(OpObj6Decoder())
+                bind(OpObjTDecoder())
+
+                bind(OpPlayer1Decoder())
+                bind(OpPlayer2Decoder())
+                bind(OpPlayer3Decoder())
+                bind(OpPlayer4Decoder())
+                bind(OpPlayer5Decoder())
+                bind(OpPlayer6Decoder())
+                bind(OpPlayer7Decoder())
+                bind(OpPlayer8Decoder())
+                bind(OpPlayerTDecoder())
+
+                bind(EventAppletFocusDecoder())
+                bind(EventCameraPositionDecoder())
+                bind(EventKeyboardDecoder())
+                bind(EventMouseScrollDecoder())
+                bind(EventMouseMoveDecoder())
+                bind(EventNativeMouseMoveDecoder())
+                bind(EventMouseClickV1Decoder())
+                bind(EventMouseClickV2Decoder())
+
+                bind(ResumePauseButtonDecoder())
+                bind(ResumePNameDialogDecoder())
+                bind(ResumePStringDialogDecoder())
+                bind(ResumePCountDialogDecoder())
+                bind(ResumePCountDialogLongDecoder())
+                bind(ResumePObjDialogDecoder())
+
+                bind(FriendChatKickDecoder())
+                bind(FriendChatSetRankDecoder())
+                bind(FriendChatJoinLeaveDecoder())
+
+                bind(ClanChannelFullRequestDecoder())
+                bind(ClanSettingsFullRequestDecoder())
+                bind(ClanChannelKickUserDecoder())
+                bind(AffinedClanSettingsAddBannedFromChannelDecoder())
+                bind(AffinedClanSettingsSetMutedFromChannelDecoder())
+
+                bind(FriendListAddDecoder())
+                bind(FriendListDelDecoder())
+                bind(IgnoreListAddDecoder())
+                bind(IgnoreListDelDecoder())
+
+                bind(MessagePublicDecoder(huffmanCodec))
+                bind(MessagePrivateDecoder(huffmanCodec))
+
+                bind(MoveGameClickDecoder())
+                bind(MoveMinimapClickDecoder())
+                bind(ClientCheatDecoder())
+                bind(SetChatFilterSettingsDecoder())
+                bind(SetHeadingDecoder())
+                bind(ClickWorldMapDecoder())
+                bind(OculusLeaveDecoder())
+                bind(CloseModalDecoder())
+                bind(TeleportDecoder())
+                bind(BugReportDecoder())
+                bind(SendSnapshotDecoder())
+                bind(HiscoreRequestDecoder())
+                bind(IfCrmViewClickDecoder())
+
+                bind(ConnectionTelemetryDecoder())
+                bind(SendPingReplyDecoder())
+                bind(DetectModifiedClientDecoder())
+                bind(ReflectionCheckReplyDecoder())
+                bind(NoTimeoutDecoder())
+                bind(IdleDecoder())
+                bind(MapBuildCompleteDecoder())
+                bind(MembershipPromotionEligibilityDecoder())
+                bind(SoundJingleEndDecoder())
+                bind(WindowStatusDecoder())
+                bind(RSevenStatusDecoder())
+            }
+        return builder.build()
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/prot/GameClientProt.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/prot/GameClientProt.kt
new file mode 100644
index 000000000..5c19e1998
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/prot/GameClientProt.kt
@@ -0,0 +1,192 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.prot
+
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.Prot
+
+public enum class GameClientProt(
+    override val opcode: Int,
+    override val size: Int,
+) : ClientProt {
+    // If buttons
+    IF_BUTTON(GameClientProtId.IF_BUTTON, 4),
+    IF_BUTTONX(GameClientProtId.IF_BUTTONX, 9),
+    IF_SUBOP(GameClientProtId.IF_SUBOP, 10),
+    IF_BUTTOND(GameClientProtId.IF_BUTTOND, 16),
+    IF_BUTTONT(GameClientProtId.IF_BUTTONT, 16),
+    IF_RUNSCRIPT(GameClientProtId.IF_RUNSCRIPT, Prot.VAR_SHORT),
+
+    // Op npc
+    OPNPC1_V1(GameClientProtId.OPNPC1_V1, 3),
+    OPNPC2_V1(GameClientProtId.OPNPC2_V1, 3),
+    OPNPC3_V1(GameClientProtId.OPNPC3_V1, 3),
+    OPNPC4_V1(GameClientProtId.OPNPC4_V1, 3),
+    OPNPC5_V1(GameClientProtId.OPNPC5_V1, 3),
+    OPNPC1_V2(GameClientProtId.OPNPC1_V2, 4),
+    OPNPC2_V2(GameClientProtId.OPNPC2_V2, 4),
+    OPNPC3_V2(GameClientProtId.OPNPC3_V2, 4),
+    OPNPC4_V2(GameClientProtId.OPNPC4_V2, 4),
+    OPNPC5_V2(GameClientProtId.OPNPC5_V2, 4),
+    OPNPC6(GameClientProtId.OPNPC6, 2),
+    OPNPCT(GameClientProtId.OPNPCT, 11),
+
+    @Deprecated(
+        "Deprecated since inventory rework in revision 204, " +
+            "all usagesgo through OPNPCT now.",
+        replaceWith = ReplaceWith("OPNPCT"),
+    )
+    OPNPCU(GameClientProtId.OPNPCU, 11),
+
+    // Op loc
+    OPLOC1_V1(GameClientProtId.OPLOC1_V1, 7),
+    OPLOC2_V1(GameClientProtId.OPLOC2_V1, 7),
+    OPLOC3_V1(GameClientProtId.OPLOC3_V1, 7),
+    OPLOC4_V1(GameClientProtId.OPLOC4_V1, 7),
+    OPLOC5_V1(GameClientProtId.OPLOC5_V1, 7),
+    OPLOC1_V2(GameClientProtId.OPLOC1_V2, 8),
+    OPLOC2_V2(GameClientProtId.OPLOC2_V2, 8),
+    OPLOC3_V2(GameClientProtId.OPLOC3_V2, 8),
+    OPLOC4_V2(GameClientProtId.OPLOC4_V2, 8),
+    OPLOC5_V2(GameClientProtId.OPLOC5_V2, 8),
+    OPLOC6(GameClientProtId.OPLOC6, 2),
+    OPLOCT(GameClientProtId.OPLOCT, 15),
+
+    @Deprecated(
+        "Deprecated since inventory rework in revision 204, " +
+            "all usagesgo through OPLOCT now.",
+        replaceWith = ReplaceWith("OPLOCT"),
+    )
+    OPLOCU(GameClientProtId.OPLOCU, 15),
+
+    // Op obj
+    OPOBJ1_V1(GameClientProtId.OPOBJ1_V1, 7),
+    OPOBJ2_V1(GameClientProtId.OPOBJ2_V1, 7),
+    OPOBJ3_V1(GameClientProtId.OPOBJ3_V1, 7),
+    OPOBJ4_V1(GameClientProtId.OPOBJ4_V1, 7),
+    OPOBJ5_V1(GameClientProtId.OPOBJ5_V1, 7),
+    OPOBJ1_V2(GameClientProtId.OPOBJ1_V2, 8),
+    OPOBJ2_V2(GameClientProtId.OPOBJ2_V2, 8),
+    OPOBJ3_V2(GameClientProtId.OPOBJ3_V2, 8),
+    OPOBJ4_V2(GameClientProtId.OPOBJ4_V2, 8),
+    OPOBJ5_V2(GameClientProtId.OPOBJ5_V2, 8),
+    OPOBJ6(GameClientProtId.OPOBJ6, 6),
+    OPOBJT(GameClientProtId.OPOBJT, 15),
+
+    @Deprecated(
+        "Deprecated since inventory rework in revision 204, " +
+            "all usagesgo through OPOBJT now.",
+        replaceWith = ReplaceWith("OPOBJT"),
+    )
+    OPOBJU(GameClientProtId.OPOBJU, 15),
+
+    // Op player
+    OPPLAYER1(GameClientProtId.OPPLAYER1, 3),
+    OPPLAYER2(GameClientProtId.OPPLAYER2, 3),
+    OPPLAYER3(GameClientProtId.OPPLAYER3, 3),
+    OPPLAYER4(GameClientProtId.OPPLAYER4, 3),
+    OPPLAYER5(GameClientProtId.OPPLAYER5, 3),
+    OPPLAYER6(GameClientProtId.OPPLAYER6, 3),
+    OPPLAYER7(GameClientProtId.OPPLAYER7, 3),
+    OPPLAYER8(GameClientProtId.OPPLAYER8, 3),
+    OPPLAYERT(GameClientProtId.OPPLAYERT, 11),
+
+    @Deprecated(
+        "Deprecated since inventory rework in revision 204, " +
+            "all usagesgo through OPPLAYERT now.",
+        replaceWith = ReplaceWith("OPPLAYERT"),
+    )
+    OPPLAYERU(GameClientProtId.OPPLAYERU, 11),
+
+    OPWORLDENTITY1(GameClientProtId.OPWORLDENTITY1, 3),
+    OPWORLDENTITY2(GameClientProtId.OPWORLDENTITY2, 3),
+    OPWORLDENTITY3(GameClientProtId.OPWORLDENTITY3, 3),
+    OPWORLDENTITY4(GameClientProtId.OPWORLDENTITY4, 3),
+    OPWORLDENTITY5(GameClientProtId.OPWORLDENTITY5, 3),
+    OPWORLDENTITY6(GameClientProtId.OPWORLDENTITY6, 2),
+    OPWORLDENTITYT(GameClientProtId.OPWORLDENTITYT, 11),
+
+    @Deprecated(
+        "Deprecated since inventory rework in revision 204, " +
+            "all usages go through OPWORLDENTITYT now.",
+        replaceWith = ReplaceWith("OPWORLDENTITYT"),
+    )
+    OPWORLDENTITYU(GameClientProtId.OPWORLDENTITYU, 11),
+
+    // Events
+    EVENT_APPLET_FOCUS(GameClientProtId.EVENT_APPLET_FOCUS, 1),
+    EVENT_CAMERA_POSITION(GameClientProtId.EVENT_CAMERA_POSITION, 4),
+    EVENT_KEYBOARD(GameClientProtId.EVENT_KEYBOARD, Prot.VAR_SHORT),
+    EVENT_MOUSE_SCROLL(GameClientProtId.EVENT_MOUSE_SCROLL, 2),
+    EVENT_MOUSE_MOVE(GameClientProtId.EVENT_MOUSE_MOVE, Prot.VAR_BYTE),
+    EVENT_NATIVE_MOUSE_MOVE(GameClientProtId.EVENT_NATIVE_MOUSE_MOVE, Prot.VAR_BYTE),
+    EVENT_MOUSE_CLICK_V1(GameClientProtId.EVENT_MOUSE_CLICK_V1, 6),
+    EVENT_MOUSE_CLICK_V2(GameClientProtId.EVENT_NATIVE_MOUSE_CLICK_V2, 7),
+
+    @Deprecated(
+        "Deprecated since rework in revision 232, " +
+            "where the platforms were joined into a single packet.",
+        replaceWith = ReplaceWith("EVENT_MOUSE_CLICK_V2"),
+    )
+    EVENT_NATIVE_MOUSE_CLICK(GameClientProtId.EVENT_NATIVE_MOUSE_CLICK_V1, 7),
+
+    // Resume events
+    RESUME_PAUSEBUTTON(GameClientProtId.RESUME_PAUSEBUTTON, 6),
+    RESUME_P_NAMEDIALOG(GameClientProtId.RESUME_P_NAMEDIALOG, Prot.VAR_BYTE),
+    RESUME_P_STRINGDIALOG(GameClientProtId.RESUME_P_STRINGDIALOG, Prot.VAR_BYTE),
+    RESUME_P_COUNTDIALOG(GameClientProtId.RESUME_P_COUNTDIALOG, 4),
+    RESUME_P_COUNTDIALOG_LONG(GameClientProtId.RESUME_P_COUNTDIALOG_LONG, 8),
+    RESUME_P_OBJDIALOG(GameClientProtId.RESUME_P_OBJDIALOG, 2),
+
+    // Friend chat packets
+    FRIENDCHAT_KICK(GameClientProtId.FRIENDCHAT_KICK, Prot.VAR_BYTE),
+    FRIENDCHAT_SETRANK(GameClientProtId.FRIENDCHAT_SETRANK, Prot.VAR_BYTE),
+    FRIENDCHAT_JOIN_LEAVE(GameClientProtId.FRIENDCHAT_JOIN_LEAVE, Prot.VAR_BYTE),
+
+    // Clan packets
+    CLANCHANNEL_FULL_REQUEST(GameClientProtId.CLANCHANNEL_FULL_REQUEST, 1),
+    CLANSETTINGS_FULL_REQUEST(GameClientProtId.CLANSETTINGS_FULL_REQUEST, 1),
+    CLANCHANNEL_KICKUSER(GameClientProtId.CLANCHANNEL_KICKUSER, Prot.VAR_BYTE),
+    AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL(
+        GameClientProtId.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL,
+        Prot.VAR_BYTE,
+    ),
+    AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL(GameClientProtId.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL, Prot.VAR_BYTE),
+
+    // Socials
+    FRIENDLIST_ADD(GameClientProtId.FRIENDLIST_ADD, Prot.VAR_BYTE),
+    FRIENDLIST_DEL(GameClientProtId.FRIENDLIST_DEL, Prot.VAR_BYTE),
+    IGNORELIST_ADD(GameClientProtId.IGNORELIST_ADD, Prot.VAR_BYTE),
+    IGNORELIST_DEL(GameClientProtId.IGNORELIST_DEL, Prot.VAR_BYTE),
+
+    // Messaging
+    MESSAGE_PUBLIC(GameClientProtId.MESSAGE_PUBLIC, Prot.VAR_BYTE),
+    MESSAGE_PRIVATE(GameClientProtId.MESSAGE_PRIVATE, Prot.VAR_SHORT),
+
+    // Misc. user packets
+    MOVE_GAMECLICK(GameClientProtId.MOVE_GAMECLICK, Prot.VAR_BYTE),
+    MOVE_MINIMAPCLICK(GameClientProtId.MOVE_MINIMAPCLICK, Prot.VAR_BYTE),
+    CLIENT_CHEAT(GameClientProtId.CLIENT_CHEAT, Prot.VAR_BYTE),
+    SET_CHATFILTERSETTINGS(GameClientProtId.SET_CHATFILTERSETTINGS, 3),
+    CLICKWORLDMAP(GameClientProtId.CLICKWORLDMAP, 4),
+    OCULUS_LEAVE(GameClientProtId.OCULUS_LEAVE, 0),
+    CLOSE_MODAL(GameClientProtId.CLOSE_MODAL, 0),
+    TELEPORT(GameClientProtId.TELEPORT, 9),
+    BUG_REPORT(GameClientProtId.BUG_REPORT, Prot.VAR_SHORT),
+    SEND_SNAPSHOT(GameClientProtId.SEND_SNAPSHOT, Prot.VAR_BYTE),
+    HISCORE_REQUEST(GameClientProtId.HISCORE_REQUEST, Prot.VAR_BYTE),
+    IF_CRMVIEW_CLICK(GameClientProtId.IF_CRMVIEW_CLICK, 22),
+    UPDATE_PLAYER_MODEL_V2(GameClientProtId.UPDATE_PLAYER_MODEL_V2, 26),
+
+    // Misc. client packets
+    CONNECTION_TELEMETRY(GameClientProtId.CONNECTION_TELEMETRY, Prot.VAR_BYTE),
+    SEND_PING_REPLY(GameClientProtId.SEND_PING_REPLY, 10),
+    DETECT_MODIFIED_CLIENT(GameClientProtId.DETECT_MODIFIED_CLIENT, 4),
+    REFLECTION_CHECK_REPLY(GameClientProtId.REFLECTION_CHECK_REPLY, Prot.VAR_BYTE),
+    NO_TIMEOUT(GameClientProtId.NO_TIMEOUT, 0),
+    IDLE(GameClientProtId.IDLE, 0),
+    MAP_BUILD_COMPLETE(GameClientProtId.MAP_BUILD_COMPLETE, 0),
+    MEMBERSHIP_PROMOTION_ELIGIBILITY(GameClientProtId.MEMBERSHIP_PROMOTION_ELIGIBILITY, 2),
+    SOUND_JINGLEEND(GameClientProtId.SOUND_JINGLEEND, 4),
+    WINDOW_STATUS(GameClientProtId.WINDOW_STATUS, 5),
+    SET_HEADING(GameClientProtId.SET_HEADING, 1),
+    RSEVEN_STATUS(GameClientProtId.RSEVEN_STATUS, 1),
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/prot/GameClientProtId.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/prot/GameClientProtId.kt
new file mode 100644
index 000000000..03fa41204
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/incoming/decoder/prot/GameClientProtId.kt
@@ -0,0 +1,121 @@
+package net.rsprox.protocol.v237.game.incoming.decoder.prot
+
+internal object GameClientProtId {
+    const val OPLOC3_V2 = 0
+    const val MEMBERSHIP_PROMOTION_ELIGIBILITY = 1
+    const val UPDATE_PLAYER_MODEL_V2 = 2
+    const val OPLOC2_V1 = 3
+    const val RSEVEN_STATUS = 4
+    const val EVENT_NATIVE_MOUSE_CLICK_V1 = 5
+    const val MOVE_GAMECLICK = 6
+    const val RESUME_P_NAMEDIALOG = 7
+    const val OPOBJ4_V1 = 8
+    const val OPNPC2_V2 = 9
+    const val WINDOW_STATUS = 10
+    const val FRIENDCHAT_KICK = 11
+    const val REFLECTION_CHECK_REPLY = 12
+    const val OPNPC2_V1 = 13
+    const val EVENT_NATIVE_MOUSE_CLICK_V2 = 14
+    const val OPLOC5_V2 = 15
+    const val OPLOCU = 16
+    const val CLANCHANNEL_FULL_REQUEST = 17
+    const val CONNECTION_TELEMETRY = 18
+    const val EVENT_CAMERA_POSITION = 19
+    const val MAP_BUILD_COMPLETE = 20
+    const val SOUND_JINGLEEND = 21
+    const val EVENT_MOUSE_CLICK_V1 = 22
+    const val OPWORLDENTITY1 = 23
+    const val OPNPC3_V1 = 24
+    const val OPOBJU = 25
+    const val IGNORELIST_ADD = 26
+    const val OPOBJ6 = 27
+    const val MESSAGE_PUBLIC = 28
+    const val OPWORLDENTITYU = 29
+    const val CLOSE_MODAL = 30
+    const val SEND_PING_REPLY = 31
+    const val OPLOC5_V1 = 32
+    const val OPNPC6 = 33
+    const val FRIENDCHAT_JOIN_LEAVE = 34
+    const val OPPLAYER8 = 35
+    const val OPOBJ1_V2 = 36
+    const val RESUME_P_COUNTDIALOG_LONG = 37
+    const val OPPLAYER5 = 38
+    const val IDLE = 39
+    const val OPWORLDENTITY4 = 40
+    const val OPPLAYER4 = 41
+    const val IF_RUNSCRIPT = 42
+    const val OPOBJ5_V2 = 43
+    const val FRIENDLIST_ADD = 44
+    const val OPWORLDENTITY3 = 45
+    const val RESUME_P_COUNTDIALOG = 46
+    const val OPWORLDENTITY6 = 47
+    const val IF_BUTTONT = 48
+    const val OPPLAYER2 = 49
+    const val CLANCHANNEL_KICKUSER = 50
+    const val EVENT_MOUSE_SCROLL = 51
+    const val RESUME_P_OBJDIALOG = 52
+    const val EVENT_MOUSE_MOVE = 53
+    const val OPPLAYER3 = 54
+    const val OPOBJ5_V1 = 55
+    const val OPNPCU = 56
+    const val EVENT_NATIVE_MOUSE_MOVE = 57
+    const val RESUME_P_STRINGDIALOG = 58
+    const val OPNPCT = 59
+    const val OPOBJ2_V2 = 60
+    const val FRIENDCHAT_SETRANK = 61
+    const val OPPLAYER7 = 62
+    const val AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL = 63
+    const val SET_CHATFILTERSETTINGS = 64
+    const val SET_HEADING = 65
+    const val FRIENDLIST_DEL = 66
+    const val OPLOC4_V2 = 67
+    const val CLIENT_CHEAT = 68
+    const val OPWORLDENTITY2 = 69
+    const val OPLOC6 = 70
+    const val OCULUS_LEAVE = 71
+    const val OPPLAYERT = 72
+    const val AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL = 73
+    const val OPPLAYER6 = 74
+    const val IF_BUTTON = 75
+    const val OPOBJT = 76
+    const val MESSAGE_PRIVATE = 77
+    const val IGNORELIST_DEL = 78
+    const val BUG_REPORT = 79
+    const val CLICKWORLDMAP = 80
+    const val TELEPORT = 81
+    const val SEND_SNAPSHOT = 82
+    const val IF_BUTTOND = 83
+    const val OPNPC1_V2 = 84
+    const val OPPLAYER1 = 85
+    const val OPLOC3_V1 = 86
+    const val NO_TIMEOUT = 87
+    const val OPNPC4_V1 = 88
+    const val OPLOC4_V1 = 89
+    const val EVENT_KEYBOARD = 90
+    const val OPNPC4_V2 = 91
+    const val OPNPC5_V1 = 92
+    const val MOVE_MINIMAPCLICK = 93
+    const val OPLOC2_V2 = 94
+    const val CLANSETTINGS_FULL_REQUEST = 95
+    const val OPLOC1_V2 = 96
+    const val OPWORLDENTITY5 = 97
+    const val EVENT_APPLET_FOCUS = 98
+    const val OPLOCT = 99
+    const val OPWORLDENTITYT = 100
+    const val OPOBJ4_V2 = 101
+    const val IF_CRMVIEW_CLICK = 102
+    const val OPLOC1_V1 = 103
+    const val IF_BUTTONX = 104
+    const val IF_SUBOP = 105
+    const val OPOBJ3_V2 = 106
+    const val OPOBJ3_V1 = 107
+    const val HISCORE_REQUEST = 108
+    const val OPNPC3_V2 = 109
+    const val OPNPC1_V1 = 110
+    const val OPNPC5_V2 = 111
+    const val DETECT_MODIFIED_CLIENT = 112
+    const val OPOBJ1_V1 = 113
+    const val RESUME_PAUSEBUTTON = 114
+    const val OPOBJ2_V1 = 115
+    const val OPPLAYERU = 116
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamLookAtEasedCoordV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamLookAtEasedCoordV2Decoder.kt
new file mode 100644
index 000000000..7bed6c7d6
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamLookAtEasedCoordV2Decoder.kt
@@ -0,0 +1,30 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.camera.CamLookAtEasedCoordV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class CamLookAtEasedCoordV2Decoder : ProxyMessageDecoder<CamLookAtEasedCoordV2> {
+    override val prot: ClientProt = GameServerProt.CAM_LOOKAT_EASED_COORD_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): CamLookAtEasedCoordV2 {
+        val height = buffer.g2Alt1()
+        val z = buffer.g2Alt1()
+        val easing = buffer.g1()
+        val x = buffer.g2()
+        val cycles = buffer.g2()
+        return CamLookAtEasedCoordV2(
+            x,
+            z,
+            height,
+            cycles,
+            easing,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamLookAtV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamLookAtV2Decoder.kt
new file mode 100644
index 000000000..6aa17bcff
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamLookAtV2Decoder.kt
@@ -0,0 +1,30 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.camera.CamLookAtV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class CamLookAtV2Decoder : ProxyMessageDecoder<CamLookAtV2> {
+    override val prot: ClientProt = GameServerProt.CAM_LOOKAT_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): CamLookAtV2 {
+        val x = buffer.g2Alt2()
+        val rate = buffer.g1Alt3()
+        val height = buffer.g2Alt3()
+        val rate2 = buffer.g1()
+        val z = buffer.g2()
+        return CamLookAtV2(
+            x,
+            z,
+            height,
+            rate,
+            rate2,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamModeDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamModeDecoder.kt
new file mode 100644
index 000000000..a48ec4787
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamModeDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.camera.CamMode
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class CamModeDecoder : ProxyMessageDecoder<CamMode> {
+    override val prot: ClientProt = GameServerProt.CAM_MODE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): CamMode {
+        val mode = buffer.g1()
+        return CamMode(
+            mode,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamMoveToArcV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamMoveToArcV2Decoder.kt
new file mode 100644
index 000000000..5d91a2b6e
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamMoveToArcV2Decoder.kt
@@ -0,0 +1,36 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.camera.CamMoveToArcV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class CamMoveToArcV2Decoder : ProxyMessageDecoder<CamMoveToArcV2> {
+    override val prot: ClientProt = GameServerProt.CAM_MOVETO_ARC_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): CamMoveToArcV2 {
+        val centerZ = buffer.g2()
+        val easing = buffer.g1Alt2()
+        val height = buffer.g2()
+        val cycles = buffer.g2Alt3()
+        val centerX = buffer.g2()
+        val destinationZ = buffer.g2Alt1()
+        val ignoreTerrain = buffer.g1Alt2() == 1
+        val destinationX = buffer.g2Alt3()
+        return CamMoveToArcV2(
+            centerX,
+            centerZ,
+            destinationX,
+            destinationZ,
+            height,
+            cycles,
+            ignoreTerrain,
+            easing,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamMoveToCyclesV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamMoveToCyclesV2Decoder.kt
new file mode 100644
index 000000000..0c0df04d1
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamMoveToCyclesV2Decoder.kt
@@ -0,0 +1,32 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.camera.CamMoveToCyclesV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class CamMoveToCyclesV2Decoder : ProxyMessageDecoder<CamMoveToCyclesV2> {
+    override val prot: ClientProt = GameServerProt.CAM_MOVETO_CYCLES_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): CamMoveToCyclesV2 {
+        val x = buffer.g2()
+        val cycles = buffer.g2Alt3()
+        val z = buffer.g2()
+        val height = buffer.g2Alt2()
+        val easing = buffer.g1()
+        val ignoreTerrain = buffer.g1Alt3() == 1
+        return CamMoveToCyclesV2(
+            x,
+            z,
+            height,
+            cycles,
+            ignoreTerrain,
+            easing,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamMoveToV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamMoveToV2Decoder.kt
new file mode 100644
index 000000000..427543ee8
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamMoveToV2Decoder.kt
@@ -0,0 +1,30 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.camera.CamMoveToV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class CamMoveToV2Decoder : ProxyMessageDecoder<CamMoveToV2> {
+    override val prot: ClientProt = GameServerProt.CAM_MOVETO_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): CamMoveToV2 {
+        val rate2 = buffer.g1Alt1()
+        val z = buffer.g2()
+        val x = buffer.g2()
+        val rate = buffer.g1Alt1()
+        val height = buffer.g2Alt1()
+        return CamMoveToV2(
+            x,
+            z,
+            height,
+            rate,
+            rate2,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamResetDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamResetDecoder.kt
new file mode 100644
index 000000000..aa71d6647
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamResetDecoder.kt
@@ -0,0 +1,21 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.camera.CamReset
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class CamResetDecoder : ProxyMessageDecoder<CamReset> {
+    override val prot: ClientProt = GameServerProt.CAM_RESET
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): CamReset {
+        return CamReset
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamRotateBy.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamRotateBy.kt
new file mode 100644
index 000000000..2aec25368
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamRotateBy.kt
@@ -0,0 +1,30 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.camera.CamRotateBy
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class CamRotateBy : ProxyMessageDecoder<CamRotateBy> {
+    override val prot: ClientProt = GameServerProt.CAM_ROTATEBY
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): CamRotateBy {
+        val yAngle = buffer.g2()
+        val xAngle = buffer.g2()
+        val duration = buffer.g2()
+        val function = buffer.g1()
+        return CamRotateBy(
+            xAngle,
+            yAngle,
+            duration,
+            function,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamRotateToDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamRotateToDecoder.kt
new file mode 100644
index 000000000..40a248187
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamRotateToDecoder.kt
@@ -0,0 +1,30 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.camera.CamRotateTo
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class CamRotateToDecoder : ProxyMessageDecoder<CamRotateTo> {
+    override val prot: ClientProt = GameServerProt.CAM_ROTATETO
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): CamRotateTo {
+        val yAngle = buffer.g2()
+        val xAngle = buffer.g2()
+        val duration = buffer.g2()
+        val function = buffer.g1()
+        return CamRotateTo(
+            xAngle,
+            yAngle,
+            duration,
+            function,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamShakeDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamShakeDecoder.kt
new file mode 100644
index 000000000..3c7128a75
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamShakeDecoder.kt
@@ -0,0 +1,30 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.camera.CamShake
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class CamShakeDecoder : ProxyMessageDecoder<CamShake> {
+    override val prot: ClientProt = GameServerProt.CAM_SHAKE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): CamShake {
+        val type = buffer.g1()
+        val randomAmount = buffer.g1()
+        val sineAmount = buffer.g1()
+        val sineFrequency = buffer.g1()
+        return CamShake(
+            type,
+            randomAmount,
+            sineAmount,
+            sineFrequency,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamSmoothResetDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamSmoothResetDecoder.kt
new file mode 100644
index 000000000..36bea9dac
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamSmoothResetDecoder.kt
@@ -0,0 +1,30 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.camera.CamSmoothReset
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class CamSmoothResetDecoder : ProxyMessageDecoder<CamSmoothReset> {
+    override val prot: ClientProt = GameServerProt.CAM_SMOOTHRESET
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): CamSmoothReset {
+        val cameraMoveConstantSpeed = buffer.g1()
+        val cameraMoveProportionalSpeed = buffer.g1()
+        val cameraLookConstantSpeed = buffer.g1()
+        val cameraLookProportionalSpeed = buffer.g1()
+        return CamSmoothReset(
+            cameraMoveConstantSpeed,
+            cameraMoveProportionalSpeed,
+            cameraLookConstantSpeed,
+            cameraLookProportionalSpeed,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamTargetV3Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamTargetV3Decoder.kt
new file mode 100644
index 000000000..8d5a59b79
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/CamTargetV3Decoder.kt
@@ -0,0 +1,37 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.camera.CamTargetV3
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class CamTargetV3Decoder : ProxyMessageDecoder<CamTargetV3> {
+    override val prot: ClientProt = GameServerProt.CAM_TARGET_V3
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): CamTargetV3 {
+        val type = buffer.g1()
+        var worldEntityIndex = buffer.g2s()
+        // 237 made toplevel/root world into id 0
+        // but because our transcriber handles all revisions, we need it to be a uniform value
+        // within logic processing.
+        if (worldEntityIndex == 0) {
+            worldEntityIndex = -1
+        }
+        val targetIndex = buffer.g2()
+        return CamTargetV3(
+            when (type) {
+                0 -> CamTargetV3.PlayerCamTarget(worldEntityIndex, if (targetIndex == 65535) -1 else targetIndex)
+                1 -> CamTargetV3.NpcCamTarget(worldEntityIndex, if (targetIndex == 65535) -1 else targetIndex)
+                2 -> CamTargetV3.WorldEntityTarget(worldEntityIndex, if (targetIndex == 65535) -1 else targetIndex)
+                else -> throw IllegalStateException("Unknown type: $type")
+            },
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/OculusSyncDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/OculusSyncDecoder.kt
new file mode 100644
index 000000000..c99f711cb
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/camera/OculusSyncDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.camera.OculusSync
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class OculusSyncDecoder : ProxyMessageDecoder<OculusSync> {
+    override val prot: ClientProt = GameServerProt.OCULUS_SYNC
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): OculusSync {
+        val value = buffer.g4()
+        return OculusSync(value)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/ClanChannelDeltaDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/ClanChannelDeltaDecoder.kt
new file mode 100644
index 000000000..fd36983d8
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/ClanChannelDeltaDecoder.kt
@@ -0,0 +1,111 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.clan.ClanChannelDelta
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class ClanChannelDeltaDecoder : ProxyMessageDecoder<ClanChannelDelta> {
+    override val prot: ClientProt = GameServerProt.CLANCHANNEL_DELTA
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ClanChannelDelta {
+        val clanType = buffer.g1()
+        val clanHash = buffer.g8()
+        val updateNum = buffer.g8()
+        val events =
+            buildList {
+                while (buffer.isReadable) {
+                    when (val opcode = buffer.g1()) {
+                        0 -> break
+                        1 -> {
+                            buffer.skipRead(1)
+                            // TODO: Should name be nullable?
+                            val name = buffer.gjstrnull() ?: ""
+                            val world = buffer.g2()
+                            val rank = buffer.g1()
+                            add(
+                                ClanChannelDelta.ClanChannelDeltaAddUserEvent(
+                                    name,
+                                    world,
+                                    rank,
+                                ),
+                            )
+                        }
+                        2 -> {
+                            val index = buffer.g2()
+                            val rank = buffer.g1()
+                            val world = buffer.g2()
+                            buffer.skipRead(8)
+                            val name = buffer.gjstr()
+                            add(
+                                ClanChannelDelta.ClanChannelDeltaUpdateUserDetailsEvent(
+                                    index,
+                                    name,
+                                    rank,
+                                    world,
+                                ),
+                            )
+                        }
+                        3 -> {
+                            val index = buffer.g2()
+                            buffer.skipRead(1)
+                            buffer.skipRead(1)
+                            add(
+                                ClanChannelDelta.ClanChannelDeltaDeleteUserEvent(
+                                    index,
+                                ),
+                            )
+                        }
+                        4 -> {
+                            val name = buffer.gjstrnull()
+                            if (name != null) {
+                                buffer.skipRead(1)
+                                val talkRank = buffer.g1()
+                                val kickRank = buffer.g1()
+                                add(
+                                    ClanChannelDelta.ClanChannelDeltaUpdateBaseSettingsEvent(
+                                        name,
+                                        talkRank,
+                                        kickRank,
+                                    ),
+                                )
+                            } else {
+                                add(ClanChannelDelta.ClanChannelDeltaUpdateBaseSettingsEvent())
+                            }
+                        }
+                        5 -> {
+                            buffer.skipRead(1)
+                            val index = buffer.g2()
+                            val rank = buffer.g1()
+                            val world = buffer.g2()
+                            buffer.skipRead(8)
+                            val name = buffer.gjstr()
+                            buffer.skipRead(1)
+                            add(
+                                ClanChannelDelta.ClanChannelDeltaUpdateUserDetailsV2Event(
+                                    index,
+                                    name,
+                                    rank,
+                                    world,
+                                ),
+                            )
+                        }
+                        else -> throw IllegalStateException("Unknown clanchannel delta update: $opcode")
+                    }
+                }
+            }
+        return ClanChannelDelta(
+            clanType,
+            clanHash,
+            updateNum,
+            events,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/ClanChannelFullDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/ClanChannelFullDecoder.kt
new file mode 100644
index 000000000..0e1c7a23c
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/ClanChannelFullDecoder.kt
@@ -0,0 +1,89 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.compression.Base37
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.clan.ClanChannelFull
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class ClanChannelFullDecoder : ProxyMessageDecoder<ClanChannelFull> {
+    override val prot: ClientProt = GameServerProt.CLANCHANNEL_FULL
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ClanChannelFull {
+        val clanType = buffer.g1()
+        if (!buffer.isReadable) {
+            return ClanChannelFull(
+                clanType,
+                ClanChannelFull.ClanChannelFullLeaveUpdate,
+            )
+        }
+        val flags = buffer.g1()
+        val version =
+            if (flags and ClanChannelFull.FLAG_HAS_VERSION != 0) {
+                buffer.g1()
+            } else {
+                ClanChannelFull.DEFAULT_OLDSCHOOL_VERSION
+            }
+        val clanHash = buffer.g8()
+        val updateNum = buffer.g8()
+        val clanName = buffer.gjstr()
+        val discardedBoolean = buffer.gboolean()
+        val kickRank = buffer.g1()
+        val talkRank = buffer.g1()
+        val memberCount = buffer.g2()
+        val base37 = flags and ClanChannelFull.FLAG_USE_BASE_37_NAMES != 0
+        val displayNames = flags and ClanChannelFull.FLAG_USE_DISPLAY_NAMES != 0
+        check(base37 || displayNames) {
+            "Unexpected behavior: Names not included in packet."
+        }
+        val members =
+            buildList {
+                for (i in 0..<memberCount) {
+                    var name: String? = null
+                    if (base37) {
+                        name = Base37.decode(buffer.g8())
+                    }
+                    if (displayNames) {
+                        name = buffer.gjstr()
+                    }
+                    val rank = buffer.g1()
+                    val world = buffer.g2()
+                    val discardedMemberBoolean =
+                        if (version >= 3) {
+                            buffer.gboolean()
+                        } else {
+                            false
+                        }
+                    add(
+                        ClanChannelFull.ClanMember(
+                            checkNotNull(name),
+                            rank,
+                            world,
+                            discardedMemberBoolean,
+                        ),
+                    )
+                }
+            }
+        return ClanChannelFull(
+            clanType,
+            ClanChannelFull.ClanChannelFullJoinUpdate(
+                clanHash,
+                updateNum,
+                clanName,
+                discardedBoolean,
+                kickRank,
+                talkRank,
+                members,
+                version,
+                base37,
+            ),
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/ClanSettingsDeltaDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/ClanSettingsDeltaDecoder.kt
new file mode 100644
index 000000000..b60fe225e
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/ClanSettingsDeltaDecoder.kt
@@ -0,0 +1,202 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.clan.ClanSettingsDelta
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class ClanSettingsDeltaDecoder : ProxyMessageDecoder<ClanSettingsDelta> {
+    override val prot: ClientProt = GameServerProt.CLANSETTINGS_DELTA
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ClanSettingsDelta {
+        val clanType = buffer.g1()
+        val owner = buffer.g8()
+        val updateNum = buffer.g4()
+        val updates =
+            buildList {
+                while (buffer.isReadable) {
+                    when (val opcode = buffer.g1()) {
+                        0 -> break
+                        1 -> {
+                            val hashOpcode = buffer.g1()
+                            val hash =
+                                if (hashOpcode != 0xFF) {
+                                    buffer.readerIndex(buffer.readerIndex() - 1)
+                                    buffer.g8()
+                                } else {
+                                    -1L
+                                }
+                            val name = buffer.gjstrnull()
+                            add(
+                                ClanSettingsDelta.ClanSettingsDeltaAddMemberV1Update(
+                                    hash,
+                                    name,
+                                ),
+                            )
+                        }
+                        2 -> {
+                            val index = buffer.g2()
+                            val rank = buffer.g1()
+                            add(
+                                ClanSettingsDelta.ClanSettingsDeltaSetMemberRankUpdate(
+                                    index,
+                                    rank,
+                                ),
+                            )
+                        }
+                        3 -> {
+                            val hashOpcode = buffer.g1()
+                            val hash =
+                                if (hashOpcode != 0xFF) {
+                                    buffer.readerIndex(buffer.readerIndex() - 1)
+                                    buffer.g8()
+                                } else {
+                                    -1L
+                                }
+                            val name = buffer.gjstrnull()
+                            add(
+                                ClanSettingsDelta.ClanSettingsDeltaAddBannedUpdate(
+                                    hash,
+                                    name,
+                                ),
+                            )
+                        }
+                        4 -> {
+                            val allowUnaffined = buffer.g1() == 1
+                            val talkRank = buffer.g1()
+                            val kickRank = buffer.g1()
+                            val lootshareRank = buffer.g1()
+                            val coinshareRank = buffer.g1()
+                            add(
+                                ClanSettingsDelta.ClanSettingsDeltaBaseSettingsUpdate(
+                                    allowUnaffined,
+                                    talkRank,
+                                    kickRank,
+                                    lootshareRank,
+                                    coinshareRank,
+                                ),
+                            )
+                        }
+                        5 -> {
+                            val index = buffer.g2()
+                            add(ClanSettingsDelta.ClanSettingsDeltaDeleteMemberUpdate(index))
+                        }
+                        6 -> {
+                            val index = buffer.g2()
+                            add(ClanSettingsDelta.ClanSettingsDeltaDeleteBannedUpdate(index))
+                        }
+                        7 -> {
+                            val index = buffer.g2()
+                            val value = buffer.g4()
+                            val startBit = buffer.g1()
+                            val endBit = buffer.g1()
+                            add(
+                                ClanSettingsDelta.ClanSettingsDeltaSetMemberExtraInfoUpdate(
+                                    index,
+                                    value,
+                                    startBit,
+                                    endBit,
+                                ),
+                            )
+                        }
+                        8 -> {
+                            val setting = buffer.g4()
+                            val value = buffer.g4()
+                            add(
+                                ClanSettingsDelta.ClanSettingsDeltaSetIntSettingUpdate(
+                                    setting,
+                                    value,
+                                ),
+                            )
+                        }
+                        9 -> {
+                            val setting = buffer.g4()
+                            val value = buffer.g8()
+                            add(
+                                ClanSettingsDelta.ClanSettingsDeltaSetLongSettingUpdate(
+                                    setting,
+                                    value,
+                                ),
+                            )
+                        }
+                        10 -> {
+                            val setting = buffer.g4()
+                            val value = buffer.gjstr()
+                            add(
+                                ClanSettingsDelta.ClanSettingsDeltaSetStringSettingUpdate(
+                                    setting,
+                                    value,
+                                ),
+                            )
+                        }
+                        11 -> {
+                            val setting = buffer.g4()
+                            val value = buffer.g4()
+                            val startBit = buffer.g1()
+                            val endBit = buffer.g1()
+                            add(
+                                ClanSettingsDelta.ClanSettingsDeltaSetVarbitSettingUpdate(
+                                    setting,
+                                    value,
+                                    startBit,
+                                    endBit,
+                                ),
+                            )
+                        }
+                        12 -> {
+                            val clanName = buffer.gjstr()
+                            buffer.skipRead(4)
+                            add(ClanSettingsDelta.ClanSettingsDeltaSetClanNameUpdate(clanName))
+                        }
+                        13 -> {
+                            val hashOpcode = buffer.g1()
+                            val hash =
+                                if (hashOpcode != 0xFF) {
+                                    buffer.readerIndex(buffer.readerIndex() - 1)
+                                    buffer.g8()
+                                } else {
+                                    -1L
+                                }
+                            val name = buffer.gjstrnull()
+                            val joinRuneDay = buffer.g2()
+                            add(
+                                ClanSettingsDelta.ClanSettingsDeltaAddMemberV2Update(
+                                    hash,
+                                    name,
+                                    joinRuneDay,
+                                ),
+                            )
+                        }
+                        14 -> {
+                            val index = buffer.g2()
+                            val muted = buffer.g1() == 1
+                            add(
+                                ClanSettingsDelta.ClanSettingsDeltaSetMemberMutedUpdate(
+                                    index,
+                                    muted,
+                                ),
+                            )
+                        }
+                        15 -> {
+                            val index = buffer.g2()
+                            add(ClanSettingsDelta.ClanSettingsDeltaSetClanOwnerUpdate(index))
+                        }
+                        else -> error("Unknown opcode: $opcode")
+                    }
+                }
+            }
+        return ClanSettingsDelta(
+            clanType,
+            owner,
+            updateNum,
+            updates,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/ClanSettingsFullDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/ClanSettingsFullDecoder.kt
new file mode 100644
index 000000000..1f5ed67df
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/ClanSettingsFullDecoder.kt
@@ -0,0 +1,176 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.clan.ClanSettingsFull
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class ClanSettingsFullDecoder : ProxyMessageDecoder<ClanSettingsFull> {
+    override val prot: ClientProt = GameServerProt.CLANSETTINGS_FULL
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ClanSettingsFull {
+        val clanType = buffer.g1()
+        if (!buffer.isReadable) {
+            return ClanSettingsFull(
+                clanType,
+                ClanSettingsFull.ClanSettingsFullLeaveUpdate,
+            )
+        }
+        val version = buffer.g1()
+        val flags = buffer.g1()
+        val updateNum = buffer.g4()
+        val creationTime = buffer.g4()
+        val affinedMemberCount = buffer.g2()
+        val bannedMemberCount = buffer.g1()
+        val clanName = buffer.gjstr()
+        if (version >= 4) {
+            buffer.skipRead(4)
+        }
+        val allowUnaffined = buffer.g1() == 1
+        val talkRank = buffer.g1()
+        val kickRank = buffer.g1()
+        val lootshareRank = buffer.g1()
+        val coinshareRank = buffer.g1()
+        val hasAffinedHashes = flags and ClanSettingsFull.FLAG_HAS_AFFINED_HASHES != 0
+        val hasAffinedDisplayNames = flags and ClanSettingsFull.FLAG_HAS_AFFINED_DISPLAY_NAMES != 0
+        check(hasAffinedHashes || hasAffinedDisplayNames) {
+            "Unexpected behavior: No hashes or display names."
+        }
+        check(hasAffinedHashes != hasAffinedDisplayNames) {
+            "Unexpected behavior: Two ways of writing names detected"
+        }
+        val affinedMembers =
+            buildList {
+                for (i in 0..<affinedMemberCount) {
+                    val hash =
+                        if (hasAffinedHashes) {
+                            buffer.g8()
+                        } else {
+                            -1L
+                        }
+                    val displayName =
+                        if (hasAffinedDisplayNames) {
+                            buffer.gjstrnull()
+                        } else {
+                            null
+                        }
+                    val rank = buffer.g1()
+                    val extraInfo =
+                        if (version >= 2) {
+                            buffer.g4()
+                        } else {
+                            0
+                        }
+                    val joinRuneDay =
+                        if (version >= 5) {
+                            buffer.g2()
+                        } else {
+                            0
+                        }
+                    val muted =
+                        if (version >= 6) {
+                            buffer.g1() == 1
+                        } else {
+                            false
+                        }
+                    if (hasAffinedHashes) {
+                        add(
+                            ClanSettingsFull.AffinedClanMember(
+                                hash,
+                                rank,
+                                extraInfo,
+                                joinRuneDay,
+                                muted,
+                            ),
+                        )
+                    } else {
+                        add(
+                            ClanSettingsFull.AffinedClanMember(
+                                checkNotNull(displayName),
+                                rank,
+                                extraInfo,
+                                joinRuneDay,
+                                muted,
+                            ),
+                        )
+                    }
+                }
+            }
+        val bannedMembers =
+            buildList {
+                for (i in 0..<bannedMemberCount) {
+                    val hash =
+                        if (hasAffinedHashes) {
+                            buffer.g8()
+                        } else {
+                            -1L
+                        }
+                    val displayName =
+                        if (hasAffinedDisplayNames) {
+                            buffer.gjstrnull()
+                        } else {
+                            null
+                        }
+                    if (hasAffinedHashes) {
+                        add(ClanSettingsFull.BannedClanMember(hash))
+                    } else {
+                        add(ClanSettingsFull.BannedClanMember(checkNotNull(displayName)))
+                    }
+                }
+            }
+        val settings =
+            if (version >= 3) {
+                val settingsCount = buffer.g2()
+                buildList {
+                    for (i in 0..<settingsCount) {
+                        val header = buffer.g4()
+                        val id = header and 0x3FFFFFFF
+                        when (val type = header ushr 30) {
+                            0 -> {
+                                val value = buffer.g4()
+                                add(ClanSettingsFull.IntClanSetting(id, value))
+                            }
+                            1 -> {
+                                val value = buffer.g8()
+                                add(ClanSettingsFull.LongClanSetting(id, value))
+                            }
+                            2 -> {
+                                val value = buffer.gjstr()
+                                add(ClanSettingsFull.StringClanSetting(id, value))
+                            }
+                            else -> {
+                                error("Unknown type: $type")
+                            }
+                        }
+                    }
+                }
+            } else {
+                emptyList()
+            }
+        return ClanSettingsFull(
+            clanType,
+            ClanSettingsFull.ClanSettingsFullJoinUpdate(
+                updateNum,
+                creationTime,
+                clanName,
+                allowUnaffined,
+                talkRank,
+                kickRank,
+                lootshareRank,
+                coinshareRank,
+                affinedMembers,
+                bannedMembers,
+                settings,
+                hasAffinedHashes,
+                hasAffinedDisplayNames,
+            ),
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/MessageClanChannelDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/MessageClanChannelDecoder.kt
new file mode 100644
index 000000000..80c6d990a
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/MessageClanChannelDecoder.kt
@@ -0,0 +1,37 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.compression.HuffmanCodec
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.clan.MessageClanChannel
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class MessageClanChannelDecoder(
+    private val huffmanCodec: HuffmanCodec,
+) : ProxyMessageDecoder<MessageClanChannel> {
+    override val prot: ClientProt = GameServerProt.MESSAGE_CLANCHANNEL
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MessageClanChannel {
+        val clanType = buffer.g1()
+        val name = buffer.gjstr()
+        val worldId = buffer.g2()
+        val worldMessageCounter = buffer.g3()
+        val chatCrownType = buffer.g1()
+        val message = huffmanCodec.decode(buffer)
+        return MessageClanChannel(
+            clanType,
+            name,
+            worldId,
+            worldMessageCounter,
+            chatCrownType,
+            message,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/MessageClanChannelSystemDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/MessageClanChannelSystemDecoder.kt
new file mode 100644
index 000000000..f4c4d9570
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/MessageClanChannelSystemDecoder.kt
@@ -0,0 +1,33 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.compression.HuffmanCodec
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.clan.MessageClanChannelSystem
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class MessageClanChannelSystemDecoder(
+    private val huffmanCodec: HuffmanCodec,
+) : ProxyMessageDecoder<MessageClanChannelSystem> {
+    override val prot: ClientProt = GameServerProt.MESSAGE_CLANCHANNEL_SYSTEM
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MessageClanChannelSystem {
+        val clanType = buffer.g1()
+        val worldId = buffer.g2()
+        val worldMessageCounter = buffer.g3()
+        val message = huffmanCodec.decode(buffer)
+        return MessageClanChannelSystem(
+            clanType,
+            worldId,
+            worldMessageCounter,
+            message,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/VarClanDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/VarClanDecoder.kt
new file mode 100644
index 000000000..b4bce7398
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/VarClanDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.clan.VarClan
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class VarClanDecoder : ProxyMessageDecoder<VarClan> {
+    override val prot: ClientProt = GameServerProt.VARCLAN
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): VarClan {
+        val id = buffer.g2()
+        val data = ByteArray(buffer.readableBytes())
+        buffer.gdata(data)
+        return VarClan(id, VarClan.UnknownVarClanData(data))
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/VarClanDisableDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/VarClanDisableDecoder.kt
new file mode 100644
index 000000000..fd9471c4d
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/VarClanDisableDecoder.kt
@@ -0,0 +1,21 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.clan.VarClanDisable
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class VarClanDisableDecoder : ProxyMessageDecoder<VarClanDisable> {
+    override val prot: ClientProt = GameServerProt.VARCLAN_DISABLE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): VarClanDisable {
+        return VarClanDisable
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/VarClanEnableDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/VarClanEnableDecoder.kt
new file mode 100644
index 000000000..057009dff
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/clan/VarClanEnableDecoder.kt
@@ -0,0 +1,21 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.clan.VarClanEnable
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class VarClanEnableDecoder : ProxyMessageDecoder<VarClanEnable> {
+    override val prot: ClientProt = GameServerProt.VARCLAN_ENABLE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): VarClanEnable {
+        return VarClanEnable
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/friendchat/MessageFriendChannelDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/friendchat/MessageFriendChannelDecoder.kt
new file mode 100644
index 000000000..4251008ee
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/friendchat/MessageFriendChannelDecoder.kt
@@ -0,0 +1,38 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.friendchat
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.compression.Base37
+import net.rsprot.compression.HuffmanCodec
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.friendchat.MessageFriendChannel
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class MessageFriendChannelDecoder(
+    private val huffmanCodec: HuffmanCodec,
+) : ProxyMessageDecoder<MessageFriendChannel> {
+    override val prot: ClientProt = GameServerProt.MESSAGE_FRIENDCHANNEL
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MessageFriendChannel {
+        val sender = buffer.gjstr()
+        val channelName = Base37.decodeWithCase(buffer.g8())
+        val worldId = buffer.g2()
+        val worldMessageCounter = buffer.g3()
+        val chatCrownType = buffer.g1()
+        val message = huffmanCodec.decode(buffer)
+        return MessageFriendChannel(
+            sender,
+            channelName,
+            worldId,
+            worldMessageCounter,
+            chatCrownType,
+            message,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/friendchat/UpdateFriendChatChannelFullV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/friendchat/UpdateFriendChatChannelFullV2Decoder.kt
new file mode 100644
index 000000000..983fbd858
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/friendchat/UpdateFriendChatChannelFullV2Decoder.kt
@@ -0,0 +1,54 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.friendchat
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.compression.Base37
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.friendchat.UpdateFriendChatChannelFull
+import net.rsprox.protocol.game.outgoing.model.friendchat.UpdateFriendChatChannelFullV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class UpdateFriendChatChannelFullV2Decoder : ProxyMessageDecoder<UpdateFriendChatChannelFullV2> {
+    override val prot: ClientProt = GameServerProt.UPDATE_FRIENDCHAT_CHANNEL_FULL_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UpdateFriendChatChannelFullV2 {
+        if (!buffer.isReadable) {
+            return UpdateFriendChatChannelFullV2(UpdateFriendChatChannelFullV2.LeaveUpdate)
+        }
+        val channelOwner = buffer.gjstr()
+        val channelName = Base37.decodeWithCase(buffer.g8())
+        val kickRank = buffer.g1s()
+        val entryCount = buffer.gSmart1or2null()
+        val entries =
+            buildList {
+                for (i in 0..<entryCount) {
+                    val name = buffer.gjstr()
+                    val worldId = buffer.g2()
+                    val rank = buffer.g1s()
+                    val worldName = buffer.gjstr()
+                    add(
+                        UpdateFriendChatChannelFull.FriendChatEntry(
+                            name,
+                            worldId,
+                            rank,
+                            worldName,
+                        ),
+                    )
+                }
+            }
+        return UpdateFriendChatChannelFullV2(
+            UpdateFriendChatChannelFullV2.JoinUpdate(
+                channelOwner,
+                channelName,
+                kickRank,
+                entries,
+            ),
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/friendchat/UpdateFriendChatChannelSingleUserDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/friendchat/UpdateFriendChatChannelSingleUserDecoder.kt
new file mode 100644
index 000000000..d9cff3311
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/friendchat/UpdateFriendChatChannelSingleUserDecoder.kt
@@ -0,0 +1,41 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.friendchat
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.friendchat.UpdateFriendChatChannelSingleUser
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class UpdateFriendChatChannelSingleUserDecoder : ProxyMessageDecoder<UpdateFriendChatChannelSingleUser> {
+    override val prot: ClientProt = GameServerProt.UPDATE_FRIENDCHAT_CHANNEL_SINGLEUSER
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UpdateFriendChatChannelSingleUser {
+        val name = buffer.gjstr()
+        val worldId = buffer.g2()
+        val rank = buffer.g1s()
+        return if (rank != -128) {
+            val worldName = buffer.gjstr()
+            UpdateFriendChatChannelSingleUser(
+                UpdateFriendChatChannelSingleUser.AddedFriendChatUser(
+                    name,
+                    worldId,
+                    rank,
+                    worldName,
+                ),
+            )
+        } else {
+            UpdateFriendChatChannelSingleUser(
+                UpdateFriendChatChannelSingleUser.RemovedFriendChatUser(
+                    name,
+                    worldId,
+                ),
+            )
+        }
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt
new file mode 100644
index 000000000..e520317c5
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.info
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.info.npcinfo.NpcInfo
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.session.getActiveWorld
+import net.rsprox.protocol.session.getNpcInfoBaseCoord
+import net.rsprox.protocol.session.getWorld
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder<NpcInfo> {
+    override val prot: ClientProt = GameServerProt.NPC_INFO_LARGE_V5
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): NpcInfo {
+        val activeWorld = session.getActiveWorld()
+        val world = session.getWorld(activeWorld)
+        return world.npcInfo.decode(
+            buffer.buffer,
+            true,
+            session.getNpcInfoBaseCoord(),
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt
new file mode 100644
index 000000000..e145a578a
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.info
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.info.npcinfo.NpcInfo
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.session.getActiveWorld
+import net.rsprox.protocol.session.getNpcInfoBaseCoord
+import net.rsprox.protocol.session.getWorld
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder<NpcInfo> {
+    override val prot: ClientProt = GameServerProt.NPC_INFO_SMALL_V5
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): NpcInfo {
+        val activeWorld = session.getActiveWorld()
+        val world = session.getWorld(activeWorld)
+        return world.npcInfo.decode(
+            buffer.buffer,
+            false,
+            session.getNpcInfoBaseCoord(),
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/PlayerInfoDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/PlayerInfoDecoder.kt
new file mode 100644
index 000000000..c9a040fc1
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/PlayerInfoDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.info
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.info.playerinfo.PlayerInfo
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.session.getActiveWorld
+import net.rsprox.protocol.session.getWorld
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class PlayerInfoDecoder : ProxyMessageDecoder<PlayerInfo> {
+    override val prot: ClientProt = GameServerProt.PLAYER_INFO
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): PlayerInfo {
+        val playerInfo = session.getWorld(session.getActiveWorld()).playerInfo
+        return playerInfo.decode(buffer.buffer)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/SetNpcUpdateOriginDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/SetNpcUpdateOriginDecoder.kt
new file mode 100644
index 000000000..bb0d53cf2
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/SetNpcUpdateOriginDecoder.kt
@@ -0,0 +1,38 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.info
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.game.outgoing.model.info.npcinfo.SetNpcUpdateOrigin
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.session.getActiveWorld
+import net.rsprox.protocol.session.getWorld
+import net.rsprox.protocol.session.setNpcInfoBaseCoord
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class SetNpcUpdateOriginDecoder : ProxyMessageDecoder<SetNpcUpdateOrigin> {
+    override val prot: ClientProt = GameServerProt.SET_NPC_UPDATE_ORIGIN
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): SetNpcUpdateOrigin {
+        val originX = buffer.g1()
+        val originZ = buffer.g1()
+        val world = session.getWorld(session.getActiveWorld())
+        val coord =
+            CoordGrid(
+                world.level,
+                world.baseX + originX,
+                world.baseZ + originZ,
+            )
+        session.setNpcInfoBaseCoord(coord)
+        return SetNpcUpdateOrigin(
+            originX,
+            originZ,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/WorldEntityInfoV7Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/WorldEntityInfoV7Decoder.kt
new file mode 100644
index 000000000..bd41feaea
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/WorldEntityInfoV7Decoder.kt
@@ -0,0 +1,112 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.info
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.compression.HuffmanCodec
+import net.rsprot.protocol.ClientProt
+import net.rsprox.cache.api.CacheProvider
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfo
+import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityUpdateType
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.session.allocateWorld
+import net.rsprox.protocol.session.getActiveWorld
+import net.rsprox.protocol.session.getWorld
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+import net.rsprox.protocol.v237.game.outgoing.model.info.npcinfo.NpcInfoClient
+import net.rsprox.protocol.v237.game.outgoing.model.info.playerinfo.PlayerInfoClient
+import net.rsprox.protocol.v237.game.outgoing.model.info.worldentityinfo.WorldEntityInfoClient
+
+internal class WorldEntityInfoV7Decoder(
+    private val huffmanCodec: HuffmanCodec,
+    private val cache: CacheProvider,
+) : ProxyMessageDecoder<WorldEntityInfo> {
+    override val prot: ClientProt = GameServerProt.WORLDENTITY_INFO_V7
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): WorldEntityInfo {
+        val activeWorld = session.getActiveWorld()
+        val world = session.getWorld(activeWorld)
+        val message =
+            world.worldEntity.decode(
+                buffer,
+                CoordGrid(world.level, world.baseX, world.baseZ),
+                7,
+            )
+        for ((index, update) in message.updates) {
+            when (update) {
+                is WorldEntityUpdateType.ActiveV2 -> {
+                }
+                WorldEntityUpdateType.HighResolutionToLowResolution -> {
+                }
+                is WorldEntityUpdateType.LowResolutionToHighResolutionV2 -> {
+                    session.allocateWorld(
+                        index,
+                        PlayerInfoClient(
+                            session.localPlayerIndex,
+                            huffmanCodec,
+                        ),
+                        NpcInfoClient(cache),
+                        WorldEntityInfoClient(),
+                        update.sizeX,
+                        update.sizeZ,
+                    )
+                }
+                WorldEntityUpdateType.Idle -> {
+                    // noop
+                }
+
+                is WorldEntityUpdateType.ActiveV1 -> {
+                }
+                is WorldEntityUpdateType.LowResolutionToHighResolutionV1 -> {
+                    session.allocateWorld(
+                        index,
+                        PlayerInfoClient(
+                            session.localPlayerIndex,
+                            huffmanCodec,
+                        ),
+                        NpcInfoClient(cache),
+                        WorldEntityInfoClient(),
+                        update.sizeX,
+                        update.sizeZ,
+                    )
+                }
+
+                is WorldEntityUpdateType.LowResolutionToHighResolutionV3 -> {
+                    session.allocateWorld(
+                        index,
+                        PlayerInfoClient(
+                            session.localPlayerIndex,
+                            huffmanCodec,
+                        ),
+                        NpcInfoClient(cache),
+                        WorldEntityInfoClient(),
+                        update.sizeX,
+                        update.sizeZ,
+                    )
+                }
+
+                is WorldEntityUpdateType.ActiveV3 -> {
+                }
+                is WorldEntityUpdateType.ExtendedInfoOnly -> {
+                }
+                is WorldEntityUpdateType.LowResolutionToHighResolutionV4 -> {
+                    session.allocateWorld(
+                        index,
+                        PlayerInfoClient(
+                            session.localPlayerIndex,
+                            huffmanCodec,
+                        ),
+                        NpcInfoClient(cache),
+                        WorldEntityInfoClient(),
+                        update.sizeX,
+                        update.sizeZ,
+                    )
+                }
+            }
+        }
+        return message
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfClearInvDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfClearInvDecoder.kt
new file mode 100644
index 000000000..805792d00
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfClearInvDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt1
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfClearInv
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfClearInvDecoder : ProxyMessageDecoder<IfClearInv> {
+    override val prot: ClientProt = GameServerProt.IF_CLEARINV
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfClearInv {
+        val combinedId = buffer.gCombinedIdAlt1()
+        return IfClearInv(
+            combinedId.interfaceId,
+            combinedId.componentId,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfCloseSubDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfCloseSubDecoder.kt
new file mode 100644
index 000000000..233d9a4b4
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfCloseSubDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprot.protocol.util.gCombinedId
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfCloseSub
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class IfCloseSubDecoder : ProxyMessageDecoder<IfCloseSub> {
+    override val prot: ClientProt = GameServerProt.IF_CLOSESUB
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfCloseSub {
+        val combinedId = buffer.gCombinedId()
+        return IfCloseSub(
+            combinedId.interfaceId,
+            combinedId.componentId,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfMoveSubDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfMoveSubDecoder.kt
new file mode 100644
index 000000000..a01e935a1
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfMoveSubDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedId
+import net.rsprot.protocol.util.gCombinedIdAlt2
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfMoveSub
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfMoveSubDecoder : ProxyMessageDecoder<IfMoveSub> {
+    override val prot: ClientProt = GameServerProt.IF_MOVESUB
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfMoveSub {
+        val destinationCombinedId = buffer.gCombinedId()
+        val sourceCombinedId = buffer.gCombinedIdAlt2()
+        return IfMoveSub(
+            sourceCombinedId.interfaceId,
+            sourceCombinedId.componentId,
+            destinationCombinedId.interfaceId,
+            destinationCombinedId.componentId,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfOpenSubDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfOpenSubDecoder.kt
new file mode 100644
index 000000000..c86fbed52
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfOpenSubDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt3
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfOpenSub
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfOpenSubDecoder : ProxyMessageDecoder<IfOpenSub> {
+    override val prot: ClientProt = GameServerProt.IF_OPENSUB
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfOpenSub {
+        val combinedId = buffer.gCombinedIdAlt3()
+        val type = buffer.g1Alt2()
+        val interfaceId = buffer.g2()
+        return IfOpenSub(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            interfaceId,
+            type,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfOpenTopDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfOpenTopDecoder.kt
new file mode 100644
index 000000000..578faf3f8
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfOpenTopDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfOpenTop
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfOpenTopDecoder : ProxyMessageDecoder<IfOpenTop> {
+    override val prot: ClientProt = GameServerProt.IF_OPENTOP
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfOpenTop {
+        val interfaceId = buffer.g2Alt1()
+        return IfOpenTop(
+            interfaceId,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfResyncV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfResyncV2Decoder.kt
new file mode 100644
index 000000000..d29bee78e
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfResyncV2Decoder.kt
@@ -0,0 +1,64 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprot.protocol.util.gCombinedId
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfResyncV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class IfResyncV2Decoder : ProxyMessageDecoder<IfResyncV2> {
+    override val prot: ClientProt = GameServerProt.IF_RESYNC_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfResyncV2 {
+        val topLevelInterface = buffer.g2()
+        val subInterfaceCount = buffer.g2()
+        val subInterfaces =
+            buildList {
+                for (i in 0..<subInterfaceCount) {
+                    val destinationCombinedId = buffer.gCombinedId()
+                    val interfaceId = buffer.g2()
+                    val type = buffer.g1()
+                    add(
+                        IfResyncV2.SubInterfaceMessage(
+                            destinationCombinedId.interfaceId,
+                            destinationCombinedId.componentId,
+                            interfaceId,
+                            type,
+                        ),
+                    )
+                }
+            }
+        val events =
+            buildList {
+                while (buffer.isReadable) {
+                    val combinedId = buffer.gCombinedId()
+                    val start = buffer.g2()
+                    val end = buffer.g2()
+                    val events1 = buffer.g4()
+                    val events2 = buffer.g4()
+                    add(
+                        IfResyncV2.InterfaceEventsMessage(
+                            combinedId.interfaceId,
+                            combinedId.componentId,
+                            start,
+                            end,
+                            events1,
+                            events2,
+                        ),
+                    )
+                }
+            }
+        return IfResyncV2(
+            topLevelInterface,
+            subInterfaces,
+            events,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetAngleDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetAngleDecoder.kt
new file mode 100644
index 000000000..5fcb11841
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetAngleDecoder.kt
@@ -0,0 +1,30 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedId
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetAngle
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetAngleDecoder : ProxyMessageDecoder<IfSetAngle> {
+    override val prot: ClientProt = GameServerProt.IF_SETANGLE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetAngle {
+        val angleY = buffer.g2Alt2()
+        val zoom = buffer.g2Alt2()
+        val combinedId = buffer.gCombinedId()
+        val angleX = buffer.g2Alt2()
+        return IfSetAngle(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            angleX,
+            angleY,
+            zoom,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetAnimDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetAnimDecoder.kt
new file mode 100644
index 000000000..bfdbf75ac
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetAnimDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedId
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetAnim
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetAnimDecoder : ProxyMessageDecoder<IfSetAnim> {
+    override val prot: ClientProt = GameServerProt.IF_SETANIM
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetAnim {
+        val combinedId = buffer.gCombinedId()
+        val anim = buffer.g2sAlt2()
+        return IfSetAnim(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            anim,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetColourDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetColourDecoder.kt
new file mode 100644
index 000000000..1c4e7064e
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetColourDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt2
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetColour
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetColourDecoder : ProxyMessageDecoder<IfSetColour> {
+    override val prot: ClientProt = GameServerProt.IF_SETCOLOUR
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetColour {
+        val colour15BitPacked = buffer.g2()
+        val combinedId = buffer.gCombinedIdAlt2()
+        return IfSetColour(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            colour15BitPacked,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetEventsV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetEventsV2Decoder.kt
new file mode 100644
index 000000000..40dc8ed19
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetEventsV2Decoder.kt
@@ -0,0 +1,32 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedId
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetEventsV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetEventsV2Decoder : ProxyMessageDecoder<IfSetEventsV2> {
+    override val prot: ClientProt = GameServerProt.IF_SETEVENTS_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetEventsV2 {
+        val start = buffer.g2Alt1()
+        val end = buffer.g2Alt1()
+        val events1 = buffer.g4Alt3()
+        val combinedId = buffer.gCombinedId()
+        val events2 = buffer.g4Alt2()
+        return IfSetEventsV2(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            start,
+            end,
+            events1,
+            events2,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetHideDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetHideDecoder.kt
new file mode 100644
index 000000000..ce89c772d
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetHideDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt1
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetHide
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetHideDecoder : ProxyMessageDecoder<IfSetHide> {
+    override val prot: ClientProt = GameServerProt.IF_SETHIDE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetHide {
+        val combinedId = buffer.gCombinedIdAlt1()
+        val hidden = buffer.g1Alt3() == 1
+        return IfSetHide(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            hidden,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetModelV1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetModelV1Decoder.kt
new file mode 100644
index 000000000..763221b84
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetModelV1Decoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt2
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModelV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetModelV1Decoder : ProxyMessageDecoder<IfSetModelV1> {
+    override val prot: ClientProt = GameServerProt.IF_SETMODEL_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetModelV1 {
+        val model = buffer.g2Alt3()
+        val combinedId = buffer.gCombinedIdAlt2()
+        return IfSetModelV1(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            model,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetModelV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetModelV2Decoder.kt
new file mode 100644
index 000000000..98720e534
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetModelV2Decoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt3
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModelV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetModelV2Decoder : ProxyMessageDecoder<IfSetModelV2> {
+    override val prot: ClientProt = GameServerProt.IF_SETMODEL_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetModelV2 {
+        val model = buffer.g4Alt1()
+        val combinedId = buffer.gCombinedIdAlt3()
+        return IfSetModelV2(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            model,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadActiveDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadActiveDecoder.kt
new file mode 100644
index 000000000..8071d54db
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadActiveDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedId
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetNpcHeadActive
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetNpcHeadActiveDecoder : ProxyMessageDecoder<IfSetNpcHeadActive> {
+    override val prot: ClientProt = GameServerProt.IF_SETNPCHEAD_ACTIVE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetNpcHeadActive {
+        val combinedId = buffer.gCombinedId()
+        val index = buffer.g2()
+        return IfSetNpcHeadActive(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            index,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadDecoder.kt
new file mode 100644
index 000000000..467997f7c
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt1
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetNpcHead
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetNpcHeadDecoder : ProxyMessageDecoder<IfSetNpcHead> {
+    override val prot: ClientProt = GameServerProt.IF_SETNPCHEAD
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetNpcHead {
+        val npc = buffer.g2Alt3()
+        val combinedId = buffer.gCombinedIdAlt1()
+        return IfSetNpcHead(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            npc,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetObjectDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetObjectDecoder.kt
new file mode 100644
index 000000000..a79b4b745
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetObjectDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt2
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetObject
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetObjectDecoder : ProxyMessageDecoder<IfSetObject> {
+    override val prot: ClientProt = GameServerProt.IF_SETOBJECT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetObject {
+        val count = buffer.g4Alt1()
+        val obj = buffer.g2Alt3()
+        val combinedId = buffer.gCombinedIdAlt2()
+        return IfSetObject(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            obj,
+            count,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPlayerHeadDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPlayerHeadDecoder.kt
new file mode 100644
index 000000000..4d4141d89
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPlayerHeadDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt1
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetPlayerHead
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetPlayerHeadDecoder : ProxyMessageDecoder<IfSetPlayerHead> {
+    override val prot: ClientProt = GameServerProt.IF_SETPLAYERHEAD
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetPlayerHead {
+        val combinedId = buffer.gCombinedIdAlt1()
+        return IfSetPlayerHead(
+            combinedId.interfaceId,
+            combinedId.componentId,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBaseColourDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBaseColourDecoder.kt
new file mode 100644
index 000000000..6d6b3057e
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBaseColourDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt2
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetPlayerModelBaseColour
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetPlayerModelBaseColourDecoder : ProxyMessageDecoder<IfSetPlayerModelBaseColour> {
+    override val prot: ClientProt = GameServerProt.IF_SETPLAYERMODEL_BASECOLOUR
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetPlayerModelBaseColour {
+        val combinedId = buffer.gCombinedIdAlt2()
+        val colour = buffer.g1()
+        val index = buffer.g1Alt3()
+        return IfSetPlayerModelBaseColour(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            index,
+            colour,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBodyTypeDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBodyTypeDecoder.kt
new file mode 100644
index 000000000..734efa05d
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBodyTypeDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedId
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetPlayerModelBodyType
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetPlayerModelBodyTypeDecoder : ProxyMessageDecoder<IfSetPlayerModelBodyType> {
+    override val prot: ClientProt = GameServerProt.IF_SETPLAYERMODEL_BODYTYPE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetPlayerModelBodyType {
+        val bodyType = buffer.g1Alt2()
+        val combinedId = buffer.gCombinedId()
+        return IfSetPlayerModelBodyType(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            bodyType,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelObjDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelObjDecoder.kt
new file mode 100644
index 000000000..baeba9771
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelObjDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt1
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetPlayerModelObj
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetPlayerModelObjDecoder : ProxyMessageDecoder<IfSetPlayerModelObj> {
+    override val prot: ClientProt = GameServerProt.IF_SETPLAYERMODEL_OBJ
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetPlayerModelObj {
+        val obj = buffer.g4Alt3()
+        val combinedId = buffer.gCombinedIdAlt1()
+        return IfSetPlayerModelObj(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            obj,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelSelfDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelSelfDecoder.kt
new file mode 100644
index 000000000..3662743ad
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelSelfDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt1
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetPlayerModelSelf
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetPlayerModelSelfDecoder : ProxyMessageDecoder<IfSetPlayerModelSelf> {
+    override val prot: ClientProt = GameServerProt.IF_SETPLAYERMODEL_SELF
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetPlayerModelSelf {
+        val copyObjs = buffer.g1Alt1() == 1
+        val combinedId = buffer.gCombinedIdAlt1()
+        return IfSetPlayerModelSelf(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            copyObjs,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPositionDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPositionDecoder.kt
new file mode 100644
index 000000000..4b27f0394
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetPositionDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedId
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetPosition
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetPositionDecoder : ProxyMessageDecoder<IfSetPosition> {
+    override val prot: ClientProt = GameServerProt.IF_SETPOSITION
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetPosition {
+        val y = buffer.g2sAlt1()
+        val x = buffer.g2sAlt1()
+        val combinedId = buffer.gCombinedId()
+        return IfSetPosition(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            x,
+            y,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetRotateSpeedDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetRotateSpeedDecoder.kt
new file mode 100644
index 000000000..1ad31a547
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetRotateSpeedDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt3
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetRotateSpeed
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetRotateSpeedDecoder : ProxyMessageDecoder<IfSetRotateSpeed> {
+    override val prot: ClientProt = GameServerProt.IF_SETROTATESPEED
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetRotateSpeed {
+        val combinedId = buffer.gCombinedIdAlt3()
+        val xSpeed = buffer.g2()
+        val ySpeed = buffer.g2Alt1()
+        return IfSetRotateSpeed(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            xSpeed,
+            ySpeed,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetScrollPosDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetScrollPosDecoder.kt
new file mode 100644
index 000000000..cd95e71b6
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetScrollPosDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedIdAlt3
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetScrollPos
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetScrollPosDecoder : ProxyMessageDecoder<IfSetScrollPos> {
+    override val prot: ClientProt = GameServerProt.IF_SETSCROLLPOS
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetScrollPos {
+        val combinedId = buffer.gCombinedIdAlt3()
+        val scrollPos = buffer.g2Alt1()
+        return IfSetScrollPos(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            scrollPos,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetTextDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetTextDecoder.kt
new file mode 100644
index 000000000..6600bcabc
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/interfaces/IfSetTextDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedId
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetText
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class IfSetTextDecoder : ProxyMessageDecoder<IfSetText> {
+    override val prot: ClientProt = GameServerProt.IF_SETTEXT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): IfSetText {
+        val combinedId = buffer.gCombinedId()
+        val text = buffer.gjstr()
+        return IfSetText(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            text,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/inv/UpdateInvFullDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/inv/UpdateInvFullDecoder.kt
new file mode 100644
index 000000000..c85dd8d00
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/inv/UpdateInvFullDecoder.kt
@@ -0,0 +1,39 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.inv
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.util.gCombinedId
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.inv.UpdateInvFull
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class UpdateInvFullDecoder : ProxyMessageDecoder<UpdateInvFull> {
+    override val prot: ClientProt = GameServerProt.UPDATE_INV_FULL
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UpdateInvFull {
+        val combinedId = buffer.gCombinedId()
+        val inventoryId = buffer.g2()
+        val capacity = buffer.g2()
+        val objs =
+            buildList {
+                for (i in 0..<capacity) {
+                    val id = buffer.g2Alt3()
+                    var count = buffer.g1Alt3()
+                    if (count >= 0xFF) {
+                        count = buffer.g4()
+                    }
+                    add(UpdateInvFull.Obj(id - 1, count))
+                }
+            }
+        return UpdateInvFull(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            inventoryId,
+            objs,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/inv/UpdateInvPartialDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/inv/UpdateInvPartialDecoder.kt
new file mode 100644
index 000000000..f35c04ffe
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/inv/UpdateInvPartialDecoder.kt
@@ -0,0 +1,45 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.inv
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprot.protocol.util.gCombinedId
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.inv.UpdateInvPartial
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class UpdateInvPartialDecoder : ProxyMessageDecoder<UpdateInvPartial> {
+    override val prot: ClientProt = GameServerProt.UPDATE_INV_PARTIAL
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UpdateInvPartial {
+        val combinedId = buffer.gCombinedId()
+        val inventoryId = buffer.g2()
+        val objs =
+            buildList {
+                while (buffer.isReadable) {
+                    val slot = buffer.gSmart1or2()
+                    val id = buffer.g2()
+                    if (id == 0) {
+                        add(UpdateInvPartial.IndexedObj(slot, -1, 0))
+                        continue
+                    }
+                    var count = buffer.g1()
+                    if (count >= 0xFF) {
+                        count = buffer.g4()
+                    }
+                    add(UpdateInvPartial.IndexedObj(slot, id - 1, count))
+                }
+            }
+        return UpdateInvPartial(
+            combinedId.interfaceId,
+            combinedId.componentId,
+            inventoryId,
+            objs,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/inv/UpdateInvStopTransmitDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/inv/UpdateInvStopTransmitDecoder.kt
new file mode 100644
index 000000000..a753c22f4
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/inv/UpdateInvStopTransmitDecoder.kt
@@ -0,0 +1,20 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.inv
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.inv.UpdateInvStopTransmit
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class UpdateInvStopTransmitDecoder : ProxyMessageDecoder<UpdateInvStopTransmit> {
+    override val prot: ClientProt = GameServerProt.UPDATE_INV_STOPTRANSMIT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UpdateInvStopTransmit {
+        val inventoryId = buffer.g2Alt1()
+        return UpdateInvStopTransmit(inventoryId)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/logout/LogoutDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/logout/LogoutDecoder.kt
new file mode 100644
index 000000000..f4fc0f6f7
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/logout/LogoutDecoder.kt
@@ -0,0 +1,21 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.logout
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.logout.Logout
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class LogoutDecoder : ProxyMessageDecoder<Logout> {
+    override val prot: ClientProt = GameServerProt.LOGOUT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): Logout {
+        return Logout
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/logout/LogoutTransferDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/logout/LogoutTransferDecoder.kt
new file mode 100644
index 000000000..8d9dd5ec1
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/logout/LogoutTransferDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.logout
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.logout.LogoutTransfer
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class LogoutTransferDecoder : ProxyMessageDecoder<LogoutTransfer> {
+    override val prot: ClientProt = GameServerProt.LOGOUT_TRANSFER
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): LogoutTransfer {
+        val host = buffer.gjstr()
+        val id = buffer.g2()
+        val properties = buffer.g4()
+        return LogoutTransfer(
+            host,
+            id,
+            properties,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/logout/LogoutWithReasonDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/logout/LogoutWithReasonDecoder.kt
new file mode 100644
index 000000000..db028aefa
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/logout/LogoutWithReasonDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.logout
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.logout.LogoutWithReason
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class LogoutWithReasonDecoder : ProxyMessageDecoder<LogoutWithReason> {
+    override val prot: ClientProt = GameServerProt.LOGOUT_WITHREASON
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): LogoutWithReason {
+        val reason = buffer.g1()
+        return LogoutWithReason(reason)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/RebuildRegionV1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/RebuildRegionV1Decoder.kt
new file mode 100644
index 000000000..30c063b49
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/RebuildRegionV1Decoder.kt
@@ -0,0 +1,55 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.map
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.buffer.bitbuffer.toBitBuf
+import net.rsprot.crypto.xtea.XteaKey
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV1
+import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
+import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.session.getWorld
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class RebuildRegionV1Decoder : ProxyMessageDecoder<RebuildRegionV1> {
+    override val prot: ClientProt = GameServerProt.REBUILD_REGION_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): RebuildRegionV1 {
+        val zoneZ = buffer.g2Alt1()
+        val zoneX = buffer.g2Alt3()
+        val reload = buffer.g1() == 1
+        val xteaCount = buffer.g2()
+        val buildArea = BuildArea()
+        buffer.buffer.toBitBuf().use { bitBuf ->
+            for (level in 0..<4) {
+                for (x in 0..<13) {
+                    for (z in 0..<13) {
+                        val exists = bitBuf.gBits(1) == 1
+                        val value = if (exists) bitBuf.gBits(26) else -1
+                        buildArea[level, x, z] = RebuildRegionZone(value)
+                    }
+                }
+            }
+        }
+        val keys =
+            buildList {
+                for (i in 0..<xteaCount) {
+                    add(XteaKey(buffer.g4(), buffer.g4(), buffer.g4(), buffer.g4()))
+                }
+            }
+        val world = session.getWorld(-1)
+        world.baseX = (zoneX - 6) * 8
+        world.baseZ = (zoneZ - 6) * 8
+        return RebuildRegionV1(
+            zoneX,
+            zoneZ,
+            reload,
+            buildArea,
+            keys,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/RebuildRegionV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/RebuildRegionV2Decoder.kt
new file mode 100644
index 000000000..92f54f29e
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/RebuildRegionV2Decoder.kt
@@ -0,0 +1,49 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.map
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.buffer.bitbuffer.toBitBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV2
+import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
+import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.session.getWorld
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class RebuildRegionV2Decoder : ProxyMessageDecoder<RebuildRegionV2> {
+    override val prot: ClientProt = GameServerProt.REBUILD_REGION_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): RebuildRegionV2 {
+        val reload = buffer.g1Alt1() == 1
+        val zoneX = buffer.g2()
+        val zoneZ = buffer.g2Alt3()
+
+        @Suppress("UnusedVariable", "unused")
+        val distinctMapsquareCount = buffer.g2()
+        val buildArea = BuildArea()
+        buffer.buffer.toBitBuf().use { bitBuf ->
+            for (level in 0..<4) {
+                for (x in 0..<13) {
+                    for (z in 0..<13) {
+                        val exists = bitBuf.gBits(1) == 1
+                        val value = if (exists) bitBuf.gBits(26) else -1
+                        buildArea[level, x, z] = RebuildRegionZone(value)
+                    }
+                }
+            }
+        }
+        val world = session.getWorld(-1)
+        world.baseX = (zoneX - 6) * 8
+        world.baseZ = (zoneZ - 6) * 8
+        return RebuildRegionV2(
+            zoneX,
+            zoneZ,
+            reload,
+            buildArea,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/RebuildWorldEntityV3Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/RebuildWorldEntityV3Decoder.kt
new file mode 100644
index 000000000..3ae925d44
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/RebuildWorldEntityV3Decoder.kt
@@ -0,0 +1,58 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.map
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.buffer.bitbuffer.toBitBuf
+import net.rsprot.crypto.xtea.XteaKey
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.map.RebuildWorldEntityV3
+import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
+import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.session.getActiveWorld
+import net.rsprox.protocol.session.getWorld
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class RebuildWorldEntityV3Decoder : ProxyMessageDecoder<RebuildWorldEntityV3> {
+    override val prot: ClientProt = GameServerProt.REBUILD_WORLDENTITY_V3
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): RebuildWorldEntityV3 {
+        val baseX = buffer.g2()
+        val baseZ = buffer.g2()
+        val xteaCount = buffer.g2()
+        val world = session.getWorld(session.getActiveWorld())
+        val width = world.sizeX / 8
+        val length = world.sizeZ / 8
+        val buildArea = BuildArea(4, width, length)
+        buffer.buffer.toBitBuf().use { bitBuf ->
+            for (level in 0..<4) {
+                for (x in 0..<width) {
+                    for (z in 0..<length) {
+                        val exists = bitBuf.gBits(1) == 1
+                        val value = if (exists) bitBuf.gBits(26) else -1
+                        buildArea[level, x, z] = RebuildRegionZone(value)
+                    }
+                }
+            }
+        }
+        val keys =
+            buildList {
+                for (i in 0..<xteaCount) {
+                    add(XteaKey(buffer.g4(), buffer.g4(), buffer.g4(), buffer.g4()))
+                }
+            }
+        world.baseX = baseX
+        world.baseZ = baseZ
+        return RebuildWorldEntityV3(
+            baseX,
+            baseZ,
+            buildArea,
+            keys,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/RebuildWorldEntityV4Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/RebuildWorldEntityV4Decoder.kt
new file mode 100644
index 000000000..531423e94
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/RebuildWorldEntityV4Decoder.kt
@@ -0,0 +1,52 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.map
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.buffer.bitbuffer.toBitBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.map.RebuildWorldEntityV4
+import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
+import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.session.getActiveWorld
+import net.rsprox.protocol.session.getWorld
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class RebuildWorldEntityV4Decoder : ProxyMessageDecoder<RebuildWorldEntityV4> {
+    override val prot: ClientProt = GameServerProt.REBUILD_WORLDENTITY_V4
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): RebuildWorldEntityV4 {
+        val baseX = buffer.g2()
+        val baseZ = buffer.g2()
+
+        @Suppress("UnusedVariable", "unused")
+        val distinctMapsquareCount = buffer.g2()
+        val world = session.getWorld(session.getActiveWorld())
+        val width = world.sizeX / 8
+        val length = world.sizeZ / 8
+        val buildArea = BuildArea(4, width, length)
+        buffer.buffer.toBitBuf().use { bitBuf ->
+            for (level in 0..<4) {
+                for (x in 0..<width) {
+                    for (z in 0..<length) {
+                        val exists = bitBuf.gBits(1) == 1
+                        val value = if (exists) bitBuf.gBits(26) else -1
+                        buildArea[level, x, z] = RebuildRegionZone(value)
+                    }
+                }
+            }
+        }
+        world.baseX = baseX
+        world.baseZ = baseZ
+        return RebuildWorldEntityV4(
+            baseX,
+            baseZ,
+            buildArea,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/ReconnectDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/ReconnectDecoder.kt
new file mode 100644
index 000000000..3157fb6a3
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/ReconnectDecoder.kt
@@ -0,0 +1,45 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.map
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.buffer.bitbuffer.toBitBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
+import net.rsprox.protocol.game.outgoing.model.map.Reconnect
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.session.getActiveWorld
+import net.rsprox.protocol.session.getWorld
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Suppress("DuplicatedCode")
+internal class ReconnectDecoder : ProxyMessageDecoder<Reconnect> {
+    override val prot: ClientProt = GameServerProt.RECONNECT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): Reconnect {
+        val playerInfoInitBlock =
+            buffer.buffer
+                .toBitBuf()
+                .use { bitBuf ->
+                    val localPlayerAbsolutePosition = bitBuf.gBits(30)
+                    val lowResolutionPositions = IntArray(2048)
+                    for (i in 1..<lowResolutionPositions.size) {
+                        if (i == session.localPlayerIndex) continue
+                        lowResolutionPositions[i] = bitBuf.gBits(18)
+                    }
+                    PlayerInfoInitBlock(
+                        session.localPlayerIndex,
+                        CoordGrid(localPlayerAbsolutePosition),
+                        lowResolutionPositions,
+                    )
+                }
+
+        val info = session.getWorld(session.getActiveWorld()).playerInfo
+        info.reset()
+        info.gpiInit(playerInfoInitBlock)
+        return Reconnect(playerInfoInitBlock)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/StaticRebuildV1Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/StaticRebuildV1Decoder.kt
new file mode 100644
index 000000000..60a55e6b3
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/StaticRebuildV1Decoder.kt
@@ -0,0 +1,151 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.map
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.buffer.bitbuffer.toBitBuf
+import net.rsprot.compression.HuffmanCodec
+import net.rsprot.crypto.xtea.XteaKey
+import net.rsprot.protocol.ClientProt
+import net.rsprox.cache.api.CacheProvider
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildNormalV1
+import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessageV1
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.session.allocateWorld
+import net.rsprox.protocol.session.getWorld
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+import net.rsprox.protocol.v237.game.outgoing.model.info.npcinfo.NpcInfoClient
+import net.rsprox.protocol.v237.game.outgoing.model.info.playerinfo.PlayerInfoClient
+import net.rsprox.protocol.v237.game.outgoing.model.info.worldentityinfo.WorldEntityInfoClient
+
+internal class StaticRebuildV1Decoder(
+    private val huffmanCodec: HuffmanCodec,
+    private val cache: CacheProvider,
+) : ProxyMessageDecoder<StaticRebuildMessageV1> {
+    override val prot: ClientProt = GameServerProt.REBUILD_NORMAL_V1
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): StaticRebuildMessageV1 {
+        val playerInfoInitBlock =
+            if (buffer.isReadable(MINIMUM_REBUILD_LOGIN_CAPACITY)) {
+                buffer.buffer
+                    .toBitBuf()
+                    .use { bitBuf ->
+                        val localPlayerAbsolutePosition = bitBuf.gBits(30)
+                        val lowResolutionPositions = IntArray(2048)
+                        for (i in 1..<lowResolutionPositions.size) {
+                            if (i == session.localPlayerIndex) continue
+                            lowResolutionPositions[i] = bitBuf.gBits(18)
+                        }
+                        PlayerInfoInitBlock(
+                            session.localPlayerIndex,
+                            CoordGrid(localPlayerAbsolutePosition),
+                            lowResolutionPositions,
+                        )
+                    }
+            } else {
+                null
+            }
+        val worldArea = buffer.g2sAlt3()
+        val zoneX = buffer.g2Alt1()
+        val zoneZ = buffer.g2Alt2()
+        val xteaCount = buffer.g2()
+        val keys =
+            buildList {
+                for (i in 0..<xteaCount) {
+                    add(
+                        XteaKey(
+                            buffer.g4(),
+                            buffer.g4(),
+                            buffer.g4(),
+                            buffer.g4(),
+                        ),
+                    )
+                }
+            }
+        return if (playerInfoInitBlock != null) {
+            val message =
+                RebuildLoginV1(
+                    zoneX,
+                    zoneZ,
+                    worldArea,
+                    keys,
+                    playerInfoInitBlock,
+                )
+            val world =
+                session.allocateWorld(
+                    -1,
+                    PlayerInfoClient(
+                        session.localPlayerIndex,
+                        huffmanCodec,
+                    ),
+                    NpcInfoClient(cache),
+                    WorldEntityInfoClient(),
+                )
+            world.baseX = (zoneX - 6) * 8
+            world.baseZ = (zoneZ - 6) * 8
+            world.playerInfo.gpiInit(playerInfoInitBlock)
+            message
+        } else {
+            val world = session.getWorld(-1)
+            world.baseX = (zoneX - 6) * 8
+            world.baseZ = (zoneZ - 6) * 8
+            RebuildNormalV1(
+                zoneX,
+                zoneZ,
+                worldArea,
+                keys,
+            )
+        }
+    }
+
+    private companion object {
+        /**
+         * Maximum num of bits that can be carried without using up an entire byte.
+         * We need this constant to ensure that our calculations "round up" without ever creating
+         * a new byte that shouldn't have been there to begin with.
+         */
+        private const val MAX_BITS_BELOW_BYTE: Int = Byte.SIZE_BITS - 1
+
+        /**
+         * The minimum number of mapsquares that could ever be sent via static rebuilds.
+         * The number can always be higher, but never below 4 with the current 104x104
+         * size buildarea.
+         */
+        private const val MINIMUM_NUM_OF_MAPSQUARES: Int = 4
+
+        /**
+         * Minimum number of bytes necessary to transmit the player info initialization block.
+         */
+        private const val MINIMUM_PLAYER_INFO_INIT_SIZE: Int = (18 * 2046 + 30 + MAX_BITS_BELOW_BYTE) ushr 3
+
+        /**
+         * The minimum number of bytes necessary to transmit everything but xteas for rebuild normal.
+         */
+        private const val MINIMUM_REBUILD_HEADER_BYTES: Int =
+            Short.SIZE_BYTES +
+                Short.SIZE_BYTES +
+                Short.SIZE_BYTES
+
+        /**
+         * The minimum number of bytes necessary to transmit the smallest possible xtea block.
+         */
+        private const val MINIMUM_REBUILD_XTEA_BYTES: Int =
+            Short.SIZE_BYTES +
+                MINIMUM_NUM_OF_MAPSQUARES * (4 * Int.SIZE_BYTES)
+
+        /**
+         * Minimum number of bytes necessary for rebuild login to work.
+         * It should be noted that this assumes that the xtea block requires at least 4 mapsquares,
+         * which would be the bare minimum at specific coordinates. The number could always be higher.
+         */
+        private const val MINIMUM_REBUILD_LOGIN_CAPACITY: Int =
+            MINIMUM_PLAYER_INFO_INIT_SIZE +
+                MINIMUM_REBUILD_HEADER_BYTES +
+                MINIMUM_REBUILD_XTEA_BYTES
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/StaticRebuildV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/StaticRebuildV2Decoder.kt
new file mode 100644
index 000000000..4c40871bf
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/map/StaticRebuildV2Decoder.kt
@@ -0,0 +1,119 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.map
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.buffer.bitbuffer.toBitBuf
+import net.rsprot.compression.HuffmanCodec
+import net.rsprot.protocol.ClientProt
+import net.rsprox.cache.api.CacheProvider
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV2
+import net.rsprox.protocol.game.outgoing.model.map.RebuildNormalV2
+import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessageV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.session.allocateWorld
+import net.rsprox.protocol.session.getWorld
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+import net.rsprox.protocol.v237.game.outgoing.model.info.npcinfo.NpcInfoClient
+import net.rsprox.protocol.v237.game.outgoing.model.info.playerinfo.PlayerInfoClient
+import net.rsprox.protocol.v237.game.outgoing.model.info.worldentityinfo.WorldEntityInfoClient
+
+internal class StaticRebuildV2Decoder(
+    private val huffmanCodec: HuffmanCodec,
+    private val cache: CacheProvider,
+) : ProxyMessageDecoder<StaticRebuildMessageV2> {
+    override val prot: ClientProt = GameServerProt.REBUILD_NORMAL_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): StaticRebuildMessageV2 {
+        val playerInfoInitBlock =
+            if (buffer.isReadable(MINIMUM_REBUILD_LOGIN_CAPACITY)) {
+                buffer.buffer
+                    .toBitBuf()
+                    .use { bitBuf ->
+                        val localPlayerAbsolutePosition = bitBuf.gBits(30)
+                        val lowResolutionPositions = IntArray(2048)
+                        for (i in 1..<lowResolutionPositions.size) {
+                            if (i == session.localPlayerIndex) continue
+                            lowResolutionPositions[i] = bitBuf.gBits(18)
+                        }
+                        PlayerInfoInitBlock(
+                            session.localPlayerIndex,
+                            CoordGrid(localPlayerAbsolutePosition),
+                            lowResolutionPositions,
+                        )
+                    }
+            } else {
+                null
+            }
+        val worldArea = buffer.g2s()
+        val zoneX = buffer.g2Alt1()
+        val zoneZ = buffer.g2Alt1()
+        return if (playerInfoInitBlock != null) {
+            val message =
+                RebuildLoginV2(
+                    zoneX,
+                    zoneZ,
+                    worldArea,
+                    playerInfoInitBlock,
+                )
+            val world =
+                session.allocateWorld(
+                    -1,
+                    PlayerInfoClient(
+                        session.localPlayerIndex,
+                        huffmanCodec,
+                    ),
+                    NpcInfoClient(cache),
+                    WorldEntityInfoClient(),
+                )
+            world.baseX = (zoneX - 6) * 8
+            world.baseZ = (zoneZ - 6) * 8
+            world.playerInfo.gpiInit(playerInfoInitBlock)
+            message
+        } else {
+            val world = session.getWorld(-1)
+            world.baseX = (zoneX - 6) * 8
+            world.baseZ = (zoneZ - 6) * 8
+            RebuildNormalV2(
+                zoneX,
+                zoneZ,
+                worldArea,
+            )
+        }
+    }
+
+    private companion object {
+        /**
+         * Maximum num of bits that can be carried without using up an entire byte.
+         * We need this constant to ensure that our calculations "round up" without ever creating
+         * a new byte that shouldn't have been there to begin with.
+         */
+        private const val MAX_BITS_BELOW_BYTE: Int = Byte.SIZE_BITS - 1
+
+        /**
+         * Minimum number of bytes necessary to transmit the player info initialization block.
+         */
+        private const val MINIMUM_PLAYER_INFO_INIT_SIZE: Int = (18 * 2046 + 30 + MAX_BITS_BELOW_BYTE) ushr 3
+
+        /**
+         * The minimum number of bytes necessary to transmit everything but xteas for rebuild normal.
+         */
+        private const val MINIMUM_REBUILD_HEADER_BYTES: Int =
+            Short.SIZE_BYTES +
+                Short.SIZE_BYTES +
+                Short.SIZE_BYTES
+
+        /**
+         * Minimum number of bytes necessary for rebuild login to work.
+         * It should be noted that this assumes that the xtea block requires at least 4 mapsquares,
+         * which would be the bare minimum at specific coordinates. The number could always be higher.
+         */
+        private const val MINIMUM_REBUILD_LOGIN_CAPACITY: Int =
+            MINIMUM_PLAYER_INFO_INIT_SIZE +
+                MINIMUM_REBUILD_HEADER_BYTES
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/HideLocOpsDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/HideLocOpsDecoder.kt
new file mode 100644
index 000000000..078befe0c
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/HideLocOpsDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.HideLocOps
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class HideLocOpsDecoder : ProxyMessageDecoder<HideLocOps> {
+    override val prot: ClientProt = GameServerProt.HIDELOCOPS
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): HideLocOps {
+        val hidden = buffer.gboolean()
+        return HideLocOps(hidden)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/HideNpcOpsDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/HideNpcOpsDecoder.kt
new file mode 100644
index 000000000..75bddf42f
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/HideNpcOpsDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.HideNpcOps
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class HideNpcOpsDecoder : ProxyMessageDecoder<HideNpcOps> {
+    override val prot: ClientProt = GameServerProt.HIDENPCOPS
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): HideNpcOps {
+        val hidden = buffer.gboolean()
+        return HideNpcOps(hidden)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/HideObjOpsDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/HideObjOpsDecoder.kt
new file mode 100644
index 000000000..01e476c07
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/HideObjOpsDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.HideObjOps
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class HideObjOpsDecoder : ProxyMessageDecoder<HideObjOps> {
+    override val prot: ClientProt = GameServerProt.HIDEOBJOPS
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): HideObjOps {
+        val hidden = buffer.gboolean()
+        return HideObjOps(hidden)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/HintArrowDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/HintArrowDecoder.kt
new file mode 100644
index 000000000..84fba4773
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/HintArrowDecoder.kt
@@ -0,0 +1,55 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.HintArrow
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class HintArrowDecoder : ProxyMessageDecoder<HintArrow> {
+    override val prot: ClientProt = GameServerProt.HINT_ARROW
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): HintArrow {
+        return when (val type = buffer.g1()) {
+            0 -> {
+                buffer.skipRead(5)
+                HintArrow(HintArrow.ResetHintArrow)
+            }
+            1 -> {
+                val index = buffer.g2()
+                buffer.skipRead(3)
+                HintArrow(HintArrow.NpcHintArrow(index))
+            }
+            10 -> {
+                val index = buffer.g2()
+                buffer.skipRead(3)
+                HintArrow(HintArrow.PlayerHintArrow(index))
+            }
+            11 -> {
+                val index = buffer.g2()
+                val height = buffer.g3()
+                HintArrow(HintArrow.WorldEntityHintArrow(index, height))
+            }
+            in 2..6 -> {
+                val x = buffer.g2()
+                val z = buffer.g2()
+                val height = buffer.g1()
+                HintArrow(
+                    HintArrow.TileHintArrow(
+                        x,
+                        z,
+                        height,
+                        type,
+                    ),
+                )
+            }
+            else -> error("Unknown hint arrow type: $type")
+        }
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/HiscoreReplyDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/HiscoreReplyDecoder.kt
new file mode 100644
index 000000000..cc81a93b2
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/HiscoreReplyDecoder.kt
@@ -0,0 +1,78 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.HiscoreReply
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class HiscoreReplyDecoder : ProxyMessageDecoder<HiscoreReply> {
+    override val prot: ClientProt = GameServerProt.HISCORE_REPLY
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): HiscoreReply {
+        val requestId = buffer.g1()
+        return when (val responseType = buffer.g1()) {
+            0 -> {
+                val version = buffer.g1()
+                val statCount = buffer.g1()
+                val stats =
+                    buildList {
+                        for (i in 0..<statCount) {
+                            val id = buffer.g2()
+                            val rank = buffer.g4()
+                            val result = buffer.g4()
+                            add(
+                                HiscoreReply.HiscoreResult(
+                                    id,
+                                    rank,
+                                    result,
+                                ),
+                            )
+                        }
+                    }
+                val overallRank = buffer.g4()
+                val overallExperience = buffer.g8()
+                val activityCount = buffer.g2()
+                val activities =
+                    buildList {
+                        for (i in 0..<activityCount) {
+                            val id = buffer.g2()
+                            val rank = buffer.g4()
+                            val result = buffer.g4()
+                            add(
+                                HiscoreReply.HiscoreResult(
+                                    id,
+                                    rank,
+                                    result,
+                                ),
+                            )
+                        }
+                    }
+                HiscoreReply(
+                    requestId,
+                    HiscoreReply.SuccessfulHiscoreReply(
+                        version,
+                        stats,
+                        overallRank,
+                        overallExperience,
+                        activities,
+                    ),
+                )
+            }
+            1 -> {
+                val reason = buffer.gjstr()
+                HiscoreReply(
+                    requestId,
+                    HiscoreReply.FailedHiscoreReply(reason),
+                )
+            }
+            else -> error("Invalid hiscore reply type: $responseType")
+        }
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/MinimapToggleDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/MinimapToggleDecoder.kt
new file mode 100644
index 000000000..2c22f5e5c
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/MinimapToggleDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.MinimapToggle
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class MinimapToggleDecoder : ProxyMessageDecoder<MinimapToggle> {
+    override val prot: ClientProt = GameServerProt.MINIMAP_TOGGLE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MinimapToggle {
+        val state = buffer.g1()
+        return MinimapToggle(state)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/PacketGroupEndDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/PacketGroupEndDecoder.kt
new file mode 100644
index 000000000..9a5f059ea
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/PacketGroupEndDecoder.kt
@@ -0,0 +1,21 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.PacketGroupEnd
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class PacketGroupEndDecoder : ProxyMessageDecoder<PacketGroupEnd> {
+    override val prot: ClientProt = GameServerProt.PACKET_GROUP_END
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): PacketGroupEnd {
+        return PacketGroupEnd(buffer.g2())
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/PacketGroupStartDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/PacketGroupStartDecoder.kt
new file mode 100644
index 000000000..e3ccd9556
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/PacketGroupStartDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.PacketGroupStart
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.session.setBytesConsumed
+import net.rsprox.protocol.session.setRemainingBytesInPacketGroup
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class PacketGroupStartDecoder : ProxyMessageDecoder<PacketGroupStart> {
+    override val prot: ClientProt = GameServerProt.PACKET_GROUP_START
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): PacketGroupStart {
+        val length = buffer.g2s()
+        session.setRemainingBytesInPacketGroup(length)
+        session.setBytesConsumed(null)
+        return PacketGroupStart(length)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/ReflectionCheckerDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/ReflectionCheckerDecoder.kt
new file mode 100644
index 000000000..eba06daa9
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/ReflectionCheckerDecoder.kt
@@ -0,0 +1,123 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.ReflectionChecker
+import net.rsprox.protocol.reflection.ReflectionCheck
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.session.getReflectionChecks
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Suppress("DuplicatedCode")
+@Consistent
+internal class ReflectionCheckerDecoder : ProxyMessageDecoder<ReflectionChecker> {
+    override val prot: ClientProt = GameServerProt.REFLECTION_CHECKER
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ReflectionChecker {
+        val checksCount = buffer.g1()
+        val id = buffer.g4()
+        val checks =
+            buildList {
+                for (i in 0..<checksCount) {
+                    when (val opcode = buffer.g1()) {
+                        0 -> {
+                            val className = buffer.gjstr()
+                            val fieldName = buffer.gjstr()
+                            add(
+                                ReflectionCheck.GetFieldValue(
+                                    className,
+                                    fieldName,
+                                ),
+                            )
+                        }
+                        1 -> {
+                            val className = buffer.gjstr()
+                            val fieldName = buffer.gjstr()
+                            val value = buffer.g4()
+                            add(
+                                ReflectionCheck.SetFieldValue(
+                                    className,
+                                    fieldName,
+                                    value,
+                                ),
+                            )
+                        }
+                        2 -> {
+                            val className = buffer.gjstr()
+                            val fieldName = buffer.gjstr()
+                            add(
+                                ReflectionCheck.GetFieldModifiers(
+                                    className,
+                                    fieldName,
+                                ),
+                            )
+                        }
+                        3 -> {
+                            val className = buffer.gjstr()
+                            val methodName = buffer.gjstr()
+                            val parameterClassCount = buffer.g1()
+                            val parameterClasses =
+                                buildList {
+                                    for (j in 0..<parameterClassCount) {
+                                        add(buffer.gjstr())
+                                    }
+                                }
+                            val returnClass = buffer.gjstr()
+                            val parameterValues =
+                                buildList {
+                                    for (j in 0..<parameterClassCount) {
+                                        val size = buffer.g4()
+                                        val array = ByteArray(size)
+                                        buffer.gdata(array)
+                                        add(array)
+                                    }
+                                }
+                            add(
+                                ReflectionCheck.InvokeMethod(
+                                    className,
+                                    methodName,
+                                    parameterClasses,
+                                    parameterValues,
+                                    returnClass,
+                                ),
+                            )
+                        }
+                        4 -> {
+                            val className = buffer.gjstr()
+                            val methodName = buffer.gjstr()
+                            val parameterClassCount = buffer.g1()
+                            val parameterClasses =
+                                buildList {
+                                    for (j in 0..<parameterClassCount) {
+                                        add(buffer.gjstr())
+                                    }
+                                }
+                            val returnClass = buffer.gjstr()
+                            add(
+                                ReflectionCheck.GetMethodModifiers(
+                                    className,
+                                    methodName,
+                                    parameterClasses,
+                                    returnClass,
+                                ),
+                            )
+                        }
+                        else -> error("Unknown reflection check type: $opcode")
+                    }
+                }
+            }
+        val old = session.getReflectionChecks().put(id, checks)
+        check(old == null) {
+            "Overlapping reflection check: $old/$checks"
+        }
+        return ReflectionChecker(
+            id,
+            checks,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/ResetAnimsDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/ResetAnimsDecoder.kt
new file mode 100644
index 000000000..6f542e928
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/ResetAnimsDecoder.kt
@@ -0,0 +1,21 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.ResetAnims
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class ResetAnimsDecoder : ProxyMessageDecoder<ResetAnims> {
+    override val prot: ClientProt = GameServerProt.RESET_ANIMS
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ResetAnims {
+        return ResetAnims
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/ResetInteractionModeDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/ResetInteractionModeDecoder.kt
new file mode 100644
index 000000000..73d24c70f
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/ResetInteractionModeDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.ResetInteractionMode
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class ResetInteractionModeDecoder : ProxyMessageDecoder<ResetInteractionMode> {
+    override val prot: ClientProt = GameServerProt.RESET_INTERACTION_MODE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ResetInteractionMode {
+        val worldId = buffer.g2()
+        return ResetInteractionMode(
+            worldId,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/SendPingDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/SendPingDecoder.kt
new file mode 100644
index 000000000..64290be94
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/SendPingDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.SendPing
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class SendPingDecoder : ProxyMessageDecoder<SendPing> {
+    override val prot: ClientProt = GameServerProt.SEND_PING
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): SendPing {
+        val value1 = buffer.g4()
+        val value2 = buffer.g4()
+        return SendPing(
+            value1,
+            value2,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/ServerTickEndDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/ServerTickEndDecoder.kt
new file mode 100644
index 000000000..3f33612c9
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/ServerTickEndDecoder.kt
@@ -0,0 +1,21 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.ServerTickEnd
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class ServerTickEndDecoder : ProxyMessageDecoder<ServerTickEnd> {
+    override val prot: ClientProt = GameServerProt.SERVER_TICK_END
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ServerTickEnd {
+        return ServerTickEnd
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/SetHeatmapEnabledDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/SetHeatmapEnabledDecoder.kt
new file mode 100644
index 000000000..ced4dce00
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/SetHeatmapEnabledDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.SetHeatmapEnabled
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class SetHeatmapEnabledDecoder : ProxyMessageDecoder<SetHeatmapEnabled> {
+    override val prot: ClientProt = GameServerProt.SET_HEATMAP_ENABLED
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): SetHeatmapEnabled {
+        val enabled = buffer.gboolean()
+        return SetHeatmapEnabled(enabled)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/SetInteractionModeDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/SetInteractionModeDecoder.kt
new file mode 100644
index 000000000..651bb5b08
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/SetInteractionModeDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.SetInteractionMode
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class SetInteractionModeDecoder : ProxyMessageDecoder<SetInteractionMode> {
+    override val prot: ClientProt = GameServerProt.SET_INTERACTION_MODE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): SetInteractionMode {
+        val worldId = buffer.g2()
+        val tileInteractionMode = buffer.g1()
+        val entityInteractionMode = buffer.g1()
+        return SetInteractionMode(
+            worldId,
+            tileInteractionMode,
+            entityInteractionMode,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/SiteSettingsDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/SiteSettingsDecoder.kt
new file mode 100644
index 000000000..7bfed22a0
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/SiteSettingsDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.SiteSettings
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class SiteSettingsDecoder : ProxyMessageDecoder<SiteSettings> {
+    override val prot: ClientProt = GameServerProt.SITE_SETTINGS
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): SiteSettings {
+        val settings = buffer.gjstr()
+        return SiteSettings(
+            settings,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/UpdateRebootTimerV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/UpdateRebootTimerV2Decoder.kt
new file mode 100644
index 000000000..799a5facc
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/UpdateRebootTimerV2Decoder.kt
@@ -0,0 +1,32 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.UpdateRebootTimerV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class UpdateRebootTimerV2Decoder : ProxyMessageDecoder<UpdateRebootTimerV2> {
+    override val prot: ClientProt = GameServerProt.UPDATE_REBOOT_TIMER_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UpdateRebootTimerV2 {
+        val message = buffer.gjstr()
+        val gameCycles = buffer.g2Alt3()
+        return UpdateRebootTimerV2(
+            gameCycles,
+            when {
+                message.isEmpty() -> UpdateRebootTimerV2.IgnoreUpdateMessage
+                message == CANCEL -> UpdateRebootTimerV2.ClearUpdateMessage
+                else -> UpdateRebootTimerV2.SetUpdateMessage(message)
+            },
+        )
+    }
+
+    private companion object {
+        private const val CANCEL: String = "\u0018"
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/UpdateUid192Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/UpdateUid192Decoder.kt
new file mode 100644
index 000000000..ff8237fed
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/UpdateUid192Decoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.crypto.crc.CyclicRedundancyCheck
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.UpdateUid192
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class UpdateUid192Decoder : ProxyMessageDecoder<UpdateUid192> {
+    override val prot: ClientProt = GameServerProt.UPDATE_UID192
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UpdateUid192 {
+        val data = ByteArray(24)
+        buffer.gdata(data)
+        val expectedCrc = buffer.g4()
+        val crc = CyclicRedundancyCheck.computeCrc32(data)
+        if (expectedCrc != crc) {
+            throw IllegalStateException("CRC Mismatch: $expectedCrc != $crc")
+        }
+        return UpdateUid192(
+            data,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/UrlOpenDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/UrlOpenDecoder.kt
new file mode 100644
index 000000000..ec32bb719
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/UrlOpenDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.UrlOpen
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class UrlOpenDecoder : ProxyMessageDecoder<UrlOpen> {
+    override val prot: ClientProt = GameServerProt.URL_OPEN
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UrlOpen {
+        // The URL is already decrypted at the proxy level
+        // Additionally, any sensitive web tokens are erased at the proxy.
+        val url = buffer.gjstr()
+        return UrlOpen(
+            url,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/ZBufDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/ZBufDecoder.kt
new file mode 100644
index 000000000..571d50a34
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/client/ZBufDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.client.ZBuf
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class ZBufDecoder : ProxyMessageDecoder<ZBuf> {
+    override val prot: ClientProt = GameServerProt.ZBUF
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ZBuf {
+        val enabled = buffer.gboolean()
+        return ZBuf(enabled)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/AccountFlagsDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/AccountFlagsDecoder.kt
new file mode 100644
index 000000000..960d6ae15
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/AccountFlagsDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.player.AccountFlags
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class AccountFlagsDecoder : ProxyMessageDecoder<AccountFlags> {
+    override val prot: ClientProt = GameServerProt.ACCOUNT_FLAGS
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): AccountFlags {
+        val flags = buffer.g8()
+        return AccountFlags(
+            flags,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/ChatFilterSettingsDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/ChatFilterSettingsDecoder.kt
new file mode 100644
index 000000000..793727a48
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/ChatFilterSettingsDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.player.ChatFilterSettings
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class ChatFilterSettingsDecoder : ProxyMessageDecoder<ChatFilterSettings> {
+    override val prot: ClientProt = GameServerProt.CHAT_FILTER_SETTINGS
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ChatFilterSettings {
+        val publicChatFilter = buffer.g1Alt2()
+        val tradeChatFilter = buffer.g1Alt1()
+        return ChatFilterSettings(
+            publicChatFilter,
+            tradeChatFilter,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/ChatFilterSettingsPrivateChatDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/ChatFilterSettingsPrivateChatDecoder.kt
new file mode 100644
index 000000000..dcf993351
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/ChatFilterSettingsPrivateChatDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.player.ChatFilterSettingsPrivateChat
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class ChatFilterSettingsPrivateChatDecoder : ProxyMessageDecoder<ChatFilterSettingsPrivateChat> {
+    override val prot: ClientProt = GameServerProt.CHAT_FILTER_SETTINGS_PRIVATECHAT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ChatFilterSettingsPrivateChat {
+        val privateChatFilter = buffer.g1()
+        return ChatFilterSettingsPrivateChat(
+            privateChatFilter,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/MessageGameDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/MessageGameDecoder.kt
new file mode 100644
index 000000000..135f98549
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/MessageGameDecoder.kt
@@ -0,0 +1,40 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.player.MessageGame
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class MessageGameDecoder : ProxyMessageDecoder<MessageGame> {
+    override val prot: ClientProt = GameServerProt.MESSAGE_GAME
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MessageGame {
+        val type = buffer.gSmart1or2()
+        val name =
+            if (buffer.g1() == 1) {
+                buffer.gjstr()
+            } else {
+                null
+            }
+        val message = buffer.gjstr()
+        return if (name != null) {
+            MessageGame(
+                type,
+                name,
+                message,
+            )
+        } else {
+            MessageGame(
+                type,
+                message,
+            )
+        }
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/RunClientScriptDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/RunClientScriptDecoder.kt
new file mode 100644
index 000000000..d4b57138f
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/RunClientScriptDecoder.kt
@@ -0,0 +1,55 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.buffer.extensions.gjstr
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.player.RunClientScript
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class RunClientScriptDecoder : ProxyMessageDecoder<RunClientScript> {
+    override val prot: ClientProt = GameServerProt.RUNCLIENTSCRIPT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): RunClientScript {
+        val types = buffer.gjstr()
+        val arguments = ArrayDeque<Any>()
+        for (char in types.reversed()) {
+            when (char) {
+                'W' -> {
+                    val length = buffer.gVarInt2()
+                    val array =
+                        IntArray(length) {
+                            buffer.gVarInt2s()
+                        }
+                    arguments.addFirst(array)
+                }
+                'X' -> {
+                    val length = buffer.gVarInt2()
+                    val array =
+                        Array(length) {
+                            buffer.buffer.gjstr()
+                        }
+                    arguments.addFirst(array)
+                }
+                's' -> {
+                    arguments.addFirst(buffer.gjstr())
+                }
+                else -> {
+                    arguments.addFirst(buffer.g4())
+                }
+            }
+        }
+        val id = buffer.g4()
+        return RunClientScript(
+            id,
+            types.toCharArray(),
+            arguments,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/SetMapFlagV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/SetMapFlagV2Decoder.kt
new file mode 100644
index 000000000..d83f5211d
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/SetMapFlagV2Decoder.kt
@@ -0,0 +1,21 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.game.outgoing.model.misc.player.SetMapFlagV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class SetMapFlagV2Decoder : ProxyMessageDecoder<SetMapFlagV2> {
+    override val prot: ClientProt = GameServerProt.SET_MAP_FLAG_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): SetMapFlagV2 {
+        val coordGrid = CoordGrid(buffer.g4())
+        return SetMapFlagV2(coordGrid)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/SetPlayerOpDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/SetPlayerOpDecoder.kt
new file mode 100644
index 000000000..3909ccb98
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/SetPlayerOpDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.player.SetPlayerOp
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class SetPlayerOpDecoder : ProxyMessageDecoder<SetPlayerOp> {
+    override val prot: ClientProt = GameServerProt.SET_PLAYER_OP
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): SetPlayerOp {
+        val priority = buffer.g1Alt2() == 1
+        val id = buffer.g1()
+        val op = buffer.gjstr()
+        return SetPlayerOp(
+            id,
+            priority,
+            if (op == "null") null else op,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/TriggerOnDialogAbortDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/TriggerOnDialogAbortDecoder.kt
new file mode 100644
index 000000000..1e23b5a0e
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/TriggerOnDialogAbortDecoder.kt
@@ -0,0 +1,21 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.player.TriggerOnDialogAbort
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class TriggerOnDialogAbortDecoder : ProxyMessageDecoder<TriggerOnDialogAbort> {
+    override val prot: ClientProt = GameServerProt.TRIGGER_ONDIALOGABORT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): TriggerOnDialogAbort {
+        return TriggerOnDialogAbort
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/UpdateRunEnergyDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/UpdateRunEnergyDecoder.kt
new file mode 100644
index 000000000..c5f4c1e56
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/UpdateRunEnergyDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.player.UpdateRunEnergy
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class UpdateRunEnergyDecoder : ProxyMessageDecoder<UpdateRunEnergy> {
+    override val prot: ClientProt = GameServerProt.UPDATE_RUNENERGY
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UpdateRunEnergy {
+        val energy = buffer.g2()
+        return UpdateRunEnergy(
+            energy,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/UpdateRunWeightDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/UpdateRunWeightDecoder.kt
new file mode 100644
index 000000000..ba7d85fbf
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/UpdateRunWeightDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.player.UpdateRunWeight
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class UpdateRunWeightDecoder : ProxyMessageDecoder<UpdateRunWeight> {
+    override val prot: ClientProt = GameServerProt.UPDATE_RUNWEIGHT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UpdateRunWeight {
+        val runweight = buffer.g2s()
+        return UpdateRunWeight(
+            runweight,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/UpdateStatV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/UpdateStatV2Decoder.kt
new file mode 100644
index 000000000..201690e87
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/UpdateStatV2Decoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.player.UpdateStatV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class UpdateStatV2Decoder : ProxyMessageDecoder<UpdateStatV2> {
+    override val prot: ClientProt = GameServerProt.UPDATE_STAT_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UpdateStatV2 {
+        val stat = buffer.g1Alt2()
+        val experience = buffer.g4()
+        val currentLevel = buffer.g1Alt3()
+        val invisibleBoostedLevel = buffer.g1Alt1()
+        return UpdateStatV2(
+            stat,
+            currentLevel,
+            invisibleBoostedLevel,
+            experience,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/UpdateStockMarketSlotDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/UpdateStockMarketSlotDecoder.kt
new file mode 100644
index 000000000..12371fbd7
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/UpdateStockMarketSlotDecoder.kt
@@ -0,0 +1,47 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.player.UpdateStockMarketSlot
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class UpdateStockMarketSlotDecoder : ProxyMessageDecoder<UpdateStockMarketSlot> {
+    override val prot: ClientProt = GameServerProt.UPDATE_STOCKMARKET_SLOT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UpdateStockMarketSlot {
+        val slot = buffer.g1()
+        return when (val status = buffer.g1()) {
+            0 -> {
+                UpdateStockMarketSlot(
+                    slot,
+                    UpdateStockMarketSlot.ResetStockMarketSlot,
+                )
+            }
+            else -> {
+                val obj = buffer.g2()
+                val price = buffer.g4()
+                val count = buffer.g4()
+                val completedCount = buffer.g4()
+                val completedGold = buffer.g4()
+                UpdateStockMarketSlot(
+                    slot,
+                    UpdateStockMarketSlot.SetStockMarketSlot(
+                        status,
+                        obj,
+                        price,
+                        count,
+                        completedCount,
+                        completedGold,
+                    ),
+                )
+            }
+        }
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/UpdateTradingPostDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/UpdateTradingPostDecoder.kt
new file mode 100644
index 000000000..185fb3390
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/misc/player/UpdateTradingPostDecoder.kt
@@ -0,0 +1,57 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.misc.player.UpdateTradingPost
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class UpdateTradingPostDecoder : ProxyMessageDecoder<UpdateTradingPost> {
+    override val prot: ClientProt = GameServerProt.UPDATE_TRADINGPOST
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UpdateTradingPost {
+        val reset = buffer.g1() == 0
+        if (reset) {
+            return UpdateTradingPost(UpdateTradingPost.ResetTradingPost)
+        }
+        val age = buffer.g8()
+        val obj = buffer.g2()
+        val status = buffer.g1() == 1
+        val offerCount = buffer.g2()
+        val offers =
+            buildList {
+                for (i in 0..<offerCount) {
+                    val name = buffer.gjstr()
+                    val previousName = buffer.gjstr()
+                    val world = buffer.g2()
+                    val time = buffer.g8()
+                    val price = buffer.g4()
+                    val count = buffer.g4()
+                    add(
+                        UpdateTradingPost.TradingPostOffer(
+                            name,
+                            previousName,
+                            world,
+                            time,
+                            price,
+                            count,
+                        ),
+                    )
+                }
+            }
+        return UpdateTradingPost(
+            UpdateTradingPost.SetTradingPostOfferList(
+                age,
+                obj,
+                status,
+                offers,
+            ),
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/social/FriendListLoadedDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/social/FriendListLoadedDecoder.kt
new file mode 100644
index 000000000..8686f6511
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/social/FriendListLoadedDecoder.kt
@@ -0,0 +1,21 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.social
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.social.FriendListLoaded
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class FriendListLoadedDecoder : ProxyMessageDecoder<FriendListLoaded> {
+    override val prot: ClientProt = GameServerProt.FRIENDLIST_LOADED
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): FriendListLoaded {
+        return FriendListLoaded
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/social/MessagePrivateDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/social/MessagePrivateDecoder.kt
new file mode 100644
index 000000000..6391e0f46
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/social/MessagePrivateDecoder.kt
@@ -0,0 +1,35 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.social
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.compression.HuffmanCodec
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.social.MessagePrivate
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class MessagePrivateDecoder(
+    private val huffmanCodec: HuffmanCodec,
+) : ProxyMessageDecoder<MessagePrivate> {
+    override val prot: ClientProt = GameServerProt.MESSAGE_PRIVATE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MessagePrivate {
+        val sender = buffer.gjstr()
+        val worldId = buffer.g2()
+        val worldMessageCounter = buffer.g3()
+        val chatCrownType = buffer.g1()
+        val message = huffmanCodec.decode(buffer)
+        return MessagePrivate(
+            sender,
+            worldId,
+            worldMessageCounter,
+            chatCrownType,
+            message,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/social/MessagePrivateEchoDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/social/MessagePrivateEchoDecoder.kt
new file mode 100644
index 000000000..2c440b4e1
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/social/MessagePrivateEchoDecoder.kt
@@ -0,0 +1,29 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.social
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.compression.HuffmanCodec
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.social.MessagePrivateEcho
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class MessagePrivateEchoDecoder(
+    private val huffmanCodec: HuffmanCodec,
+) : ProxyMessageDecoder<MessagePrivateEcho> {
+    override val prot: ClientProt = GameServerProt.MESSAGE_PRIVATE_ECHO
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MessagePrivateEcho {
+        val recipient = buffer.gjstr()
+        val message = huffmanCodec.decode(buffer)
+        return MessagePrivateEcho(
+            recipient,
+            message,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/social/UpdateFriendListDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/social/UpdateFriendListDecoder.kt
new file mode 100644
index 000000000..41c0531ff
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/social/UpdateFriendListDecoder.kt
@@ -0,0 +1,64 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.social
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.social.UpdateFriendList
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class UpdateFriendListDecoder : ProxyMessageDecoder<UpdateFriendList> {
+    override val prot: ClientProt = GameServerProt.UPDATE_FRIENDLIST
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UpdateFriendList {
+        return UpdateFriendList(
+            buildList {
+                while (buffer.isReadable) {
+                    val added = buffer.g1() == 1
+                    val name = buffer.gjstr()
+                    val previousName = buffer.gjstr()
+                    val worldId = buffer.g2()
+                    val rank = buffer.g1()
+                    val properties = buffer.g1()
+                    if (worldId > 0) {
+                        val worldName = buffer.gjstr()
+                        val platform = buffer.g1()
+                        val worldFlags = buffer.g4()
+                        val notes = buffer.gjstr()
+                        add(
+                            UpdateFriendList.OnlineFriend(
+                                added,
+                                name,
+                                previousName,
+                                worldId,
+                                rank,
+                                properties,
+                                notes,
+                                worldName,
+                                platform,
+                                worldFlags,
+                            ),
+                        )
+                        continue
+                    }
+                    val notes = buffer.gjstr()
+                    add(
+                        UpdateFriendList.OfflineFriend(
+                            added,
+                            name,
+                            previousName,
+                            rank,
+                            properties,
+                            notes,
+                        ),
+                    )
+                }
+            },
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/social/UpdateIgnoreListDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/social/UpdateIgnoreListDecoder.kt
new file mode 100644
index 000000000..d25021753
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/social/UpdateIgnoreListDecoder.kt
@@ -0,0 +1,47 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.social
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.social.UpdateIgnoreList
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class UpdateIgnoreListDecoder : ProxyMessageDecoder<UpdateIgnoreList> {
+    override val prot: ClientProt = GameServerProt.UPDATE_IGNORELIST
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UpdateIgnoreList {
+        return UpdateIgnoreList(
+            buildList {
+                while (buffer.isReadable) {
+                    val type = buffer.g1()
+                    val name = buffer.gjstr()
+                    if (type == 4) {
+                        add(
+                            UpdateIgnoreList.RemovedIgnoredEntry(
+                                name,
+                            ),
+                        )
+                        continue
+                    }
+                    val added = type and 0x1 != 0
+                    val previousName = buffer.gjstr()
+                    val note = buffer.gjstr()
+                    add(
+                        UpdateIgnoreList.AddedIgnoredEntry(
+                            name,
+                            previousName,
+                            note,
+                            added,
+                        ),
+                    )
+                }
+            },
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/MidiJingleDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/MidiJingleDecoder.kt
new file mode 100644
index 000000000..d04a4e6d8
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/MidiJingleDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.sound
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.sound.MidiJingle
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class MidiJingleDecoder : ProxyMessageDecoder<MidiJingle> {
+    override val prot: ClientProt = GameServerProt.MIDI_JINGLE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MidiJingle {
+        val lengthInMillis = buffer.g3()
+        val id = buffer.g2Alt1()
+        return MidiJingle(
+            id,
+            lengthInMillis,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/MidiSongStopDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/MidiSongStopDecoder.kt
new file mode 100644
index 000000000..55a97faa4
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/MidiSongStopDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.sound
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.sound.MidiSongStop
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class MidiSongStopDecoder : ProxyMessageDecoder<MidiSongStop> {
+    override val prot: ClientProt = GameServerProt.MIDI_SONG_STOP
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MidiSongStop {
+        val fadeOutSpeed = buffer.g2()
+        val fadeOutDelay = buffer.g2Alt3()
+        return MidiSongStop(
+            fadeOutDelay,
+            fadeOutSpeed,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/MidiSongV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/MidiSongV2Decoder.kt
new file mode 100644
index 000000000..6c6a67445
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/MidiSongV2Decoder.kt
@@ -0,0 +1,30 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.sound
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.sound.MidiSongV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class MidiSongV2Decoder : ProxyMessageDecoder<MidiSongV2> {
+    override val prot: ClientProt = GameServerProt.MIDI_SONG_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MidiSongV2 {
+        val fadeInSpeed = buffer.g2()
+        val fadeOutDelay = buffer.g2Alt3()
+        val fadeOutSpeed = buffer.g2Alt2()
+        val fadeInDelay = buffer.g2Alt1()
+        val id = buffer.g2()
+        return MidiSongV2(
+            id,
+            fadeOutDelay,
+            fadeOutSpeed,
+            fadeInDelay,
+            fadeInSpeed,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/MidiSongWithSecondaryDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/MidiSongWithSecondaryDecoder.kt
new file mode 100644
index 000000000..a87eb63d2
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/MidiSongWithSecondaryDecoder.kt
@@ -0,0 +1,32 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.sound
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.sound.MidiSongWithSecondary
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class MidiSongWithSecondaryDecoder : ProxyMessageDecoder<MidiSongWithSecondary> {
+    override val prot: ClientProt = GameServerProt.MIDI_SONG_WITHSECONDARY
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MidiSongWithSecondary {
+        val fadeOutSpeed = buffer.g2Alt3()
+        val fadeInSpeed = buffer.g2Alt2()
+        val secondaryId = buffer.g2Alt2()
+        val fadeInDelay = buffer.g2Alt1()
+        val primaryId = buffer.g2Alt1()
+        val fadeOutDelay = buffer.g2Alt2()
+        return MidiSongWithSecondary(
+            primaryId,
+            secondaryId,
+            fadeOutDelay,
+            fadeOutSpeed,
+            fadeInDelay,
+            fadeInSpeed,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/MidiSwapDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/MidiSwapDecoder.kt
new file mode 100644
index 000000000..971f5a470
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/MidiSwapDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.sound
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.sound.MidiSwap
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class MidiSwapDecoder : ProxyMessageDecoder<MidiSwap> {
+    override val prot: ClientProt = GameServerProt.MIDI_SWAP
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MidiSwap {
+        val fadeOutSpeed = buffer.g2Alt3()
+        val fadeInSpeed = buffer.g2Alt2()
+        val fadeOutDelay = buffer.g2Alt1()
+        val fadeInDelay = buffer.g2Alt3()
+        return MidiSwap(
+            fadeOutDelay,
+            fadeOutSpeed,
+            fadeInDelay,
+            fadeInSpeed,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/SynthSoundDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/SynthSoundDecoder.kt
new file mode 100644
index 000000000..31d3187c3
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/sound/SynthSoundDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.sound
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.sound.SynthSound
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class SynthSoundDecoder : ProxyMessageDecoder<SynthSound> {
+    override val prot: ClientProt = GameServerProt.SYNTH_SOUND
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): SynthSound {
+        val id = buffer.g2()
+        val loops = buffer.g1()
+        val delay = buffer.g2()
+        return SynthSound(
+            id,
+            loops,
+            delay,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/LocAnimSpecificDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/LocAnimSpecificDecoder.kt
new file mode 100644
index 000000000..69f92e95c
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/LocAnimSpecificDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.specific.LocAnimSpecific
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInBuildArea
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.LocProperties
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class LocAnimSpecificDecoder : ProxyMessageDecoder<LocAnimSpecific> {
+    override val prot: ClientProt = GameServerProt.LOC_ANIM_SPECIFIC
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): LocAnimSpecific {
+        val id = buffer.g2Alt1()
+        val locProperties = LocProperties(buffer.g1Alt1())
+        val coordInBuildArea = CoordInBuildArea(buffer.g3())
+        return LocAnimSpecific(
+            id,
+            coordInBuildArea,
+            locProperties,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/MapAnimSpecificDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/MapAnimSpecificDecoder.kt
new file mode 100644
index 000000000..d1e2411c9
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/MapAnimSpecificDecoder.kt
@@ -0,0 +1,29 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.specific.MapAnimSpecific
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInBuildArea
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class MapAnimSpecificDecoder : ProxyMessageDecoder<MapAnimSpecific> {
+    override val prot: ClientProt = GameServerProt.MAP_ANIM_SPECIFIC
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MapAnimSpecific {
+        val delay = buffer.g2Alt1()
+        val id = buffer.g2Alt2()
+        val height = buffer.g1()
+        val coordInBuildArea = CoordInBuildArea(buffer.g3())
+        return MapAnimSpecific(
+            id,
+            delay,
+            height,
+            coordInBuildArea,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/NpcAnimSpecificDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/NpcAnimSpecificDecoder.kt
new file mode 100644
index 000000000..087a50e7a
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/NpcAnimSpecificDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.specific.NpcAnimSpecific
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class NpcAnimSpecificDecoder : ProxyMessageDecoder<NpcAnimSpecific> {
+    override val prot: ClientProt = GameServerProt.NPC_ANIM_SPECIFIC
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): NpcAnimSpecific {
+        val id = buffer.g2Alt1()
+        val delay = buffer.g1Alt3()
+        val index = buffer.g2Alt3()
+        return NpcAnimSpecific(
+            index,
+            id,
+            delay,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/NpcHeadIconSpecificDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/NpcHeadIconSpecificDecoder.kt
new file mode 100644
index 000000000..12baf5416
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/NpcHeadIconSpecificDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.specific.NpcHeadIconSpecific
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class NpcHeadIconSpecificDecoder : ProxyMessageDecoder<NpcHeadIconSpecific> {
+    override val prot: ClientProt = GameServerProt.NPC_HEADICON_SPECIFIC
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): NpcHeadIconSpecific {
+        val spriteGroup = buffer.g4()
+        val headIconSlot = buffer.g1Alt3()
+        val spriteIndex = buffer.g2sAlt3()
+        val index = buffer.g2Alt1()
+        return NpcHeadIconSpecific(
+            index,
+            headIconSlot,
+            spriteGroup,
+            spriteIndex,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/NpcSpotAnimSpecificDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/NpcSpotAnimSpecificDecoder.kt
new file mode 100644
index 000000000..3947632c7
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/NpcSpotAnimSpecificDecoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.specific.NpcSpotAnimSpecific
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class NpcSpotAnimSpecificDecoder : ProxyMessageDecoder<NpcSpotAnimSpecific> {
+    override val prot: ClientProt = GameServerProt.NPC_SPOTANIM_SPECIFIC
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): NpcSpotAnimSpecific {
+        val index = buffer.g2Alt1()
+        val slot = buffer.g1Alt1()
+        val id = buffer.g2Alt3()
+        val packed = buffer.g4Alt1()
+        val height = packed ushr 16
+        val delay = packed and 0xFFFF
+        return NpcSpotAnimSpecific(
+            index,
+            id,
+            slot,
+            height,
+            delay,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjAddSpecificDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjAddSpecificDecoder.kt
new file mode 100644
index 000000000..2568d3770
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjAddSpecificDecoder.kt
@@ -0,0 +1,38 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.game.outgoing.model.specific.ObjAddSpecific
+import net.rsprox.protocol.game.outgoing.model.util.OpFlags
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class ObjAddSpecificDecoder : ProxyMessageDecoder<ObjAddSpecific> {
+    override val prot: ClientProt = GameServerProt.OBJ_ADD_SPECIFIC
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ObjAddSpecific {
+        val quantity = buffer.g4Alt2()
+        val ownershipType = buffer.g1Alt2()
+        val neverBecomesPublic = buffer.g1() == 1
+        val opFlags = OpFlags(buffer.g1Alt3())
+        val coordGrid = CoordGrid(buffer.g4())
+        val id = buffer.g2Alt2()
+        val timeUntilDespawn = buffer.g2()
+        val timeUntilPublic = buffer.g2Alt1()
+        return ObjAddSpecific(
+            id,
+            quantity,
+            coordGrid,
+            opFlags,
+            timeUntilPublic,
+            timeUntilDespawn,
+            ownershipType,
+            neverBecomesPublic,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjCountSpecificDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjCountSpecificDecoder.kt
new file mode 100644
index 000000000..8dff995a7
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjCountSpecificDecoder.kt
@@ -0,0 +1,29 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.game.outgoing.model.specific.ObjCountSpecific
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class ObjCountSpecificDecoder : ProxyMessageDecoder<ObjCountSpecific> {
+    override val prot: ClientProt = GameServerProt.OBJ_COUNT_SPECIFIC
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ObjCountSpecific {
+        val oldQuantity = buffer.g4Alt3()
+        val coordGrid = CoordGrid(buffer.g4Alt3())
+        val id = buffer.g2Alt1()
+        val newQuantity = buffer.g4Alt1()
+        return ObjCountSpecific(
+            id,
+            oldQuantity,
+            newQuantity,
+            coordGrid,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjCustomiseSpecificDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjCustomiseSpecificDecoder.kt
new file mode 100644
index 000000000..bbbb29707
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjCustomiseSpecificDecoder.kt
@@ -0,0 +1,37 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.game.outgoing.model.specific.ObjCustomiseSpecific
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class ObjCustomiseSpecificDecoder : ProxyMessageDecoder<ObjCustomiseSpecific> {
+    override val prot: ClientProt = GameServerProt.OBJ_CUSTOMISE_SPECIFIC
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ObjCustomiseSpecific {
+        val recolIndex = buffer.g2sAlt3()
+        val quantity = buffer.g4Alt3()
+        val retexIndex = buffer.g2s()
+        val model = buffer.g2Alt1()
+        val recol = buffer.g2sAlt3()
+        val retex = buffer.g2s()
+        val coordGrid = CoordGrid(buffer.g4())
+        val id = buffer.g2Alt1()
+        return ObjCustomiseSpecific(
+            id,
+            quantity,
+            model,
+            recolIndex,
+            recol,
+            retexIndex,
+            retex,
+            coordGrid,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjDelSpecificDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjDelSpecificDecoder.kt
new file mode 100644
index 000000000..17cd90164
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjDelSpecificDecoder.kt
@@ -0,0 +1,27 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.game.outgoing.model.specific.ObjDelSpecific
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class ObjDelSpecificDecoder : ProxyMessageDecoder<ObjDelSpecific> {
+    override val prot: ClientProt = GameServerProt.OBJ_DEL_SPECIFIC
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ObjDelSpecific {
+        val quantity = buffer.g4Alt2()
+        val coordGrid = CoordGrid(buffer.g4Alt2())
+        val id = buffer.g2Alt3()
+        return ObjDelSpecific(
+            id,
+            quantity,
+            coordGrid,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjEnabledOpsSpecificDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjEnabledOpsSpecificDecoder.kt
new file mode 100644
index 000000000..07c12e88c
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjEnabledOpsSpecificDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.game.outgoing.model.specific.ObjEnabledOpsSpecific
+import net.rsprox.protocol.game.outgoing.model.util.OpFlags
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class ObjEnabledOpsSpecificDecoder : ProxyMessageDecoder<ObjEnabledOpsSpecific> {
+    override val prot: ClientProt = GameServerProt.OBJ_ENABLED_OPS_SPECIFIC
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ObjEnabledOpsSpecific {
+        val coordGrid = CoordGrid(buffer.g4())
+        val opFlags = OpFlags(buffer.g1Alt3())
+        val id = buffer.g2Alt3()
+        return ObjEnabledOpsSpecific(
+            id,
+            opFlags,
+            coordGrid,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjUncustomiseSpecificDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjUncustomiseSpecificDecoder.kt
new file mode 100644
index 000000000..e6cecedf1
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ObjUncustomiseSpecificDecoder.kt
@@ -0,0 +1,27 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.game.outgoing.model.specific.ObjUncustomiseSpecific
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class ObjUncustomiseSpecificDecoder : ProxyMessageDecoder<ObjUncustomiseSpecific> {
+    override val prot: ClientProt = GameServerProt.OBJ_UNCUSTOMISE_SPECIFIC
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ObjUncustomiseSpecific {
+        val coordGrid = CoordGrid(buffer.g4Alt3())
+        val id = buffer.g2Alt3()
+        val quantity = buffer.g4Alt1()
+        return ObjUncustomiseSpecific(
+            id,
+            quantity,
+            coordGrid,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/PlayerAnimSpecificDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/PlayerAnimSpecificDecoder.kt
new file mode 100644
index 000000000..d597dcca8
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/PlayerAnimSpecificDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.specific.PlayerAnimSpecific
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class PlayerAnimSpecificDecoder : ProxyMessageDecoder<PlayerAnimSpecific> {
+    override val prot: ClientProt = GameServerProt.PLAYER_ANIM_SPECIFIC
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): PlayerAnimSpecific {
+        val delay = buffer.g1Alt2()
+        val id = buffer.g2Alt2()
+        return PlayerAnimSpecific(
+            id,
+            delay,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/PlayerSpotAnimSpecificDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/PlayerSpotAnimSpecificDecoder.kt
new file mode 100644
index 000000000..49dfbe473
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/PlayerSpotAnimSpecificDecoder.kt
@@ -0,0 +1,31 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.specific.PlayerSpotAnimSpecific
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class PlayerSpotAnimSpecificDecoder : ProxyMessageDecoder<PlayerSpotAnimSpecific> {
+    override val prot: ClientProt = GameServerProt.PLAYER_SPOTANIM_SPECIFIC
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): PlayerSpotAnimSpecific {
+        val slot = buffer.g1Alt3()
+        val index = buffer.g2Alt3()
+        val id = buffer.g2Alt2()
+        val packed = buffer.g4Alt1()
+        val height = packed ushr 16
+        val delay = packed and 0xFFFF
+        return PlayerSpotAnimSpecific(
+            index,
+            id,
+            slot,
+            height,
+            delay,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ProjAnimSpecificV4Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ProjAnimSpecificV4Decoder.kt
new file mode 100644
index 000000000..27e7fcc0b
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/specific/ProjAnimSpecificV4Decoder.kt
@@ -0,0 +1,43 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.game.outgoing.model.specific.ProjAnimSpecificV4
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class ProjAnimSpecificV4Decoder : ProxyMessageDecoder<ProjAnimSpecificV4> {
+    override val prot: ClientProt = GameServerProt.PROJANIM_SPECIFIC_V4
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ProjAnimSpecificV4 {
+        val end = CoordGrid(buffer.g4Alt2())
+        val start = CoordGrid(buffer.g4Alt2())
+        val endHeight = buffer.g2Alt3()
+        val startHeight = buffer.g2Alt2()
+        val startTime = buffer.g2()
+        val endTime = buffer.g2Alt2()
+        val sourceIndex = buffer.g3sAlt1()
+        val targetIndex = buffer.g3s()
+        val id = buffer.g2()
+        val progress = buffer.g2()
+        val angle = buffer.g1Alt1()
+        return ProjAnimSpecificV4(
+            id,
+            startHeight,
+            endHeight,
+            startTime,
+            endTime,
+            angle,
+            progress,
+            start,
+            sourceIndex,
+            end,
+            targetIndex,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/unknown/UnknownStringDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/unknown/UnknownStringDecoder.kt
new file mode 100644
index 000000000..8d3b1b8de
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/unknown/UnknownStringDecoder.kt
@@ -0,0 +1,22 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.unknown
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.unknown.UnknownString
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class UnknownStringDecoder : ProxyMessageDecoder<UnknownString> {
+    override val prot: ClientProt = GameServerProt.UNKNOWN_STRING
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UnknownString {
+        val string = buffer.gjstr()
+        return UnknownString(string)
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/varp/VarpLargeDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/varp/VarpLargeDecoder.kt
new file mode 100644
index 000000000..25b1e74ac
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/varp/VarpLargeDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.varp
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.varp.VarpLarge
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class VarpLargeDecoder : ProxyMessageDecoder<VarpLarge> {
+    override val prot: ClientProt = GameServerProt.VARP_LARGE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): VarpLarge {
+        val id = buffer.g2Alt1()
+        val value = buffer.g4Alt3()
+        return VarpLarge(
+            id,
+            value,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/varp/VarpResetDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/varp/VarpResetDecoder.kt
new file mode 100644
index 000000000..2f0ad136f
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/varp/VarpResetDecoder.kt
@@ -0,0 +1,21 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.varp
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.varp.VarpReset
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class VarpResetDecoder : ProxyMessageDecoder<VarpReset> {
+    override val prot: ClientProt = GameServerProt.VARP_RESET
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): VarpReset {
+        return VarpReset
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/varp/VarpSmallDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/varp/VarpSmallDecoder.kt
new file mode 100644
index 000000000..46c272f6e
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/varp/VarpSmallDecoder.kt
@@ -0,0 +1,24 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.varp
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.varp.VarpSmall
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class VarpSmallDecoder : ProxyMessageDecoder<VarpSmall> {
+    override val prot: ClientProt = GameServerProt.VARP_SMALL
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): VarpSmall {
+        val id = buffer.g2Alt1()
+        val value = buffer.g1sAlt3()
+        return VarpSmall(
+            id,
+            value,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/varp/VarpSyncDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/varp/VarpSyncDecoder.kt
new file mode 100644
index 000000000..81bac2692
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/varp/VarpSyncDecoder.kt
@@ -0,0 +1,21 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.varp
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.varp.VarpSync
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class VarpSyncDecoder : ProxyMessageDecoder<VarpSync> {
+    override val prot: ClientProt = GameServerProt.VARP_SYNC
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): VarpSync {
+        return VarpSync
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/worldentity/SetActiveWorldV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/worldentity/SetActiveWorldV2Decoder.kt
new file mode 100644
index 000000000..17512832c
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/worldentity/SetActiveWorldV2Decoder.kt
@@ -0,0 +1,38 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.worldentity
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.metadata.Consistent
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.worldentity.SetActiveWorldV2
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.session.getWorld
+import net.rsprox.protocol.session.setActiveWorld
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+@Consistent
+internal class SetActiveWorldV2Decoder : ProxyMessageDecoder<SetActiveWorldV2> {
+    override val prot: ClientProt = GameServerProt.SET_ACTIVE_WORLD_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): SetActiveWorldV2 {
+        var index = buffer.g2s()
+        // 237 made toplevel/root world into id 0
+        // but because our transcriber handles all revisions, we need it to be a uniform value
+        // within logic processing.
+        if (index == 0) {
+            index = -1
+        }
+        val activeLevel = buffer.g1()
+        session.setActiveWorld(index, activeLevel)
+        val world = session.getWorld(index)
+        world.level = activeLevel
+        return if (index == -1) {
+            SetActiveWorldV2(SetActiveWorldV2.RootWorldType(activeLevel))
+        } else {
+            SetActiveWorldV2(SetActiveWorldV2.DynamicWorldType(index, activeLevel))
+        }
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/header/UpdateZoneFullFollowsDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/header/UpdateZoneFullFollowsDecoder.kt
new file mode 100644
index 000000000..d6adb5729
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/header/UpdateZoneFullFollowsDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.header
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.zone.header.UpdateZoneFullFollows
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class UpdateZoneFullFollowsDecoder : ProxyMessageDecoder<UpdateZoneFullFollows> {
+    override val prot: ClientProt = GameServerProt.UPDATE_ZONE_FULL_FOLLOWS
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UpdateZoneFullFollows {
+        val zoneZ = buffer.g1Alt3()
+        val zoneX = buffer.g1()
+        val level = buffer.g1Alt3()
+        return UpdateZoneFullFollows(
+            zoneX,
+            zoneZ,
+            level,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/header/UpdateZonePartialEnclosedDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/header/UpdateZonePartialEnclosedDecoder.kt
new file mode 100644
index 000000000..0ecb58c34
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/header/UpdateZonePartialEnclosedDecoder.kt
@@ -0,0 +1,67 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.header
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.IncomingZoneProt
+import net.rsprox.protocol.game.outgoing.model.zone.header.UpdateZonePartialEnclosed
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.LocAddChangeV2Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.LocAnimDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.LocDelDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.LocMergeDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.MapAnimDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.MapProjAnimV2Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.ObjAddDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.ObjCountDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.ObjCustomiseDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.ObjDelDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.ObjEnabledOpsDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.ObjUncustomiseDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.SoundAreaDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class UpdateZonePartialEnclosedDecoder : ProxyMessageDecoder<UpdateZonePartialEnclosed> {
+    override val prot: ClientProt = GameServerProt.UPDATE_ZONE_PARTIAL_ENCLOSED
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UpdateZonePartialEnclosed {
+        val zoneX = buffer.g1Alt3()
+        val zoneZ = buffer.g1Alt1()
+        val level = buffer.g1Alt2()
+        val packets =
+            buildList {
+                while (buffer.isReadable) {
+                    val index = buffer.g1()
+                    val decoder = IndexedZoneProtDecoder.entries[index]
+                    add(decoder.decoder.decode(buffer, session) as IncomingZoneProt)
+                }
+            }
+        return UpdateZonePartialEnclosed(
+            zoneX,
+            zoneZ,
+            level,
+            packets,
+        )
+    }
+
+    private enum class IndexedZoneProtDecoder(
+        val decoder: ProxyMessageDecoder<*>,
+    ) {
+        MAP_ANIM(MapAnimDecoder()),
+        LOC_MERGE(LocMergeDecoder()),
+        LOC_DEL(LocDelDecoder()),
+        OBJ_DEL(ObjDelDecoder()),
+        OBJ_ENABLED_OPS(ObjEnabledOpsDecoder()),
+        OBJ_COUNT(ObjCountDecoder()),
+        MAP_PROJANIM_V2(MapProjAnimV2Decoder()),
+        LOC_ANIM(LocAnimDecoder()),
+        LOC_ADD_CHANGE_V2(LocAddChangeV2Decoder()),
+        OBJ_CUSTOMISE(ObjCustomiseDecoder()),
+        OBJ_UNCUSTOMISE(ObjUncustomiseDecoder()),
+        SOUND_AREA(SoundAreaDecoder()),
+        OBJ_ADD(ObjAddDecoder()),
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/header/UpdateZonePartialFollowsDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/header/UpdateZonePartialFollowsDecoder.kt
new file mode 100644
index 000000000..b3199a764
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/header/UpdateZonePartialFollowsDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.header
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.zone.header.UpdateZonePartialFollows
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class UpdateZonePartialFollowsDecoder : ProxyMessageDecoder<UpdateZonePartialFollows> {
+    override val prot: ClientProt = GameServerProt.UPDATE_ZONE_PARTIAL_FOLLOWS
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): UpdateZonePartialFollows {
+        val zoneZ = buffer.g1Alt2()
+        val level = buffer.g1Alt3()
+        val zoneX = buffer.g1Alt3()
+        return UpdateZonePartialFollows(
+            zoneX,
+            zoneZ,
+            level,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/LocAddChangeV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/LocAddChangeV2Decoder.kt
new file mode 100644
index 000000000..3776eb43f
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/LocAddChangeV2Decoder.kt
@@ -0,0 +1,45 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.util.OpFlags
+import net.rsprox.protocol.game.outgoing.model.zone.payload.LocAddChangeV2
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.LocProperties
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class LocAddChangeV2Decoder : ProxyMessageDecoder<LocAddChangeV2> {
+    override val prot: ClientProt = GameServerProt.LOC_ADD_CHANGE_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): LocAddChangeV2 {
+        val coordInZone = CoordInZone(buffer.g1())
+        val opFlags = OpFlags(buffer.g1Alt2())
+        val locProperties = LocProperties(buffer.g1())
+        val id = buffer.g2()
+        val opOverrideCount = buffer.g1()
+        val opOverrides: Map<Byte, String>? =
+            if (opOverrideCount > 0) {
+                buildMap {
+                    for (i in 0..<opOverrideCount) {
+                        val index = buffer.g1()
+                        val string = buffer.gjstr()
+                        put(index.toByte(), string)
+                    }
+                }
+            } else {
+                null
+            }
+        return LocAddChangeV2(
+            id,
+            coordInZone,
+            locProperties,
+            opFlags,
+            opOverrides,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/LocAnimDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/LocAnimDecoder.kt
new file mode 100644
index 000000000..5e0fa14e8
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/LocAnimDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.zone.payload.LocAnim
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.LocProperties
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class LocAnimDecoder : ProxyMessageDecoder<LocAnim> {
+    override val prot: ClientProt = GameServerProt.LOC_ANIM
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): LocAnim {
+        val id = buffer.g2Alt3()
+        val locProperties = LocProperties(buffer.g1Alt1())
+        val coordInZone = CoordInZone(buffer.g1Alt2())
+        return LocAnim(
+            id,
+            coordInZone,
+            locProperties,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/LocDelDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/LocDelDecoder.kt
new file mode 100644
index 000000000..413e30135
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/LocDelDecoder.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.zone.payload.LocDel
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.LocProperties
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class LocDelDecoder : ProxyMessageDecoder<LocDel> {
+    override val prot: ClientProt = GameServerProt.LOC_DEL
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): LocDel {
+        val coordInZone = CoordInZone(buffer.g1Alt1())
+        val locProperties = LocProperties(buffer.g1Alt3())
+        return LocDel(
+            coordInZone,
+            locProperties,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/LocMergeDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/LocMergeDecoder.kt
new file mode 100644
index 000000000..bb0d3dd62
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/LocMergeDecoder.kt
@@ -0,0 +1,42 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.zone.payload.LocMerge
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.LocProperties
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class LocMergeDecoder : ProxyMessageDecoder<LocMerge> {
+    override val prot: ClientProt = GameServerProt.LOC_MERGE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): LocMerge {
+        val minX = buffer.g1sAlt1()
+        val start = buffer.g2Alt2()
+        val coordInZone = CoordInZone(buffer.g1Alt2())
+        val end = buffer.g2Alt3()
+        val id = buffer.g2Alt2()
+        val index = buffer.g2()
+        val maxZ = buffer.g1sAlt2()
+        val locProperties = LocProperties(buffer.g1())
+        val minZ = buffer.g1sAlt2()
+        val maxX = buffer.g1sAlt1()
+        return LocMerge(
+            index,
+            id,
+            coordInZone,
+            locProperties,
+            start,
+            end,
+            minX,
+            minZ,
+            maxX,
+            maxZ,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/MapAnimDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/MapAnimDecoder.kt
new file mode 100644
index 000000000..a2e988656
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/MapAnimDecoder.kt
@@ -0,0 +1,29 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.zone.payload.MapAnim
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class MapAnimDecoder : ProxyMessageDecoder<MapAnim> {
+    override val prot: ClientProt = GameServerProt.MAP_ANIM
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MapAnim {
+        val id = buffer.g2Alt1()
+        val coordInZone = CoordInZone(buffer.g1())
+        val delay = buffer.g2()
+        val height = buffer.g1Alt2()
+        return MapAnim(
+            id,
+            delay,
+            height,
+            coordInZone,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/MapProjAnimV2Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/MapProjAnimV2Decoder.kt
new file mode 100644
index 000000000..c60a5ae27
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/MapProjAnimV2Decoder.kt
@@ -0,0 +1,44 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.game.outgoing.model.zone.payload.MapProjAnimV2
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class MapProjAnimV2Decoder : ProxyMessageDecoder<MapProjAnimV2> {
+    override val prot: ClientProt = GameServerProt.MAP_PROJANIM_V2
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): MapProjAnimV2 {
+        val targetIndex = buffer.g3sAlt3()
+        val angle = buffer.g1()
+        val coordInZone = CoordInZone(buffer.g1())
+        val end = CoordGrid(buffer.g4Alt3())
+        val id = buffer.g2Alt1()
+        val endTime = buffer.g2Alt3()
+        val sourceIndex = buffer.g3sAlt2()
+        val progress = buffer.g2Alt3()
+        val startTime = buffer.g2Alt2()
+        val startHeight = buffer.g2()
+        val endHeight = buffer.g2()
+        return MapProjAnimV2(
+            id,
+            startHeight,
+            endHeight,
+            startTime,
+            endTime,
+            angle,
+            progress,
+            sourceIndex,
+            targetIndex,
+            coordInZone,
+            end,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjAddDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjAddDecoder.kt
new file mode 100644
index 000000000..5b0d6bcb0
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjAddDecoder.kt
@@ -0,0 +1,38 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.util.OpFlags
+import net.rsprox.protocol.game.outgoing.model.zone.payload.ObjAdd
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class ObjAddDecoder : ProxyMessageDecoder<ObjAdd> {
+    override val prot: ClientProt = GameServerProt.OBJ_ADD
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ObjAdd {
+        val opFlags = OpFlags(buffer.g1Alt1())
+        val id = buffer.g2Alt2()
+        val neverBecomesPublic = buffer.g1() == 1
+        val timeUntilDespawn = buffer.g2Alt3()
+        val ownershipType = buffer.g1Alt1()
+        val coordInZone = CoordInZone(buffer.g1Alt3())
+        val quantity = buffer.g4Alt3()
+        val timeUntilPublic = buffer.g2Alt2()
+        return ObjAdd(
+            id,
+            quantity,
+            coordInZone,
+            opFlags,
+            timeUntilPublic,
+            timeUntilDespawn,
+            ownershipType,
+            neverBecomesPublic,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjCountDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjCountDecoder.kt
new file mode 100644
index 000000000..8c27e9ddb
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjCountDecoder.kt
@@ -0,0 +1,29 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.zone.payload.ObjCount
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class ObjCountDecoder : ProxyMessageDecoder<ObjCount> {
+    override val prot: ClientProt = GameServerProt.OBJ_COUNT
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ObjCount {
+        val newQuantity = buffer.g4Alt1()
+        val coordInZone = CoordInZone(buffer.g1())
+        val oldQuantity = buffer.g4Alt3()
+        val id = buffer.g2Alt3()
+        return ObjCount(
+            id,
+            oldQuantity,
+            newQuantity,
+            coordInZone,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjCustomiseDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjCustomiseDecoder.kt
new file mode 100644
index 000000000..77c294692
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjCustomiseDecoder.kt
@@ -0,0 +1,38 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.zone.payload.ObjCustomise
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class ObjCustomiseDecoder : ProxyMessageDecoder<ObjCustomise> {
+    override val prot: ClientProt = GameServerProt.OBJ_CUSTOMISE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ObjCustomise {
+        val recolIndex = buffer.g2sAlt2()
+        val coordInZone = CoordInZone(buffer.g1Alt2())
+        val model = buffer.g2Alt3()
+        val id = buffer.g2Alt3()
+        val quantity = buffer.g4Alt3()
+        val recol = buffer.g2s()
+        val retexIndex = buffer.g2sAlt1()
+        val retex = buffer.g2s()
+        return ObjCustomise(
+            id,
+            quantity,
+            model,
+            recolIndex,
+            recol,
+            retexIndex,
+            retex,
+            coordInZone.xInZone,
+            coordInZone.zInZone,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjDelDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjDelDecoder.kt
new file mode 100644
index 000000000..3e97abc5b
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjDelDecoder.kt
@@ -0,0 +1,27 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.zone.payload.ObjDel
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class ObjDelDecoder : ProxyMessageDecoder<ObjDel> {
+    override val prot: ClientProt = GameServerProt.OBJ_DEL
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ObjDel {
+        val quantity = buffer.g4Alt2()
+        val id = buffer.g2Alt1()
+        val coordInZone = CoordInZone(buffer.g1Alt1())
+        return ObjDel(
+            id,
+            quantity,
+            coordInZone,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjEnabledOpsDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjEnabledOpsDecoder.kt
new file mode 100644
index 000000000..2069767dd
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjEnabledOpsDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.util.OpFlags
+import net.rsprox.protocol.game.outgoing.model.zone.payload.ObjEnabledOps
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class ObjEnabledOpsDecoder : ProxyMessageDecoder<ObjEnabledOps> {
+    override val prot: ClientProt = GameServerProt.OBJ_ENABLED_OPS
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ObjEnabledOps {
+        val id = buffer.g2Alt3()
+        val opFlags = OpFlags(buffer.g1Alt2())
+        val coordInZone = CoordInZone(buffer.g1Alt1())
+        return ObjEnabledOps(
+            id,
+            opFlags,
+            coordInZone,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjUncustomiseDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjUncustomiseDecoder.kt
new file mode 100644
index 000000000..26a84bea4
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/ObjUncustomiseDecoder.kt
@@ -0,0 +1,28 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.zone.payload.ObjUncustomise
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class ObjUncustomiseDecoder : ProxyMessageDecoder<ObjUncustomise> {
+    override val prot: ClientProt = GameServerProt.OBJ_UNCUSTOMISE
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): ObjUncustomise {
+        val coordInZone = CoordInZone(buffer.g1())
+        val quantity = buffer.g4Alt2()
+        val id = buffer.g2()
+        return ObjUncustomise(
+            id,
+            quantity,
+            coordInZone.xInZone,
+            coordInZone.zInZone,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/SoundAreaDecoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/SoundAreaDecoder.kt
new file mode 100644
index 000000000..12429675f
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/zone/payload/SoundAreaDecoder.kt
@@ -0,0 +1,33 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.protocol.ClientProt
+import net.rsprox.protocol.ProxyMessageDecoder
+import net.rsprox.protocol.game.outgoing.model.zone.payload.SoundArea
+import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone
+import net.rsprox.protocol.session.Session
+import net.rsprox.protocol.v237.game.outgoing.decoder.prot.GameServerProt
+
+internal class SoundAreaDecoder : ProxyMessageDecoder<SoundArea> {
+    override val prot: ClientProt = GameServerProt.SOUND_AREA
+
+    override fun decode(
+        buffer: JagByteBuf,
+        session: Session,
+    ): SoundArea {
+        val id = buffer.g2Alt2()
+        val delay = buffer.g1Alt3()
+        val coordInZone = CoordInZone(buffer.g1Alt2())
+        val radius = buffer.g1Alt1()
+        val loops = buffer.g1()
+        val size = buffer.g1Alt1()
+        return SoundArea(
+            id,
+            delay,
+            loops,
+            radius,
+            size,
+            coordInZone,
+        )
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/prot/GameServerProt.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/prot/GameServerProt.kt
new file mode 100644
index 000000000..25e350585
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/prot/GameServerProt.kt
@@ -0,0 +1,204 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.prot
+
+import net.rsprot.protocol.ClientProt
+import net.rsprot.protocol.Prot
+import net.rsprot.protocol.ServerProt
+
+public enum class GameServerProt(
+    override val opcode: Int,
+    override val size: Int,
+) : ServerProt,
+    ClientProt {
+    // Interface related packets
+    IF_RESYNC_V2(GameServerProtId.IF_RESYNC_V2, Prot.VAR_SHORT),
+    IF_OPENTOP(GameServerProtId.IF_OPENTOP, 2),
+    IF_OPENSUB(GameServerProtId.IF_OPENSUB, 7),
+    IF_CLOSESUB(GameServerProtId.IF_CLOSESUB, 4),
+    IF_MOVESUB(GameServerProtId.IF_MOVESUB, 8),
+    IF_CLEARINV(GameServerProtId.IF_CLEARINV, 4),
+
+    IF_SETEVENTS_V2(GameServerProtId.IF_SETEVENTS_V2, 16),
+    IF_SETPOSITION(GameServerProtId.IF_SETPOSITION, 8),
+    IF_SETSCROLLPOS(GameServerProtId.IF_SETSCROLLPOS, 6),
+    IF_SETROTATESPEED(GameServerProtId.IF_SETROTATESPEED, 8),
+    IF_SETTEXT(GameServerProtId.IF_SETTEXT, Prot.VAR_SHORT),
+    IF_SETHIDE(GameServerProtId.IF_SETHIDE, 5),
+    IF_SETANGLE(GameServerProtId.IF_SETANGLE, 10),
+    IF_SETOBJECT(GameServerProtId.IF_SETOBJECT, 10),
+    IF_SETCOLOUR(GameServerProtId.IF_SETCOLOUR, 6),
+    IF_SETANIM(GameServerProtId.IF_SETANIM, 6),
+    IF_SETNPCHEAD(GameServerProtId.IF_SETNPCHEAD, 6),
+    IF_SETNPCHEAD_ACTIVE(GameServerProtId.IF_SETNPCHEAD_ACTIVE, 6),
+    IF_SETPLAYERHEAD(GameServerProtId.IF_SETPLAYERHEAD, 4),
+    IF_SETMODEL_V1(GameServerProtId.IF_SETMODEL_V1, 6),
+    IF_SETMODEL_V2(GameServerProtId.IF_SETMODEL_V2, 8),
+    IF_SETPLAYERMODEL_BASECOLOUR(GameServerProtId.IF_SETPLAYERMODEL_BASECOLOUR, 6),
+    IF_SETPLAYERMODEL_BODYTYPE(GameServerProtId.IF_SETPLAYERMODEL_BODYTYPE, 5),
+    IF_SETPLAYERMODEL_OBJ(GameServerProtId.IF_SETPLAYERMODEL_OBJ, 8),
+    IF_SETPLAYERMODEL_SELF(GameServerProtId.IF_SETPLAYERMODEL_SELF, 5),
+
+    // Music-system related packets (excl. zone ones)
+    MIDI_SONG_V2(GameServerProtId.MIDI_SONG_V2, 10),
+    MIDI_SONG_WITHSECONDARY(GameServerProtId.MIDI_SONG_WITHSECONDARY, 12),
+    MIDI_SWAP(GameServerProtId.MIDI_SWAP, 8),
+    MIDI_SONG_STOP(GameServerProtId.MIDI_SONG_STOP, 4),
+    MIDI_JINGLE(GameServerProtId.MIDI_JINGLE, 5),
+    SYNTH_SOUND(GameServerProtId.SYNTH_SOUND, 5),
+
+    // Zone header packets
+    UPDATE_ZONE_FULL_FOLLOWS(GameServerProtId.UPDATE_ZONE_FULL_FOLLOWS, 3),
+    UPDATE_ZONE_PARTIAL_FOLLOWS(GameServerProtId.UPDATE_ZONE_PARTIAL_FOLLOWS, 3),
+    UPDATE_ZONE_PARTIAL_ENCLOSED(GameServerProtId.UPDATE_ZONE_PARTIAL_ENCLOSED, Prot.VAR_SHORT),
+
+    // Zone payload packets
+    LOC_ADD_CHANGE_V2(GameServerProtId.LOC_ADD_CHANGE_V2, -2),
+    LOC_DEL(GameServerProtId.LOC_DEL, 2),
+    LOC_ANIM(GameServerProtId.LOC_ANIM, 4),
+    LOC_MERGE(GameServerProtId.LOC_MERGE, 14),
+    OBJ_ADD(-1, 14),
+    OBJ_DEL(-1, 7),
+    OBJ_COUNT(-1, 11),
+    OBJ_ENABLED_OPS(-1, 4),
+    OBJ_CUSTOMISE(-1, 17),
+    OBJ_UNCUSTOMISE(-1, 7),
+    MAP_ANIM(GameServerProtId.MAP_ANIM, 6),
+
+    // MAP_PROJANIM_V2 has no packet of its own. It can only be transmitted via the partial enclosed packet.
+    MAP_PROJANIM_V2(-1, 24),
+    SOUND_AREA(GameServerProtId.SOUND_AREA, 7),
+
+    // Specific packets
+    PROJANIM_SPECIFIC_V4(GameServerProtId.PROJANIM_SPECIFIC_V4, 27),
+    MAP_ANIM_SPECIFIC(GameServerProtId.MAP_ANIM_SPECIFIC, 8),
+    LOC_ANIM_SPECIFIC(GameServerProtId.LOC_ANIM_SPECIFIC, 6),
+    NPC_HEADICON_SPECIFIC(GameServerProtId.NPC_HEADICON_SPECIFIC, 9),
+    NPC_SPOTANIM_SPECIFIC(GameServerProtId.NPC_SPOTANIM_SPECIFIC, 9),
+    NPC_ANIM_SPECIFIC(GameServerProtId.NPC_ANIM_SPECIFIC, 5),
+    PLAYER_ANIM_SPECIFIC(GameServerProtId.PLAYER_ANIM_SPECIFIC, 3),
+    PLAYER_SPOTANIM_SPECIFIC(GameServerProtId.PLAYER_SPOTANIM_SPECIFIC, 9),
+    OBJ_ADD_SPECIFIC(GameServerProtId.OBJ_ADD_SPECIFIC, 17),
+    OBJ_DEL_SPECIFIC(GameServerProtId.OBJ_DEL_SPECIFIC, 10),
+    OBJ_ENABLED_OPS_SPECIFIC(GameServerProtId.OBJ_ENABLED_OPS_SPECIFIC, 7),
+    OBJ_UNCUSTOMISE_SPECIFIC(GameServerProtId.OBJ_UNCUSTOMISE_SPECIFIC, 10),
+    OBJ_COUNT_SPECIFIC(GameServerProtId.OBJ_COUNT_SPECIFIC, 14),
+    OBJ_CUSTOMISE_SPECIFIC(GameServerProtId.OBJ_CUSTOMISE_SPECIFIC, 20),
+
+    // Info packets
+    PLAYER_INFO(GameServerProtId.PLAYER_INFO, Prot.VAR_SHORT),
+    NPC_INFO_SMALL_V5(GameServerProtId.NPC_INFO_SMALL_V5, Prot.VAR_SHORT),
+    NPC_INFO_LARGE_V5(GameServerProtId.NPC_INFO_LARGE_V5, Prot.VAR_SHORT),
+
+    SET_NPC_UPDATE_ORIGIN(GameServerProtId.SET_NPC_UPDATE_ORIGIN, 2),
+
+    // World entity packets
+    SET_ACTIVE_WORLD_V2(GameServerProtId.SET_ACTIVE_WORLD_V2, 3),
+    WORLDENTITY_INFO_V7(GameServerProtId.WORLDENTITY_INFO_V7, Prot.VAR_SHORT),
+
+    // Map packets
+    REBUILD_NORMAL_V1(GameServerProtId.REBUILD_NORMAL_V1, Prot.VAR_SHORT),
+    REBUILD_NORMAL_V2(GameServerProtId.REBUILD_NORMAL_V2, Prot.VAR_SHORT),
+    REBUILD_REGION_V1(GameServerProtId.REBUILD_REGION_V1, Prot.VAR_SHORT),
+    REBUILD_REGION_V2(GameServerProtId.REBUILD_REGION_V2, Prot.VAR_SHORT),
+    REBUILD_WORLDENTITY_V3(GameServerProtId.REBUILD_WORLDENTITY_V3, Prot.VAR_SHORT),
+    REBUILD_WORLDENTITY_V4(GameServerProtId.REBUILD_WORLDENTITY_V4, Prot.VAR_SHORT),
+
+    // Varp packets
+    VARP_SMALL(GameServerProtId.VARP_SMALL, 3),
+    VARP_LARGE(GameServerProtId.VARP_LARGE, 6),
+    VARP_RESET(GameServerProtId.VARP_RESET, 0),
+    VARP_SYNC(GameServerProtId.VARP_SYNC, 0),
+
+    // Camera packets
+    CAM_SHAKE(GameServerProtId.CAM_SHAKE, 4),
+    CAM_RESET(GameServerProtId.CAM_RESET, 0),
+    CAM_SMOOTHRESET(GameServerProtId.CAM_SMOOTHRESET, 4),
+    CAM_MOVETO_V2(GameServerProtId.CAM_MOVETO_V2, 8),
+    CAM_MOVETO_CYCLES_V2(GameServerProtId.CAM_MOVETO_CYCLES_V2, 10),
+    CAM_MOVETO_ARC_V2(GameServerProtId.CAM_MOVETO_ARC_V2, 14),
+    CAM_LOOKAT_V2(GameServerProtId.CAM_LOOKAT_V2, 8),
+    CAM_LOOKAT_EASED_COORD_V2(GameServerProtId.CAM_LOOKAT_EASED_COORD_V2, 9),
+    CAM_ROTATEBY(GameServerProtId.CAM_ROTATEBY, 7),
+    CAM_ROTATETO(GameServerProtId.CAM_ROTATETO, 7),
+    CAM_MODE(GameServerProtId.CAM_MODE, 1),
+    CAM_TARGET_V3(GameServerProtId.CAM_TARGET_V3, 5),
+    OCULUS_SYNC(GameServerProtId.OCULUS_SYNC, 4),
+
+    // Inventory packets
+    UPDATE_INV_FULL(GameServerProtId.UPDATE_INV_FULL, Prot.VAR_SHORT),
+    UPDATE_INV_PARTIAL(GameServerProtId.UPDATE_INV_PARTIAL, Prot.VAR_SHORT),
+    UPDATE_INV_STOPTRANSMIT(GameServerProtId.UPDATE_INV_STOPTRANSMIT, 2),
+
+    // Social packets
+    MESSAGE_PRIVATE(GameServerProtId.MESSAGE_PRIVATE, Prot.VAR_SHORT),
+    MESSAGE_PRIVATE_ECHO(GameServerProtId.MESSAGE_PRIVATE_ECHO, Prot.VAR_SHORT),
+    FRIENDLIST_LOADED(GameServerProtId.FRIENDLIST_LOADED, 0),
+    UPDATE_FRIENDLIST(GameServerProtId.UPDATE_FRIENDLIST, Prot.VAR_SHORT),
+    UPDATE_IGNORELIST(GameServerProtId.UPDATE_IGNORELIST, Prot.VAR_SHORT),
+
+    // Friend chat (old "clans") packets
+    UPDATE_FRIENDCHAT_CHANNEL_FULL_V2(GameServerProtId.UPDATE_FRIENDCHAT_CHANNEL_FULL_V2, Prot.VAR_SHORT),
+    UPDATE_FRIENDCHAT_CHANNEL_SINGLEUSER(GameServerProtId.UPDATE_FRIENDCHAT_CHANNEL_SINGLEUSER, Prot.VAR_BYTE),
+    MESSAGE_FRIENDCHANNEL(GameServerProtId.MESSAGE_FRIENDCHANNEL, Prot.VAR_BYTE),
+
+    // Clan chat packets
+    VARCLAN(GameServerProtId.VARCLAN, Prot.VAR_BYTE),
+    VARCLAN_ENABLE(GameServerProtId.VARCLAN_ENABLE, 0),
+    VARCLAN_DISABLE(GameServerProtId.VARCLAN_DISABLE, 0),
+    CLANCHANNEL_FULL(GameServerProtId.CLANCHANNEL_FULL, Prot.VAR_SHORT),
+    CLANCHANNEL_DELTA(GameServerProtId.CLANCHANNEL_DELTA, Prot.VAR_SHORT),
+    CLANSETTINGS_FULL(GameServerProtId.CLANSETTINGS_FULL, Prot.VAR_SHORT),
+    CLANSETTINGS_DELTA(GameServerProtId.CLANSETTINGS_DELTA, Prot.VAR_SHORT),
+    MESSAGE_CLANCHANNEL(GameServerProtId.MESSAGE_CLANCHANNEL, Prot.VAR_BYTE),
+    MESSAGE_CLANCHANNEL_SYSTEM(GameServerProtId.MESSAGE_CLANCHANNEL_SYSTEM, Prot.VAR_BYTE),
+
+    // Log out packets
+    LOGOUT(GameServerProtId.LOGOUT, 0),
+    LOGOUT_WITHREASON(GameServerProtId.LOGOUT_WITHREASON, 1),
+    LOGOUT_TRANSFER(GameServerProtId.LOGOUT_TRANSFER, Prot.VAR_BYTE),
+
+    // Misc. player state packets
+    UPDATE_RUNWEIGHT(GameServerProtId.UPDATE_RUNWEIGHT, 2),
+    UPDATE_RUNENERGY(GameServerProtId.UPDATE_RUNENERGY, 2),
+    SET_MAP_FLAG_V2(GameServerProtId.SET_MAP_FLAG_V2, 4),
+    SET_PLAYER_OP(GameServerProtId.SET_PLAYER_OP, Prot.VAR_BYTE),
+    UPDATE_STAT_V2(GameServerProtId.UPDATE_STAT_V2, 7),
+
+    // Misc. player packets
+    RUNCLIENTSCRIPT(GameServerProtId.RUNCLIENTSCRIPT, Prot.VAR_SHORT),
+    TRIGGER_ONDIALOGABORT(GameServerProtId.TRIGGER_ONDIALOGABORT, 0),
+    MESSAGE_GAME(GameServerProtId.MESSAGE_GAME, Prot.VAR_BYTE),
+    CHAT_FILTER_SETTINGS(GameServerProtId.CHAT_FILTER_SETTINGS, 2),
+    CHAT_FILTER_SETTINGS_PRIVATECHAT(GameServerProtId.CHAT_FILTER_SETTINGS_PRIVATECHAT, 1),
+    UPDATE_TRADINGPOST(GameServerProtId.UPDATE_TRADINGPOST, Prot.VAR_SHORT),
+    UPDATE_STOCKMARKET_SLOT(GameServerProtId.UPDATE_STOCKMARKET_SLOT, 20),
+    ACCOUNT_FLAGS(GameServerProtId.ACCOUNT_FLAGS, 8),
+
+    // Misc. client state packets
+    HINT_ARROW(GameServerProtId.HINT_ARROW, 6),
+    RESET_ANIMS(GameServerProtId.RESET_ANIMS, 0),
+    UPDATE_REBOOT_TIMER_V2(GameServerProtId.UPDATE_REBOOT_TIMER_V2, Prot.VAR_BYTE),
+    SET_HEATMAP_ENABLED(GameServerProtId.SET_HEATMAP_ENABLED, 1),
+    MINIMAP_TOGGLE(GameServerProtId.MINIMAP_TOGGLE, 1),
+    SERVER_TICK_END(GameServerProtId.SERVER_TICK_END, 0),
+    HIDENPCOPS(GameServerProtId.HIDENPCOPS, 1),
+    HIDEOBJOPS(GameServerProtId.HIDEOBJOPS, 1),
+    HIDELOCOPS(GameServerProtId.HIDELOCOPS, 1),
+    SET_INTERACTION_MODE(GameServerProtId.SET_INTERACTION_MODE, 4),
+    RESET_INTERACTION_MODE(GameServerProtId.RESET_INTERACTION_MODE, 2),
+    ZBUF(GameServerProtId.ZBUF, 1),
+
+    // Misc. client packets
+    URL_OPEN(GameServerProtId.URL_OPEN, Prot.VAR_SHORT),
+    SITE_SETTINGS(GameServerProtId.SITE_SETTINGS, Prot.VAR_BYTE),
+    UPDATE_UID192(GameServerProtId.UPDATE_UID192, 28),
+    REFLECTION_CHECKER(GameServerProtId.REFLECTION_CHECKER, Prot.VAR_SHORT),
+    SEND_PING(GameServerProtId.SEND_PING, 8),
+    HISCORE_REPLY(GameServerProtId.HISCORE_REPLY, Prot.VAR_SHORT),
+    PACKET_GROUP_START(GameServerProtId.PACKET_GROUP_START, 2),
+
+    // Unknown packets
+    UNKNOWN_STRING(GameServerProtId.UNKNOWN_STRING, Prot.VAR_BYTE),
+
+    PACKET_GROUP_END(0xFE, 0),
+    RECONNECT(0xFF, Prot.VAR_SHORT),
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/prot/GameServerProtId.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/prot/GameServerProtId.kt
new file mode 100644
index 000000000..269e52d35
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/prot/GameServerProtId.kt
@@ -0,0 +1,143 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.prot
+
+internal object GameServerProtId {
+    const val UPDATE_REBOOT_TIMER_V2 = 0
+    const val UPDATE_INV_STOPTRANSMIT = 1
+    const val MESSAGE_PRIVATE = 2
+    const val SEND_PING = 3
+    const val FRIENDLIST_LOADED = 4
+    const val UPDATE_RUNWEIGHT = 5
+    const val IF_SETTEXT = 6
+    const val SET_NPC_UPDATE_ORIGIN = 7
+    const val SET_HEATMAP_ENABLED = 8
+    const val NPC_ANIM_SPECIFIC = 9
+    const val UPDATE_ZONE_PARTIAL_FOLLOWS = 10
+    const val SET_ACTIVE_WORLD_V2 = 11
+    const val LOC_ANIM = 12
+    const val UPDATE_FRIENDCHAT_CHANNEL_SINGLEUSER = 13
+    const val CLANCHANNEL_DELTA = 14
+    const val IF_SETPLAYERMODEL_OBJ = 15
+    const val MESSAGE_PRIVATE_ECHO = 16
+    const val LOC_ADD_CHANGE_V2 = 17
+    const val RESET_ANIMS = 18
+    const val NPC_INFO_SMALL_V5 = 19
+    const val CAM_ROTATEBY = 20
+    const val OCULUS_SYNC = 21
+    const val VARP_SYNC = 22
+    const val IF_SETEVENTS_V2 = 23
+    const val VARCLAN = 24
+    const val IF_SETHIDE = 25
+    const val ACCOUNT_FLAGS = 26
+    const val UPDATE_STAT_V2 = 27
+    const val MESSAGE_CLANCHANNEL = 28
+    const val MESSAGE_FRIENDCHANNEL = 29
+    const val TRIGGER_ONDIALOGABORT = 30
+    const val PLAYER_SPOTANIM_SPECIFIC = 31
+    const val IF_OPENTOP = 32
+    const val MIDI_SONG_V2 = 33
+    const val SOUND_AREA = 34
+    const val URL_OPEN = 35
+    const val MESSAGE_GAME = 36
+    const val IF_SETOBJECT = 37
+    const val HIDEOBJOPS = 38
+    const val REBUILD_REGION_V1 = 39
+    const val CAM_MODE = 40
+    const val PACKET_GROUP_START = 41
+    const val CAM_RESET = 42
+    const val LOC_MERGE = 43
+    const val VARP_RESET = 44
+    const val IF_CLEARINV = 45
+    const val HIDENPCOPS = 46
+    const val IF_SETNPCHEAD_ACTIVE = 47
+    const val IF_SETANGLE = 48
+    const val CAM_SHAKE = 49
+    const val CHAT_FILTER_SETTINGS_PRIVATECHAT = 50
+    const val IF_SETPOSITION = 51
+    const val IF_CLOSESUB = 52
+    const val NPC_INFO_LARGE_V5 = 53
+    const val LOGOUT_WITHREASON = 54
+    const val IF_OPENSUB = 55
+    const val REBUILD_WORLDENTITY_V3 = 56
+    const val PLAYER_ANIM_SPECIFIC = 57
+    const val IF_SETPLAYERHEAD = 58
+    const val UPDATE_ZONE_FULL_FOLLOWS = 59
+    const val UPDATE_TRADINGPOST = 60
+    const val MAP_ANIM_SPECIFIC = 61
+    const val MAP_ANIM = 62
+    const val SYNTH_SOUND = 63
+    const val PLAYER_INFO = 64
+    const val LOGOUT = 65
+    const val UPDATE_FRIENDCHAT_CHANNEL_FULL_V2 = 66
+    const val IF_RESYNC_V2 = 67
+    const val RUNCLIENTSCRIPT = 68
+    const val MIDI_SONG_STOP = 69
+    const val IF_MOVESUB = 70
+    const val REBUILD_REGION_V2 = 71
+    const val VARP_SMALL = 72
+    const val SET_INTERACTION_MODE = 73
+    const val OBJ_ADD_SPECIFIC = 74
+    const val MIDI_SWAP = 75
+    const val HINT_ARROW = 76
+    const val LOC_DEL = 77
+    const val UPDATE_STOCKMARKET_SLOT = 78
+    const val REBUILD_NORMAL_V1 = 79
+    const val IF_SETPLAYERMODEL_BASECOLOUR = 80
+    const val MESSAGE_CLANCHANNEL_SYSTEM = 81
+    const val SITE_SETTINGS = 82
+    const val CAM_TARGET_V3 = 83
+    const val CLANCHANNEL_FULL = 84
+    const val IF_SETANIM = 85
+    const val CLANSETTINGS_DELTA = 86
+    const val REBUILD_WORLDENTITY_V4 = 87
+    const val MIDI_SONG_WITHSECONDARY = 88
+    const val UPDATE_IGNORELIST = 89
+    const val LOGOUT_TRANSFER = 90
+    const val LOC_ANIM_SPECIFIC = 91
+    const val PROJANIM_SPECIFIC_V4 = 92
+    const val SERVER_TICK_END = 93
+    const val UPDATE_FRIENDLIST = 94
+    const val CLANSETTINGS_FULL = 95
+    const val SET_PLAYER_OP = 96
+    const val IF_SETCOLOUR = 97
+    const val UPDATE_ZONE_PARTIAL_ENCLOSED = 98
+    const val IF_SETROTATESPEED = 99
+    const val REBUILD_NORMAL_V2 = 100
+    const val IF_SETMODEL_V1 = 101
+    const val OBJ_ENABLED_OPS_SPECIFIC = 102
+    const val CAM_SMOOTHRESET = 103
+    const val CHAT_FILTER_SETTINGS = 104
+    const val VARP_LARGE = 105
+    const val IF_SETPLAYERMODEL_BODYTYPE = 106
+    const val UPDATE_UID192 = 107
+    const val NPC_HEADICON_SPECIFIC = 108
+    const val MINIMAP_TOGGLE = 109
+    const val HISCORE_REPLY = 110
+    const val VARCLAN_DISABLE = 111
+    const val OBJ_DEL_SPECIFIC = 112
+    const val VARCLAN_ENABLE = 113
+    const val HIDELOCOPS = 114
+    const val UPDATE_RUNENERGY = 115
+    const val UNKNOWN_STRING = 116
+    const val CAM_ROTATETO = 117
+    const val RESET_INTERACTION_MODE = 118
+    const val IF_SETSCROLLPOS = 119
+    const val IF_SETPLAYERMODEL_SELF = 120
+    const val OBJ_COUNT_SPECIFIC = 121
+    const val UPDATE_INV_FULL = 122
+    const val UPDATE_INV_PARTIAL = 123
+    const val IF_SETNPCHEAD = 124
+    const val MIDI_JINGLE = 125
+    const val NPC_SPOTANIM_SPECIFIC = 126
+    const val REFLECTION_CHECKER = 127
+    const val IF_SETMODEL_V2 = 128
+    const val OBJ_UNCUSTOMISE_SPECIFIC = 129
+    const val CAM_MOVETO_CYCLES_V2 = 130
+    const val ZBUF = 131
+    const val SET_MAP_FLAG_V2 = 132
+    const val CAM_LOOKAT_EASED_COORD_V2 = 133
+    const val OBJ_CUSTOMISE_SPECIFIC = 134
+    const val CAM_MOVETO_ARC_V2 = 135
+    const val WORLDENTITY_INFO_V7 = 136
+    const val CAM_MOVETO_V2 = 137
+    const val CAM_LOOKAT_V2 = 138
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/prot/ServerMessageDecoderRepository.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/prot/ServerMessageDecoderRepository.kt
new file mode 100644
index 000000000..5e6508c17
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/prot/ServerMessageDecoderRepository.kt
@@ -0,0 +1,317 @@
+package net.rsprox.protocol.v237.game.outgoing.decoder.prot
+
+import net.rsprot.compression.HuffmanCodec
+import net.rsprot.protocol.ProtRepository
+import net.rsprox.cache.api.CacheProvider
+import net.rsprox.protocol.MessageDecoderRepository
+import net.rsprox.protocol.MessageDecoderRepositoryBuilder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera.CamLookAtEasedCoordV2Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera.CamLookAtV2Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera.CamModeDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera.CamMoveToArcV2Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera.CamMoveToCyclesV2Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera.CamMoveToV2Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera.CamResetDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera.CamRotateBy
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera.CamRotateToDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera.CamShakeDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera.CamSmoothResetDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera.CamTargetV3Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.camera.OculusSyncDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan.ClanChannelDeltaDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan.ClanChannelFullDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan.ClanSettingsDeltaDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan.ClanSettingsFullDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan.MessageClanChannelDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan.MessageClanChannelSystemDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan.VarClanDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan.VarClanDisableDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.clan.VarClanEnableDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.friendchat.MessageFriendChannelDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.friendchat.UpdateFriendChatChannelFullV2Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.friendchat.UpdateFriendChatChannelSingleUserDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.info.NpcInfoLargeV5Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.info.NpcInfoSmallV5Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.info.PlayerInfoDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.info.SetNpcUpdateOriginDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.info.WorldEntityInfoV7Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.*
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfClearInvDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfCloseSubDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfMoveSubDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfOpenSubDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfOpenTopDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfResyncV2Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfSetAngleDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfSetAnimDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfSetColourDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfSetHideDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfSetModelV1Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfSetNpcHeadActiveDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfSetNpcHeadDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfSetObjectDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfSetPlayerHeadDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfSetPlayerModelBaseColourDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfSetPlayerModelBodyTypeDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfSetPlayerModelObjDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfSetPlayerModelSelfDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfSetPositionDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfSetRotateSpeedDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfSetScrollPosDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.interfaces.IfSetTextDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.inv.UpdateInvFullDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.inv.UpdateInvPartialDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.inv.UpdateInvStopTransmitDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.logout.LogoutDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.logout.LogoutTransferDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.logout.LogoutWithReasonDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.map.RebuildRegionV1Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.map.RebuildRegionV2Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.map.RebuildWorldEntityV3Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.map.RebuildWorldEntityV4Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.map.ReconnectDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.map.StaticRebuildV1Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.map.StaticRebuildV2Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.HideLocOpsDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.HideNpcOpsDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.HideObjOpsDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.HintArrowDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.HiscoreReplyDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.MinimapToggleDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.PacketGroupEndDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.PacketGroupStartDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.ReflectionCheckerDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.ResetAnimsDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.ResetInteractionModeDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.SendPingDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.ServerTickEndDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.SetHeatmapEnabledDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.SetInteractionModeDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.SiteSettingsDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.UpdateRebootTimerV2Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.UpdateUid192Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.UrlOpenDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.client.ZBufDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player.AccountFlagsDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player.ChatFilterSettingsDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player.ChatFilterSettingsPrivateChatDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player.MessageGameDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player.RunClientScriptDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player.SetMapFlagV2Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player.SetPlayerOpDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player.TriggerOnDialogAbortDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player.UpdateRunEnergyDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player.UpdateRunWeightDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player.UpdateStatV2Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player.UpdateStockMarketSlotDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.misc.player.UpdateTradingPostDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.social.FriendListLoadedDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.social.MessagePrivateDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.social.MessagePrivateEchoDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.social.UpdateFriendListDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.social.UpdateIgnoreListDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.sound.MidiJingleDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.sound.MidiSongStopDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.sound.MidiSongV2Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.sound.MidiSongWithSecondaryDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.sound.MidiSwapDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.sound.SynthSoundDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific.*
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific.LocAnimSpecificDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific.MapAnimSpecificDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific.NpcAnimSpecificDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific.NpcHeadIconSpecificDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific.NpcSpotAnimSpecificDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific.ObjAddSpecificDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific.PlayerAnimSpecificDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific.PlayerSpotAnimSpecificDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.specific.ProjAnimSpecificV4Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.unknown.UnknownStringDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.varp.VarpLargeDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.varp.VarpResetDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.varp.VarpSmallDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.varp.VarpSyncDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.worldentity.SetActiveWorldV2Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.header.UpdateZoneFullFollowsDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.header.UpdateZonePartialEnclosedDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.header.UpdateZonePartialFollowsDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.LocAddChangeV2Decoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.LocAnimDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.LocDelDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.LocMergeDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.MapAnimDecoder
+import net.rsprox.protocol.v237.game.outgoing.decoder.codec.zone.payload.SoundAreaDecoder
+
+internal object ServerMessageDecoderRepository {
+    @ExperimentalStdlibApi
+    fun build(
+        huffmanCodec: HuffmanCodec,
+        cache: CacheProvider,
+    ): MessageDecoderRepository<GameServerProt> {
+        val protRepository = ProtRepository.of<GameServerProt>()
+        val builder =
+            MessageDecoderRepositoryBuilder(
+                protRepository,
+            ).apply {
+                bind(CamRotateToDecoder())
+                bind(CamRotateBy())
+                bind(CamLookAtEasedCoordV2Decoder())
+                bind(CamLookAtV2Decoder())
+                bind(CamModeDecoder())
+                bind(CamMoveToArcV2Decoder())
+                bind(CamMoveToCyclesV2Decoder())
+                bind(CamMoveToV2Decoder())
+                bind(CamResetDecoder())
+                bind(CamShakeDecoder())
+                bind(CamSmoothResetDecoder())
+                bind(CamTargetV3Decoder())
+                bind(OculusSyncDecoder())
+
+                bind(ClanChannelDeltaDecoder())
+                bind(ClanChannelFullDecoder())
+                bind(ClanSettingsDeltaDecoder())
+                bind(ClanSettingsFullDecoder())
+                bind(MessageClanChannelDecoder(huffmanCodec))
+                bind(MessageClanChannelSystemDecoder(huffmanCodec))
+                bind(VarClanDisableDecoder())
+                bind(VarClanEnableDecoder())
+                bind(VarClanDecoder())
+
+                bind(MessageFriendChannelDecoder(huffmanCodec))
+                bind(UpdateFriendChatChannelFullV2Decoder())
+                bind(UpdateFriendChatChannelSingleUserDecoder())
+
+                bind(PlayerInfoDecoder())
+                bind(NpcInfoSmallV5Decoder())
+                bind(NpcInfoLargeV5Decoder())
+                bind(SetNpcUpdateOriginDecoder())
+                bind(WorldEntityInfoV7Decoder(huffmanCodec, cache))
+
+                bind(IfClearInvDecoder())
+                bind(IfCloseSubDecoder())
+                bind(IfResyncV2Decoder())
+                bind(IfMoveSubDecoder())
+                bind(IfOpenSubDecoder())
+                bind(IfOpenTopDecoder())
+                bind(IfSetAngleDecoder())
+                bind(IfSetAnimDecoder())
+                bind(IfSetColourDecoder())
+                bind(IfSetEventsV2Decoder())
+                bind(IfSetHideDecoder())
+                bind(IfSetModelV1Decoder())
+                bind(IfSetModelV2Decoder())
+                bind(IfSetNpcHeadActiveDecoder())
+                bind(IfSetNpcHeadDecoder())
+                bind(IfSetObjectDecoder())
+                bind(IfSetPlayerHeadDecoder())
+                bind(IfSetPlayerModelBaseColourDecoder())
+                bind(IfSetPlayerModelBodyTypeDecoder())
+                bind(IfSetPlayerModelObjDecoder())
+                bind(IfSetPlayerModelSelfDecoder())
+                bind(IfSetPositionDecoder())
+                bind(IfSetRotateSpeedDecoder())
+                bind(IfSetScrollPosDecoder())
+                bind(IfSetTextDecoder())
+
+                bind(UpdateInvFullDecoder())
+                bind(UpdateInvPartialDecoder())
+                bind(UpdateInvStopTransmitDecoder())
+
+                bind(LogoutDecoder())
+                bind(LogoutTransferDecoder())
+                bind(LogoutWithReasonDecoder())
+
+                bind(ReconnectDecoder())
+                bind(StaticRebuildV1Decoder(huffmanCodec, cache))
+                bind(StaticRebuildV2Decoder(huffmanCodec, cache))
+                bind(RebuildRegionV1Decoder())
+                bind(RebuildRegionV2Decoder())
+                bind(RebuildWorldEntityV3Decoder())
+                bind(RebuildWorldEntityV4Decoder())
+
+                bind(SetHeatmapEnabledDecoder())
+                bind(HideLocOpsDecoder())
+                bind(HideNpcOpsDecoder())
+                bind(HideObjOpsDecoder())
+                bind(SetInteractionModeDecoder())
+                bind(ResetInteractionModeDecoder())
+                bind(HintArrowDecoder())
+                bind(HiscoreReplyDecoder())
+                bind(MinimapToggleDecoder())
+                bind(ReflectionCheckerDecoder())
+                bind(ResetAnimsDecoder())
+                bind(SendPingDecoder())
+                bind(ServerTickEndDecoder())
+                bind(UpdateRebootTimerV2Decoder())
+                bind(SiteSettingsDecoder())
+                bind(UpdateUid192Decoder())
+                bind(UrlOpenDecoder())
+                bind(PacketGroupStartDecoder())
+                bind(PacketGroupEndDecoder())
+                bind(ZBufDecoder())
+
+                bind(ChatFilterSettingsDecoder())
+                bind(ChatFilterSettingsPrivateChatDecoder())
+                bind(MessageGameDecoder())
+                bind(RunClientScriptDecoder())
+                bind(SetMapFlagV2Decoder())
+                bind(SetPlayerOpDecoder())
+                bind(TriggerOnDialogAbortDecoder())
+                bind(UpdateRunEnergyDecoder())
+                bind(UpdateRunWeightDecoder())
+                bind(UpdateStatV2Decoder())
+                bind(UpdateStockMarketSlotDecoder())
+                bind(UpdateTradingPostDecoder())
+                bind(AccountFlagsDecoder())
+
+                bind(FriendListLoadedDecoder())
+                bind(MessagePrivateEchoDecoder(huffmanCodec))
+                bind(MessagePrivateDecoder(huffmanCodec))
+                bind(UpdateFriendListDecoder())
+                bind(UpdateIgnoreListDecoder())
+
+                bind(MidiJingleDecoder())
+                bind(MidiSongV2Decoder())
+                bind(MidiSongStopDecoder())
+                bind(MidiSongWithSecondaryDecoder())
+                bind(MidiSwapDecoder())
+                bind(SynthSoundDecoder())
+
+                bind(LocAnimSpecificDecoder())
+                bind(MapAnimSpecificDecoder())
+                bind(NpcAnimSpecificDecoder())
+                bind(NpcHeadIconSpecificDecoder())
+                bind(NpcSpotAnimSpecificDecoder())
+                bind(PlayerAnimSpecificDecoder())
+                bind(PlayerSpotAnimSpecificDecoder())
+                bind(ProjAnimSpecificV4Decoder())
+                bind(ObjAddSpecificDecoder())
+                bind(ObjDelSpecificDecoder())
+                bind(ObjCountSpecificDecoder())
+                bind(ObjEnabledOpsSpecificDecoder())
+                bind(ObjCustomiseSpecificDecoder())
+                bind(ObjUncustomiseSpecificDecoder())
+
+                bind(VarpLargeDecoder())
+                bind(VarpResetDecoder())
+                bind(VarpSmallDecoder())
+                bind(VarpSyncDecoder())
+
+                bind(SetActiveWorldV2Decoder())
+
+                bind(UpdateZonePartialEnclosedDecoder())
+                bind(UpdateZoneFullFollowsDecoder())
+                bind(UpdateZonePartialFollowsDecoder())
+
+                bind(LocAddChangeV2Decoder())
+                bind(LocAnimDecoder())
+                bind(LocDelDecoder())
+                bind(LocMergeDecoder())
+                bind(MapAnimDecoder())
+                bind(SoundAreaDecoder())
+
+                bind(UnknownStringDecoder())
+            }
+        return builder.build()
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/npcinfo/NpcInfoClient.kt
new file mode 100644
index 000000000..09486d43a
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/npcinfo/NpcInfoClient.kt
@@ -0,0 +1,1105 @@
+package net.rsprox.protocol.v237.game.outgoing.model.info.npcinfo
+
+import io.netty.buffer.ByteBuf
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.buffer.bitbuffer.BitBuf
+import net.rsprot.buffer.bitbuffer.toBitBuf
+import net.rsprot.buffer.extensions.toJagByteBuf
+import net.rsprox.cache.api.CacheProvider
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.exceptions.DecodeError
+import net.rsprox.protocol.game.outgoing.model.info.npcinfo.MoveSpeed
+import net.rsprox.protocol.game.outgoing.model.info.npcinfo.NpcInfo
+import net.rsprox.protocol.game.outgoing.model.info.npcinfo.NpcInfoDecoder
+import net.rsprox.protocol.game.outgoing.model.info.npcinfo.NpcUpdateType
+import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.BaseAnimationSetExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.BodyCustomisationExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.CombatLevelChangeExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.HeadCustomisationExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.HeadIconCustomisationExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.NameChangeExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.TransformationExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.customisation.ModelCustomisation
+import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.customisation.ResetCustomisation
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.EnabledOpsExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.ExactMoveExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.ExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.FaceAngleExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.FacePathingEntityExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.Headbar
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.HeadbarExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.Hit
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.HitExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.HitmarkExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SayExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SequenceExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.Spotanim
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SpotanimExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.TintingExtendedInfo
+
+@Suppress("DuplicatedCode")
+internal class NpcInfoClient(
+    val cache: CacheProvider,
+) : NpcInfoDecoder {
+    private var deletedNPCCount: Int = 0
+    private var deletedNPC = IntArray(1000)
+    private var npc = arrayOfNulls<Npc>(65536)
+    private var transmittedNPCCount = 0
+    private var transmittedNPC = IntArray(65536)
+    private var extraUpdateNPCCount: Int = 0
+    private var extraUpdateNPC: IntArray = IntArray(250)
+    private var cycle = 0
+
+    private val updates: MutableMap<Int, UpdateType> = mutableMapOf()
+    private val extendedInfoBlocks: MutableMap<Int, List<ExtendedInfo>> = mutableMapOf()
+
+    override fun decode(
+        buffer: ByteBuf,
+        large: Boolean,
+        baseCoord: CoordGrid,
+    ): NpcInfo {
+        deletedNPCCount = 0
+        extraUpdateNPCCount = 0
+        buffer.toBitBuf().use { bitBuffer ->
+            processHighResolution(bitBuffer)
+            processLowResolution(large, bitBuffer, baseCoord)
+        }
+        processExtendedInfo(buffer.toJagByteBuf())
+        for (i in 0..<deletedNPCCount) {
+            val index = deletedNPC[i]
+            if (cycle != checkNotNull(npc[index]).lastTransmitCycle) {
+                npc[index] = null
+            }
+        }
+        if (buffer.isReadable) {
+            throw IllegalStateException("npc info buffer still readable: ${buffer.readableBytes()}")
+        }
+        for (i in 0..<transmittedNPCCount) {
+            if (npc[transmittedNPC[i]] == null) {
+                throw IllegalStateException("Npc null at i $i")
+            }
+        }
+        cycle++
+        val result = mutableMapOf<Int, NpcUpdateType>()
+        for ((index, update) in updates) {
+            when (update) {
+                UpdateType.IDLE -> {
+                    // Too spammy, continue
+                    continue
+                }
+                UpdateType.LOW_RESOLUTION_TO_HIGH_RESOLUTION -> {
+                    val npc = checkNotNull(npc[index])
+                    val extendedInfo = this.extendedInfoBlocks[index] ?: emptyList()
+                    result[index] =
+                        NpcUpdateType.LowResolutionToHighResolution(
+                            npc.id,
+                            npc.spawnCycle,
+                            npc.coord.x,
+                            npc.coord.z,
+                            npc.coord.level,
+                            npc.angle,
+                            npc.jump,
+                            extendedInfo,
+                        )
+                }
+                UpdateType.HIGH_RESOLUTION_TO_LOW_RESOLUTION -> {
+                    result[index] = NpcUpdateType.HighResolutionToLowResolution
+                }
+                UpdateType.ACTIVE -> {
+                    val npc = checkNotNull(npc[index])
+                    val extendedInfo = this.extendedInfoBlocks[index] ?: emptyList()
+                    result[index] =
+                        NpcUpdateType.Active(
+                            npc.coord.x,
+                            npc.coord.z,
+                            npc.coord.level,
+                            npc.steps,
+                            npc.moveSpeed,
+                            extendedInfo,
+                            npc.jump,
+                        )
+                }
+            }
+        }
+        this.updates.clear()
+        this.extendedInfoBlocks.clear()
+        return NpcInfo(result)
+    }
+
+    private fun processExtendedInfo(buffer: JagByteBuf) {
+        for (i in 0..<extraUpdateNPCCount) {
+            val index = extraUpdateNPC[i]
+            val npc = checkNotNull(npc[index])
+            var flag = buffer.g1()
+            if ((flag and EXTENDED_SHORT) != 0) {
+                flag += buffer.g1() shl 8
+            }
+            if ((flag and EXTENDED_MEDIUM) != 0) {
+                flag += buffer.g1() shl 16
+            }
+            if ((flag and EXTENDED_INT != 0)) {
+                flag += buffer.g1() shl 24
+            }
+            val blocks = mutableListOf<ExtendedInfo>()
+
+            this.extendedInfoBlocks[index] = blocks
+
+            if (flag and HITMARKS != 0) {
+                decodeHitmarks(buffer, blocks)
+            }
+            if (flag and NAME_CHANGE != 0) {
+                decodeNameChange(buffer, blocks)
+            }
+            if (flag and HITS_OLD != 0) {
+                decodeHitsV1(buffer, blocks)
+            }
+            if (flag and LEVEL_CHANGE != 0) {
+                decodeCombatLevelChange(buffer, blocks)
+            }
+            if (flag and SPOTANIM != 0) {
+                decodeSpotanim(buffer, blocks)
+            }
+            if (flag and HEADICON_CUSTOMISATION != 0) {
+                decodeHeadiconCustomisation(buffer, blocks)
+            }
+            if (flag and OLD_HEAD_CUSTOMISATION != 0) {
+                decodeHeadCustomisationV1(npc.id, buffer, blocks)
+            }
+            if (flag and EXACT_MOVE != 0) {
+                decodeExactMove(buffer, blocks)
+            }
+            if (flag and OPS != 0) {
+                decodeEnabledOps(buffer, blocks)
+            }
+            if (flag and BAS_CHANGE != 0) {
+                decodeBaseAnimationSet(buffer, blocks)
+            }
+            if (flag and OLD_BODY_CUSTOMISATION != 0) {
+                decodeBodyCustomisationV1(npc.id, buffer, blocks)
+            }
+            if (flag and SEQUENCE != 0) {
+                decodeSequence(buffer, blocks)
+            }
+            if (flag and OLD_SPOTANIM_UNUSED != 0) {
+                throw IllegalStateException("Old spotanim used!")
+            }
+            if (flag and FACE_PATHINGENTITY != 0) {
+                decodeFacePathingEntity(buffer, blocks)
+            }
+            if (flag and FACE_ANGLE != 0) {
+                decodeFaceAngle(buffer, blocks)
+            }
+            if (flag and SAY != 0) {
+                decodeSay(buffer, blocks)
+            }
+            if (flag and HEADBARS != 0) {
+                decodeHeadbars(buffer, blocks)
+            }
+            if (flag and BODY_CUSTOMISATION != 0) {
+                decodeBodyCustomisationV2(npc.id, buffer, blocks)
+            }
+            if (flag and TRANSFORMATION != 0) {
+                decodeTransformation(buffer, blocks, npc)
+            }
+            if (flag and TINTING != 0) {
+                decodeTinting(buffer, blocks)
+            }
+            if (flag and OLD_FACE_COORD_UNUSED != 0) {
+                throw IllegalStateException("Old face coord used!")
+            }
+            if (flag and HEAD_CUSTOMISATION != 0) {
+                decodeHeadCustomisationV2(npc.id, buffer, blocks)
+            }
+        }
+    }
+
+    private fun decodeBaseAnimationSet(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val flag = buffer.g4Alt1()
+        val turnLeftAnim = if (flag and 0x1 != 0) buffer.g2Alt1() else null
+        val turnRightAnim = if (flag and 0x2 != 0) buffer.g2() else null
+        val walkAnim = if (flag and 0x4 != 0) buffer.g2Alt1() else null
+        val walkAnimBack = if (flag and 0x8 != 0) buffer.g2Alt1() else null
+        val walkAnimLeft = if (flag and 0x10 != 0) buffer.g2Alt1() else null
+        val walkAnimRight = if (flag and 0x20 != 0) buffer.g2Alt2() else null
+        val runAnim = if (flag and 0x40 != 0) buffer.g2() else null
+        val runAnimBack = if (flag and 0x80 != 0) buffer.g2() else null
+        val runAnimLeft = if (flag and 0x100 != 0) buffer.g2Alt3() else null
+        val runAnimRight = if (flag and 0x200 != 0) buffer.g2Alt2() else null
+        val crawlAnim = if (flag and 0x400 != 0) buffer.g2() else null
+        val crawlAnimBack = if (flag and 0x800 != 0) buffer.g2Alt1() else null
+        val crawlAnimLeft = if (flag and 0x1000 != 0) buffer.g2Alt2() else null
+        val crawlAnimRight = if (flag and 0x2000 != 0) buffer.g2Alt2() else null
+        val readyAnim = if (flag and 0x4000 != 0) buffer.g2() else null
+        blocks +=
+            BaseAnimationSetExtendedInfo(
+                turnLeftAnim,
+                turnRightAnim,
+                walkAnim,
+                walkAnimBack,
+                walkAnimLeft,
+                walkAnimRight,
+                runAnim,
+                runAnimBack,
+                runAnimLeft,
+                runAnimRight,
+                crawlAnim,
+                crawlAnimBack,
+                crawlAnimLeft,
+                crawlAnimRight,
+                readyAnim,
+            )
+    }
+
+    private fun decodeHitsV1(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val hitCount = buffer.g1Alt2()
+        val hits = ArrayList<Hit>(hitCount)
+        for (i in 0..<hitCount) {
+            when (val type = buffer.gSmart1or2()) {
+                0x7FFE -> {
+                    val delay = buffer.gSmart1or2()
+                    hits +=
+                        Hit(
+                            0x7FFE,
+                            -1,
+                            -1,
+                            -1,
+                            delay,
+                        )
+                }
+                0x7FFF -> {
+                    val mainType = buffer.gSmart1or2()
+                    val value = buffer.gSmart1or2()
+                    val soakType = buffer.gSmart1or2()
+                    val soakValue = buffer.gSmart1or2()
+                    val delay = buffer.gSmart1or2()
+                    hits +=
+                        Hit(
+                            mainType,
+                            value,
+                            soakType,
+                            soakValue,
+                            delay,
+                        )
+                }
+                else -> {
+                    val value = buffer.gSmart1or2()
+                    val delay = buffer.gSmart1or2()
+                    hits +=
+                        Hit(
+                            type,
+                            value,
+                            -1,
+                            -1,
+                            delay,
+                        )
+                }
+            }
+        }
+
+        val headbarCount = buffer.g1()
+        val headbars = ArrayList<Headbar>(headbarCount)
+        for (i in 0..<headbarCount) {
+            val type = buffer.gSmart1or2()
+            val endTime = buffer.gSmart1or2()
+            if (endTime == 0x7FFF) {
+                headbars +=
+                    Headbar(
+                        type,
+                        -1,
+                        -1,
+                        -1,
+                        -1,
+                    )
+                continue
+            }
+            val startTime = buffer.gSmart1or2()
+            val startFill = buffer.g1()
+            val endFill =
+                if (endTime > 0) {
+                    buffer.g1Alt1()
+                } else {
+                    startFill
+                }
+            headbars +=
+                Headbar(
+                    type,
+                    startFill,
+                    endFill,
+                    startTime,
+                    endTime,
+                )
+        }
+        blocks += HitExtendedInfo(hits, headbars)
+    }
+
+    private fun decodeHitmarks(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val hitCount = buffer.g1Alt2()
+        val hits = ArrayList<Hit>(hitCount)
+        for (i in 0..<hitCount) {
+            val type = buffer.gSmart1or2()
+            val value = buffer.gSmart1or2()
+            val delay = buffer.gSmart1or2()
+            val limit = buffer.gSmart1or2()
+            hits +=
+                Hit(
+                    type,
+                    value,
+                    -1,
+                    -1,
+                    delay,
+                    limit,
+                )
+        }
+        blocks += HitmarkExtendedInfo(hits)
+    }
+
+    private fun decodeHeadbars(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val headbarCount = buffer.g1()
+        val headbars = ArrayList<Headbar>(headbarCount)
+        for (i in 0..<headbarCount) {
+            val type = buffer.gSmart1or2()
+            val endTime = buffer.gSmart1or2()
+            if (endTime == 0x7FFF) {
+                headbars +=
+                    Headbar(
+                        type,
+                        -1,
+                        -1,
+                        -1,
+                        -1,
+                    )
+                continue
+            }
+            val startTime = buffer.gSmart1or2()
+            val startFill = buffer.g1Alt1()
+            val endFill =
+                if (endTime > 0) {
+                    buffer.g1Alt2()
+                } else {
+                    startFill
+                }
+            headbars +=
+                Headbar(
+                    type,
+                    startFill,
+                    endFill,
+                    startTime,
+                    endTime,
+                )
+        }
+        blocks += HeadbarExtendedInfo(headbars)
+    }
+
+    private fun decodeSpotanim(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val spotanims = mutableMapOf<Int, Spotanim>()
+        val count = buffer.g1()
+        for (i in 0..<count) {
+            val slot = buffer.g1()
+            val id = buffer.g2Alt2()
+            val heightAndDelay = buffer.g4()
+            val height = heightAndDelay ushr 16
+            val delay = heightAndDelay and 0xFFFF
+            spotanims[slot] = Spotanim(id, delay, height)
+        }
+        blocks += SpotanimExtendedInfo(spotanims)
+    }
+
+    private fun decodeSequence(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val id = buffer.g2Alt3()
+        val delay = buffer.g1Alt2()
+        blocks += SequenceExtendedInfo(id, delay)
+    }
+
+    private fun decodeCombatLevelChange(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val level = buffer.g4Alt2()
+        blocks += CombatLevelChangeExtendedInfo(level)
+    }
+
+    private fun decodeTinting(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val start = buffer.g2()
+        val end = buffer.g2Alt1()
+        val hue = buffer.g1()
+        val saturation = buffer.g1Alt1()
+        val lightness = buffer.g1Alt3()
+        val weight = buffer.g1Alt3()
+        blocks +=
+            TintingExtendedInfo(
+                start,
+                end,
+                hue,
+                saturation,
+                lightness,
+                weight,
+            )
+    }
+
+    private fun decodeTransformation(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+        npc: Npc,
+    ) {
+        val id = buffer.g2Alt2()
+        blocks += TransformationExtendedInfo(id)
+        npc.id = id
+    }
+
+    private fun decodeEnabledOps(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val flag = buffer.g1Alt1()
+        blocks += EnabledOpsExtendedInfo(flag)
+    }
+
+    private fun decodeFacePathingEntity(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        var index = buffer.g2Alt3()
+        index += buffer.g1Alt2() shl 16
+        blocks += FacePathingEntityExtendedInfo(index)
+    }
+
+    private fun decodeBodyCustomisationV1(
+        id: Int,
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val flag = buffer.g1Alt3()
+        if (flag and 0x1 != 0) {
+            blocks += BodyCustomisationExtendedInfo(ResetCustomisation)
+            return
+        }
+        val models =
+            if (flag and 0x2 != 0) {
+                val count = buffer.g1Alt3()
+                val models = ArrayList<Int>(count)
+                for (i in 0..<count) {
+                    val modelId = buffer.g2Alt1()
+                    models += if (modelId == 0xFFFF) -1 else modelId
+                }
+                models
+            } else {
+                null
+            }
+        val recolours =
+            if (flag and 0x4 != 0) {
+                val cache = cache.get()
+                val npc =
+                    cache.getNpcType(id)
+                        ?: throw DecodeError("Npc $id not found in cache $cache! Npc info decoding cannot continue.")
+                val length = npc.recoldest.size
+                val recolours = ArrayList<Int>(length)
+                for (i in 0..<length) {
+                    recolours += buffer.g2Alt3()
+                }
+                recolours
+            } else {
+                null
+            }
+        val retextures =
+            if (flag and 0x8 != 0) {
+                val cache = cache.get()
+                val npc =
+                    cache.getNpcType(id)
+                        ?: throw DecodeError("Npc $id not found in cache $cache! Npc info decoding cannot continue.")
+                val length = npc.retexdest.size
+                val retextures = ArrayList<Int>(length)
+                for (i in 0..<length) {
+                    retextures += buffer.g2()
+                }
+                retextures
+            } else {
+                null
+            }
+        val mirror =
+            if (flag and 0x10 != 0) {
+                buffer.g1Alt1() == 1
+            } else {
+                null
+            }
+        blocks +=
+            BodyCustomisationExtendedInfo(
+                ModelCustomisation(
+                    models,
+                    recolours,
+                    retextures,
+                    mirror,
+                ),
+            )
+    }
+
+    private fun decodeHeadCustomisationV1(
+        id: Int,
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val flag = buffer.g1Alt2()
+        if (flag and 0x1 != 0) {
+            blocks += BodyCustomisationExtendedInfo(ResetCustomisation)
+            return
+        }
+        val models =
+            if (flag and 0x2 != 0) {
+                val count = buffer.g1Alt3()
+                val models = ArrayList<Int>(count)
+                for (i in 0..<count) {
+                    val modelId = buffer.g2Alt1()
+                    models += if (modelId == 0xFFFF) -1 else modelId
+                }
+                models
+            } else {
+                null
+            }
+        val recolours =
+            if (flag and 0x4 != 0) {
+                val cache = cache.get()
+                val npc =
+                    cache.getNpcType(id)
+                        ?: throw DecodeError("Npc $id not found in cache $cache! Npc info decoding cannot continue.")
+                val length = npc.recoldest.size
+                val recolours = ArrayList<Int>(length)
+                for (i in 0..<length) {
+                    recolours += buffer.g2Alt2()
+                }
+                recolours
+            } else {
+                null
+            }
+        val retextures =
+            if (flag and 0x8 != 0) {
+                val cache = cache.get()
+                val npc =
+                    cache.getNpcType(id)
+                        ?: throw DecodeError("Npc $id not found in cache $cache! Npc info decoding cannot continue.")
+                val length = npc.retexdest.size
+                val retextures = ArrayList<Int>(length)
+                for (i in 0..<length) {
+                    retextures += buffer.g2Alt1()
+                }
+                retextures
+            } else {
+                null
+            }
+        val mirror =
+            if (flag and 0x10 != 0) {
+                buffer.g1Alt3() == 1
+            } else {
+                null
+            }
+        blocks +=
+            HeadCustomisationExtendedInfo(
+                ModelCustomisation(
+                    models,
+                    recolours,
+                    retextures,
+                    mirror,
+                ),
+            )
+    }
+
+    private fun decodeBodyCustomisationV2(
+        id: Int,
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val flag = buffer.g1()
+        if (flag and 0x1 != 0) {
+            blocks += BodyCustomisationExtendedInfo(ResetCustomisation)
+            return
+        }
+        val models =
+            if (flag and 0x2 != 0) {
+                val count = buffer.g1Alt3()
+                val models = ArrayList<Int>(count)
+                for (i in 0..<count) {
+                    val modelId = buffer.g4Alt2()
+                    models += modelId
+                }
+                models
+            } else {
+                null
+            }
+        val recolours =
+            if (flag and 0x4 != 0) {
+                val cache = cache.get()
+                val npc =
+                    cache.getNpcType(id)
+                        ?: throw DecodeError("Npc $id not found in cache $cache! Npc info decoding cannot continue.")
+                val length = npc.recoldest.size
+                val recolours = ArrayList<Int>(length)
+                for (i in 0..<length) {
+                    recolours += buffer.g2Alt3()
+                }
+                recolours
+            } else {
+                null
+            }
+        val retextures =
+            if (flag and 0x8 != 0) {
+                val cache = cache.get()
+                val npc =
+                    cache.getNpcType(id)
+                        ?: throw DecodeError("Npc $id not found in cache $cache! Npc info decoding cannot continue.")
+                val length = npc.retexdest.size
+                val retextures = ArrayList<Int>(length)
+                for (i in 0..<length) {
+                    retextures += buffer.g2Alt3()
+                }
+                retextures
+            } else {
+                null
+            }
+        val mirror =
+            if (flag and 0x10 != 0) {
+                buffer.g1() == 1
+            } else {
+                null
+            }
+        blocks +=
+            BodyCustomisationExtendedInfo(
+                ModelCustomisation(
+                    models,
+                    recolours,
+                    retextures,
+                    mirror,
+                ),
+            )
+    }
+
+    private fun decodeHeadCustomisationV2(
+        id: Int,
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val flag = buffer.g1Alt1()
+        if (flag and 0x1 != 0) {
+            blocks += BodyCustomisationExtendedInfo(ResetCustomisation)
+            return
+        }
+        val models =
+            if (flag and 0x2 != 0) {
+                val count = buffer.g1Alt1()
+                val models = ArrayList<Int>(count)
+                for (i in 0..<count) {
+                    val modelId = buffer.g4()
+                    models += modelId
+                }
+                models
+            } else {
+                null
+            }
+        val recolours =
+            if (flag and 0x4 != 0) {
+                val cache = cache.get()
+                val npc =
+                    cache.getNpcType(id)
+                        ?: throw DecodeError("Npc $id not found in cache $cache! Npc info decoding cannot continue.")
+                val length = npc.recoldest.size
+                val recolours = ArrayList<Int>(length)
+                for (i in 0..<length) {
+                    recolours += buffer.g2()
+                }
+                recolours
+            } else {
+                null
+            }
+        val retextures =
+            if (flag and 0x8 != 0) {
+                val cache = cache.get()
+                val npc =
+                    cache.getNpcType(id)
+                        ?: throw DecodeError("Npc $id not found in cache $cache! Npc info decoding cannot continue.")
+                val length = npc.retexdest.size
+                val retextures = ArrayList<Int>(length)
+                for (i in 0..<length) {
+                    retextures += buffer.g2Alt3()
+                }
+                retextures
+            } else {
+                null
+            }
+        val mirror =
+            if (flag and 0x10 != 0) {
+                buffer.g1Alt3() == 1
+            } else {
+                null
+            }
+        blocks +=
+            HeadCustomisationExtendedInfo(
+                ModelCustomisation(
+                    models,
+                    recolours,
+                    retextures,
+                    mirror,
+                ),
+            )
+    }
+
+    private fun decodeSay(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val text = buffer.gjstr()
+        blocks += SayExtendedInfo(text)
+    }
+
+    private fun decodeExactMove(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val deltaX1 = buffer.g1sAlt1()
+        val deltaZ1 = buffer.g1sAlt1()
+        val deltaX2 = buffer.g1sAlt3()
+        val deltaZ2 = buffer.g1sAlt2()
+        val delay1 = buffer.g2Alt2()
+        val delay2 = buffer.g2()
+        val direction = buffer.g2Alt3()
+        blocks +=
+            ExactMoveExtendedInfo(
+                deltaX1,
+                deltaZ1,
+                delay1,
+                deltaX2,
+                deltaZ2,
+                delay2,
+                direction,
+            )
+    }
+
+    private fun decodeNameChange(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val text = buffer.gjstr()
+        blocks += NameChangeExtendedInfo(text)
+    }
+
+    private fun decodeHeadiconCustomisation(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val flag = buffer.g1()
+        val groups = IntArray(8)
+        val indices = IntArray(8)
+        for (i in 0..<8) {
+            if (flag and (1 shl i) != 0) {
+                groups[i] = buffer.gSmart2or4null()
+                indices[i] = buffer.gSmart1or2null()
+            } else {
+                groups[i] = -1
+                indices[i] = -1
+            }
+        }
+        blocks += HeadIconCustomisationExtendedInfo(groups, indices)
+    }
+
+    private fun decodeFaceAngle(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val angle = buffer.g2()
+        val instant = buffer.g1Alt3() == 1
+        blocks += FaceAngleExtendedInfo(angle, instant)
+    }
+
+    private fun processHighResolution(buffer: BitBuf) {
+        val count = buffer.gBits(8)
+        if (count < transmittedNPCCount) {
+            for (i in count..<transmittedNPCCount) {
+                deletedNPC[deletedNPCCount++] = transmittedNPC[i]
+                updates[transmittedNPC[i]] = UpdateType.HIGH_RESOLUTION_TO_LOW_RESOLUTION
+            }
+        }
+        require(count <= transmittedNPCCount) {
+            "Too many npcs to process: $count, $transmittedNPCCount"
+        }
+        transmittedNPCCount = 0
+        for (i in 0..<count) {
+            val index = transmittedNPC[i]
+            val npc = requireNotNull(npc[index])
+            npc.steps.clear()
+            val hasUpdate = buffer.gBits(1)
+            if (hasUpdate == 0) {
+                transmittedNPC[transmittedNPCCount++] = index
+                npc.lastTransmitCycle = cycle
+                npc.clearMovement()
+                updates[index] = UpdateType.IDLE
+                continue
+            }
+            val updateType = buffer.gBits(2)
+            when (updateType) {
+                0 -> {
+                    transmittedNPC[transmittedNPCCount++] = index
+                    npc.lastTransmitCycle = cycle
+                    npc.clearMovement()
+                    extraUpdateNPC[extraUpdateNPCCount++] = index
+                    updates[index] = UpdateType.ACTIVE
+                }
+                1 -> {
+                    transmittedNPC[transmittedNPCCount++] = index
+                    npc.lastTransmitCycle = cycle
+                    val walkDirection = buffer.gBits(3)
+                    npc.addRouteWaypointAdjacent(
+                        walkDirection,
+                        MoveSpeed.WALK,
+                    )
+                    val extendedInfo = buffer.gBits(1)
+                    if (extendedInfo == 1) {
+                        this.extraUpdateNPC[extraUpdateNPCCount++] = index
+                    }
+                    updates[index] = UpdateType.ACTIVE
+                }
+                2 -> {
+                    transmittedNPC[transmittedNPCCount++] = index
+                    npc.lastTransmitCycle = cycle
+                    if (buffer.gBits(1) == 1) {
+                        val walkDirection = buffer.gBits(3)
+                        npc.addRouteWaypointAdjacent(
+                            walkDirection,
+                            MoveSpeed.RUN,
+                        )
+                        val runDirection = buffer.gBits(3)
+                        npc.addRouteWaypointAdjacent(
+                            runDirection,
+                            MoveSpeed.RUN,
+                        )
+                    } else {
+                        val crawlDirection = buffer.gBits(3)
+                        npc.addRouteWaypointAdjacent(
+                            crawlDirection,
+                            MoveSpeed.CRAWL,
+                        )
+                    }
+                    val extendedInfo = buffer.gBits(1)
+                    if (extendedInfo == 1) {
+                        this.extraUpdateNPC[extraUpdateNPCCount++] = index
+                    }
+                    updates[index] = UpdateType.ACTIVE
+                }
+                3 -> {
+                    npc.clearMovement()
+                    deletedNPC[deletedNPCCount++] = index
+                    updates[index] = UpdateType.HIGH_RESOLUTION_TO_LOW_RESOLUTION
+                }
+            }
+        }
+    }
+
+    private fun processLowResolution(
+        large: Boolean,
+        buffer: BitBuf,
+        baseCoord: CoordGrid,
+    ) {
+        while (true) {
+            val indexBitCount = 16
+            val capacity = (1 shl indexBitCount)
+            if (buffer.readableBits() >= indexBitCount + 12) {
+                val index = buffer.gBits(indexBitCount)
+                if (capacity - 1 != index) {
+                    var isNew = false
+                    if (npc[index] == null) {
+                        npc[index] = Npc(-1, CoordGrid.INVALID)
+                        isNew = true
+                    }
+                    val existingType = updates[index]
+                    if (existingType == UpdateType.HIGH_RESOLUTION_TO_LOW_RESOLUTION) {
+                        // Teleport
+                        updates[index] = UpdateType.ACTIVE
+                    } else {
+                        updates[index] = UpdateType.LOW_RESOLUTION_TO_HIGH_RESOLUTION
+                    }
+                    val npc = checkNotNull(npc[index])
+                    transmittedNPC[transmittedNPCCount++] = index
+                    npc.lastTransmitCycle = cycle
+
+                    val extendedInfo = buffer.gBits(1)
+                    val angle = NPC_TURN_ANGLES[buffer.gBits(3)]
+                    val deltaZ = decodeDelta(large, buffer)
+                    val deltaX = decodeDelta(large, buffer)
+                    val hasSpawnCycle = buffer.gBits(1) == 1
+                    if (hasSpawnCycle) {
+                        npc.spawnCycle = buffer.gBits(32)
+                    }
+                    val jump = buffer.gBits(1)
+                    npc.id = buffer.gBits(14)
+                    if (isNew) {
+                        npc.turnAngle = angle
+                        npc.angle = angle
+                    }
+                    // reset bas
+                    if (npc.turnSpeed == 0) {
+                        npc.angle = 0
+                    }
+                    if (extendedInfo == 1) {
+                        this.extraUpdateNPC[extraUpdateNPCCount++] = index
+                    }
+                    npc.addRouteWaypoint(
+                        baseCoord,
+                        deltaX,
+                        deltaZ,
+                        jump == 1,
+                    )
+                    continue
+                }
+            }
+            return
+        }
+    }
+
+    private fun decodeDelta(
+        large: Boolean,
+        buffer: BitBuf,
+    ): Int =
+        if (large) {
+            var delta = buffer.gBits(8)
+            if (delta > 127) {
+                delta -= 256
+            }
+            delta
+        } else {
+            var delta = buffer.gBits(6)
+            if (delta > 31) {
+                delta -= 64
+            }
+            delta
+        }
+
+    private class Npc(
+        var id: Int,
+        var coord: CoordGrid,
+    ) {
+        var lastTransmitCycle: Int = 0
+        var moveSpeed: MoveSpeed = MoveSpeed.STATIONARY
+        var turnAngle = 0
+        var angle = 0
+        var spawnCycle = 0
+        var turnSpeed = 32
+        var jump: Boolean = false
+        var steps: MutableList<Int> = mutableListOf()
+
+        fun clearMovement() {
+            this.moveSpeed = MoveSpeed.STATIONARY
+            this.jump = false
+        }
+
+        fun addRouteWaypoint(
+            baseCoord: CoordGrid,
+            relativeX: Int,
+            relativeZ: Int,
+            jump: Boolean,
+        ) {
+            coord = CoordGrid(baseCoord.level, baseCoord.x + relativeX, baseCoord.z + relativeZ)
+            moveSpeed = MoveSpeed.STATIONARY
+            this.jump = jump
+        }
+
+        fun addRouteWaypointAdjacent(
+            opcode: Int,
+            speed: MoveSpeed,
+        ) {
+            steps += opcode
+            var x = coord.x
+            var z = coord.z
+            if (opcode == 0) {
+                --x
+                ++z
+            }
+
+            if (opcode == 1) {
+                ++z
+            }
+
+            if (opcode == 2) {
+                ++x
+                ++z
+            }
+
+            if (opcode == 3) {
+                --x
+            }
+
+            if (opcode == 4) {
+                ++x
+            }
+
+            if (opcode == 5) {
+                --x
+                --z
+            }
+
+            if (opcode == 6) {
+                --z
+            }
+
+            if (opcode == 7) {
+                ++x
+                --z
+            }
+
+            coord = CoordGrid(coord.level, x, z)
+            moveSpeed = speed
+        }
+    }
+
+    private companion object {
+        private val NPC_TURN_ANGLES = intArrayOf(768, 1024, 1280, 512, 1536, 256, 0, 1792)
+        private const val EXTENDED_SHORT: Int = 0x4
+        private const val EXTENDED_MEDIUM: Int = 0x4_000
+        private const val EXTENDED_INT: Int = 0x80_000
+
+        private const val FACE_PATHINGENTITY: Int = 0x1
+        private const val OLD_SPOTANIM_UNUSED: Int = 0x2
+        private const val OLD_FACE_COORD_UNUSED: Int = 0x8
+        private const val TRANSFORMATION: Int = 0x10
+        private const val SAY: Int = 0x20
+        private const val SEQUENCE: Int = 0x40
+        private const val HITS_OLD: Int = 0x80
+        private const val EXACT_MOVE: Int = 0x100
+        private const val TINTING: Int = 0x200
+        private const val OLD_HEAD_CUSTOMISATION: Int = 0x400
+        private const val OPS: Int = 0x800
+        private const val OLD_BODY_CUSTOMISATION: Int = 0x1_000
+        private const val NAME_CHANGE: Int = 0x2_000
+        private const val LEVEL_CHANGE: Int = 0x8_000
+        private const val FACE_ANGLE: Int = 0x10_000
+        private const val BODY_CUSTOMISATION: Int = 0x20_000
+        private const val HEADICON_CUSTOMISATION: Int = 0x40_000
+        private const val SPOTANIM: Int = 0x100_000
+        private const val BAS_CHANGE: Int = 0x200_000
+        private const val HEAD_CUSTOMISATION: Int = 0x400_000
+        private const val HITMARKS: Int = 0x800_000
+        private const val HEADBARS: Int = 0x1_000_000
+
+        private enum class UpdateType {
+            IDLE,
+            LOW_RESOLUTION_TO_HIGH_RESOLUTION,
+            HIGH_RESOLUTION_TO_LOW_RESOLUTION,
+            ACTIVE,
+        }
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/playerinfo/PlayerInfoClient.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/playerinfo/PlayerInfoClient.kt
new file mode 100644
index 000000000..17b062bbb
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/playerinfo/PlayerInfoClient.kt
@@ -0,0 +1,1147 @@
+package net.rsprox.protocol.v237.game.outgoing.model.info.playerinfo
+
+import io.netty.buffer.ByteBuf
+import io.netty.buffer.Unpooled
+import net.rsprot.buffer.JagByteBuf
+import net.rsprot.buffer.bitbuffer.BitBuf
+import net.rsprot.buffer.bitbuffer.toBitBuf
+import net.rsprot.buffer.extensions.toJagByteBuf
+import net.rsprot.compression.HuffmanCodec
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.game.outgoing.model.info.playerinfo.PlayerInfo
+import net.rsprox.protocol.game.outgoing.model.info.playerinfo.PlayerInfoDecoder
+import net.rsprox.protocol.game.outgoing.model.info.playerinfo.PlayerUpdateType
+import net.rsprox.protocol.game.outgoing.model.info.playerinfo.extendedinfo.AppearanceExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.playerinfo.extendedinfo.ChatExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.playerinfo.extendedinfo.MoveSpeedExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.playerinfo.extendedinfo.NameExtrasExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.playerinfo.extendedinfo.ObjTypeCustomisation
+import net.rsprox.protocol.game.outgoing.model.info.playerinfo.extendedinfo.TemporaryMoveSpeedExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.LowResolutionPosition
+import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.ExactMoveExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.ExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.FaceAngleExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.FacePathingEntityExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.Headbar
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.HeadbarExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.Hit
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.HitExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.HitmarkExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SayExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SequenceExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.Spotanim
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SpotanimExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.TintingExtendedInfo
+
+@Suppress("DuplicatedCode")
+internal class PlayerInfoClient(
+    private val localIndex: Int,
+    private val huffmanCodec: HuffmanCodec,
+) : PlayerInfoDecoder {
+    private var extendedInfoCount: Int = 0
+    private val extendedInfoIndices: IntArray = IntArray(2048)
+    private var highResolutionCount: Int = 0
+    private val highResolutionIndices: IntArray = IntArray(2048)
+    private var lowResolutionCount: Int = 0
+    private val lowResolutionIndices: IntArray = IntArray(2048)
+    private val unmodifiedFlags: ByteArray = ByteArray(2048)
+    private val cachedPlayers: Array<Player?> = arrayOfNulls(2048)
+    private val lowResolutionPositions: IntArray = IntArray(2048)
+    private val updateTypes: Array<UpdateType> =
+        Array(2048) {
+            UpdateType.LOW_RESOLUTION_IDLE
+        }
+
+    override fun gpiInit(initBlock: PlayerInfoInitBlock) {
+        val localPlayer = Player()
+        cachedPlayers[localIndex] = localPlayer
+        localPlayer.coord = initBlock.localPlayerCoord
+        highResolutionCount = 0
+        highResolutionIndices[highResolutionCount++] = localIndex
+        unmodifiedFlags[localIndex] = 0
+        lowResolutionCount = 0
+        for (idx in 1..<2048) {
+            if (idx == localIndex) continue
+            val packed = initBlock.getLowResolutionPosition(idx).packed
+            val level = packed shr 16
+            val x = packed shr 8 and 597
+            val z = packed and 597
+            lowResolutionPositions[idx] = CoordGrid(level, x, z).packed
+            lowResolutionIndices[lowResolutionCount++] = idx
+            unmodifiedFlags[idx] = 0
+        }
+    }
+
+    override fun reset() {
+        for (i in cachedPlayers.indices) {
+            cachedPlayers[i] = null
+        }
+        highResolutionCount = 0
+        lowResolutionCount = 0
+        unmodifiedFlags.fill(0)
+        lowResolutionPositions.fill(0)
+        lowResolutionIndices.fill(0)
+    }
+
+    override fun decode(buffer: ByteBuf): PlayerInfo {
+        extendedInfoCount = 0
+        updateTypes.fill(UpdateType.LOW_RESOLUTION_IDLE)
+        for (player in cachedPlayers) {
+            player?.extendedInfoBlocks = emptyList()
+        }
+        val updates = mutableMapOf<Int, PlayerUpdateType>()
+        decodeBitCodes(buffer)
+        for ((index, updateType) in updateTypes.withIndex()) {
+            when (updateType) {
+                UpdateType.LOW_RESOLUTION_IDLE -> {
+                    // updates[index] = PlayerUpdateType.LowResolutionIdle
+                    //  ^Ignore these as they are too spammy
+                }
+                UpdateType.HIGH_RESOLUTION_IDLE -> {
+                    val player = checkNotNull(cachedPlayers[index])
+                    updates[index] = PlayerUpdateType.HighResolutionIdle(player.extendedInfoBlocks)
+                }
+                UpdateType.LOW_RESOLUTION_TO_HIGH_RESOLUTION -> {
+                    val player = checkNotNull(cachedPlayers[index])
+                    updates[index] =
+                        PlayerUpdateType.LowResolutionToHighResolution(
+                            player.coord,
+                            player.extendedInfoBlocks,
+                        )
+                }
+                UpdateType.HIGH_RESOLUTION_MOVEMENT -> {
+                    val player = checkNotNull(cachedPlayers[index])
+                    updates[index] =
+                        PlayerUpdateType.HighResolutionMovement(
+                            player.coord,
+                            player.extendedInfoBlocks,
+                        )
+                }
+                UpdateType.LOW_RESOLUTION_MOVEMENT -> {
+                    val coord = CoordGrid(this.lowResolutionPositions[index])
+                    val lowResX = coord.x
+                    val lowResZ = coord.z
+                    val level = coord.level
+                    updates[index] =
+                        PlayerUpdateType.LowResolutionMovement(
+                            LowResolutionPosition(
+                                lowResX,
+                                lowResZ,
+                                level,
+                            ),
+                        )
+                }
+                UpdateType.HIGH_RESOLUTION_TO_LOW_RESOLUTION -> {
+                    val coord = CoordGrid(this.lowResolutionPositions[index])
+                    val lowResX = coord.x
+                    val lowResZ = coord.z
+                    val level = coord.level
+                    updates[index] =
+                        PlayerUpdateType.HighResolutionToLowResolution(
+                            LowResolutionPosition(
+                                lowResX,
+                                lowResZ,
+                                level,
+                            ),
+                        )
+                }
+            }
+        }
+        return PlayerInfo(updates)
+    }
+
+    private fun setUpdateType(
+        idx: Int,
+        updateType: UpdateType,
+    ) {
+        this.updateTypes[idx] = updateType
+    }
+
+    private fun decodeBitCodes(byteBuf: ByteBuf) {
+        byteBuf.toBitBuf().use { buffer ->
+            var skipped = 0
+            for (i in 0..<highResolutionCount) {
+                val idx = highResolutionIndices[i]
+                if (unmodifiedFlags[idx].toInt() and CUR_CYCLE_INACTIVE == 0) {
+                    if (skipped > 0) {
+                        --skipped
+                        setUpdateType(idx, UpdateType.HIGH_RESOLUTION_IDLE)
+                        unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte()
+                    } else {
+                        val active = buffer.gBits(1)
+                        if (active == 0) {
+                            skipped = readStationary(buffer)
+                            setUpdateType(idx, UpdateType.HIGH_RESOLUTION_IDLE)
+                            unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte()
+                        } else {
+                            getHighResolutionPlayerPosition(buffer, idx)
+                        }
+                    }
+                }
+            }
+            if (skipped != 0) {
+                throw RuntimeException()
+            }
+        }
+        byteBuf.toBitBuf().use { buffer ->
+            var skipped = 0
+            for (i in 0..<highResolutionCount) {
+                val idx = highResolutionIndices[i]
+                if (unmodifiedFlags[idx].toInt() and CUR_CYCLE_INACTIVE != 0) {
+                    if (skipped > 0) {
+                        --skipped
+                        setUpdateType(idx, UpdateType.HIGH_RESOLUTION_IDLE)
+                        unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte()
+                    } else {
+                        val active = buffer.gBits(1)
+                        if (active == 0) {
+                            skipped = readStationary(buffer)
+                            setUpdateType(idx, UpdateType.HIGH_RESOLUTION_IDLE)
+                            unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte()
+                        } else {
+                            getHighResolutionPlayerPosition(buffer, idx)
+                        }
+                    }
+                }
+            }
+            if (skipped != 0) {
+                throw RuntimeException()
+            }
+        }
+
+        byteBuf.toBitBuf().use { buffer ->
+            var skipped = 0
+            for (i in 0..<lowResolutionCount) {
+                val idx = lowResolutionIndices[i]
+                if (unmodifiedFlags[idx].toInt() and CUR_CYCLE_INACTIVE != 0) {
+                    if (skipped > 0) {
+                        --skipped
+                        setUpdateType(idx, UpdateType.LOW_RESOLUTION_IDLE)
+                        unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte()
+                    } else {
+                        val active = buffer.gBits(1)
+                        if (active == 0) {
+                            skipped = readStationary(buffer)
+                            setUpdateType(idx, UpdateType.LOW_RESOLUTION_IDLE)
+                            unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte()
+                        } else if (getLowResolutionPlayerPosition(buffer, idx)) {
+                            unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte()
+                        }
+                    }
+                }
+            }
+            if (skipped != 0) {
+                throw RuntimeException()
+            }
+        }
+        byteBuf.toBitBuf().use { buffer ->
+            var skipped = 0
+            for (i in 0..<lowResolutionCount) {
+                val idx = lowResolutionIndices[i]
+                if (unmodifiedFlags[idx].toInt() and CUR_CYCLE_INACTIVE == 0) {
+                    if (skipped > 0) {
+                        --skipped
+                        setUpdateType(idx, UpdateType.LOW_RESOLUTION_IDLE)
+                        unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte()
+                    } else {
+                        val active = buffer.gBits(1)
+                        if (active == 0) {
+                            skipped = readStationary(buffer)
+                            setUpdateType(idx, UpdateType.LOW_RESOLUTION_IDLE)
+                            unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte()
+                        } else if (getLowResolutionPlayerPosition(buffer, idx)) {
+                            unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte()
+                        }
+                    }
+                }
+            }
+            if (skipped != 0) {
+                throw RuntimeException()
+            }
+        }
+        lowResolutionCount = 0
+        highResolutionCount = 0
+        for (i in 1..<2048) {
+            unmodifiedFlags[i] = (unmodifiedFlags[i].toInt() shr 1).toByte()
+            val cachedPlayer = cachedPlayers[i]
+            if (cachedPlayer != null) {
+                highResolutionIndices[highResolutionCount++] = i
+            } else {
+                lowResolutionIndices[lowResolutionCount++] = i
+            }
+        }
+        decodeExtendedInfo(byteBuf.toJagByteBuf())
+    }
+
+    private fun decodeExtendedInfo(buffer: JagByteBuf) {
+        for (i in 0..<extendedInfoCount) {
+            val index = extendedInfoIndices[i]
+            val player = checkNotNull(cachedPlayers[index])
+            var flag = buffer.g1()
+            if (flag and EXTENDED_SHORT != 0) {
+                flag += buffer.g1() shl 8
+            }
+            if (flag and EXTENDED_MEDIUM != 0) {
+                flag += buffer.g1() shl 16
+            }
+            val blocks = mutableListOf<ExtendedInfo>()
+            player.extendedInfoBlocks = blocks
+            decodeExtendedInfoBlocks(buffer, flag, blocks)
+        }
+    }
+
+    private fun decodeExtendedInfoBlocks(
+        buffer: JagByteBuf,
+        flags: Int,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        if (flags and APPEARANCE != 0) {
+            val len = buffer.g1()
+            val data = ByteArray(len)
+            buffer.gdata(data)
+            decodeAppearance(Unpooled.wrappedBuffer(data).toJagByteBuf(), blocks)
+        }
+        if (flags and HITS_OLD != 0) {
+            decodeHit(buffer, blocks)
+        }
+        if (flags and TEMP_MOVE_SPEED != 0) {
+            decodeTemporaryMoveSpeed(buffer, blocks)
+        }
+        if (flags and EXACT_MOVE != 0) {
+            decodeExactMove(buffer, blocks)
+        }
+        if (flags and SEQUENCE != 0) {
+            decodeSequence(buffer, blocks)
+        }
+        if (flags and HEADBARS != 0) {
+            decodeHeadbar(buffer, blocks)
+        }
+        if (flags and CHAT_OLD != 0) {
+            throw IllegalStateException("Old chat used!")
+        }
+        if (flags and HITMARKS != 0) {
+            decodeHitmark(buffer, blocks)
+        }
+        if (flags and FACE_ANGLE != 0) {
+            decodeFaceAngle(buffer, blocks)
+        }
+        if (flags and TINTING != 0) {
+            decodeTinting(buffer, blocks)
+        }
+        if (flags and NAME_EXTRAS != 0) {
+            decodeNameExtras(buffer, blocks)
+        }
+        if (flags and FACE_PATHINGENTITY != 0) {
+            decodeFacePathingEntity(buffer, blocks)
+        }
+        if (flags and MOVE_SPEED != 0) {
+            decodeMoveSpeed(buffer, blocks)
+        }
+        if (flags and SAY != 0) {
+            decodeSay(buffer, blocks)
+        }
+        if (flags and SPOTANIM != 0) {
+            decodeSpotanims(buffer, blocks)
+        }
+        if (flags and CHAT != 0) {
+            decodeChat(buffer, blocks)
+        }
+    }
+
+    private fun decodeMoveSpeed(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        blocks += MoveSpeedExtendedInfo(buffer.g1sAlt2())
+    }
+
+    private fun decodeTemporaryMoveSpeed(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        blocks += TemporaryMoveSpeedExtendedInfo(buffer.g1s())
+    }
+
+    private fun decodeSequence(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val id = buffer.g2Alt1()
+        val delay = buffer.g1Alt1()
+        blocks += SequenceExtendedInfo(id, delay)
+    }
+
+    private fun decodeFacePathingEntity(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        var index = buffer.g2()
+        index += buffer.g1Alt3() shl 16
+        blocks += FacePathingEntityExtendedInfo(index)
+    }
+
+    private fun decodeFaceAngle(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        blocks += FaceAngleExtendedInfo(buffer.g2Alt3())
+    }
+
+    private fun decodeSay(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        blocks += SayExtendedInfo(buffer.gjstr())
+    }
+
+    private fun decodeNameExtras(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val beforeName = buffer.gjstr()
+        val afterName = buffer.gjstr()
+        val afterCombatLevel = buffer.gjstr()
+        blocks += NameExtrasExtendedInfo(beforeName, afterName, afterCombatLevel)
+    }
+
+    private fun decodeChat(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val colourAndEffectsPacked = buffer.g2Alt3()
+        val modIcon = buffer.g1Alt1()
+        val autotyper = buffer.g1Alt2() == 1
+        val huffmanLength = buffer.g1Alt1()
+        val data = ByteArray(huffmanLength)
+        buffer.gdata(data)
+        val text = huffmanCodec.decode(Unpooled.wrappedBuffer(data))
+        val colour = colourAndEffectsPacked ushr 8
+        val effects = colourAndEffectsPacked and 0xFF
+        val patternLength = if (colour in 13..20) colour - 12 else 0
+        val pattern =
+            if (patternLength in 1..8) {
+                val array = ByteArray(patternLength)
+                for (i in 0..<patternLength) {
+                    array[i] = buffer.g1().toByte()
+                }
+                array
+            } else {
+                null
+            }
+        blocks +=
+            ChatExtendedInfo(
+                colour,
+                effects,
+                modIcon,
+                autotyper,
+                text,
+                pattern,
+            )
+    }
+
+    private fun decodeExactMove(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val deltaX1 = buffer.g1sAlt1()
+        val deltaZ1 = buffer.g1s()
+        val deltaX2 = buffer.g1s()
+        val deltaZ2 = buffer.g1sAlt2()
+        val delay1 = buffer.g2()
+        val delay2 = buffer.g2Alt2()
+        val direction = buffer.g2Alt3()
+        blocks +=
+            ExactMoveExtendedInfo(
+                deltaX1,
+                deltaZ1,
+                delay1,
+                deltaX2,
+                deltaZ2,
+                delay2,
+                direction,
+            )
+    }
+
+    private fun decodeSpotanims(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val spotanims = mutableMapOf<Int, Spotanim>()
+        val count = buffer.g1Alt2()
+        for (i in 0..<count) {
+            val slot = buffer.g1()
+            val id = buffer.g2Alt1()
+            val heightAndDelay = buffer.g4()
+            val height = heightAndDelay ushr 16
+            val delay = heightAndDelay and 0xFFFF
+            spotanims[slot] = Spotanim(id, delay, height)
+        }
+        blocks += SpotanimExtendedInfo(spotanims)
+    }
+
+    private fun decodeHit(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val hitCount = buffer.g1Alt2()
+        val hits = ArrayList<Hit>(hitCount)
+        for (i in 0..<hitCount) {
+            when (val type = buffer.gSmart1or2()) {
+                0x7FFE -> {
+                    val delay = buffer.gSmart1or2()
+                    hits +=
+                        Hit(
+                            0x7FFE,
+                            -1,
+                            -1,
+                            -1,
+                            delay,
+                        )
+                }
+                0x7FFF -> {
+                    val mainType = buffer.gSmart1or2()
+                    val value = buffer.gSmart1or2()
+                    val soakType = buffer.gSmart1or2()
+                    val soakValue = buffer.gSmart1or2()
+                    val delay = buffer.gSmart1or2()
+                    hits +=
+                        Hit(
+                            mainType,
+                            value,
+                            soakType,
+                            soakValue,
+                            delay,
+                        )
+                }
+                else -> {
+                    val value = buffer.gSmart1or2()
+                    val delay = buffer.gSmart1or2()
+                    hits +=
+                        Hit(
+                            type,
+                            value,
+                            -1,
+                            -1,
+                            delay,
+                        )
+                }
+            }
+        }
+
+        val headbarCount = buffer.g1Alt2()
+        val headbars = ArrayList<Headbar>(headbarCount)
+        for (i in 0..<headbarCount) {
+            val type = buffer.gSmart1or2()
+            val endTime = buffer.gSmart1or2()
+            if (endTime == 0x7FFF) {
+                headbars +=
+                    Headbar(
+                        type,
+                        -1,
+                        -1,
+                        -1,
+                        -1,
+                    )
+                continue
+            }
+            val startTime = buffer.gSmart1or2()
+            val startFill = buffer.g1Alt3()
+            val endFill =
+                if (endTime > 0) {
+                    buffer.g1Alt2()
+                } else {
+                    startFill
+                }
+            headbars +=
+                Headbar(
+                    type,
+                    startFill,
+                    endFill,
+                    startTime,
+                    endTime,
+                )
+        }
+        blocks += HitExtendedInfo(hits, headbars)
+    }
+
+    private fun decodeHitmark(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val hitCount = buffer.g1Alt2()
+        val hits = ArrayList<Hit>(hitCount)
+        for (i in 0..<hitCount) {
+            val type = buffer.gSmart1or2()
+            val value = buffer.gSmart1or2()
+            val delay = buffer.gSmart1or2()
+            val limit = buffer.gSmart1or2()
+            hits +=
+                Hit(
+                    type,
+                    value,
+                    -1,
+                    -1,
+                    delay,
+                    limit,
+                )
+        }
+        blocks += HitmarkExtendedInfo(hits)
+    }
+
+    private fun decodeHeadbar(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val headbarCount = buffer.g1()
+        val headbars = ArrayList<Headbar>(headbarCount)
+        for (i in 0..<headbarCount) {
+            val type = buffer.gSmart1or2()
+            val endTime = buffer.gSmart1or2()
+            if (endTime == 0x7FFF) {
+                headbars +=
+                    Headbar(
+                        type,
+                        -1,
+                        -1,
+                        -1,
+                        -1,
+                    )
+                continue
+            }
+            val startTime = buffer.gSmart1or2()
+            val startFill = buffer.g1Alt1()
+            val endFill =
+                if (endTime > 0) {
+                    buffer.g1()
+                } else {
+                    startFill
+                }
+            headbars +=
+                Headbar(
+                    type,
+                    startFill,
+                    endFill,
+                    startTime,
+                    endTime,
+                )
+        }
+        blocks += HeadbarExtendedInfo(headbars)
+    }
+
+    private fun decodeTinting(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val start = buffer.g2()
+        val end = buffer.g2Alt1()
+        val hue = buffer.g1sAlt3()
+        val saturation = buffer.g1s()
+        val lightness = buffer.g1s()
+        val weight = buffer.g1Alt1()
+        blocks +=
+            TintingExtendedInfo(
+                start,
+                end,
+                hue,
+                saturation,
+                lightness,
+                weight,
+            )
+    }
+
+    private fun decodeAppearance(
+        buffer: JagByteBuf,
+        blocks: MutableList<ExtendedInfo>,
+    ) {
+        val gender = buffer.g1s()
+        val skullIcon = buffer.g1s()
+        val overheadIcon = buffer.g1s()
+        val identKit = IntArray(12)
+        var transformedNpcId: Int = -1
+        for (i in 0..<12) {
+            val flag = buffer.g1()
+            if (flag == 0) {
+                identKit[i] = 0
+                continue
+            }
+            val extra = buffer.g1()
+            identKit[i] = (flag shl 8) + extra
+            if (i == 0 && identKit[i] == 65535) {
+                transformedNpcId = buffer.g2()
+                break
+            }
+        }
+        val interfaceInentKit = IntArray(12)
+        for (i in 0..<12) {
+            val value = buffer.g1()
+            if (value == 0) {
+                interfaceInentKit[i] = 0
+            } else {
+                interfaceInentKit[i] = (value shl 8) + buffer.g1()
+            }
+        }
+        val colours = IntArray(5)
+        for (i in 0..<5) {
+            colours[i] = buffer.g1()
+        }
+        val readyAnim = buffer.g2()
+        val turnAnim = buffer.g2()
+        val walkAnim = buffer.g2()
+        val walkAnimBack = buffer.g2()
+        val walkAnimLeft = buffer.g2()
+        val walkAnimRight = buffer.g2()
+        val runAnim = buffer.g2()
+        val name = buffer.gjstr()
+        val combatLevel = buffer.g1()
+        val skillLevel = buffer.g2()
+        val hidden = buffer.g1() == 1
+        val customisationFlag = buffer.g2()
+        val forceRefresh = customisationFlag shr 15 and 0x1 == 1
+        val objTypeCustomisation: Array<ObjTypeCustomisation?>? =
+            if (customisationFlag > 0 && customisationFlag != 32768) {
+                val customisation = arrayOfNulls<ObjTypeCustomisation?>(12)
+                for (i in 0..<12) {
+                    val hasCustomisation = customisationFlag shr (12 - i) and 1
+                    if (hasCustomisation == 1) {
+                        var recolIndices: Int = -1
+                        var recol1: Int = -1
+                        var recol2: Int = -1
+                        var retexIndices: Int = -1
+                        var retex1: Int = -1
+                        var retex2: Int = -1
+                        var manWear: Int = -1
+                        var womanWear: Int = -1
+                        var manHead: Int = -1
+                        var womanHead: Int = -1
+
+                        val slotFlag = buffer.g1()
+                        val recol = slotFlag and 0x1 != 0
+                        val retex = slotFlag and 0x2 != 0
+                        val wearModels = slotFlag and 0x4 != 0
+                        val headModels = slotFlag and 0x8 != 0
+                        if (recol) {
+                            recolIndices = buffer.g1()
+                            val recolIndex1 = recolIndices and 15
+                            val recolIndex2 = recolIndices ushr 4 and 15
+                            recol1 =
+                                if (recolIndex1 != 15) {
+                                    buffer.g2()
+                                } else {
+                                    -1
+                                }
+                            recol2 =
+                                if (recolIndex2 != 15) {
+                                    buffer.g2()
+                                } else {
+                                    -1
+                                }
+                        }
+
+                        if (retex) {
+                            retexIndices = buffer.g1()
+                            val retexIndex1 = retexIndices and 15
+                            val retexIndex2 = retexIndices ushr 4 and 15
+                            retex1 =
+                                if (retexIndex1 != 15) {
+                                    buffer.g2()
+                                } else {
+                                    -1
+                                }
+                            retex2 =
+                                if (retexIndex2 != 15) {
+                                    buffer.g2()
+                                } else {
+                                    -1
+                                }
+                        }
+
+                        // Note: This branch is server-version checked, but we're pushing
+                        // RSProx out after revision 237 is forced,
+                        // meaning we can check this. RSprot does not support it either.
+                        if (wearModels) {
+                            manWear = buffer.g4()
+                            womanWear = buffer.g4()
+                        }
+
+                        if (headModels) {
+                            manHead = buffer.g4()
+                            womanHead = buffer.g4()
+                        }
+                        customisation[i] =
+                            ObjTypeCustomisation(
+                                recolIndices,
+                                recol1,
+                                recol2,
+                                retexIndices,
+                                retex1,
+                                retex2,
+                                manWear,
+                                womanWear,
+                                manHead,
+                                womanHead,
+                            )
+                    }
+                }
+                customisation
+            } else {
+                null
+            }
+        val beforeName = buffer.gjstr()
+        val afterName = buffer.gjstr()
+        val afterCombatLevel = buffer.gjstr()
+        val textGender = buffer.g1s()
+        blocks +=
+            AppearanceExtendedInfo(
+                name,
+                combatLevel,
+                skillLevel,
+                hidden,
+                gender,
+                textGender,
+                skullIcon,
+                overheadIcon,
+                transformedNpcId,
+                identKit,
+                interfaceInentKit,
+                colours,
+                readyAnim,
+                turnAnim,
+                walkAnim,
+                walkAnimBack,
+                walkAnimLeft,
+                walkAnimRight,
+                runAnim,
+                beforeName,
+                afterName,
+                afterCombatLevel,
+                forceRefresh,
+                objTypeCustomisation,
+            )
+    }
+
+    private fun getHighResolutionPlayerPosition(
+        buffer: BitBuf,
+        idx: Int,
+    ) {
+        val extendedInfo = buffer.gBits(1) == 1
+        if (extendedInfo) {
+            extendedInfoIndices[extendedInfoCount++] = idx
+        }
+        val opcode = buffer.gBits(2)
+        val cachedPlayer = checkNotNull(cachedPlayers[idx])
+        if (opcode == 0) {
+            if (extendedInfo) {
+                cachedPlayer.queuedMove = false
+                setUpdateType(idx, UpdateType.HIGH_RESOLUTION_IDLE)
+            } else if (localIndex == idx) {
+                throw RuntimeException()
+            } else {
+                lowResolutionPositions[idx] =
+                    (cachedPlayer.coord.level shl 28)
+                        .or(cachedPlayer.coord.z shr 13)
+                        .or(cachedPlayer.coord.x shr 13 shl 14)
+                cachedPlayers[idx] = null
+                setUpdateType(idx, UpdateType.HIGH_RESOLUTION_TO_LOW_RESOLUTION)
+                if (buffer.gBits(1) != 0) {
+                    getLowResolutionPlayerPosition(buffer, idx)
+                }
+            }
+        } else if (opcode == 1) {
+            setUpdateType(idx, UpdateType.HIGH_RESOLUTION_MOVEMENT)
+            val movementOpcode = buffer.gBits(3)
+            var curX = cachedPlayer.coord.x
+            var curZ = cachedPlayer.coord.z
+            when (movementOpcode) {
+                0 -> {
+                    --curX
+                    --curZ
+                }
+                1 -> {
+                    --curZ
+                }
+                2 -> {
+                    ++curX
+                    --curZ
+                }
+                3 -> {
+                    --curX
+                }
+                4 -> {
+                    ++curX
+                }
+                5 -> {
+                    --curX
+                    ++curZ
+                }
+                6 -> {
+                    ++curZ
+                }
+                7 -> {
+                    ++curX
+                    ++curZ
+                }
+            }
+            cachedPlayer.coord = CoordGrid(cachedPlayer.coord.level, curX, curZ)
+            cachedPlayer.queuedMove = extendedInfo
+        } else if (opcode == 2) {
+            setUpdateType(idx, UpdateType.HIGH_RESOLUTION_MOVEMENT)
+            val movementOpcode = buffer.gBits(4)
+            var curX = cachedPlayer.coord.x
+            var curZ = cachedPlayer.coord.z
+            when (movementOpcode) {
+                0 -> {
+                    curX -= 2
+                    curZ -= 2
+                }
+                1 -> {
+                    --curX
+                    curZ -= 2
+                }
+                2 -> {
+                    curZ -= 2
+                }
+                3 -> {
+                    ++curX
+                    curZ -= 2
+                }
+                4 -> {
+                    curX += 2
+                    curZ -= 2
+                }
+                5 -> {
+                    curX -= 2
+                    --curZ
+                }
+                6 -> {
+                    curX += 2
+                    --curZ
+                }
+                7 -> {
+                    curX -= 2
+                }
+                8 -> {
+                    curX += 2
+                }
+                9 -> {
+                    curX -= 2
+                    ++curZ
+                }
+                10 -> {
+                    curX += 2
+                    ++curZ
+                }
+                11 -> {
+                    curX -= 2
+                    curZ += 2
+                }
+                12 -> {
+                    --curX
+                    curZ += 2
+                }
+                13 -> {
+                    curZ += 2
+                }
+                14 -> {
+                    ++curX
+                    curZ += 2
+                }
+                15 -> {
+                    curX += 2
+                    curZ += 2
+                }
+            }
+            cachedPlayer.coord = CoordGrid(cachedPlayer.coord.level, curX, curZ)
+            cachedPlayer.queuedMove = extendedInfo
+        } else {
+            setUpdateType(idx, UpdateType.HIGH_RESOLUTION_MOVEMENT)
+            val far = buffer.gBits(1)
+            if (far == 0) {
+                val coord = buffer.gBits(12)
+                val deltaLevel = coord shr 10
+                var deltaX = coord shr 5 and 31
+                if (deltaX > 15) {
+                    deltaX -= 32
+                }
+                var deltaZ = coord and 31
+                if (deltaZ > 15) {
+                    deltaZ -= 32
+                }
+                var curLevel = cachedPlayer.coord.level
+                var curX = cachedPlayer.coord.x
+                var curZ = cachedPlayer.coord.z
+                curX += deltaX
+                curZ += deltaZ
+                curLevel = (curLevel + deltaLevel) and 0x3
+                cachedPlayer.coord = CoordGrid(curLevel, curX, curZ)
+                cachedPlayer.queuedMove = extendedInfo
+            } else {
+                val coord = buffer.gBits(30)
+                val deltaLevel = coord shr 28
+                val deltaX = coord shr 14 and 16383
+                val deltaZ = coord and 16383
+                var curLevel = cachedPlayer.coord.level
+                var curX = cachedPlayer.coord.x
+                var curZ = cachedPlayer.coord.z
+                curX = (curX + deltaX) and 16383
+                curZ = (curZ + deltaZ) and 16383
+                curLevel = (curLevel + deltaLevel) and 0x3
+                cachedPlayer.coord = CoordGrid(curLevel, curX, curZ)
+                cachedPlayer.queuedMove = extendedInfo
+            }
+        }
+    }
+
+    private fun getLowResolutionPlayerPosition(
+        buffer: BitBuf,
+        idx: Int,
+    ): Boolean {
+        val opcode = buffer.gBits(2)
+        when (opcode) {
+            0 -> {
+                if (buffer.gBits(1) != 0) {
+                    getLowResolutionPlayerPosition(buffer, idx)
+                }
+                val x = buffer.gBits(13)
+                val z = buffer.gBits(13)
+                val extendedInfo = buffer.gBits(1) == 1
+                if (extendedInfo) {
+                    this.extendedInfoIndices[extendedInfoCount++] = idx
+                }
+                if (cachedPlayers[idx] != null) {
+                    throw RuntimeException()
+                }
+                val player = Player()
+                cachedPlayers[idx] = player
+                // cached appearance decoding
+                val lowResolutionPosition = lowResolutionPositions[idx]
+                val level = lowResolutionPosition shr 28
+                val lowResX = lowResolutionPosition shr 14 and 0xFF
+                val lowResZ = lowResolutionPosition and 0xFF
+                player.coord = CoordGrid(level, (lowResX shl 13) + x, (lowResZ shl 13) + z)
+                player.queuedMove = false
+                setUpdateType(idx, UpdateType.LOW_RESOLUTION_TO_HIGH_RESOLUTION)
+                return true
+            }
+            1 -> {
+                val levelDelta = buffer.gBits(2)
+                val lowResPosition = lowResolutionPositions[idx]
+                lowResolutionPositions[idx] =
+                    ((((lowResPosition shr 28) + levelDelta) and 3 shl 28))
+                        .plus(lowResPosition and 268435455)
+                setUpdateType(idx, UpdateType.LOW_RESOLUTION_MOVEMENT)
+                return false
+            }
+            2 -> {
+                setUpdateType(idx, UpdateType.LOW_RESOLUTION_MOVEMENT)
+                val bitpacked = buffer.gBits(5)
+                val levelDelta = bitpacked shr 3
+                val movementCode = bitpacked and 7
+                val lowResPosition = lowResolutionPositions[idx]
+                val level = (lowResPosition shr 28) + levelDelta and 3
+                var x = lowResPosition shr 14 and 255
+                var z = lowResPosition and 255
+                if (movementCode == 0) {
+                    --x
+                    --z
+                }
+
+                if (movementCode == 1) {
+                    --z
+                }
+
+                if (movementCode == 2) {
+                    ++x
+                    --z
+                }
+
+                if (movementCode == 3) {
+                    --x
+                }
+
+                if (movementCode == 4) {
+                    ++x
+                }
+
+                if (movementCode == 5) {
+                    --x
+                    ++z
+                }
+
+                if (movementCode == 6) {
+                    ++z
+                }
+
+                if (movementCode == 7) {
+                    ++x
+                    ++z
+                }
+                lowResolutionPositions[idx] = (x shl 14) + z + (level shl 28)
+                return false
+            }
+            else -> {
+                setUpdateType(idx, UpdateType.LOW_RESOLUTION_MOVEMENT)
+                val bitpacked = buffer.gBits(18)
+                val levelDelta = bitpacked shr 16
+                val xDelta = bitpacked shr 8 and 255
+                val zDelta = bitpacked and 255
+                val lowResPosition = lowResolutionPositions[idx]
+                val level = (lowResPosition shr 28) + levelDelta and 3
+                val x = (xDelta + (lowResPosition shr 14)) and 255
+                val z = (zDelta + lowResPosition) and 255
+                lowResolutionPositions[idx] = (x shl 14) + z + (level shl 28)
+                return false
+            }
+        }
+    }
+
+    private fun readStationary(buffer: BitBuf): Int {
+        val type = buffer.gBits(2)
+        return when (type) {
+            0 -> 0
+            1 -> buffer.gBits(5)
+            2 -> buffer.gBits(8)
+            else -> buffer.gBits(11)
+        }
+    }
+
+    private companion object {
+        private const val CUR_CYCLE_INACTIVE = 0x1
+        private const val NEXT_CYCLE_INACTIVE = 0x2
+
+        private const val EXTENDED_SHORT = 0x10
+        private const val EXTENDED_MEDIUM = 0x100
+
+        private const val CHAT_OLD = 0x1
+        private const val APPEARANCE = 0x2
+        private const val FACE_PATHINGENTITY = 0x4
+        private const val HITS_OLD = 0x8
+        private const val SAY = 0x20
+        private const val SEQUENCE = 0x40
+        private const val FACE_ANGLE = 0x80
+        private const val EXACT_MOVE = 0x200
+        private const val TEMP_MOVE_SPEED = 0x800
+        private const val MOVE_SPEED = 0x1000
+        private const val TINTING = 0x2000
+        private const val CHAT = 0x4000
+        private const val NAME_EXTRAS = 0x8000
+        private const val HEADBARS = 0x10000
+        private const val HITMARKS = 0x20000
+        private const val SPOTANIM = 0x40000
+
+        private class Player {
+            var queuedMove: Boolean = false
+            var coord: CoordGrid = CoordGrid.INVALID
+            var extendedInfoBlocks: List<ExtendedInfo> = emptyList()
+        }
+
+        private enum class UpdateType {
+            LOW_RESOLUTION_IDLE,
+            HIGH_RESOLUTION_IDLE,
+            LOW_RESOLUTION_TO_HIGH_RESOLUTION,
+            HIGH_RESOLUTION_MOVEMENT,
+            LOW_RESOLUTION_MOVEMENT,
+            HIGH_RESOLUTION_TO_LOW_RESOLUTION,
+        }
+    }
+}
diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt
new file mode 100644
index 000000000..6d90ddb5b
--- /dev/null
+++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt
@@ -0,0 +1,649 @@
+package net.rsprox.protocol.v237.game.outgoing.model.info.worldentityinfo
+
+import net.rsprot.buffer.JagByteBuf
+import net.rsprox.protocol.common.CoordFine
+import net.rsprox.protocol.common.CoordGrid
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.EnabledOpsExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.ExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SequenceExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfo
+import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoDecoder
+import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV1
+import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV2
+import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV3
+import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV4
+import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV5
+import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV6
+import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV7
+import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityMoveSpeed
+import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityUpdateType
+
+public class WorldEntityInfoClient : WorldEntityInfoDecoder {
+    private var transmittedWorldEntityCount: Int = 0
+    private val transmittedWorldEntity: IntArray = IntArray(25)
+    private val worldEntity: Array<Any?> = arrayOfNulls(4096)
+    private val earlyRemovals: MutableSet<Int> = mutableSetOf()
+    private val updates: MutableMap<Int, WorldEntityUpdateType> = mutableMapOf()
+
+    override fun decode(
+        buffer: JagByteBuf,
+        baseCoord: CoordGrid,
+        version: Int,
+    ): WorldEntityInfo {
+        updates.clear()
+        earlyRemovals.clear()
+        if (version >= 7) {
+            decodeHighResolutionV5(buffer)
+            decodeLowResolutionV5(buffer, baseCoord)
+        } else if (version >= 6) {
+            decodeHighResolutionV4(buffer)
+            decodeLowResolutionV4(buffer, baseCoord)
+        } else if (version >= 5) {
+            decodeHighResolutionV3(buffer)
+            decodeLowResolutionV3(buffer, baseCoord)
+        } else if (version >= 3) {
+            decodeHighResolutionV2(buffer)
+            decodeLowResolutionV2(buffer, baseCoord, version)
+        } else {
+            decodeHighResolutionV1(buffer)
+            decodeLowResolutionV1(buffer, baseCoord)
+        }
+        val updates = updates.toMap()
+        return when (version) {
+            1 -> WorldEntityInfoV1(updates)
+            2 -> WorldEntityInfoV2(updates)
+            3 -> WorldEntityInfoV3(updates)
+            4 -> WorldEntityInfoV4(updates)
+            5 -> WorldEntityInfoV5(earlyRemovals, updates)
+            6 -> WorldEntityInfoV6(earlyRemovals, updates)
+            7 -> WorldEntityInfoV7(earlyRemovals, updates)
+            else -> error("Invalid version: $version")
+        }
+    }
+
+    private fun decodeHighResolutionV1(buffer: JagByteBuf) {
+        val count = buffer.g1()
+        if (count < transmittedWorldEntityCount) {
+            throw RuntimeException("dang")
+        }
+        if (count > transmittedWorldEntityCount) {
+            throw RuntimeException("dang!")
+        }
+        this.transmittedWorldEntityCount = 0
+        for (i in 0..<count) {
+            val index = this.transmittedWorldEntity[i]
+            val worldEntity = checkNotNull(this.worldEntity[index]) as WorldEntityV1
+            val keep = buffer.g1() == 1
+            if (!keep) {
+                this.worldEntity[index] = null
+                updates[index] = WorldEntityUpdateType.HighResolutionToLowResolution
+                continue
+            }
+            this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index
+            val dx = buffer.g1()
+            val dz = buffer.g1()
+            val angle = buffer.g2()
+            val moveSpeed = buffer.g1()
+            val coord = worldEntity.coordGrid
+            worldEntity.coordGrid = CoordGrid(coord.level, coord.x + dx, coord.z + dz)
+            worldEntity.angle = angle
+            worldEntity.moveSpeed = WorldEntityMoveSpeed.Companion[moveSpeed]
+            if (dx == 0 &&
+                dz == 0 &&
+                angle == worldEntity.angle &&
+                worldEntity.moveSpeed ==
+                WorldEntityMoveSpeed.ZERO
+            ) {
+                updates[index] = WorldEntityUpdateType.Idle
+            } else {
+                updates[index] =
+                    WorldEntityUpdateType.ActiveV1(
+                        angle,
+                        worldEntity.coordGrid,
+                        worldEntity.moveSpeed,
+                    )
+            }
+        }
+    }
+
+    private fun decodeHighResolutionV2(buffer: JagByteBuf) {
+        val count = buffer.g1()
+        if (count < transmittedWorldEntityCount) {
+            throw RuntimeException("dang")
+        }
+        if (count > transmittedWorldEntityCount) {
+            throw RuntimeException("dang!")
+        }
+        this.transmittedWorldEntityCount = 0
+        for (i in 0..<count) {
+            val index = this.transmittedWorldEntity[i]
+            val worldEntity = checkNotNull(this.worldEntity[index]) as WorldEntityV2
+            val opcode = buffer.g1()
+            val remove = opcode == 0
+            if (remove) {
+                this.worldEntity[index] = null
+                updates[index] = WorldEntityUpdateType.HighResolutionToLowResolution
+                continue
+            }
+            this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index
+            if (opcode == 1) {
+                updates[index] = WorldEntityUpdateType.Idle
+                continue
+            }
+            val teleport = opcode == 3
+            val bitpackedAngledCoordFineOpcodes = buffer.g1s()
+            if (bitpackedAngledCoordFineOpcodes != 0) {
+                val deltaX = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 0)
+                val deltaY = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 2)
+                val deltaZ = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 4)
+                val angle = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 6)
+                val current = worldEntity.coordFine
+                val next = CoordFine(current.x + deltaX, current.y + deltaY, current.z + deltaZ)
+                worldEntity.coordFine = next
+                worldEntity.angle = (worldEntity.angle + angle) and 2047
+            }
+            updates[index] =
+                WorldEntityUpdateType.ActiveV2(
+                    worldEntity.angle,
+                    worldEntity.coordFine,
+                    teleport,
+                )
+        }
+    }
+
+    private fun decodeHighResolutionV3(buffer: JagByteBuf) {
+        val count = buffer.g1()
+        if (count < transmittedWorldEntityCount) {
+            for (i in count..<transmittedWorldEntityCount) {
+                val index = this.transmittedWorldEntity[i]
+                this.worldEntity[index] = null
+                earlyRemovals.add(index)
+            }
+        }
+        if (count > transmittedWorldEntityCount) {
+            throw RuntimeException("dang!")
+        }
+        this.transmittedWorldEntityCount = 0
+        for (i in 0..<count) {
+            val index = this.transmittedWorldEntity[i]
+            val worldEntity = checkNotNull(this.worldEntity[index]) as WorldEntityV3
+            val opcode = buffer.g1()
+            val remove = opcode == 0
+            if (remove) {
+                this.worldEntity[index] = null
+                updates[index] = WorldEntityUpdateType.HighResolutionToLowResolution
+                continue
+            }
+            this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index
+            if (opcode == 1) {
+                updates[index] = WorldEntityUpdateType.Idle
+                continue
+            }
+            val teleport = opcode == 3
+            val bitpackedAngledCoordFineOpcodes = buffer.g1s()
+            if (bitpackedAngledCoordFineOpcodes != 0) {
+                val deltaX = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 0)
+                val deltaY = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 2)
+                val deltaZ = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 4)
+                val angle = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 6)
+                val current = worldEntity.coordFine
+                val next = CoordFine(current.x + deltaX, current.y + deltaY, current.z + deltaZ)
+                worldEntity.coordFine = next
+                worldEntity.angle = (worldEntity.angle + angle) and 2047
+            }
+            updates[index] =
+                WorldEntityUpdateType.ActiveV2(
+                    worldEntity.angle,
+                    worldEntity.coordFine,
+                    teleport,
+                )
+        }
+    }
+
+    private fun decodeHighResolutionV4(buffer: JagByteBuf) {
+        val count = buffer.g1()
+        if (count < transmittedWorldEntityCount) {
+            for (i in count..<transmittedWorldEntityCount) {
+                val index = this.transmittedWorldEntity[i]
+                this.worldEntity[index] = null
+                earlyRemovals.add(index)
+            }
+        }
+        if (count > transmittedWorldEntityCount) {
+            throw RuntimeException("dang!")
+        }
+        this.transmittedWorldEntityCount = 0
+        for (i in 0..<count) {
+            val index = this.transmittedWorldEntity[i]
+            val worldEntity = checkNotNull(this.worldEntity[index]) as WorldEntityV3
+            val opcode = buffer.g1()
+            val remove = opcode == 0
+            if (remove) {
+                this.worldEntity[index] = null
+                updates[index] = WorldEntityUpdateType.HighResolutionToLowResolution
+                continue
+            }
+            this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index
+            if (opcode == 1) {
+                val extendedInfo = decodeWorldEntityInfoExtendedInfoUnobfuscated(buffer)
+                if (extendedInfo.isEmpty()) {
+                    updates[index] = WorldEntityUpdateType.Idle
+                } else {
+                    updates[index] = WorldEntityUpdateType.ExtendedInfoOnly(extendedInfo)
+                }
+                continue
+            }
+            val teleport = opcode == 3
+            val bitpackedAngledCoordFineOpcodes = buffer.g1s()
+            if (bitpackedAngledCoordFineOpcodes != 0) {
+                val deltaX = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 0)
+                val deltaY = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 2)
+                val deltaZ = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 4)
+                val angle = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 6)
+                val current = worldEntity.coordFine
+                val next = CoordFine(current.x + deltaX, current.y + deltaY, current.z + deltaZ)
+                worldEntity.coordFine = next
+                worldEntity.angle = (worldEntity.angle + angle) and 2047
+            }
+            val extendedInfo = decodeWorldEntityInfoExtendedInfoUnobfuscated(buffer)
+            updates[index] =
+                WorldEntityUpdateType.ActiveV3(
+                    worldEntity.angle,
+                    worldEntity.coordFine,
+                    teleport,
+                    extendedInfo,
+                )
+        }
+    }
+
+    private fun decodeHighResolutionV5(buffer: JagByteBuf) {
+        val count = buffer.g1()
+        if (count < transmittedWorldEntityCount) {
+            for (i in count..<transmittedWorldEntityCount) {
+                val index = this.transmittedWorldEntity[i]
+                this.worldEntity[index] = null
+                earlyRemovals.add(index)
+            }
+        }
+        if (count > transmittedWorldEntityCount) {
+            throw RuntimeException("dang!")
+        }
+        this.transmittedWorldEntityCount = 0
+        for (i in 0..<count) {
+            val index = this.transmittedWorldEntity[i]
+            val worldEntity = checkNotNull(this.worldEntity[index]) as WorldEntityV3
+            val opcode = buffer.g1()
+            val remove = opcode == 0
+            if (remove) {
+                this.worldEntity[index] = null
+                updates[index] = WorldEntityUpdateType.HighResolutionToLowResolution
+                continue
+            }
+            this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index
+            if (opcode == 1) {
+                val extendedInfo = decodeWorldEntityInfoExtendedInfoUnobfuscated(buffer)
+                if (extendedInfo.isEmpty()) {
+                    updates[index] = WorldEntityUpdateType.Idle
+                } else {
+                    updates[index] = WorldEntityUpdateType.ExtendedInfoOnly(extendedInfo)
+                }
+                continue
+            }
+            val teleport = opcode == 3
+            val bitpackedAngledCoordFineOpcodes = buffer.g1s()
+            if (bitpackedAngledCoordFineOpcodes != 0) {
+                val deltaX = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 0)
+                val deltaY = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 2)
+                val deltaZ = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 4)
+                val angle = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 6)
+                val current = worldEntity.coordFine
+                val next = CoordFine(current.x + deltaX, current.y + deltaY, current.z + deltaZ)
+                worldEntity.coordFine = next
+                worldEntity.angle = (worldEntity.angle + angle) and 2047
+            }
+            val flags = buffer.g1()
+            val extendedInfo = decodeWorldEntityInfoExtendedInfoObfuscated(buffer, flags)
+            updates[index] =
+                WorldEntityUpdateType.ActiveV3(
+                    worldEntity.angle,
+                    worldEntity.coordFine,
+                    teleport,
+                    extendedInfo,
+                )
+        }
+    }
+
+    private fun decodeWorldEntityInfoExtendedInfoUnobfuscated(buffer: JagByteBuf): List<ExtendedInfo> {
+        val flags = buffer.g1()
+        if (flags == 0) {
+            return emptyList()
+        }
+        val blocks = mutableListOf<ExtendedInfo>()
+        if (flags and 0x2 != 0) {
+            val id = buffer.g2()
+            val delay = buffer.g1()
+            blocks += SequenceExtendedInfo(id, delay)
+        }
+
+        if (flags and 0x1 != 0) {
+            blocks += EnabledOpsExtendedInfo(buffer.g1())
+        }
+        return blocks
+    }
+
+    private fun decodeWorldEntityInfoExtendedInfoObfuscated(
+        buffer: JagByteBuf,
+        flags: Int,
+    ): List<ExtendedInfo> {
+        if (flags == 0) {
+            return emptyList()
+        }
+        val blocks = mutableListOf<ExtendedInfo>()
+        if (flags and 0x2 != 0) {
+            blocks += EnabledOpsExtendedInfo(buffer.g1Alt2())
+        }
+        if (flags and 0x1 != 0) {
+            val id = buffer.g2Alt1()
+            val delay = buffer.g1Alt3()
+            blocks += SequenceExtendedInfo(id, delay)
+        }
+        return blocks
+    }
+
+    private fun decodeAngledCoordFineComponent(
+        buffer: JagByteBuf,
+        bitpackedOpcode: Int,
+        shift: Int,
+    ): Int {
+        val opcode = (bitpackedOpcode shr shift) and 0x3
+        return when (opcode) {
+            3 -> buffer.g4()
+            2 -> buffer.g2s()
+            1 -> buffer.g1s()
+            else -> 0
+        }
+    }
+
+    private fun decodeLowResolutionV1(
+        buffer: JagByteBuf,
+        baseCoord: CoordGrid,
+    ) {
+        while (buffer.isReadable(10)) {
+            val index = buffer.g2()
+            this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index
+            val sizeX = buffer.g1() * 8
+            val sizeZ = buffer.g1() * 8
+            val xInBuildArea = buffer.g1()
+            val zInBuildArea = buffer.g1()
+            val angle = buffer.g2()
+            val unknownProperty = buffer.g2()
+            val coord = CoordGrid(baseCoord.level, baseCoord.x + xInBuildArea, baseCoord.z + zInBuildArea)
+            val worldEntity =
+                WorldEntityV1(
+                    index,
+                    sizeX,
+                    sizeZ,
+                    unknownProperty,
+                    coord,
+                    angle,
+                    WorldEntityMoveSpeed.ZERO,
+                )
+            this.worldEntity[index] = worldEntity
+            this.updates[index] =
+                WorldEntityUpdateType.LowResolutionToHighResolutionV1(
+                    sizeX,
+                    sizeZ,
+                    angle,
+                    unknownProperty,
+                    coord,
+                )
+        }
+    }
+
+    private fun decodeLowResolutionV2(
+        buffer: JagByteBuf,
+        baseCoord: CoordGrid,
+        version: Int,
+    ) {
+        while (buffer.isReadable(10)) {
+            val index = buffer.g2()
+            this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index
+            val sizeX = buffer.g1() * 8
+            val sizeZ = buffer.g1() * 8
+            val level = buffer.g1s()
+            var coordFine = CoordFine(0, 0, 0)
+            var angle = 0
+            val bitpackedAngledCoordFineOpcodes = buffer.g1s()
+            if (bitpackedAngledCoordFineOpcodes != 0) {
+                val deltaX = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 0)
+                val deltaY = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 2)
+                val deltaZ = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 4)
+                angle = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 6)
+                coordFine = CoordFine(coordFine.x + deltaX, coordFine.y + deltaY, coordFine.z + deltaZ)
+            }
+            coordFine =
+                CoordFine(
+                    (baseCoord.x shl 7) + coordFine.x,
+                    coordFine.y,
+                    (baseCoord.z shl 7) + coordFine.z,
+                )
+            val centerFineOffsetX = if (version >= 4) buffer.g2s() else null
+            val centerFineOffsetZ = if (version >= 4) buffer.g2s() else null
+            val worldEntity =
+                WorldEntityV2(
+                    index,
+                    sizeX,
+                    sizeZ,
+                    coordFine,
+                    angle,
+                    level,
+                    centerFineOffsetX,
+                    centerFineOffsetZ,
+                )
+            this.worldEntity[index] = worldEntity
+            this.updates[index] =
+                WorldEntityUpdateType.LowResolutionToHighResolutionV2(
+                    sizeX,
+                    sizeZ,
+                    angle,
+                    coordFine,
+                    level,
+                    centerFineOffsetX,
+                    centerFineOffsetZ,
+                )
+        }
+    }
+
+    private fun decodeLowResolutionV3(
+        buffer: JagByteBuf,
+        baseCoord: CoordGrid,
+    ) {
+        while (buffer.isReadable(10)) {
+            val index = buffer.g2()
+            this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index
+            val sizeX = buffer.g1() * 8
+            val sizeZ = buffer.g1() * 8
+            val id = buffer.g2()
+            var coordFine = CoordFine(0, 0, 0)
+            var angle = 0
+            val bitpackedAngledCoordFineOpcodes = buffer.g1s()
+            if (bitpackedAngledCoordFineOpcodes != 0) {
+                val deltaX = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 0)
+                val deltaY = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 2)
+                val deltaZ = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 4)
+                angle = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 6)
+                coordFine = CoordFine(coordFine.x + deltaX, coordFine.y + deltaY, coordFine.z + deltaZ)
+            }
+            coordFine =
+                CoordFine(
+                    (baseCoord.x shl 7) + coordFine.x,
+                    coordFine.y,
+                    (baseCoord.z shl 7) + coordFine.z,
+                )
+            val priority = buffer.g1()
+            val worldEntity =
+                WorldEntityV3(
+                    index,
+                    id,
+                    sizeX,
+                    sizeZ,
+                    priority,
+                    coordFine,
+                    angle,
+                )
+            this.worldEntity[index] = worldEntity
+            this.updates[index] =
+                WorldEntityUpdateType.LowResolutionToHighResolutionV3(
+                    id,
+                    sizeX,
+                    sizeZ,
+                    angle,
+                    priority,
+                    coordFine,
+                )
+        }
+    }
+
+    private fun decodeLowResolutionV4(
+        buffer: JagByteBuf,
+        baseCoord: CoordGrid,
+    ) {
+        while (buffer.isReadable) {
+            val index = buffer.g2()
+            this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index
+            val sizeX = buffer.g1() * 8
+            val sizeZ = buffer.g1() * 8
+            val id = buffer.g2()
+            var coordFine = CoordFine(0, 0, 0)
+            var angle = 0
+            val bitpackedAngledCoordFineOpcodes = buffer.g1s()
+            if (bitpackedAngledCoordFineOpcodes != 0) {
+                val deltaX = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 0)
+                val deltaY = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 2)
+                val deltaZ = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 4)
+                angle = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 6)
+                coordFine = CoordFine(coordFine.x + deltaX, coordFine.y + deltaY, coordFine.z + deltaZ)
+            }
+            coordFine =
+                CoordFine(
+                    (baseCoord.x shl 7) + coordFine.x,
+                    coordFine.y,
+                    (baseCoord.z shl 7) + coordFine.z,
+                )
+            val priority = buffer.g1()
+            val worldEntity =
+                WorldEntityV3(
+                    index,
+                    id,
+                    sizeX,
+                    sizeZ,
+                    priority,
+                    coordFine,
+                    angle,
+                )
+            val extendedInfo = decodeWorldEntityInfoExtendedInfoUnobfuscated(buffer)
+            this.worldEntity[index] = worldEntity
+            this.updates[index] =
+                WorldEntityUpdateType.LowResolutionToHighResolutionV4(
+                    id,
+                    sizeX,
+                    sizeZ,
+                    angle,
+                    priority,
+                    coordFine,
+                    extendedInfo,
+                )
+        }
+    }
+
+    private fun decodeLowResolutionV5(
+        buffer: JagByteBuf,
+        baseCoord: CoordGrid,
+    ) {
+        while (buffer.isReadable) {
+            val index = buffer.g2()
+            // Note: If serverVersion < 237, add +1 to index
+            this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index
+            val id = buffer.g2sAlt1()
+            val priority = buffer.g1Alt3()
+            val packedSize = buffer.g1Alt3()
+            val extendedInfoFlags = buffer.g1Alt3()
+
+            var coordFine = CoordFine(0, 0, 0)
+            var angle = 0
+            val bitpackedAngledCoordFineOpcodes = buffer.g1s()
+            if (bitpackedAngledCoordFineOpcodes != 0) {
+                val deltaX = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 0)
+                val deltaY = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 2)
+                val deltaZ = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 4)
+                angle = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 6)
+                coordFine = CoordFine(coordFine.x + deltaX, coordFine.y + deltaY, coordFine.z + deltaZ)
+            }
+            coordFine =
+                CoordFine(
+                    (baseCoord.x shl 7) + coordFine.x,
+                    coordFine.y,
+                    (baseCoord.z shl 7) + coordFine.z,
+                )
+
+            val sizeX = (packedSize ushr 4 and 0xF) * 8
+            val sizeZ = (packedSize and 0xF) * 8
+            val worldEntity =
+                WorldEntityV3(
+                    index,
+                    id,
+                    sizeX,
+                    sizeZ,
+                    priority,
+                    coordFine,
+                    angle,
+                )
+            val extendedInfo = decodeWorldEntityInfoExtendedInfoObfuscated(buffer, extendedInfoFlags)
+            this.worldEntity[index] = worldEntity
+            this.updates[index] =
+                WorldEntityUpdateType.LowResolutionToHighResolutionV4(
+                    id,
+                    sizeX,
+                    sizeZ,
+                    angle,
+                    priority,
+                    coordFine,
+                    extendedInfo,
+                )
+        }
+    }
+
+    @Suppress("unused")
+    private class WorldEntityV1(
+        val index: Int,
+        val sizeX: Int,
+        val sizeZ: Int,
+        val unknownProperty: Int,
+        var coordGrid: CoordGrid,
+        var angle: Int,
+        var moveSpeed: WorldEntityMoveSpeed,
+    )
+
+    @Suppress("unused")
+    private class WorldEntityV2(
+        val index: Int,
+        val sizeX: Int,
+        val sizeZ: Int,
+        var coordFine: CoordFine,
+        var angle: Int,
+        val level: Int,
+        val centerFineOffsetX: Int?,
+        val centerFineOffsetZ: Int?,
+    )
+
+    @Suppress("unused")
+    private class WorldEntityV3(
+        val index: Int,
+        val id: Int,
+        val sizeX: Int,
+        val sizeZ: Int,
+        val priority: Int,
+        var coordFine: CoordFine,
+        var angle: Int,
+    )
+}
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/locs/OpLoc.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/locs/OpLocV1.kt
similarity index 96%
rename from protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/locs/OpLoc.kt
rename to protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/locs/OpLocV1.kt
index bda64e6bd..82f1fb79c 100644
--- a/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/locs/OpLoc.kt
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/locs/OpLocV1.kt
@@ -14,7 +14,7 @@ import net.rsprox.protocol.game.incoming.model.GameClientProtCategory
  * @property op the option clicked, ranging from 1 to 5 (inclusive)
  */
 @Suppress("DuplicatedCode", "MemberVisibilityCanBePrivate")
-public class OpLoc private constructor(
+public class OpLocV1 private constructor(
     private val _id: UShort,
     private val _x: UShort,
     private val _z: UShort,
@@ -50,7 +50,7 @@ public class OpLoc private constructor(
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
 
-        other as OpLoc
+        other as OpLocV1
 
         if (_id != other._id) return false
         if (_x != other._x) return false
@@ -71,7 +71,7 @@ public class OpLoc private constructor(
     }
 
     override fun toString(): String =
-        "OpLoc(" +
+        "OpLocV1(" +
             "id=$id, " +
             "x=$x, " +
             "z=$z, " +
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/locs/OpLocV2.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/locs/OpLocV2.kt
new file mode 100644
index 000000000..ef7598117
--- /dev/null
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/locs/OpLocV2.kt
@@ -0,0 +1,90 @@
+package net.rsprox.protocol.game.incoming.model.locs
+
+import net.rsprot.protocol.ClientProtCategory
+import net.rsprot.protocol.message.IncomingGameMessage
+import net.rsprox.protocol.game.incoming.model.GameClientProtCategory
+
+/**
+ * OpLoc messages are fired when a player clicks one of the five (excluding oploc6)
+ * options on a loc in the game.
+ * @property id the base(non-multi-transformed) id of the loc the player clicked on
+ * @property x the absolute x coordinate of the south-western corner of the loc
+ * @property z the absolute z coordinate of the south-western corner of the loc
+ * @property controlKey whether the control key was held down, used to invert movement speed
+ * @property op the option clicked, ranging from 1 to 5 (inclusive)
+ * @property subop the sub option clicked, or 0 if no sub op.
+ */
+@Suppress("DuplicatedCode", "MemberVisibilityCanBePrivate")
+public class OpLocV2 private constructor(
+    private val _id: UShort,
+    private val _x: UShort,
+    private val _z: UShort,
+    public val controlKey: Boolean,
+    private val _op: UByte,
+    private val _subop: UByte,
+) : IncomingGameMessage {
+    public constructor(
+        id: Int,
+        x: Int,
+        z: Int,
+        controlKey: Boolean,
+        op: Int,
+        subop: Int,
+    ) : this(
+        id.toUShort(),
+        x.toUShort(),
+        z.toUShort(),
+        controlKey,
+        op.toUByte(),
+        subop.toUByte(),
+    )
+
+    public val id: Int
+        get() = _id.toInt()
+    public val x: Int
+        get() = _x.toInt()
+    public val z: Int
+        get() = _z.toInt()
+    public val op: Int
+        get() = _op.toInt()
+    public val subop: Int
+        get() = _subop.toInt()
+    override val category: ClientProtCategory
+        get() = GameClientProtCategory.USER_EVENT
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as OpLocV2
+
+        if (_id != other._id) return false
+        if (_x != other._x) return false
+        if (_z != other._z) return false
+        if (controlKey != other.controlKey) return false
+        if (_op != other._op) return false
+        if (_subop != other._subop) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = _id.hashCode()
+        result = 31 * result + _x.hashCode()
+        result = 31 * result + _z.hashCode()
+        result = 31 * result + controlKey.hashCode()
+        result = 31 * result + _op.hashCode()
+        result = 31 * result + _subop.hashCode()
+        return result
+    }
+
+    override fun toString(): String =
+        "OpLocV2(" +
+            "id=$id, " +
+            "x=$x, " +
+            "z=$z, " +
+            "controlKey=$controlKey, " +
+            "op=$op, " +
+            "subop=$subop" +
+            ")"
+}
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/npcs/OpNpc.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/npcs/OpNpcV1.kt
similarity index 95%
rename from protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/npcs/OpNpc.kt
rename to protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/npcs/OpNpcV1.kt
index a5cdb734c..7efc3dc93 100644
--- a/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/npcs/OpNpc.kt
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/npcs/OpNpcV1.kt
@@ -13,7 +13,7 @@ import net.rsprox.protocol.game.incoming.model.GameClientProtCategory
  * @property op the option clicked, ranging from 1 to 5(inclusive).
  */
 @Suppress("MemberVisibilityCanBePrivate")
-public class OpNpc private constructor(
+public class OpNpcV1 private constructor(
     private val _index: UShort,
     public val controlKey: Boolean,
     private val _op: UByte,
@@ -39,7 +39,7 @@ public class OpNpc private constructor(
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
 
-        other as OpNpc
+        other as OpNpcV1
 
         if (_index != other._index) return false
         if (controlKey != other.controlKey) return false
@@ -56,7 +56,7 @@ public class OpNpc private constructor(
     }
 
     override fun toString(): String =
-        "OpNpc(" +
+        "OpNpcV1(" +
             "index=$index, " +
             "controlKey=$controlKey, " +
             "op=$op" +
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/npcs/OpNpcV2.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/npcs/OpNpcV2.kt
new file mode 100644
index 000000000..3b9ed4171
--- /dev/null
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/npcs/OpNpcV2.kt
@@ -0,0 +1,73 @@
+package net.rsprox.protocol.game.incoming.model.npcs
+
+import net.rsprot.protocol.ClientProtCategory
+import net.rsprot.protocol.message.IncomingGameMessage
+import net.rsprox.protocol.game.incoming.model.GameClientProtCategory
+
+/**
+ * OpNpc messages are sent when a player clicks one of the five primary options on a NPC.
+ * It should be noted that this message will not handle 'OPNPC6', as that message requires
+ * different arguments.
+ * @property index the index of the npc that was clicked
+ * @property controlKey whether the control key was held down, used to invert movement speed
+ * @property op the option clicked, ranging from 1 to 5(inclusive).
+ * @property subop the sub option clicked, or 0 if no sub op.
+ */
+@Suppress("MemberVisibilityCanBePrivate")
+public class OpNpcV2 private constructor(
+    private val _index: UShort,
+    public val controlKey: Boolean,
+    private val _op: UByte,
+    private val _subop: UByte,
+) : IncomingGameMessage {
+    public constructor(
+        index: Int,
+        controlKey: Boolean,
+        op: Int,
+        subop: Int,
+    ) : this(
+        index.toUShort(),
+        controlKey,
+        op.toUByte(),
+        subop.toUByte(),
+    )
+
+    public val index: Int
+        get() = _index.toInt()
+    public val op: Int
+        get() = _op.toInt()
+    public val subop: Int
+        get() = _subop.toInt()
+    override val category: ClientProtCategory
+        get() = GameClientProtCategory.USER_EVENT
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as OpNpcV2
+
+        if (_index != other._index) return false
+        if (controlKey != other.controlKey) return false
+        if (_op != other._op) return false
+        if (_subop != other._subop) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = _index.hashCode()
+        result = 31 * result + controlKey.hashCode()
+        result = 31 * result + _op.hashCode()
+        result = 31 * result + _subop.hashCode()
+        return result
+    }
+
+    override fun toString(): String =
+        "OpNpcV2(" +
+            "index=$index, " +
+            "controlKey=$controlKey, " +
+            "op=$op, " +
+            "subop=$subop" +
+            ")"
+}
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/objs/OpObj.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/objs/OpObjV1.kt
similarity index 96%
rename from protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/objs/OpObj.kt
rename to protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/objs/OpObjV1.kt
index e067481f7..dffe2e7c9 100644
--- a/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/objs/OpObj.kt
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/objs/OpObjV1.kt
@@ -14,7 +14,7 @@ import net.rsprox.protocol.game.incoming.model.GameClientProtCategory
  * @property op the option clicked, ranging from 1 to 5 (inclusive)
  */
 @Suppress("DuplicatedCode", "MemberVisibilityCanBePrivate")
-public class OpObj private constructor(
+public class OpObjV1 private constructor(
     private val _id: UShort,
     private val _x: UShort,
     private val _z: UShort,
@@ -50,7 +50,7 @@ public class OpObj private constructor(
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
 
-        other as OpObj
+        other as OpObjV1
 
         if (_id != other._id) return false
         if (_x != other._x) return false
@@ -71,7 +71,7 @@ public class OpObj private constructor(
     }
 
     override fun toString(): String =
-        "OpObj(" +
+        "OpObjV1(" +
             "id=$id, " +
             "x=$x, " +
             "z=$z, " +
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/objs/OpObjV2.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/objs/OpObjV2.kt
new file mode 100644
index 000000000..626322c57
--- /dev/null
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/objs/OpObjV2.kt
@@ -0,0 +1,90 @@
+package net.rsprox.protocol.game.incoming.model.objs
+
+import net.rsprot.protocol.ClientProtCategory
+import net.rsprot.protocol.message.IncomingGameMessage
+import net.rsprox.protocol.game.incoming.model.GameClientProtCategory
+
+/**
+ * OpObj messages are fired when the player interacts with an obj on the ground,
+ * e.g. picking an obj up off the ground. This does not include examining objs.
+ * @property id the id of the obj interacted with
+ * @property x the absolute x coordinate of the obj on the ground
+ * @property z the absolute z coordinate of the obj on the ground
+ * @property controlKey whether the control key was held down, used to invert movement speed
+ * @property op the option clicked, ranging from 1 to 5 (inclusive)
+ * @property subop the sub option clicked, or 0 if no sub op.
+ */
+@Suppress("DuplicatedCode", "MemberVisibilityCanBePrivate")
+public class OpObjV2 private constructor(
+    private val _id: UShort,
+    private val _x: UShort,
+    private val _z: UShort,
+    public val controlKey: Boolean,
+    private val _op: UByte,
+    private val _subop: UByte,
+) : IncomingGameMessage {
+    public constructor(
+        id: Int,
+        x: Int,
+        z: Int,
+        controlKey: Boolean,
+        op: Int,
+        subop: Int,
+    ) : this(
+        id.toUShort(),
+        x.toUShort(),
+        z.toUShort(),
+        controlKey,
+        op.toUByte(),
+        subop.toUByte(),
+    )
+
+    public val id: Int
+        get() = _id.toInt()
+    public val x: Int
+        get() = _x.toInt()
+    public val z: Int
+        get() = _z.toInt()
+    public val op: Int
+        get() = _op.toInt()
+    public val subop: Int
+        get() = _subop.toInt()
+    override val category: ClientProtCategory
+        get() = GameClientProtCategory.USER_EVENT
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as OpObjV2
+
+        if (_id != other._id) return false
+        if (_x != other._x) return false
+        if (_z != other._z) return false
+        if (controlKey != other.controlKey) return false
+        if (_op != other._op) return false
+        if (_subop != other._subop) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = _id.hashCode()
+        result = 31 * result + _x.hashCode()
+        result = 31 * result + _z.hashCode()
+        result = 31 * result + controlKey.hashCode()
+        result = 31 * result + _op.hashCode()
+        result = 31 * result + _subop.hashCode()
+        return result
+    }
+
+    override fun toString(): String =
+        "OpObjV2(" +
+            "id=$id, " +
+            "x=$x, " +
+            "z=$z, " +
+            "controlKey=$controlKey, " +
+            "op=$op, " +
+            "subop=$subop" +
+            ")"
+}
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/resumed/ResumePCountDialogLong.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/resumed/ResumePCountDialogLong.kt
new file mode 100644
index 000000000..357328039
--- /dev/null
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/resumed/ResumePCountDialogLong.kt
@@ -0,0 +1,30 @@
+package net.rsprox.protocol.game.incoming.model.resumed
+
+import net.rsprot.protocol.ClientProtCategory
+import net.rsprot.protocol.message.IncomingGameMessage
+import net.rsprox.protocol.game.incoming.model.GameClientProtCategory
+
+/**
+ * Resume p count dialogue is sent whenever a player enters a
+ * long to the input box. It has no uses as of writing this.
+ * @property count the count entered.
+ */
+public class ResumePCountDialogLong(
+    public val count: Long,
+) : IncomingGameMessage {
+    override val category: ClientProtCategory
+        get() = GameClientProtCategory.USER_EVENT
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as ResumePCountDialogLong
+
+        return count == other.count
+    }
+
+    override fun hashCode(): Int = count.hashCode()
+
+    override fun toString(): String = "ResumePCountDialogLong(count=$count)"
+}
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/shared/extendedinfo/HeadbarExtendedInfo.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/shared/extendedinfo/HeadbarExtendedInfo.kt
new file mode 100644
index 000000000..697833fdd
--- /dev/null
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/shared/extendedinfo/HeadbarExtendedInfo.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo
+
+public class HeadbarExtendedInfo(
+    public val headbars: List<Headbar>,
+) : ExtendedInfo {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as HeadbarExtendedInfo
+
+        if (headbars != other.headbars) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return headbars.hashCode()
+    }
+
+    override fun toString(): String {
+        return "HitExtendedInfo(" +
+            "headbars=$headbars" +
+            ")"
+    }
+}
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/shared/extendedinfo/Hit.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/shared/extendedinfo/Hit.kt
index e20c3a455..e67933ad8 100644
--- a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/shared/extendedinfo/Hit.kt
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/shared/extendedinfo/Hit.kt
@@ -6,6 +6,7 @@ public class Hit(
     public val soakType: Int,
     public val soakValue: Int,
     public val delay: Int,
+    public val limit: Int = -1,
 ) {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -18,6 +19,7 @@ public class Hit(
         if (soakType != other.soakType) return false
         if (soakValue != other.soakValue) return false
         if (delay != other.delay) return false
+        if (limit != other.limit) return false
 
         return true
     }
@@ -28,6 +30,7 @@ public class Hit(
         result = 31 * result + soakType
         result = 31 * result + soakValue
         result = 31 * result + delay
+        result = 31 * result + limit
         return result
     }
 
@@ -37,7 +40,8 @@ public class Hit(
             "value=$value, " +
             "soakType=$soakType, " +
             "soakValue=$soakValue, " +
-            "delay=$delay" +
+            "delay=$delay, " +
+            "limit=$limit" +
             ")"
     }
 }
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/shared/extendedinfo/HitmarkExtendedInfo.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/shared/extendedinfo/HitmarkExtendedInfo.kt
new file mode 100644
index 000000000..f1bc589eb
--- /dev/null
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/shared/extendedinfo/HitmarkExtendedInfo.kt
@@ -0,0 +1,26 @@
+package net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo
+
+public class HitmarkExtendedInfo(
+    public val hits: List<Hit>,
+) : ExtendedInfo {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as HitmarkExtendedInfo
+
+        if (hits != other.hits) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return hits.hashCode()
+    }
+
+    override fun toString(): String {
+        return "HitExtendedInfo(" +
+            "hits=$hits" +
+            ")"
+    }
+}
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/interfaces/IfSetModel.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/interfaces/IfSetModelV1.kt
similarity index 93%
rename from protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/interfaces/IfSetModel.kt
rename to protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/interfaces/IfSetModelV1.kt
index 1d875899b..1a0530e17 100644
--- a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/interfaces/IfSetModel.kt
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/interfaces/IfSetModelV1.kt
@@ -10,7 +10,7 @@ import net.rsprox.protocol.game.outgoing.model.IncomingServerGameMessage
  * @property componentId the component on that interface to set the events on
  * @property model the id of the model to render.
  */
-public class IfSetModel private constructor(
+public class IfSetModelV1 private constructor(
     public val combinedId: CombinedId,
     private val _model: UShort,
 ) : IncomingServerGameMessage {
@@ -34,7 +34,7 @@ public class IfSetModel private constructor(
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
 
-        other as IfSetModel
+        other as IfSetModelV1
 
         if (combinedId != other.combinedId) return false
         if (_model != other._model) return false
@@ -49,7 +49,7 @@ public class IfSetModel private constructor(
     }
 
     override fun toString(): String {
-        return "IfSetModel(" +
+        return "IfSetModelV1(" +
             "interfaceId=$interfaceId, " +
             "componentId=$componentId, " +
             "model=$model" +
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/interfaces/IfSetModelV2.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/interfaces/IfSetModelV2.kt
new file mode 100644
index 000000000..ea5decfaf
--- /dev/null
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/interfaces/IfSetModelV2.kt
@@ -0,0 +1,56 @@
+package net.rsprox.protocol.game.outgoing.model.interfaces
+
+import net.rsprot.protocol.util.CombinedId
+import net.rsprox.protocol.game.outgoing.model.IncomingServerGameMessage
+
+/**
+ * If set model packet is used to set a model to render on an interface.
+ * The component must be of model type for this to succeed.
+ * @property interfaceId the interface id on which to set the events
+ * @property componentId the component on that interface to set the events on
+ * @property model the id of the model to render.
+ */
+public class IfSetModelV2(
+    public val combinedId: CombinedId,
+    public val model: Int,
+) : IncomingServerGameMessage {
+    public constructor(
+        interfaceId: Int,
+        componentId: Int,
+        model: Int,
+    ) : this(
+        CombinedId(interfaceId, componentId),
+        model,
+    )
+
+    public val interfaceId: Int
+        get() = combinedId.interfaceId
+    public val componentId: Int
+        get() = combinedId.componentId
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as IfSetModelV2
+
+        if (combinedId != other.combinedId) return false
+        if (model != other.model) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = combinedId.hashCode()
+        result = 31 * result + model.hashCode()
+        return result
+    }
+
+    override fun toString(): String {
+        return "IfSetModelV2(" +
+            "interfaceId=$interfaceId, " +
+            "componentId=$componentId, " +
+            "model=$model" +
+            ")"
+    }
+}
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildLogin.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildLoginV1.kt
similarity index 94%
rename from protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildLogin.kt
rename to protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildLoginV1.kt
index dadb5c6fc..4752651bc 100644
--- a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildLogin.kt
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildLoginV1.kt
@@ -14,13 +14,13 @@ import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoIn
  * @property playerInfoInitBlock the initialization block of player info, containing the
  * absolute coordinate of the local player, and low resolution positions of everyone else.
  */
-public class RebuildLogin private constructor(
+public class RebuildLoginV1 private constructor(
     private val _zoneX: UShort,
     private val _zoneZ: UShort,
     private val _worldArea: UShort,
     override val keys: List<XteaKey>,
     public val playerInfoInitBlock: PlayerInfoInitBlock,
-) : StaticRebuildMessage {
+) : StaticRebuildMessageV1 {
     public constructor(
         zoneX: Int,
         zoneZ: Int,
@@ -46,7 +46,7 @@ public class RebuildLogin private constructor(
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
 
-        other as RebuildLogin
+        other as RebuildLoginV1
 
         if (_zoneX != other._zoneX) return false
         if (_zoneZ != other._zoneZ) return false
@@ -65,7 +65,7 @@ public class RebuildLogin private constructor(
     }
 
     override fun toString(): String {
-        return "RebuildLogin(" +
+        return "RebuildLoginV1(" +
             "zoneX=$zoneX, " +
             "zoneZ=$zoneZ, " +
             "worldArea=$worldArea, " +
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildLoginV2.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildLoginV2.kt
new file mode 100644
index 000000000..d7002de03
--- /dev/null
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildLoginV2.kt
@@ -0,0 +1,68 @@
+package net.rsprox.protocol.game.outgoing.model.map
+
+import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock
+
+/**
+ * Rebuild login is sent as part of the login procedure as the very first packet,
+ * as this one contains information about everyone's low resolution position, allowing
+ * the player information packet to be initialized properly.
+ * @property zoneX the x coordinate of the local player's current zone.
+ * @property zoneZ the z coordinate of the local player's current zone.
+ * @property worldArea the current world area in which the player resides.
+ * @property playerInfoInitBlock the initialization block of player info, containing the
+ * absolute coordinate of the local player, and low resolution positions of everyone else.
+ */
+public class RebuildLoginV2 private constructor(
+    private val _zoneX: UShort,
+    private val _zoneZ: UShort,
+    private val _worldArea: UShort,
+    public val playerInfoInitBlock: PlayerInfoInitBlock,
+) : StaticRebuildMessageV2 {
+    public constructor(
+        zoneX: Int,
+        zoneZ: Int,
+        worldArea: Int,
+        playerInfoInitBlock: PlayerInfoInitBlock,
+    ) : this(
+        zoneX.toUShort(),
+        zoneZ.toUShort(),
+        worldArea.toUShort(),
+        playerInfoInitBlock,
+    )
+
+    override val zoneX: Int
+        get() = _zoneX.toInt()
+    override val zoneZ: Int
+        get() = _zoneZ.toInt()
+    override val worldArea: Int
+        get() = _worldArea.toInt()
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as RebuildLoginV2
+
+        if (_zoneX != other._zoneX) return false
+        if (_zoneZ != other._zoneZ) return false
+        if (_worldArea != other._worldArea) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = _zoneX.hashCode()
+        result = 31 * result + _zoneZ.hashCode()
+        result = 31 * result + _worldArea.hashCode()
+        return result
+    }
+
+    override fun toString(): String {
+        return "RebuildLoginV2(" +
+            "zoneX=$zoneX, " +
+            "zoneZ=$zoneZ, " +
+            "worldArea=$worldArea, " +
+            "playerInfoInitBlock=$playerInfoInitBlock" +
+            ")"
+    }
+}
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildNormal.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildNormalV1.kt
similarity index 92%
rename from protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildNormal.kt
rename to protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildNormalV1.kt
index e3cfa6538..6c6f08960 100644
--- a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildNormal.kt
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildNormalV1.kt
@@ -9,12 +9,12 @@ import net.rsprot.crypto.xtea.XteaKey
  * @property worldArea the current world area in which the player resides.
  * @property keys the list of xtea keys needed to decrypt the map.
  */
-public class RebuildNormal private constructor(
+public class RebuildNormalV1 private constructor(
     private val _zoneX: UShort,
     private val _zoneZ: UShort,
     private val _worldArea: UShort,
     override val keys: List<XteaKey>,
-) : StaticRebuildMessage {
+) : StaticRebuildMessageV1 {
     public constructor(
         zoneX: Int,
         zoneZ: Int,
@@ -38,7 +38,7 @@ public class RebuildNormal private constructor(
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
 
-        other as RebuildNormal
+        other as RebuildNormalV1
 
         if (_zoneX != other._zoneX) return false
         if (_zoneZ != other._zoneZ) return false
@@ -57,7 +57,7 @@ public class RebuildNormal private constructor(
     }
 
     override fun toString(): String {
-        return "RebuildNormal(" +
+        return "RebuildNormalV1(" +
             "zoneX=$zoneX, " +
             "zoneZ=$zoneZ, " +
             "worldArea=$worldArea, " +
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildNormalV2.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildNormalV2.kt
new file mode 100644
index 000000000..11e6b1338
--- /dev/null
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildNormalV2.kt
@@ -0,0 +1,58 @@
+package net.rsprox.protocol.game.outgoing.model.map
+
+/**
+ * Rebuild normal is sent when the game requires a map reload without being in instances.
+ * @property zoneX the x coordinate of the local player's current zone.
+ * @property zoneZ the z coordinate of the local player's current zone.
+ * @property worldArea the current world area in which the player resides.
+ */
+public class RebuildNormalV2 private constructor(
+    private val _zoneX: UShort,
+    private val _zoneZ: UShort,
+    private val _worldArea: UShort,
+) : StaticRebuildMessageV2 {
+    public constructor(
+        zoneX: Int,
+        zoneZ: Int,
+        worldArea: Int,
+    ) : this(
+        zoneX.toUShort(),
+        zoneZ.toUShort(),
+        worldArea.toUShort(),
+    )
+
+    override val zoneX: Int
+        get() = _zoneX.toInt()
+    override val zoneZ: Int
+        get() = _zoneZ.toInt()
+    override val worldArea: Int
+        get() = _worldArea.toInt()
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as RebuildNormalV2
+
+        if (_zoneX != other._zoneX) return false
+        if (_zoneZ != other._zoneZ) return false
+        if (_worldArea != other._worldArea) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = _zoneX.hashCode()
+        result = 31 * result + _zoneZ.hashCode()
+        result = 31 * result + _worldArea.hashCode()
+        return result
+    }
+
+    override fun toString(): String {
+        return "RebuildNormalV2(" +
+            "zoneX=$zoneX, " +
+            "zoneZ=$zoneZ, " +
+            "worldArea=$worldArea" +
+            ")"
+    }
+}
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildRegion.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildRegionV1.kt
similarity index 95%
rename from protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildRegion.kt
rename to protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildRegionV1.kt
index f728899f6..54fd6c286 100644
--- a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildRegion.kt
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildRegionV1.kt
@@ -19,7 +19,7 @@ import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
  * @property buildArea the build area consisting of all the zones
  * @property keys the unique set of keys in order of the zones.
  */
-public class RebuildRegion private constructor(
+public class RebuildRegionV1 private constructor(
     private val _zoneX: UShort,
     private val _zoneZ: UShort,
     public val reload: Boolean,
@@ -49,7 +49,7 @@ public class RebuildRegion private constructor(
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
 
-        other as RebuildRegion
+        other as RebuildRegionV1
 
         if (_zoneX != other._zoneX) return false
         if (_zoneZ != other._zoneZ) return false
@@ -70,7 +70,7 @@ public class RebuildRegion private constructor(
     }
 
     override fun toString(): String {
-        return "RebuildRegion(" +
+        return "RebuildRegionV1(" +
             "zoneX=$zoneX, " +
             "zoneZ=$zoneZ, " +
             "reload=$reload, " +
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildRegionV2.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildRegionV2.kt
new file mode 100644
index 000000000..425d14558
--- /dev/null
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildRegionV2.kt
@@ -0,0 +1,73 @@
+package net.rsprox.protocol.game.outgoing.model.map
+
+import net.rsprox.protocol.game.outgoing.model.IncomingServerGameMessage
+import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
+
+/**
+ * Rebuild region is used to send a dynamic map to the client,
+ * built up out of zones (8x8x1 tiles), allowing for any kind
+ * of unique instancing to occur.
+ * @property zoneX the x coordinate of the center zone around
+ * which the build area is built
+ * @property zoneZ the z coordinate of the center zone around
+ * which the build area is built
+ * @property reload whether to forcibly reload the map client-sided.
+ * If this property is false, the client will only reload if
+ * the last rebuild had difference [zoneX] or [zoneZ] coordinates
+ * than this one.
+ * @property buildArea the build area consisting of all the zones
+ */
+public class RebuildRegionV2 private constructor(
+    private val _zoneX: UShort,
+    private val _zoneZ: UShort,
+    public val reload: Boolean,
+    public val buildArea: BuildArea,
+) : IncomingServerGameMessage {
+    public constructor(
+        zoneX: Int,
+        zoneZ: Int,
+        reload: Boolean,
+        buildArea: BuildArea,
+    ) : this(
+        zoneX.toUShort(),
+        zoneZ.toUShort(),
+        reload,
+        buildArea,
+    )
+
+    public val zoneX: Int
+        get() = _zoneX.toInt()
+    public val zoneZ: Int
+        get() = _zoneZ.toInt()
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as RebuildRegionV2
+
+        if (_zoneX != other._zoneX) return false
+        if (_zoneZ != other._zoneZ) return false
+        if (reload != other.reload) return false
+        if (buildArea != other.buildArea) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = _zoneX.hashCode()
+        result = 31 * result + _zoneZ.hashCode()
+        result = 31 * result + reload.hashCode()
+        result = 31 * result + buildArea.hashCode()
+        return result
+    }
+
+    override fun toString(): String {
+        return "RebuildRegionV2(" +
+            "zoneX=$zoneX, " +
+            "zoneZ=$zoneZ, " +
+            "reload=$reload, " +
+            "buildArea=$buildArea" +
+            ")"
+    }
+}
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildWorldEntityV3.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildWorldEntityV3.kt
index 2e67b31d8..f73236ec6 100644
--- a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildWorldEntityV3.kt
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildWorldEntityV3.kt
@@ -58,7 +58,7 @@ public class RebuildWorldEntityV3(
     }
 
     override fun toString(): String {
-        return "RebuildWorldEntityV2(" +
+        return "RebuildWorldEntityV3(" +
             "baseX=$baseX, " +
             "baseZ=$baseZ, " +
             "buildArea=$buildArea, " +
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildWorldEntityV4.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildWorldEntityV4.kt
new file mode 100644
index 000000000..08de36828
--- /dev/null
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/RebuildWorldEntityV4.kt
@@ -0,0 +1,60 @@
+package net.rsprox.protocol.game.outgoing.model.map
+
+import net.rsprox.protocol.game.outgoing.model.IncomingServerGameMessage
+import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
+
+/**
+ * Rebuild worldentity packet is used to build a new world entity block,
+ * which will be rendered in the root world for the player.
+ * @property baseX the absolute base x coordinate of the world entity in the instance land
+ * @property baseZ the absolute base z coordinate of the world entity in the instance land
+ * @property buildArea the list of zones that will be built into the root world
+ */
+public class RebuildWorldEntityV4(
+    private val _baseX: UShort,
+    private val _baseZ: UShort,
+    public val buildArea: BuildArea,
+) : IncomingServerGameMessage {
+    public constructor(
+        baseX: Int,
+        baseZ: Int,
+        buildArea: BuildArea,
+    ) : this(
+        baseX.toUShort(),
+        baseZ.toUShort(),
+        buildArea,
+    )
+
+    public val baseX: Int
+        get() = _baseX.toInt()
+    public val baseZ: Int
+        get() = _baseZ.toInt()
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as RebuildWorldEntityV4
+
+        if (_baseX != other._baseX) return false
+        if (_baseZ != other._baseZ) return false
+        if (buildArea != other.buildArea) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = _baseX.hashCode()
+        result = 31 * result + _baseZ.hashCode()
+        result = 31 * result + buildArea.hashCode()
+        return result
+    }
+
+    override fun toString(): String {
+        return "RebuildWorldEntityV4(" +
+            "baseX=$baseX, " +
+            "baseZ=$baseZ, " +
+            "buildArea=$buildArea" +
+            ")"
+    }
+}
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/StaticRebuildMessage.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/StaticRebuildMessageV1.kt
similarity index 78%
rename from protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/StaticRebuildMessage.kt
rename to protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/StaticRebuildMessageV1.kt
index 7c09eef22..e7568917b 100644
--- a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/StaticRebuildMessage.kt
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/StaticRebuildMessageV1.kt
@@ -3,7 +3,7 @@ package net.rsprox.protocol.game.outgoing.model.map
 import net.rsprot.crypto.xtea.XteaKey
 import net.rsprox.protocol.game.outgoing.model.IncomingServerGameMessage
 
-public sealed interface StaticRebuildMessage : IncomingServerGameMessage {
+public sealed interface StaticRebuildMessageV1 : IncomingServerGameMessage {
     public val zoneX: Int
     public val zoneZ: Int
     public val worldArea: Int
diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/StaticRebuildMessageV2.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/StaticRebuildMessageV2.kt
new file mode 100644
index 000000000..684fd26e8
--- /dev/null
+++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/map/StaticRebuildMessageV2.kt
@@ -0,0 +1,9 @@
+package net.rsprox.protocol.game.outgoing.model.map
+
+import net.rsprox.protocol.game.outgoing.model.IncomingServerGameMessage
+
+public sealed interface StaticRebuildMessageV2 : IncomingServerGameMessage {
+    public val zoneX: Int
+    public val zoneZ: Int
+    public val worldArea: Int
+}
diff --git a/proxy/src/main/kotlin/net/rsprox/proxy/client/ClientGameHandler.kt b/proxy/src/main/kotlin/net/rsprox/proxy/client/ClientGameHandler.kt
index a4b355356..54d885f60 100644
--- a/proxy/src/main/kotlin/net/rsprox/proxy/client/ClientGameHandler.kt
+++ b/proxy/src/main/kotlin/net/rsprox/proxy/client/ClientGameHandler.kt
@@ -148,6 +148,12 @@ public class ClientGameHandler(
                             replacement.p1Alt1(0)
                             replacement.p3Alt2(delta)
                         }
+                        237 -> {
+                            val delta = buffer.g3Alt1()
+                            buffer.g1Alt2() // Key
+                            replacement.p3Alt1(delta)
+                            replacement.p1Alt2(0)
+                        }
                     }
                 }
 
diff --git a/proxy/src/main/kotlin/net/rsprox/proxy/config/RSProx.kt b/proxy/src/main/kotlin/net/rsprox/proxy/config/RSProx.kt
index 76751d600..81f203d0b 100644
--- a/proxy/src/main/kotlin/net/rsprox/proxy/config/RSProx.kt
+++ b/proxy/src/main/kotlin/net/rsprox/proxy/config/RSProx.kt
@@ -19,8 +19,8 @@ internal val BINARY_CREDENTIALS: Path = BINARY_CREDENTIALS_FOLDER.resolve("binar
 internal val FAKE_CERTIFICATE_FILE: Path = SIGN_KEY_DIRECTORY.resolve("fake-cert.jks")
 internal val JAGEX_ACCOUNTS_FILE: Path = CONFIGURATION_PATH.resolve("jagex-accounts.properties")
 internal val RUNELITE_LAUNCHER_REPO_DIRECTORY: Path = CONFIGURATION_PATH.resolve("runelite-launcher")
-internal const val CURRENT_REVISION: Int = 236
-internal const val LATEST_SUPPORTED_PLUGIN: Int = 236
+internal const val CURRENT_REVISION: Int = 237
+internal const val LATEST_SUPPORTED_PLUGIN: Int = 237
 
 /**
  * Http server port needs to be hard-coded as we modify it in a few RuneLite classes directly.
diff --git a/proxy/src/main/kotlin/net/rsprox/proxy/plugin/DecoderLoader.kt b/proxy/src/main/kotlin/net/rsprox/proxy/plugin/DecoderLoader.kt
index 2fa82e3b8..d2ac5df36 100644
--- a/proxy/src/main/kotlin/net/rsprox/proxy/plugin/DecoderLoader.kt
+++ b/proxy/src/main/kotlin/net/rsprox/proxy/plugin/DecoderLoader.kt
@@ -60,7 +60,13 @@ import net.rsprox.protocol.v236.ClientPacketDecoderServiceV236
 import net.rsprox.protocol.v236.GameClientProtProviderV236
 import net.rsprox.protocol.v236.GameServerProtProviderV236
 import net.rsprox.protocol.v236.ServerPacketDecoderServiceV236
+import net.rsprox.protocol.v237.ClientPacketDecoderServiceV237
+import net.rsprox.protocol.v237.GameClientProtProviderV237
+import net.rsprox.protocol.v237.GameServerProtProviderV237
+import net.rsprox.protocol.v237.ServerPacketDecoderServiceV237
 import net.rsprox.proxy.huffman.HuffmanProvider
+import net.rsprox.transcriber.legacy.LegacyClientProt
+import net.rsprox.transcriber.legacy.LegacyServerProt
 import net.rsprox.transcriber.prot.GameClientProt
 import net.rsprox.transcriber.prot.GameServerProt
 import java.util.concurrent.Callable
@@ -128,7 +134,8 @@ public class DecoderLoader {
         var errorCount = 0
         for ((rev, decoder) in decoders) {
             for (serverProt in decoder.gameServerProtProvider.allProts()) {
-                val prot = serverProtOrNull(serverProt.toString())
+                val name = LegacyServerProt[serverProt.toString()]
+                val prot = serverProtOrNull(name)
                 if (prot == null) {
                     errorCount++
                     logger.error {
@@ -138,7 +145,8 @@ public class DecoderLoader {
             }
 
             for (clientProt in decoder.gameClientProtProvider.allProts()) {
-                val prot = clientProtOrNull(clientProt.toString())
+                val name = LegacyClientProt[clientProt.toString()]
+                val prot = clientProtOrNull(name)
                 if (prot == null) {
                     errorCount++
                     logger.error {
@@ -190,6 +198,7 @@ public class DecoderLoader {
             234 to Callable { loadRevision234(huffmanCodec, cache) },
             235 to Callable { loadRevision235(huffmanCodec, cache) },
             236 to Callable { loadRevision236(huffmanCodec, cache) },
+            237 to Callable { loadRevision237(huffmanCodec, cache) },
         )
     }
 
@@ -389,6 +398,20 @@ public class DecoderLoader {
         )
     }
 
+    private fun loadRevision237(
+        huffmanCodec: HuffmanCodec,
+        cache: CacheProvider,
+    ): RevisionDecoder {
+        logger.debug { "Loading revision 237 decoders" }
+        return RevisionDecoder(
+            237,
+            ClientPacketDecoderServiceV237(huffmanCodec),
+            ServerPacketDecoderServiceV237(huffmanCodec, cache),
+            GameClientProtProviderV237,
+            GameServerProtProviderV237,
+        )
+    }
+
     public fun getDecoder(
         revision: Int,
         cache: CacheProvider,
diff --git a/proxy/src/main/kotlin/net/rsprox/proxy/runelite/RuneliteLauncher.kt b/proxy/src/main/kotlin/net/rsprox/proxy/runelite/RuneliteLauncher.kt
index ded1064d9..35bf56553 100644
--- a/proxy/src/main/kotlin/net/rsprox/proxy/runelite/RuneliteLauncher.kt
+++ b/proxy/src/main/kotlin/net/rsprox/proxy/runelite/RuneliteLauncher.kt
@@ -81,13 +81,13 @@ public class RuneliteLauncher {
         // Pick the correct bootstrap commit from here:
         // https://github.com/runelite/static.runelite.net/commits/gh-pages/bootstrap.json
         val repository = "https://raw.githubusercontent.com/runelite/static.runelite.net"
-        val commit = "0357970b30978614936a80b725a27bdc538bef24"
-        val bootstrapUrl = "$repository/$commit/bootstrap.json"
-        val bootstrapSigUrl = "$repository/$commit/bootstrap.json.sha256"
+        // val commit = "0357970b30978614936a80b725a27bdc538bef24"
+        // val bootstrapUrl = "$repository/$commit/bootstrap.json"
+        // val bootstrapSigUrl = "$repository/$commit/bootstrap.json.sha256"
 
         // Any other time, just rely on the latest bootstrap.
-        // val bootstrapUrl = "https://static.runelite.net/bootstrap.json"
-        // val bootstrapSigUrl = "https://static.runelite.net/bootstrap.json.sha256"
+        val bootstrapUrl = "https://static.runelite.net/bootstrap.json"
+        val bootstrapSigUrl = "https://static.runelite.net/bootstrap.json.sha256"
         val primaryArgs =
             listOf(
                 getJava(),
diff --git a/proxy/src/main/kotlin/net/rsprox/proxy/server/ServerGameHandler.kt b/proxy/src/main/kotlin/net/rsprox/proxy/server/ServerGameHandler.kt
index da2d7420d..ca402bd22 100644
--- a/proxy/src/main/kotlin/net/rsprox/proxy/server/ServerGameHandler.kt
+++ b/proxy/src/main/kotlin/net/rsprox/proxy/server/ServerGameHandler.kt
@@ -219,6 +219,11 @@ public class ServerGameHandler(
                         buf.skipRead(1)
                         interfaceId = buf.g2()
                     }
+                    237 -> {
+                        targetComponent = buf.gCombinedIdAlt3()
+                        buf.skipRead(1)
+                        interfaceId = buf.g2()
+                    }
 
                     else -> {
                         error("Unsupported revision: $revision")
diff --git a/proxy/src/main/kotlin/net/rsprox/proxy/unix/UnixSocketConnection.kt b/proxy/src/main/kotlin/net/rsprox/proxy/unix/UnixSocketConnection.kt
index 2551340fc..3afb986bb 100644
--- a/proxy/src/main/kotlin/net/rsprox/proxy/unix/UnixSocketConnection.kt
+++ b/proxy/src/main/kotlin/net/rsprox/proxy/unix/UnixSocketConnection.kt
@@ -8,7 +8,7 @@ import com.esotericsoftware.kryo.serializers.CollectionSerializer
 import com.esotericsoftware.kryo.serializers.MapSerializer
 import com.github.michaelbull.logging.InlineLogger
 import net.rsprot.protocol.message.IncomingMessage
-import net.rsprox.protocol.game.outgoing.model.map.RebuildLogin
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
 import net.rsprox.proxy.config.SOCKETS_DIRECTORY
 import org.newsclub.net.unix.AFUNIXServerSocket
 import org.newsclub.net.unix.AFUNIXSocketAddress
@@ -156,7 +156,7 @@ public class UnixSocketConnection(
     }
 
     public fun push(payload: IncomingMessage) {
-        if (payload is RebuildLogin) {
+        if (payload is RebuildLoginV1) {
             eventLog.clearEvents()
         }
         eventLog.append(UnixPacket(payload))
diff --git a/shared/src/main/kotlin/net/rsprox/shared/property/PropertyExtensions.kt b/shared/src/main/kotlin/net/rsprox/shared/property/PropertyExtensions.kt
index a693b10cb..59bcbff00 100644
--- a/shared/src/main/kotlin/net/rsprox/shared/property/PropertyExtensions.kt
+++ b/shared/src/main/kotlin/net/rsprox/shared/property/PropertyExtensions.kt
@@ -6,6 +6,7 @@ import net.rsprox.shared.property.filtered.FilteredAnyProperty
 import net.rsprox.shared.property.filtered.FilteredNamedEnumProperty
 import net.rsprox.shared.property.filtered.FilteredScriptVarTypeProperty
 import net.rsprox.shared.property.formatted.FormattedIntProperty
+import net.rsprox.shared.property.formatted.FormattedLongProperty
 import net.rsprox.shared.property.regular.*
 import java.text.NumberFormat
 import kotlin.contracts.ExperimentalContracts
@@ -192,6 +193,20 @@ public fun Property.formattedInt(
     )
 }
 
+public fun Property.formattedLong(
+    name: String,
+    value: Long,
+    format: NumberFormat = NumberFormat.getIntegerInstance(),
+): FormattedLongProperty {
+    return child(
+        FormattedLongProperty(
+            name,
+            value,
+            format,
+        ),
+    )
+}
+
 public fun Property.filteredInt(
     name: String,
     value: Int,
diff --git a/shared/src/main/kotlin/net/rsprox/shared/property/PropertyFormatterCollection.kt b/shared/src/main/kotlin/net/rsprox/shared/property/PropertyFormatterCollection.kt
index ac8c8228f..36bebf5a6 100644
--- a/shared/src/main/kotlin/net/rsprox/shared/property/PropertyFormatterCollection.kt
+++ b/shared/src/main/kotlin/net/rsprox/shared/property/PropertyFormatterCollection.kt
@@ -6,6 +6,7 @@ import net.rsprox.shared.ScriptVarType
 import net.rsprox.shared.property.filtered.FilteredNamedEnumProperty
 import net.rsprox.shared.property.filtered.FilteredScriptVarTypeProperty
 import net.rsprox.shared.property.formatted.FormattedIntProperty
+import net.rsprox.shared.property.formatted.FormattedLongProperty
 import net.rsprox.shared.property.regular.*
 import net.rsprox.shared.settings.Setting
 import net.rsprox.shared.settings.SettingSetStore
@@ -142,6 +143,9 @@ public class PropertyFormatterCollection private constructor(
             builder.add<FormattedIntProperty> {
                 it.format.format(it.value)
             }
+            builder.add<FormattedLongProperty> {
+                it.format.format(it.value)
+            }
             val scriptVarTypePropertyFormatter =
                 PropertyFormatter<ScriptVarTypeProperty<*>> {
                     val vartype = it.scriptVarType.baseVarType
diff --git a/shared/src/main/kotlin/net/rsprox/shared/property/formatted/FormattedLongProperty.kt b/shared/src/main/kotlin/net/rsprox/shared/property/formatted/FormattedLongProperty.kt
new file mode 100644
index 000000000..d44c3d00a
--- /dev/null
+++ b/shared/src/main/kotlin/net/rsprox/shared/property/formatted/FormattedLongProperty.kt
@@ -0,0 +1,12 @@
+package net.rsprox.shared.property.formatted
+
+import net.rsprox.shared.property.ChildProperty
+import java.text.NumberFormat
+
+public class FormattedLongProperty(
+    override val propertyName: String,
+    override val value: Long,
+    public val format: NumberFormat,
+    override val children: MutableList<ChildProperty<*>> = mutableListOf(),
+    override val type: Class<Long> = Long::class.java,
+) : ChildProperty<Long>
diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/TranscriberPlugin.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/TranscriberPlugin.kt
index cbd4448ae..88aee377b 100644
--- a/transcriber/src/main/kotlin/net/rsprox/transcriber/TranscriberPlugin.kt
+++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/TranscriberPlugin.kt
@@ -2,7 +2,10 @@ package net.rsprox.transcriber
 
 import net.rsprot.protocol.Prot
 import net.rsprot.protocol.message.IncomingMessage
-import net.rsprox.protocol.game.outgoing.model.map.RebuildLogin
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV1
+import net.rsprox.protocol.game.outgoing.model.map.RebuildLoginV2
+import net.rsprox.transcriber.legacy.LegacyClientProt
+import net.rsprox.transcriber.legacy.LegacyServerProt
 import net.rsprox.transcriber.prot.GameClientProt
 import net.rsprox.transcriber.prot.GameServerProt
 
@@ -26,11 +29,15 @@ public class TranscriberPlugin(
         message: IncomingMessage,
         revision: Int,
     ) {
-        val toString = prot.toString()
+        val toString = LegacyServerProt[prot.toString()]
         val serverProt = GameServerProt.valueOf(toString)
         // Special exception as it has its own dedicated class
-        if (message is RebuildLogin) {
-            pass(message, Transcriber::rebuildLogin)
+        if (message is RebuildLoginV1) {
+            pass(message, Transcriber::rebuildLoginV1)
+            return
+        }
+        if (message is RebuildLoginV2) {
+            pass(message, Transcriber::rebuildLoginV2)
             return
         }
         when (serverProt) {
@@ -55,7 +62,8 @@ public class TranscriberPlugin(
             GameServerProt.IF_SETNPCHEAD -> pass(message, Transcriber::ifSetNpcHead)
             GameServerProt.IF_SETNPCHEAD_ACTIVE -> pass(message, Transcriber::ifSetNpcHeadActive)
             GameServerProt.IF_SETPLAYERHEAD -> pass(message, Transcriber::ifSetPlayerHead)
-            GameServerProt.IF_SETMODEL -> pass(message, Transcriber::ifSetModel)
+            GameServerProt.IF_SETMODEL_V1 -> pass(message, Transcriber::ifSetModelV1)
+            GameServerProt.IF_SETMODEL_V2 -> pass(message, Transcriber::ifSetModelV2)
             GameServerProt.IF_SETPLAYERMODEL_BASECOLOUR -> pass(message, Transcriber::ifSetPlayerModelBaseColour)
             GameServerProt.IF_SETPLAYERMODEL_BODYTYPE -> pass(message, Transcriber::ifSetPlayerModelBodyType)
             GameServerProt.IF_SETPLAYERMODEL_OBJ -> pass(message, Transcriber::ifSetPlayerModelObj)
@@ -112,11 +120,14 @@ public class TranscriberPlugin(
             GameServerProt.WORLDENTITY_INFO_V3 -> pass(message, Transcriber::worldEntityInfoV3)
             GameServerProt.WORLDENTITY_INFO_V2 -> pass(message, Transcriber::worldEntityInfoV2)
             GameServerProt.WORLDENTITY_INFO_V1 -> pass(message, Transcriber::worldEntityInfoV1)
-            GameServerProt.REBUILD_NORMAL -> pass(message, Transcriber::rebuildNormal)
-            GameServerProt.REBUILD_REGION -> pass(message, Transcriber::rebuildRegion)
+            GameServerProt.REBUILD_NORMAL_V1 -> pass(message, Transcriber::rebuildNormalV1)
+            GameServerProt.REBUILD_NORMAL_V2 -> pass(message, Transcriber::rebuildNormalV2)
+            GameServerProt.REBUILD_REGION_V1 -> pass(message, Transcriber::rebuildRegionV1)
+            GameServerProt.REBUILD_REGION_V2 -> pass(message, Transcriber::rebuildRegionV2)
             GameServerProt.REBUILD_WORLDENTITY_V1 -> pass(message, Transcriber::rebuildWorldEntityV1)
             GameServerProt.REBUILD_WORLDENTITY_V2 -> pass(message, Transcriber::rebuildWorldEntityV2)
             GameServerProt.REBUILD_WORLDENTITY_V3 -> pass(message, Transcriber::rebuildWorldEntityV3)
+            GameServerProt.REBUILD_WORLDENTITY_V4 -> pass(message, Transcriber::rebuildWorldEntityV4)
             GameServerProt.VARP_SMALL -> pass(message, Transcriber::varpSmall)
             GameServerProt.VARP_LARGE -> pass(message, Transcriber::varpLarge)
             GameServerProt.VARP_RESET -> pass(message, Transcriber::varpReset)
@@ -223,7 +234,7 @@ public class TranscriberPlugin(
         message: IncomingMessage,
         revision: Int,
     ) {
-        val toString = prot.toString()
+        val toString = LegacyClientProt[prot.toString()]
         val clientProt = GameClientProt.valueOf(toString)
         when (clientProt) {
             GameClientProt.IF_BUTTON -> pass(message, Transcriber::if1Button)
@@ -242,27 +253,42 @@ public class TranscriberPlugin(
             GameClientProt.IF_BUTTOND -> pass(message, Transcriber::ifButtonD)
             GameClientProt.IF_BUTTONT -> pass(message, Transcriber::ifButtonT)
             GameClientProt.IF_RUNSCRIPT -> pass(message, Transcriber::ifRunScript)
-            GameClientProt.OPNPC1 -> pass(message, Transcriber::opNpc)
-            GameClientProt.OPNPC2 -> pass(message, Transcriber::opNpc)
-            GameClientProt.OPNPC3 -> pass(message, Transcriber::opNpc)
-            GameClientProt.OPNPC4 -> pass(message, Transcriber::opNpc)
-            GameClientProt.OPNPC5 -> pass(message, Transcriber::opNpc)
+            GameClientProt.OPNPC1_V1 -> pass(message, Transcriber::opNpcV1)
+            GameClientProt.OPNPC2_V1 -> pass(message, Transcriber::opNpcV1)
+            GameClientProt.OPNPC3_V1 -> pass(message, Transcriber::opNpcV1)
+            GameClientProt.OPNPC4_V1 -> pass(message, Transcriber::opNpcV1)
+            GameClientProt.OPNPC5_V1 -> pass(message, Transcriber::opNpcV1)
+            GameClientProt.OPNPC1_V2 -> pass(message, Transcriber::opNpcV2)
+            GameClientProt.OPNPC2_V2 -> pass(message, Transcriber::opNpcV2)
+            GameClientProt.OPNPC3_V2 -> pass(message, Transcriber::opNpcV2)
+            GameClientProt.OPNPC4_V2 -> pass(message, Transcriber::opNpcV2)
+            GameClientProt.OPNPC5_V2 -> pass(message, Transcriber::opNpcV2)
             GameClientProt.OPNPC6 -> pass(message, Transcriber::opNpc6)
             GameClientProt.OPNPCT -> pass(message, Transcriber::opNpcT)
             GameClientProt.OPNPCU -> throw IllegalArgumentException("Unimplemented packet: $message")
-            GameClientProt.OPLOC1 -> pass(message, Transcriber::opLoc)
-            GameClientProt.OPLOC2 -> pass(message, Transcriber::opLoc)
-            GameClientProt.OPLOC3 -> pass(message, Transcriber::opLoc)
-            GameClientProt.OPLOC4 -> pass(message, Transcriber::opLoc)
-            GameClientProt.OPLOC5 -> pass(message, Transcriber::opLoc)
+            GameClientProt.OPLOC1_V1 -> pass(message, Transcriber::opLocV1)
+            GameClientProt.OPLOC2_V1 -> pass(message, Transcriber::opLocV1)
+            GameClientProt.OPLOC3_V1 -> pass(message, Transcriber::opLocV1)
+            GameClientProt.OPLOC4_V1 -> pass(message, Transcriber::opLocV1)
+            GameClientProt.OPLOC5_V1 -> pass(message, Transcriber::opLocV1)
+            GameClientProt.OPLOC1_V2 -> pass(message, Transcriber::opLocV2)
+            GameClientProt.OPLOC2_V2 -> pass(message, Transcriber::opLocV2)
+            GameClientProt.OPLOC3_V2 -> pass(message, Transcriber::opLocV2)
+            GameClientProt.OPLOC4_V2 -> pass(message, Transcriber::opLocV2)
+            GameClientProt.OPLOC5_V2 -> pass(message, Transcriber::opLocV2)
             GameClientProt.OPLOC6 -> pass(message, Transcriber::opLoc6)
             GameClientProt.OPLOCT -> pass(message, Transcriber::opLocT)
             GameClientProt.OPLOCU -> throw IllegalArgumentException("Unimplemented packet: $message")
-            GameClientProt.OPOBJ1 -> pass(message, Transcriber::opObj)
-            GameClientProt.OPOBJ2 -> pass(message, Transcriber::opObj)
-            GameClientProt.OPOBJ3 -> pass(message, Transcriber::opObj)
-            GameClientProt.OPOBJ4 -> pass(message, Transcriber::opObj)
-            GameClientProt.OPOBJ5 -> pass(message, Transcriber::opObj)
+            GameClientProt.OPOBJ1_V1 -> pass(message, Transcriber::opObjV1)
+            GameClientProt.OPOBJ2_V1 -> pass(message, Transcriber::opObjV1)
+            GameClientProt.OPOBJ3_V1 -> pass(message, Transcriber::opObjV1)
+            GameClientProt.OPOBJ4_V1 -> pass(message, Transcriber::opObjV1)
+            GameClientProt.OPOBJ5_V1 -> pass(message, Transcriber::opObjV1)
+            GameClientProt.OPOBJ1_V2 -> pass(message, Transcriber::opObjV2)
+            GameClientProt.OPOBJ2_V2 -> pass(message, Transcriber::opObjV2)
+            GameClientProt.OPOBJ3_V2 -> pass(message, Transcriber::opObjV2)
+            GameClientProt.OPOBJ4_V2 -> pass(message, Transcriber::opObjV2)
+            GameClientProt.OPOBJ5_V2 -> pass(message, Transcriber::opObjV2)
             GameClientProt.OPOBJ6 -> pass(message, Transcriber::opObj6)
             GameClientProt.OPOBJT -> pass(message, Transcriber::opObjT)
             GameClientProt.OPOBJU -> throw IllegalArgumentException("Unimplemented packet: $message")
@@ -290,6 +316,7 @@ public class TranscriberPlugin(
             GameClientProt.RESUME_P_NAMEDIALOG -> pass(message, Transcriber::resumePNameDialog)
             GameClientProt.RESUME_P_STRINGDIALOG -> pass(message, Transcriber::resumePStringDialog)
             GameClientProt.RESUME_P_COUNTDIALOG -> pass(message, Transcriber::resumePCountDialog)
+            GameClientProt.RESUME_P_COUNTDIALOG_LONG -> pass(message, Transcriber::resumePCountDialogLong)
             GameClientProt.RESUME_P_OBJDIALOG -> pass(message, Transcriber::resumePObjDialog)
             GameClientProt.FRIENDCHAT_KICK -> pass(message, Transcriber::friendChatKick)
             GameClientProt.FRIENDCHAT_SETRANK -> pass(message, Transcriber::friendChatSetRank)
diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/indexer/IndexerTranscriber.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/indexer/IndexerTranscriber.kt
index 1e0d50baa..04978e98f 100644
--- a/transcriber/src/main/kotlin/net/rsprox/transcriber/indexer/IndexerTranscriber.kt
+++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/indexer/IndexerTranscriber.kt
@@ -14,9 +14,10 @@ import net.rsprox.protocol.game.incoming.model.events.*
 import net.rsprox.protocol.game.incoming.model.friendchat.FriendChatJoinLeave
 import net.rsprox.protocol.game.incoming.model.friendchat.FriendChatKick
 import net.rsprox.protocol.game.incoming.model.friendchat.FriendChatSetRank
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
 import net.rsprox.protocol.game.incoming.model.locs.OpLoc6
 import net.rsprox.protocol.game.incoming.model.locs.OpLocT
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV2
 import net.rsprox.protocol.game.incoming.model.messaging.MessagePrivate
 import net.rsprox.protocol.game.incoming.model.messaging.MessagePublic
 import net.rsprox.protocol.game.incoming.model.misc.client.*
@@ -34,15 +35,18 @@ import net.rsprox.protocol.game.incoming.model.misc.user.SetChatFilterSettings
 import net.rsprox.protocol.game.incoming.model.misc.user.SetHeading
 import net.rsprox.protocol.game.incoming.model.misc.user.Teleport
 import net.rsprox.protocol.game.incoming.model.misc.user.UpdatePlayerModelV1
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
 import net.rsprox.protocol.game.incoming.model.npcs.OpNpc6
 import net.rsprox.protocol.game.incoming.model.npcs.OpNpcT
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV2
 import net.rsprox.protocol.game.incoming.model.objs.OpObj6
 import net.rsprox.protocol.game.incoming.model.objs.OpObjT
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV2
 import net.rsprox.protocol.game.incoming.model.players.OpPlayer
 import net.rsprox.protocol.game.incoming.model.players.OpPlayerT
 import net.rsprox.protocol.game.incoming.model.resumed.ResumePCountDialog
+import net.rsprox.protocol.game.incoming.model.resumed.ResumePCountDialogLong
 import net.rsprox.protocol.game.incoming.model.resumed.ResumePNameDialog
 import net.rsprox.protocol.game.incoming.model.resumed.ResumePObjDialog
 import net.rsprox.protocol.game.incoming.model.resumed.ResumePStringDialog
@@ -269,7 +273,11 @@ public class IndexerTranscriber(
     override fun friendChatSetRank(message: FriendChatSetRank) {
     }
 
-    override fun opLoc(message: OpLoc) {
+    override fun opLocV1(message: OpLocV1) {
+        binaryIndex.increment(IndexedType.LOC, message.id)
+    }
+
+    override fun opLocV2(message: OpLocV2) {
         binaryIndex.increment(IndexedType.LOC, message.id)
     }
 
@@ -356,7 +364,12 @@ public class IndexerTranscriber(
     override fun updatePlayerModelV1(message: UpdatePlayerModelV1) {
     }
 
-    override fun opNpc(message: OpNpc) {
+    override fun opNpcV1(message: OpNpcV1) {
+        val npc = getNpcInAnyWorld(message.index) ?: return
+        binaryIndex.increment(IndexedType.NPC, npc.id)
+    }
+
+    override fun opNpcV2(message: OpNpcV2) {
         val npc = getNpcInAnyWorld(message.index) ?: return
         binaryIndex.increment(IndexedType.NPC, npc.id)
     }
@@ -370,7 +383,11 @@ public class IndexerTranscriber(
         binaryIndex.increment(IndexedType.NPC, npc.id)
     }
 
-    override fun opObj(message: OpObj) {
+    override fun opObjV1(message: OpObjV1) {
+        binaryIndex.increment(IndexedType.OBJ, message.id)
+    }
+
+    override fun opObjV2(message: OpObjV2) {
         binaryIndex.increment(IndexedType.OBJ, message.id)
     }
 
@@ -404,6 +421,9 @@ public class IndexerTranscriber(
     override fun resumePCountDialog(message: ResumePCountDialog) {
     }
 
+    override fun resumePCountDialogLong(message: ResumePCountDialogLong) {
+    }
+
     override fun resumePNameDialog(message: ResumePNameDialog) {
     }
 
@@ -607,7 +627,11 @@ public class IndexerTranscriber(
         incrementComponent(message.combinedId)
     }
 
-    override fun ifSetModel(message: IfSetModel) {
+    override fun ifSetModelV1(message: IfSetModelV1) {
+        incrementComponent(message.combinedId)
+    }
+
+    override fun ifSetModelV2(message: IfSetModelV2) {
         incrementComponent(message.combinedId)
     }
 
@@ -713,7 +737,20 @@ public class IndexerTranscriber(
     override fun reconnect(message: Reconnect) {
     }
 
-    override fun rebuildLogin(message: RebuildLogin) {
+    override fun rebuildLoginV1(message: RebuildLoginV1) {
+        val minMapsquareX = (message.zoneX - 6) ushr 3
+        val maxMapsquareX = (message.zoneX + 6) ushr 3
+        val minMapsquareZ = (message.zoneZ - 6) ushr 3
+        val maxMapsquareZ = (message.zoneZ + 6) ushr 3
+        for (mapsquareX in minMapsquareX..maxMapsquareX) {
+            for (mapsquareZ in minMapsquareZ..maxMapsquareZ) {
+                val mapsquareId = (mapsquareX shl 8) or mapsquareZ
+                binaryIndex.increment(IndexedType.MAPSQUARE, mapsquareId)
+            }
+        }
+    }
+
+    override fun rebuildLoginV2(message: RebuildLoginV2) {
         val minMapsquareX = (message.zoneX - 6) ushr 3
         val maxMapsquareX = (message.zoneX + 6) ushr 3
         val minMapsquareZ = (message.zoneZ - 6) ushr 3
@@ -726,7 +763,7 @@ public class IndexerTranscriber(
         }
     }
 
-    override fun rebuildNormal(message: RebuildNormal) {
+    override fun rebuildNormalV1(message: RebuildNormalV1) {
         val minMapsquareX = (message.zoneX - 6) ushr 3
         val maxMapsquareX = (message.zoneX + 6) ushr 3
         val minMapsquareZ = (message.zoneZ - 6) ushr 3
@@ -739,7 +776,39 @@ public class IndexerTranscriber(
         }
     }
 
-    override fun rebuildRegion(message: RebuildRegion) {
+    override fun rebuildNormalV2(message: RebuildNormalV2) {
+        val minMapsquareX = (message.zoneX - 6) ushr 3
+        val maxMapsquareX = (message.zoneX + 6) ushr 3
+        val minMapsquareZ = (message.zoneZ - 6) ushr 3
+        val maxMapsquareZ = (message.zoneZ + 6) ushr 3
+        for (mapsquareX in minMapsquareX..maxMapsquareX) {
+            for (mapsquareZ in minMapsquareZ..maxMapsquareZ) {
+                val mapsquareId = (mapsquareX shl 8) or mapsquareZ
+                binaryIndex.increment(IndexedType.MAPSQUARE, mapsquareId)
+            }
+        }
+    }
+
+    override fun rebuildRegionV1(message: RebuildRegionV1) {
+        val startZoneX = message.zoneX - 6
+        val startZoneZ = message.zoneZ - 6
+        val mapsquares = mutableSetOf<Int>()
+        for (level in 0..<4) {
+            for (zoneX in startZoneX..(message.zoneX + 6)) {
+                for (zoneZ in startZoneZ..(message.zoneZ + 6)) {
+                    val block = message.buildArea[level, zoneX - startZoneX, zoneZ - startZoneZ]
+                    // Invalid zone
+                    if (block.mapsquareId == 32767) continue
+                    mapsquares += block.mapsquareId
+                }
+            }
+        }
+        for (mapsquare in mapsquares) {
+            binaryIndex.increment(IndexedType.MAPSQUARE, mapsquare)
+        }
+    }
+
+    override fun rebuildRegionV2(message: RebuildRegionV2) {
         val startZoneX = message.zoneX - 6
         val startZoneZ = message.zoneZ - 6
         val mapsquares = mutableSetOf<Int>()
@@ -815,6 +884,25 @@ public class IndexerTranscriber(
         }
     }
 
+    override fun rebuildWorldEntityV4(message: RebuildWorldEntityV4) {
+        val startZoneX = message.baseX - 6
+        val startZoneZ = message.baseZ - 6
+        val mapsquares = mutableSetOf<Int>()
+        for (level in 0..<4) {
+            for (zoneX in startZoneX..(message.baseX + 6)) {
+                for (zoneZ in startZoneZ..(message.baseZ + 6)) {
+                    val block = message.buildArea[level, zoneX - startZoneX, zoneZ - startZoneZ]
+                    // Invalid zone
+                    if (block.mapsquareId == 32767) continue
+                    mapsquares += block.mapsquareId
+                }
+            }
+        }
+        for (mapsquare in mapsquares) {
+            binaryIndex.increment(IndexedType.MAPSQUARE, mapsquare)
+        }
+    }
+
     override fun hideLocOps(message: HideLocOps) {
     }
 
diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/interfaces/ClientPacketTranscriber.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/interfaces/ClientPacketTranscriber.kt
index 438383b53..5d459804a 100644
--- a/transcriber/src/main/kotlin/net/rsprox/transcriber/interfaces/ClientPacketTranscriber.kt
+++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/interfaces/ClientPacketTranscriber.kt
@@ -10,9 +10,10 @@ import net.rsprox.protocol.game.incoming.model.events.*
 import net.rsprox.protocol.game.incoming.model.friendchat.FriendChatJoinLeave
 import net.rsprox.protocol.game.incoming.model.friendchat.FriendChatKick
 import net.rsprox.protocol.game.incoming.model.friendchat.FriendChatSetRank
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
 import net.rsprox.protocol.game.incoming.model.locs.OpLoc6
 import net.rsprox.protocol.game.incoming.model.locs.OpLocT
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV2
 import net.rsprox.protocol.game.incoming.model.messaging.MessagePrivate
 import net.rsprox.protocol.game.incoming.model.messaging.MessagePublic
 import net.rsprox.protocol.game.incoming.model.misc.client.*
@@ -30,15 +31,18 @@ import net.rsprox.protocol.game.incoming.model.misc.user.SetChatFilterSettings
 import net.rsprox.protocol.game.incoming.model.misc.user.SetHeading
 import net.rsprox.protocol.game.incoming.model.misc.user.Teleport
 import net.rsprox.protocol.game.incoming.model.misc.user.UpdatePlayerModelV1
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
 import net.rsprox.protocol.game.incoming.model.npcs.OpNpc6
 import net.rsprox.protocol.game.incoming.model.npcs.OpNpcT
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV2
 import net.rsprox.protocol.game.incoming.model.objs.OpObj6
 import net.rsprox.protocol.game.incoming.model.objs.OpObjT
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV2
 import net.rsprox.protocol.game.incoming.model.players.OpPlayer
 import net.rsprox.protocol.game.incoming.model.players.OpPlayerT
 import net.rsprox.protocol.game.incoming.model.resumed.ResumePCountDialog
+import net.rsprox.protocol.game.incoming.model.resumed.ResumePCountDialogLong
 import net.rsprox.protocol.game.incoming.model.resumed.ResumePNameDialog
 import net.rsprox.protocol.game.incoming.model.resumed.ResumePObjDialog
 import net.rsprox.protocol.game.incoming.model.resumed.ResumePStringDialog
@@ -100,7 +104,9 @@ public interface ClientPacketTranscriber {
 
     public fun friendChatSetRank(message: FriendChatSetRank)
 
-    public fun opLoc(message: OpLoc)
+    public fun opLocV1(message: OpLocV1)
+
+    public fun opLocV2(message: OpLocV2)
 
     public fun opLoc6(message: OpLoc6)
 
@@ -156,13 +162,17 @@ public interface ClientPacketTranscriber {
 
     public fun updatePlayerModelV1(message: UpdatePlayerModelV1)
 
-    public fun opNpc(message: OpNpc)
+    public fun opNpcV1(message: OpNpcV1)
+
+    public fun opNpcV2(message: OpNpcV2)
 
     public fun opNpc6(message: OpNpc6)
 
     public fun opNpcT(message: OpNpcT)
 
-    public fun opObj(message: OpObj)
+    public fun opObjV1(message: OpObjV1)
+
+    public fun opObjV2(message: OpObjV2)
 
     public fun opObj6(message: OpObj6)
 
@@ -182,6 +192,8 @@ public interface ClientPacketTranscriber {
 
     public fun resumePCountDialog(message: ResumePCountDialog)
 
+    public fun resumePCountDialogLong(message: ResumePCountDialogLong)
+
     public fun resumePNameDialog(message: ResumePNameDialog)
 
     public fun resumePObjDialog(message: ResumePObjDialog)
diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/interfaces/ServerPacketTranscriber.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/interfaces/ServerPacketTranscriber.kt
index d4cb51386..937a1c76f 100644
--- a/transcriber/src/main/kotlin/net/rsprox/transcriber/interfaces/ServerPacketTranscriber.kt
+++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/interfaces/ServerPacketTranscriber.kt
@@ -175,7 +175,9 @@ public interface ServerPacketTranscriber {
 
     public fun ifSetHide(message: IfSetHide)
 
-    public fun ifSetModel(message: IfSetModel)
+    public fun ifSetModelV1(message: IfSetModelV1)
+
+    public fun ifSetModelV2(message: IfSetModelV2)
 
     public fun ifSetNpcHead(message: IfSetNpcHead)
 
@@ -215,11 +217,17 @@ public interface ServerPacketTranscriber {
 
     public fun reconnect(message: Reconnect)
 
-    public fun rebuildLogin(message: RebuildLogin)
+    public fun rebuildLoginV1(message: RebuildLoginV1)
+
+    public fun rebuildLoginV2(message: RebuildLoginV2)
+
+    public fun rebuildNormalV1(message: RebuildNormalV1)
 
-    public fun rebuildNormal(message: RebuildNormal)
+    public fun rebuildNormalV2(message: RebuildNormalV2)
 
-    public fun rebuildRegion(message: RebuildRegion)
+    public fun rebuildRegionV1(message: RebuildRegionV1)
+
+    public fun rebuildRegionV2(message: RebuildRegionV2)
 
     public fun rebuildWorldEntityV1(message: RebuildWorldEntityV1)
 
@@ -227,6 +235,8 @@ public interface ServerPacketTranscriber {
 
     public fun rebuildWorldEntityV3(message: RebuildWorldEntityV3)
 
+    public fun rebuildWorldEntityV4(message: RebuildWorldEntityV4)
+
     public fun hideLocOps(message: HideLocOps)
 
     public fun hideNpcOps(message: HideNpcOps)
diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/legacy/LegacyClientProt.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/legacy/LegacyClientProt.kt
new file mode 100644
index 000000000..cc724a3aa
--- /dev/null
+++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/legacy/LegacyClientProt.kt
@@ -0,0 +1,30 @@
+package net.rsprox.transcriber.legacy
+
+public enum class LegacyClientProt(
+    public val remappedName: String,
+) {
+    OPLOC1("OPLOC1_V1"),
+    OPLOC2("OPLOC2_V1"),
+    OPLOC3("OPLOC3_V1"),
+    OPLOC4("OPLOC4_V1"),
+    OPLOC5("OPLOC5_V1"),
+    OPNPC1("OPNPC1_V1"),
+    OPNPC2("OPNPC2_V1"),
+    OPNPC3("OPNPC3_V1"),
+    OPNPC4("OPNPC4_V1"),
+    OPNPC5("OPNPC5_V1"),
+    OPOBJ1("OPOBJ1_V1"),
+    OPOBJ2("OPOBJ2_V1"),
+    OPOBJ3("OPOBJ3_V1"),
+    OPOBJ4("OPOBJ4_V1"),
+    OPOBJ5("OPOBJ5_V1"),
+    ;
+
+    public companion object {
+        @JvmStatic private val dictionary = entries.associate { it.name to it.remappedName }
+
+        public operator fun get(name: String): String {
+            return dictionary.getOrDefault(name, name)
+        }
+    }
+}
diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/legacy/LegacyServerProt.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/legacy/LegacyServerProt.kt
new file mode 100644
index 000000000..5fa24adac
--- /dev/null
+++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/legacy/LegacyServerProt.kt
@@ -0,0 +1,18 @@
+package net.rsprox.transcriber.legacy
+
+public enum class LegacyServerProt(
+    public val remappedName: String,
+) {
+    REBUILD_NORMAL("REBUILD_NORMAL_V1"),
+    REBUILD_REGION("REBUILD_REGION_V1"),
+    IF_SETMODEL("IF_SETMODEL_V1"),
+    ;
+
+    public companion object {
+        @JvmStatic private val dictionary = entries.associate { it.name to it.remappedName }
+
+        public operator fun get(name: String): String {
+            return dictionary.getOrDefault(name, name)
+        }
+    }
+}
diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/prot/GameClientProt.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/prot/GameClientProt.kt
index f50c226ce..b35c3c9f6 100644
--- a/transcriber/src/main/kotlin/net/rsprox/transcriber/prot/GameClientProt.kt
+++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/prot/GameClientProt.kt
@@ -20,31 +20,46 @@ public enum class GameClientProt : Prot {
     IF_RUNSCRIPT,
 
     // Op npc
-    OPNPC1,
-    OPNPC2,
-    OPNPC3,
-    OPNPC4,
-    OPNPC5,
+    OPNPC1_V1,
+    OPNPC2_V1,
+    OPNPC3_V1,
+    OPNPC4_V1,
+    OPNPC5_V1,
+    OPNPC1_V2,
+    OPNPC2_V2,
+    OPNPC3_V2,
+    OPNPC4_V2,
+    OPNPC5_V2,
     OPNPC6,
     OPNPCT,
     OPNPCU,
 
     // Op loc
-    OPLOC1,
-    OPLOC2,
-    OPLOC3,
-    OPLOC4,
-    OPLOC5,
+    OPLOC1_V1,
+    OPLOC2_V1,
+    OPLOC3_V1,
+    OPLOC4_V1,
+    OPLOC5_V1,
+    OPLOC1_V2,
+    OPLOC2_V2,
+    OPLOC3_V2,
+    OPLOC4_V2,
+    OPLOC5_V2,
     OPLOC6,
     OPLOCT,
     OPLOCU,
 
     // Op obj
-    OPOBJ1,
-    OPOBJ2,
-    OPOBJ3,
-    OPOBJ4,
-    OPOBJ5,
+    OPOBJ1_V1,
+    OPOBJ2_V1,
+    OPOBJ3_V1,
+    OPOBJ4_V1,
+    OPOBJ5_V1,
+    OPOBJ1_V2,
+    OPOBJ2_V2,
+    OPOBJ3_V2,
+    OPOBJ4_V2,
+    OPOBJ5_V2,
     OPOBJ6,
     OPOBJT,
     OPOBJU,
@@ -89,6 +104,7 @@ public enum class GameClientProt : Prot {
     RESUME_P_NAMEDIALOG,
     RESUME_P_STRINGDIALOG,
     RESUME_P_COUNTDIALOG,
+    RESUME_P_COUNTDIALOG_LONG,
     RESUME_P_OBJDIALOG,
 
     // Friend chat packets
diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/prot/GameServerProt.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/prot/GameServerProt.kt
index 2c7502ff4..5f94a52e9 100644
--- a/transcriber/src/main/kotlin/net/rsprox/transcriber/prot/GameServerProt.kt
+++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/prot/GameServerProt.kt
@@ -23,7 +23,8 @@ public enum class GameServerProt : Prot {
     IF_SETNPCHEAD,
     IF_SETNPCHEAD_ACTIVE,
     IF_SETPLAYERHEAD,
-    IF_SETMODEL,
+    IF_SETMODEL_V1,
+    IF_SETMODEL_V2,
     IF_SETPLAYERMODEL_BASECOLOUR,
     IF_SETPLAYERMODEL_BODYTYPE,
     IF_SETPLAYERMODEL_OBJ,
@@ -100,8 +101,11 @@ public enum class GameServerProt : Prot {
     WORLDENTITY_INFO_V1,
 
     // Map packets
-    REBUILD_NORMAL,
-    REBUILD_REGION,
+    REBUILD_NORMAL_V1,
+    REBUILD_NORMAL_V2,
+    REBUILD_REGION_V1,
+    REBUILD_REGION_V2,
+    REBUILD_WORLDENTITY_V4,
     REBUILD_WORLDENTITY_V3,
     REBUILD_WORLDENTITY_V2,
     REBUILD_WORLDENTITY_V1,
diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/state/KeyStorage.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/state/KeyStorage.kt
index a5198853b..72f038372 100644
--- a/transcriber/src/main/kotlin/net/rsprox/transcriber/state/KeyStorage.kt
+++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/state/KeyStorage.kt
@@ -4,8 +4,8 @@ package net.rsprox.transcriber.state
 
 import com.github.michaelbull.logging.InlineLogger
 import net.rsprot.crypto.xtea.XteaKey
-import net.rsprox.protocol.game.outgoing.model.map.RebuildRegion
-import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessage
+import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV1
+import net.rsprox.protocol.game.outgoing.model.map.StaticRebuildMessageV1
 import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea
 
 public class KeyStorage {
@@ -27,7 +27,7 @@ public class KeyStorage {
         }
     }
 
-    public fun onStaticRebuild(message: StaticRebuildMessage) {
+    public fun onStaticRebuild(message: StaticRebuildMessageV1) {
         val minMapsquareX = (message.zoneX - 6) ushr 3
         val maxMapsquareX = (message.zoneX + 6) ushr 3
         val minMapsquareZ = (message.zoneZ - 6) ushr 3
@@ -42,7 +42,7 @@ public class KeyStorage {
         }
     }
 
-    public fun onRebuildRegion(message: RebuildRegion) {
+    public fun onRebuildRegion(message: RebuildRegionV1) {
         val mapsquares = mutableSetOf<Int>()
         val startZoneX = message.zoneX - 6
         val startZoneZ = message.zoneZ - 6
diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/state/SessionState.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/state/SessionState.kt
index 82d9325b1..48140ff2c 100644
--- a/transcriber/src/main/kotlin/net/rsprox/transcriber/state/SessionState.kt
+++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/state/SessionState.kt
@@ -20,7 +20,7 @@ public class SessionState(
     private val worlds: MutableMap<Int, World> = mutableMapOf()
     private val players: MutableMap<Int, Player> = mutableMapOf()
     private val lastKnownPlayerNames: MutableMap<Int, String> = mutableMapOf()
-    public var currentProt: String = GameServerProt.REBUILD_NORMAL.name
+    public var currentProt: String = GameServerProt.REBUILD_NORMAL_V1.name
     public var localPlayerIndex: Int = -1
     private val openInterfaces: MutableMap<CombinedId, Int> = mutableMapOf()
     public var toplevelInterface: Int = -1
diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/state/SessionTracker.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/state/SessionTracker.kt
index c760f1f0e..0fc04734c 100644
--- a/transcriber/src/main/kotlin/net/rsprox/transcriber/state/SessionTracker.kt
+++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/state/SessionTracker.kt
@@ -36,6 +36,8 @@ import net.rsprox.protocol.game.outgoing.model.zone.header.UpdateZonePartialEncl
 import net.rsprox.protocol.game.outgoing.model.zone.header.UpdateZonePartialFollows
 import net.rsprox.shared.SessionMonitor
 import net.rsprox.transcriber.firstOfInstanceOfNull
+import net.rsprox.transcriber.legacy.LegacyClientProt
+import net.rsprox.transcriber.legacy.LegacyServerProt
 import net.rsprox.transcriber.prot.GameClientProt
 import net.rsprox.transcriber.prot.GameServerProt
 import net.rsprox.transcriber.prot.Prot
@@ -62,22 +64,22 @@ public class SessionTracker(
                 "Exception processing keys for message: $message"
             }
         }
-        if (message is RebuildLogin) {
-            setCurrentProt(GameServerProt.REBUILD_NORMAL)
+        if (message is RebuildLoginV1) {
+            setCurrentProt(GameServerProt.REBUILD_NORMAL_V1)
             return
         }
-        val toString = prot.toString()
+        val toString = LegacyServerProt[prot.toString()]
         val serverProt = GameServerProt.valueOf(toString)
         setCurrentProt(serverProt)
     }
 
     private fun processKeys(message: IncomingMessage) {
         when (message) {
-            is StaticRebuildMessage -> {
+            is StaticRebuildMessageV1 -> {
                 keyStorage.onStaticRebuild(message)
             }
 
-            is RebuildRegion -> {
+            is RebuildRegionV1 -> {
                 keyStorage.onRebuildRegion(message)
             }
 
@@ -114,24 +116,47 @@ public class SessionTracker(
         @Suppress("UNUSED_PARAMETER") message: IncomingMessage,
         prot: net.rsprot.protocol.Prot,
     ) {
-        val toString = prot.toString()
+        val toString = LegacyClientProt[prot.toString()]
         val clientProt = GameClientProt.valueOf(toString)
         setCurrentProt(clientProt)
     }
 
     public fun beforeTranscribe(message: IncomingMessage) {
         when (message) {
-            is RebuildNormal -> {
+            is RebuildNormalV1 -> {
                 val world = sessionState.getWorld(-1)
                 world.rebuild(CoordGrid(0, (message.zoneX - 6) shl 3, (message.zoneZ - 6) shl 3))
                 world.setBuildArea(null)
             }
-            is RebuildRegion -> {
+            is RebuildNormalV2 -> {
+                val world = sessionState.getWorld(-1)
+                world.rebuild(CoordGrid(0, (message.zoneX - 6) shl 3, (message.zoneZ - 6) shl 3))
+                world.setBuildArea(null)
+            }
+            is RebuildRegionV1 -> {
+                val world = sessionState.getWorld(-1)
+                world.rebuild(CoordGrid(0, (message.zoneX - 6) shl 3, (message.zoneZ - 6) shl 3))
+                world.setBuildArea(message.buildArea)
+            }
+            is RebuildRegionV2 -> {
                 val world = sessionState.getWorld(-1)
                 world.rebuild(CoordGrid(0, (message.zoneX - 6) shl 3, (message.zoneZ - 6) shl 3))
                 world.setBuildArea(message.buildArea)
             }
-            is RebuildLogin -> {
+            is RebuildLoginV1 -> {
+                sessionState.overridePlayer(
+                    Player(
+                        message.playerInfoInitBlock.localPlayerIndex,
+                        "uninitialized",
+                        message.playerInfoInitBlock.localPlayerCoord,
+                    ),
+                )
+                sessionState.localPlayerIndex = message.playerInfoInitBlock.localPlayerIndex
+                val world = sessionState.createWorld(-1)
+                world.rebuild(CoordGrid(0, (message.zoneX - 6) shl 3, (message.zoneZ - 6) shl 3))
+                world.setBuildArea(null)
+            }
+            is RebuildLoginV2 -> {
                 sessionState.overridePlayer(
                     Player(
                         message.playerInfoInitBlock.localPlayerIndex,
@@ -159,6 +184,11 @@ public class SessionTracker(
                 world.rebuild(CoordGrid(0, message.baseX, message.baseZ))
                 world.setBuildArea(message.buildArea)
             }
+            is RebuildWorldEntityV4 -> {
+                val world = sessionState.getActiveWorld()
+                world.rebuild(CoordGrid(0, message.baseX, message.baseZ))
+                world.setBuildArea(message.buildArea)
+            }
             is VarpSmall -> {
                 if (!sessionState.varbitsLoaded()) {
                     sessionState.associateVarbits(cache.listVarBitTypes())
@@ -172,6 +202,9 @@ public class SessionTracker(
             ClearEntities -> {
                 sessionState.destroyDynamicWorlds()
             }
+            is Reconnect -> {
+                sessionState.destroyDynamicWorlds()
+            }
             is UpdateZoneFullFollows -> {
                 sessionState.getActiveWorld().setActiveZone(message.zoneX, message.zoneZ, message.level)
             }
diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextClientPacketTranscriber.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextClientPacketTranscriber.kt
index a56e93331..f3b13e663 100644
--- a/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextClientPacketTranscriber.kt
+++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextClientPacketTranscriber.kt
@@ -12,9 +12,10 @@ import net.rsprox.protocol.game.incoming.model.events.*
 import net.rsprox.protocol.game.incoming.model.friendchat.FriendChatJoinLeave
 import net.rsprox.protocol.game.incoming.model.friendchat.FriendChatKick
 import net.rsprox.protocol.game.incoming.model.friendchat.FriendChatSetRank
-import net.rsprox.protocol.game.incoming.model.locs.OpLoc
 import net.rsprox.protocol.game.incoming.model.locs.OpLoc6
 import net.rsprox.protocol.game.incoming.model.locs.OpLocT
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV1
+import net.rsprox.protocol.game.incoming.model.locs.OpLocV2
 import net.rsprox.protocol.game.incoming.model.messaging.MessagePrivate
 import net.rsprox.protocol.game.incoming.model.messaging.MessagePublic
 import net.rsprox.protocol.game.incoming.model.misc.client.*
@@ -32,15 +33,18 @@ import net.rsprox.protocol.game.incoming.model.misc.user.SetChatFilterSettings
 import net.rsprox.protocol.game.incoming.model.misc.user.SetHeading
 import net.rsprox.protocol.game.incoming.model.misc.user.Teleport
 import net.rsprox.protocol.game.incoming.model.misc.user.UpdatePlayerModelV1
-import net.rsprox.protocol.game.incoming.model.npcs.OpNpc
 import net.rsprox.protocol.game.incoming.model.npcs.OpNpc6
 import net.rsprox.protocol.game.incoming.model.npcs.OpNpcT
-import net.rsprox.protocol.game.incoming.model.objs.OpObj
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV1
+import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV2
 import net.rsprox.protocol.game.incoming.model.objs.OpObj6
 import net.rsprox.protocol.game.incoming.model.objs.OpObjT
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV1
+import net.rsprox.protocol.game.incoming.model.objs.OpObjV2
 import net.rsprox.protocol.game.incoming.model.players.OpPlayer
 import net.rsprox.protocol.game.incoming.model.players.OpPlayerT
 import net.rsprox.protocol.game.incoming.model.resumed.ResumePCountDialog
+import net.rsprox.protocol.game.incoming.model.resumed.ResumePCountDialogLong
 import net.rsprox.protocol.game.incoming.model.resumed.ResumePNameDialog
 import net.rsprox.protocol.game.incoming.model.resumed.ResumePObjDialog
 import net.rsprox.protocol.game.incoming.model.resumed.ResumePStringDialog
@@ -71,6 +75,7 @@ import net.rsprox.shared.property.filteredNamedEnum
 import net.rsprox.shared.property.filteredScriptVarType
 import net.rsprox.shared.property.filteredString
 import net.rsprox.shared.property.formattedInt
+import net.rsprox.shared.property.formattedLong
 import net.rsprox.shared.property.group
 import net.rsprox.shared.property.identifiedMultinpc
 import net.rsprox.shared.property.identifiedNpc
@@ -408,13 +413,21 @@ public open class TextClientPacketTranscriber(
         root.int("rank", message.rank)
     }
 
-    override fun opLoc(message: OpLoc) {
+    override fun opLocV1(message: OpLocV1) {
         if (!filters[PropertyFilter.OPLOC]) return omit()
         root.scriptVarType("id", ScriptVarType.LOC, message.id)
         root.coordGrid(sessionState.level(), message.x, message.z)
         root.filteredBoolean("ctrl", message.controlKey)
     }
 
+    override fun opLocV2(message: OpLocV2) {
+        if (!filters[PropertyFilter.OPLOC]) return omit()
+        root.scriptVarType("id", ScriptVarType.LOC, message.id)
+        root.coordGrid(sessionState.level(), message.x, message.z)
+        root.filteredBoolean("ctrl", message.controlKey)
+        root.filteredInt("subop", message.subop, 0)
+    }
+
     override fun opLoc6(message: OpLoc6) {
         if (!filters[PropertyFilter.OPLOC]) return omit()
         root.scriptVarType("id", ScriptVarType.LOC, message.id)
@@ -775,10 +788,17 @@ public open class TextClientPacketTranscriber(
         root.string("colours", message.getColoursByteArray().contentToString())
     }
 
-    override fun opNpc(message: OpNpc) {
+    override fun opNpcV1(message: OpNpcV1) {
+        if (!filters[PropertyFilter.OPNPC]) return omit()
+        root.npc(message.index)
+        root.filteredBoolean("ctrl", message.controlKey)
+    }
+
+    override fun opNpcV2(message: OpNpcV2) {
         if (!filters[PropertyFilter.OPNPC]) return omit()
         root.npc(message.index)
         root.filteredBoolean("ctrl", message.controlKey)
+        root.filteredInt("subop", message.subop, 0)
     }
 
     override fun opNpc6(message: OpNpc6) {
@@ -795,11 +815,19 @@ public open class TextClientPacketTranscriber(
         root.filteredScriptVarType("obj", ScriptVarType.OBJ, message.selectedObj, -1)
     }
 
-    override fun opObj(message: OpObj) {
+    override fun opObjV1(message: OpObjV1) {
+        if (!filters[PropertyFilter.OPOBJ]) return omit()
+        root.scriptVarType("id", ScriptVarType.OBJ, message.id)
+        root.coordGrid(sessionState.level(), message.x, message.z)
+        root.filteredBoolean("ctrl", message.controlKey)
+    }
+
+    override fun opObjV2(message: OpObjV2) {
         if (!filters[PropertyFilter.OPOBJ]) return omit()
         root.scriptVarType("id", ScriptVarType.OBJ, message.id)
         root.coordGrid(sessionState.level(), message.x, message.z)
         root.filteredBoolean("ctrl", message.controlKey)
+        root.filteredInt("subop", message.subop, 0)
     }
 
     override fun opObj6(message: OpObj6) {
@@ -864,6 +892,11 @@ public open class TextClientPacketTranscriber(
         root.formattedInt("count", message.count)
     }
 
+    override fun resumePCountDialogLong(message: ResumePCountDialogLong) {
+        if (!filters[PropertyFilter.RESUME_P_COUNTDIALOG]) return omit()
+        root.formattedLong("count", message.count)
+    }
+
     override fun resumePNameDialog(message: ResumePNameDialog) {
         if (!filters[PropertyFilter.RESUME_P_NAMEDIALOG]) return omit()
         root.string("name", message.name)
diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextNpcInfoTranscriber.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextNpcInfoTranscriber.kt
index a0b48e73f..99ee9a233 100644
--- a/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextNpcInfoTranscriber.kt
+++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextNpcInfoTranscriber.kt
@@ -21,7 +21,9 @@ import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.ExactMov
 import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.ExtendedInfo
 import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.FaceAngleExtendedInfo
 import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.FacePathingEntityExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.HeadbarExtendedInfo
 import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.HitExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.HitmarkExtendedInfo
 import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SayExtendedInfo
 import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SequenceExtendedInfo
 import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SpotanimExtendedInfo
@@ -327,6 +329,16 @@ public class TextNpcInfoTranscriber(
                         hits(npc, info)
                     }
                 }
+                is HitmarkExtendedInfo -> {
+                    if (filters[PropertyFilter.NPC_HITS]) {
+                        hitmarks(npc, info)
+                    }
+                }
+                is HeadbarExtendedInfo -> {
+                    if (filters[PropertyFilter.NPC_HITS]) {
+                        headbars(npc, info)
+                    }
+                }
                 is SayExtendedInfo -> {
                     if (filters[PropertyFilter.NPC_SAY]) {
                         group("SAY") {
@@ -519,6 +531,56 @@ public class TextNpcInfoTranscriber(
         }
     }
 
+    private fun Property.hitmarks(
+        npc: Npc,
+        info: HitmarkExtendedInfo,
+    ) {
+        for (hit in info.hits) {
+            group("HIT") {
+                if (settings[Setting.NPC_EXT_INFO_INDICATOR]) {
+                    shortNpc(npc.index)
+                }
+                scriptVarType("id", ScriptVarType.HITMARK, hit.type)
+                int("value", hit.value)
+                filteredInt("delay", hit.delay, 0)
+                filteredInt("limit", hit.limit, 4)
+            }
+        }
+    }
+
+    private fun Property.headbars(
+        npc: Npc,
+        info: HeadbarExtendedInfo,
+    ) {
+        for (headbar in info.headbars) {
+            group("HEADBAR") {
+                if (settings[Setting.NPC_EXT_INFO_INDICATOR]) {
+                    shortNpc(npc.index)
+                }
+                scriptVarType("id", ScriptVarType.HEADBAR, headbar.type)
+                if (headbar.startFill == -1 &&
+                    headbar.endFill == -1 &&
+                    headbar.startTime == -1 &&
+                    headbar.endTime == -1
+                ) {
+                    boolean("removed", true)
+                } else {
+                    val logTime = headbar.startTime != 0 || headbar.endTime != 0
+                    if (headbar.startFill == headbar.endFill && !logTime) {
+                        int("fill", headbar.startFill)
+                    } else {
+                        int("startfill", headbar.startFill)
+                        int("endfill", headbar.endFill)
+                    }
+                    if (logTime) {
+                        int("starttime", headbar.startTime)
+                        int("endtime", headbar.endTime)
+                    }
+                }
+            }
+        }
+    }
+
     private fun Property.say(
         npc: Npc,
         info: SayExtendedInfo,
diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextPlayerInfoTranscriber.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextPlayerInfoTranscriber.kt
index cf443c038..c2afe9d82 100644
--- a/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextPlayerInfoTranscriber.kt
+++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextPlayerInfoTranscriber.kt
@@ -13,7 +13,9 @@ import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.ExactMov
 import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.ExtendedInfo
 import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.FaceAngleExtendedInfo
 import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.FacePathingEntityExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.HeadbarExtendedInfo
 import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.HitExtendedInfo
+import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.HitmarkExtendedInfo
 import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SayExtendedInfo
 import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SequenceExtendedInfo
 import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SpotanimExtendedInfo
@@ -327,6 +329,16 @@ public class TextPlayerInfoTranscriber(
                         appendHitExtendedInfo(player, info)
                     }
                 }
+                is HitmarkExtendedInfo -> {
+                    if (filters[PropertyFilter.PLAYER_HITS]) {
+                        appendHitmarkExtendedInfo(player, info)
+                    }
+                }
+                is HeadbarExtendedInfo -> {
+                    if (filters[PropertyFilter.PLAYER_HITS]) {
+                        appendHeadbarExtendedInfo(player, info)
+                    }
+                }
                 is TintingExtendedInfo -> {
                     if (filters[PropertyFilter.PLAYER_TINTING]) {
                         group("TINTING") {
@@ -528,6 +540,56 @@ public class TextPlayerInfoTranscriber(
         }
     }
 
+    private fun Property.appendHitmarkExtendedInfo(
+        player: Player,
+        info: HitmarkExtendedInfo,
+    ) {
+        for (hit in info.hits) {
+            group("HIT") {
+                if (settings[Setting.PLAYER_EXT_INFO_INLINE]) {
+                    shortPlayer(player.index)
+                }
+                scriptVarType("id", ScriptVarType.HITMARK, hit.type)
+                int("value", hit.value)
+                filteredInt("delay", hit.delay, 0)
+                filteredInt("limit", hit.limit, 4)
+            }
+        }
+    }
+
+    private fun Property.appendHeadbarExtendedInfo(
+        player: Player,
+        info: HeadbarExtendedInfo,
+    ) {
+        for (headbar in info.headbars) {
+            group("HEADBAR") {
+                if (settings[Setting.PLAYER_EXT_INFO_INLINE]) {
+                    shortPlayer(player.index)
+                }
+                scriptVarType("id", ScriptVarType.HEADBAR, headbar.type)
+                if (headbar.startFill == -1 &&
+                    headbar.endFill == -1 &&
+                    headbar.startTime == -1 &&
+                    headbar.endTime == -1
+                ) {
+                    boolean("removed", true)
+                } else {
+                    val logTime = headbar.startTime != 0 || headbar.endTime != 0
+                    if (headbar.startFill == headbar.endFill && !logTime) {
+                        int("fill", headbar.startFill)
+                    } else {
+                        int("startfill", headbar.startFill)
+                        int("endfill", headbar.endFill)
+                    }
+                    if (logTime) {
+                        int("starttime", headbar.startTime)
+                        int("endtime", headbar.endTime)
+                    }
+                }
+            }
+        }
+    }
+
     private fun Property.appendTintingExtendedInfo(
         player: Player,
         info: TintingExtendedInfo,
diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextServerPacketTranscriber.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextServerPacketTranscriber.kt
index 59805a0ef..7d499d52b 100644
--- a/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextServerPacketTranscriber.kt
+++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextServerPacketTranscriber.kt
@@ -1380,7 +1380,13 @@ public class TextServerPacketTranscriber(
         root.boolean("hide", message.hidden)
     }
 
-    override fun ifSetModel(message: IfSetModel) {
+    override fun ifSetModelV1(message: IfSetModelV1) {
+        if (!filters[PropertyFilter.IF_SETMODEL]) return omit()
+        root.com(message.interfaceId, message.componentId)
+        root.scriptVarType("id", ScriptVarType.MODEL, message.model)
+    }
+
+    override fun ifSetModelV2(message: IfSetModelV2) {
         if (!filters[PropertyFilter.IF_SETMODEL]) return omit()
         root.com(message.interfaceId, message.componentId)
         root.scriptVarType("id", ScriptVarType.MODEL, message.model)
@@ -1583,7 +1589,7 @@ public class TextServerPacketTranscriber(
         root.coordGrid("localplayercoord", message.playerInfoInitBlock.localPlayerCoord)
     }
 
-    override fun rebuildLogin(message: RebuildLogin) {
+    override fun rebuildLoginV1(message: RebuildLoginV1) {
         if (!filters[PropertyFilter.REBUILD]) return omit()
         root.int("zonex", message.zoneX)
         root.int("zonez", message.zoneZ)
@@ -1611,7 +1617,15 @@ public class TextServerPacketTranscriber(
         }
     }
 
-    override fun rebuildNormal(message: RebuildNormal) {
+    override fun rebuildLoginV2(message: RebuildLoginV2) {
+        if (!filters[PropertyFilter.REBUILD]) return omit()
+        root.int("zonex", message.zoneX)
+        root.int("zonez", message.zoneZ)
+        root.int("worldarea", message.worldArea)
+        root.coordGrid("localplayercoord", message.playerInfoInitBlock.localPlayerCoord)
+    }
+
+    override fun rebuildNormalV1(message: RebuildNormalV1) {
         if (!filters[PropertyFilter.REBUILD]) return omit()
         root.int("zonex", message.zoneX)
         root.int("zonez", message.zoneZ)
@@ -1638,7 +1652,14 @@ public class TextServerPacketTranscriber(
         }
     }
 
-    override fun rebuildRegion(message: RebuildRegion) {
+    override fun rebuildNormalV2(message: RebuildNormalV2) {
+        if (!filters[PropertyFilter.REBUILD]) return omit()
+        root.int("zonex", message.zoneX)
+        root.int("zonez", message.zoneZ)
+        root.int("worldarea", message.worldArea)
+    }
+
+    override fun rebuildRegionV1(message: RebuildRegionV1) {
         if (!filters[PropertyFilter.REBUILD]) return omit()
         root.int("zonex", message.zoneX)
         root.int("zonez", message.zoneZ)
@@ -1716,6 +1737,57 @@ public class TextServerPacketTranscriber(
         }
     }
 
+    override fun rebuildRegionV2(message: RebuildRegionV2) {
+        if (!filters[PropertyFilter.REBUILD]) return omit()
+        root.int("zonex", message.zoneX)
+        root.int("zonez", message.zoneZ)
+        root.boolean("reload", message.reload)
+        root.group("BUILD_AREA") {
+            val startZoneX = message.zoneX - 6
+            val startZoneZ = message.zoneZ - 6
+            val simpleBlock = message.buildArea.calculateSimpleBlockOrNull()
+            if (simpleBlock != null) {
+                group {
+                    val sw = message.buildArea[simpleBlock.minLevel, simpleBlock.minX, simpleBlock.minZ]
+                    val ne = message.buildArea[simpleBlock.maxLevel, simpleBlock.maxX, simpleBlock.maxZ]
+                    zoneCoord("minsource", sw.level, sw.zoneX, sw.zoneZ)
+                    zoneCoord("maxsource", ne.level, ne.zoneX, ne.zoneZ)
+                    zoneCoord(
+                        "mindest",
+                        simpleBlock.minLevel,
+                        simpleBlock.minX + startZoneX,
+                        simpleBlock.minZ + startZoneZ,
+                    )
+                    zoneCoord(
+                        "maxdest",
+                        simpleBlock.maxLevel,
+                        simpleBlock.maxX + startZoneX,
+                        simpleBlock.maxZ + startZoneZ,
+                    )
+                    // Always consistent rotation 0 here
+                    int("rotation", sw.rotation)
+                    filteredInt("firstbit", sw.packed and 0x1, 0)
+                }
+            } else {
+                for (level in 0..<4) {
+                    for (zoneX in startZoneX..(message.zoneX + 6)) {
+                        for (zoneZ in startZoneZ..(message.zoneZ + 6)) {
+                            val block = message.buildArea[level, zoneX - startZoneX, zoneZ - startZoneZ]
+                            // Invalid zone
+                            if (block.mapsquareId == 32767) continue
+                            group {
+                                zoneCoord("source", block.level, block.zoneX, block.zoneZ)
+                                zoneCoord("dest", level, zoneX, zoneZ)
+                                int("rotation", block.rotation)
+                                filteredInt("firstbit", block.packed and 0x1, 0)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     private fun rebuildWorldEntity(
         index: Int,
         baseX: Int,
@@ -1789,18 +1861,20 @@ public class TextServerPacketTranscriber(
                 }
             }
         }
-        val iterator = keys.listIterator()
-        root.group("KEYS") {
-            for (mapsquareId in mapsquares) {
-                val key = iterator.next()
-                group {
-                    int("mapsquareid", mapsquareId)
-                    any("key", key.key.contentToString())
+        if (keys.isNotEmpty()) {
+            val iterator = keys.listIterator()
+            root.group("KEYS") {
+                for (mapsquareId in mapsquares) {
+                    val key = iterator.next()
+                    group {
+                        int("mapsquareid", mapsquareId)
+                        any("key", key.key.contentToString())
+                    }
                 }
             }
-        }
-        check(!iterator.hasNext()) {
-            "Xtea keys leftover"
+            check(!iterator.hasNext()) {
+                "Xtea keys leftover"
+            }
         }
     }
 
@@ -1843,6 +1917,19 @@ public class TextServerPacketTranscriber(
         )
     }
 
+    override fun rebuildWorldEntityV4(message: RebuildWorldEntityV4) {
+        rebuildWorldEntity(
+            sessionState.getActiveWorld().index,
+            message.baseX,
+            message.baseZ,
+            sessionState.getActiveWorld().sizeX,
+            sessionState.getActiveWorld().sizeZ,
+            message.buildArea,
+            emptyList(),
+            null,
+        )
+    }
+
     override fun hideLocOps(message: HideLocOps) {
         if (!filters[PropertyFilter.HIDEOPS]) return omit()
         root.boolean("hide", message.hidden)