Revision 237

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()

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
         }

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
             }

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,