Revision 240

cache/src/main/kotlin/net/rsprox/cache/clientscript/RSProxArchiveClientScriptIndex.kt

@@ -73,9 +73,10 @@ internal class RSProxArchiveClientScriptIndex(
             "Unsupported clientscript index schema ${index.kind} version ${index.version}"
         }
         require(index.game == OLDSCHOOL_GAME) { "Unexpected clientscript index game: ${index.game}" }
-        require(index.revision == masterIndex.revision) {
-            "Clientscript index revision ${index.revision} does not match cache revision ${masterIndex.revision}"
-        }
+        // Don't allow this check as it breaks during revision transitions.
+        // require(index.revision == masterIndex.revision) {
+        //     "Clientscript index revision ${index.revision} does not match cache revision ${masterIndex.revision}"
+        // }
         require(index.masterIndexSha256.equals(sha256, ignoreCase = true)) {
             "Clientscript index master SHA ${index.masterIndexSha256} does not match $sha256"
         }
@@ -86,9 +87,10 @@ internal class RSProxArchiveClientScriptIndex(
             ClientScriptDefinition(
                 type = definition.type,
                 name = definition.name,
-                arguments = definition.arguments.map { argument ->
-                    ClientScriptArgument(argument.type, argument.name)
-                },
+                arguments =
+                    definition.arguments.map { argument ->
+                        ClientScriptArgument(argument.type, argument.name)
+                    },
                 returnTypes = definition.returnTypes,
             )
         }

protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/info/NpcInfoLargeDecoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoLargeDecoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             true,
             session.getNpcInfoBaseCoord(),
+            4,
         )
     }
 }

protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/info/NpcInfoSmallDecoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoSmallDecoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             false,
             session.getNpcInfoBaseCoord(),
+            4,
         )
     }
 }

protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/model/info/npcinfo/NpcInfoClient.kt

@@ -56,6 +56,7 @@ internal class NpcInfoClient(
         buffer: ByteBuf,
         large: Boolean,
         baseCoord: CoordGrid,
+        version: Int,
     ): NpcInfo {
         deletedNPCCount = 0
         extraUpdateNPCCount = 0

protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/info/NpcInfoLargeDecoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoLargeDecoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             true,
             session.getNpcInfoBaseCoord(),
+            4,
         )
     }
 }

protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/info/NpcInfoSmallDecoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoSmallDecoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             false,
             session.getNpcInfoBaseCoord(),
+            4,
         )
     }
 }

protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/model/info/npcinfo/NpcInfoClient.kt

@@ -56,6 +56,7 @@ internal class NpcInfoClient(
         buffer: ByteBuf,
         large: Boolean,
         baseCoord: CoordGrid,
+        version: Int,
     ): NpcInfo {
         deletedNPCCount = 0
         extraUpdateNPCCount = 0

protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/info/NpcInfoLargeDecoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoLargeDecoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             true,
             session.getNpcInfoBaseCoord(),
+            4,
         )
     }
 }

protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/info/NpcInfoSmallDecoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoSmallDecoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             false,
             session.getNpcInfoBaseCoord(),
+            4,
         )
     }
 }

protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/model/info/npcinfo/NpcInfoClient.kt

@@ -55,6 +55,7 @@ internal class NpcInfoClient(
         buffer: ByteBuf,
         large: Boolean,
         baseCoord: CoordGrid,
+        version: Int,
     ): NpcInfo {
         deletedNPCCount = 0
         extraUpdateNPCCount = 0

protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             true,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             false,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/model/info/npcinfo/NpcInfoClient.kt

@@ -55,6 +55,7 @@ internal class NpcInfoClient(
         buffer: ByteBuf,
         large: Boolean,
         baseCoord: CoordGrid,
+        version: Int,
     ): NpcInfo {
         deletedNPCCount = 0
         extraUpdateNPCCount = 0

protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             true,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             false,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/model/info/npcinfo/NpcInfoClient.kt

@@ -55,6 +55,7 @@ internal class NpcInfoClient(
         buffer: ByteBuf,
         large: Boolean,
         baseCoord: CoordGrid,
+        version: Int,
     ): NpcInfo {
         deletedNPCCount = 0
         extraUpdateNPCCount = 0

protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             true,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             false,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/model/info/npcinfo/NpcInfoClient.kt

@@ -55,6 +55,7 @@ internal class NpcInfoClient(
         buffer: ByteBuf,
         large: Boolean,
         baseCoord: CoordGrid,
+        version: Int,
     ): NpcInfo {
         deletedNPCCount = 0
         extraUpdateNPCCount = 0

protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             true,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             false,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/model/info/npcinfo/NpcInfoClient.kt

@@ -55,6 +55,7 @@ internal class NpcInfoClient(
         buffer: ByteBuf,
         large: Boolean,
         baseCoord: CoordGrid,
+        version: Int,
     ): NpcInfo {
         deletedNPCCount = 0
         extraUpdateNPCCount = 0

protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             true,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             false,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/model/info/npcinfo/NpcInfoClient.kt

@@ -55,6 +55,7 @@ internal class NpcInfoClient(
         buffer: ByteBuf,
         large: Boolean,
         baseCoord: CoordGrid,
+        version: Int,
     ): NpcInfo {
         deletedNPCCount = 0
         extraUpdateNPCCount = 0

protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             true,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             false,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/model/info/npcinfo/NpcInfoClient.kt

@@ -56,6 +56,7 @@ internal class NpcInfoClient(
         buffer: ByteBuf,
         large: Boolean,
         baseCoord: CoordGrid,
+        version: Int,
     ): NpcInfo {
         deletedNPCCount = 0
         extraUpdateNPCCount = 0

protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             true,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             false,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/model/info/npcinfo/NpcInfoClient.kt

@@ -55,6 +55,7 @@ internal class NpcInfoClient(
         buffer: ByteBuf,
         large: Boolean,
         baseCoord: CoordGrid,
+        version: Int,
     ): NpcInfo {
         deletedNPCCount = 0
         extraUpdateNPCCount = 0

protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             true,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             false,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/model/info/npcinfo/NpcInfoClient.kt

@@ -55,6 +55,7 @@ internal class NpcInfoClient(
         buffer: ByteBuf,
         large: Boolean,
         baseCoord: CoordGrid,
+        version: Int,
     ): NpcInfo {
         deletedNPCCount = 0
         extraUpdateNPCCount = 0

protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             true,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             false,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/model/info/npcinfo/NpcInfoClient.kt

@@ -55,6 +55,7 @@ internal class NpcInfoClient(
         buffer: ByteBuf,
         large: Boolean,
         baseCoord: CoordGrid,
+        version: Int,
     ): NpcInfo {
         deletedNPCCount = 0
         extraUpdateNPCCount = 0

protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             true,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             false,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/model/info/npcinfo/NpcInfoClient.kt

@@ -55,6 +55,7 @@ internal class NpcInfoClient(
         buffer: ByteBuf,
         large: Boolean,
         baseCoord: CoordGrid,
+        version: Int,
     ): NpcInfo {
         deletedNPCCount = 0
         extraUpdateNPCCount = 0

protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             true,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             false,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/model/info/npcinfo/NpcInfoClient.kt

@@ -55,6 +55,7 @@ internal class NpcInfoClient(
         buffer: ByteBuf,
         large: Boolean,
         baseCoord: CoordGrid,
+        version: Int,
     ): NpcInfo {
         deletedNPCCount = 0
         extraUpdateNPCCount = 0

protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt

@@ -281,7 +281,8 @@ public class WorldEntityInfoClient : WorldEntityInfoDecoder {
             }
             this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index
             if (opcode == 1) {
-                val extendedInfo = decodeWorldEntityInfoExtendedInfoUnobfuscated(buffer)
+                val flags = buffer.g1()
+                val extendedInfo = decodeWorldEntityInfoExtendedInfoObfuscated(buffer, flags)
                 if (extendedInfo.isEmpty()) {
                     updates[index] = WorldEntityUpdateType.Idle
                 } else {

protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             true,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt

@@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder<NpcInfo> {
             buffer.buffer,
             false,
             session.getNpcInfoBaseCoord(),
+            5,
         )
     }
 }

protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/npcinfo/NpcInfoClient.kt

@@ -57,6 +57,7 @@ internal class NpcInfoClient(
         buffer: ByteBuf,
         large: Boolean,
         baseCoord: CoordGrid,
+        version: Int,
     ): NpcInfo {
         deletedNPCCount = 0
         extraUpdateNPCCount = 0