From f3ea8e71fef1d30b131867a1ed4960f8c23157b6 Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.org>
Date: Wed, 13 Jan 2021 19:02:29 +0000
Subject: [PATCH] Rename version to build

Signed-off-by: Graham <gpe@openrs2.org>
---
 .../org/openrs2/archive/cache/Js5ChannelHandler.kt   | 12 ++++++------
 .../protocol/login/InitJs5RemoteConnectionCodec.kt   |  6 +++---
 .../org/openrs2/protocol/login/LoginRequest.kt       |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/archive/src/main/kotlin/org/openrs2/archive/cache/Js5ChannelHandler.kt b/archive/src/main/kotlin/org/openrs2/archive/cache/Js5ChannelHandler.kt
index 27f2284e2e..5b46faf1c3 100644
--- a/archive/src/main/kotlin/org/openrs2/archive/cache/Js5ChannelHandler.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/cache/Js5ChannelHandler.kt
@@ -32,13 +32,13 @@ public class Js5ChannelHandler(
     private val gameId: Int,
     private val hostname: String,
     private val port: Int,
-    private var version: Int,
+    private var build: Int,
     private val continuation: Continuation<Unit>,
     private val importer: CacheImporter,
     private val maxInFlightRequests: Int = 200,
-    maxVersionAttempts: Int = 10
+    maxBuildAttempts: Int = 10
 ) : SimpleChannelInboundHandler<Any>(Object::class.java) {
-    private val maxVersion = version + maxVersionAttempts
+    private val maxBuild = build + maxBuildAttempts
     private val inFlightRequests = mutableSetOf<Js5Request.Group>()
     private val pendingRequests = ArrayDeque<Js5Request.Group>()
     private var masterIndex: Js5MasterIndex? = null
@@ -46,7 +46,7 @@ public class Js5ChannelHandler(
     private val groups = mutableListOf<CacheImporter.Group>()
 
     override fun channelActive(ctx: ChannelHandlerContext) {
-        ctx.writeAndFlush(LoginRequest.InitJs5RemoteConnection(version), ctx.voidPromise())
+        ctx.writeAndFlush(LoginRequest.InitJs5RemoteConnection(build), ctx.voidPromise())
         ctx.read()
     }
 
@@ -103,7 +103,7 @@ public class Js5ChannelHandler(
     }
 
     private fun handleClientOutOfDate(ctx: ChannelHandlerContext) {
-        if (++version > maxVersion) {
+        if (++build > maxBuild) {
             throw Exception("Failed to identify current version")
         }
 
@@ -156,7 +156,7 @@ public class Js5ChannelHandler(
             Js5MasterIndex.read(uncompressed)
         }
 
-        val rawIndexes = runBlocking { importer.importMasterIndexAndGetIndexes(masterIndex!!, buf, gameId, version) }
+        val rawIndexes = runBlocking { importer.importMasterIndexAndGetIndexes(masterIndex!!, buf, gameId, build) }
         try {
             indexes = arrayOfNulls(rawIndexes.size)
 
diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/InitJs5RemoteConnectionCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/InitJs5RemoteConnectionCodec.kt
index 7aec2c7196..24da7fb572 100644
--- a/protocol/src/main/kotlin/org/openrs2/protocol/login/InitJs5RemoteConnectionCodec.kt
+++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/InitJs5RemoteConnectionCodec.kt
@@ -9,11 +9,11 @@ public object InitJs5RemoteConnectionCodec : PacketCodec<LoginRequest.InitJs5Rem
     length = 4
 ) {
     override fun decode(input: ByteBuf): LoginRequest.InitJs5RemoteConnection {
-        val version = input.readInt()
-        return LoginRequest.InitJs5RemoteConnection(version)
+        val build = input.readInt()
+        return LoginRequest.InitJs5RemoteConnection(build)
     }
 
     override fun encode(input: LoginRequest.InitJs5RemoteConnection, output: ByteBuf) {
-        output.writeInt(input.version)
+        output.writeInt(input.build)
     }
 }
diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/LoginRequest.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/LoginRequest.kt
index 15461d4d58..30cf19ddf4 100644
--- a/protocol/src/main/kotlin/org/openrs2/protocol/login/LoginRequest.kt
+++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/LoginRequest.kt
@@ -3,5 +3,5 @@ package org.openrs2.protocol.login
 import org.openrs2.protocol.Packet
 
 public sealed class LoginRequest : Packet {
-    public data class InitJs5RemoteConnection(public val version: Int) : LoginRequest()
+    public data class InitJs5RemoteConnection(public val build: Int) : LoginRequest()
 }