Fix kotlin compile warnings

GregHib · Feb 10, 2024 · d812621 · d812621
1 parent 198abe9
commit d812621
Show file tree

Hide file tree

Showing 62 changed files with 143 additions and 98 deletions.
diff --git a/cache/src/main/kotlin/world/gregs/voidps/cache/compress/BZIP2Compressor.kt b/cache/src/main/kotlin/world/gregs/voidps/cache/compress/BZIP2Compressor.kt
@@ -68,10 +68,10 @@ internal class BZIP2Compressor {
      * Decompress a BZIP2 block entry.
      */
     private fun decompress() {
-        var i = 0
-        var intArray1 = IntArray(0)
-        var intArray2 = IntArray(0)
-        var intArray3 = IntArray(0)
+        var i: Int
+        var intArray1: IntArray
+        var intArray2: IntArray
+        var intArray3: IntArray
         var bool28 = true
         while (bool28) {
             var i29 = method152(8)
@@ -113,9 +113,9 @@ internal class BZIP2Compressor {
                 }
             }
             var anInt3073 = 0
-            for (i in 0..255) {
-                if (aBooleanArray3103[i]) {
-                    aByteArray3107[anInt3073] = i.toByte()
+            for (j in 0..255) {
+                if (aBooleanArray3103[j]) {
+                    aByteArray3107[anInt3073] = j.toByte()
                     anInt3073++
                 }
             }
@@ -187,7 +187,7 @@ internal class BZIP2Compressor {
             }
             val i52 = anInt3073 + 1
             var i53 = 0
-            var i54 = 0
+            var i54: Int
             for (i55 in 0..255) {
                 anIntArray3075[i55] = 0
             }
@@ -231,11 +231,11 @@ internal class BZIP2Compressor {
                         if (i54 == 0) {
                             i53++
                             i54 = 50
-                            val index = aByteArray3076[i53]
-                            i = anIntArray3090[index.toInt()]
-                            intArray1 = anIntArrayArray3095[index.toInt()]
-                            intArray3 = anIntArrayArray3099[index.toInt()]
-                            intArray2 = anIntArrayArray3082[index.toInt()]
+                            val index2 = aByteArray3076[i53]
+                            i = anIntArray3090[index2.toInt()]
+                            intArray1 = anIntArrayArray3095[index2.toInt()]
+                            intArray3 = anIntArrayArray3099[index2.toInt()]
+                            intArray2 = anIntArrayArray3082[index2.toInt()]
                         }
                         i54--
                         i61 = i

diff --git a/cache/src/main/kotlin/world/gregs/voidps/cache/definition/decoder/ClientScriptDecoder.kt b/cache/src/main/kotlin/world/gregs/voidps/cache/definition/decoder/ClientScriptDecoder.kt
@@ -37,8 +37,8 @@ class ClientScriptDecoder(private val revision667: Boolean = false) : Definition
 
     override fun ClientScriptDefinition.read(opcode: Int, buffer: Reader) {
         buffer.position(buffer.length - 2)
-        val i = buffer.readShort()
-        val length: Int = buffer.length - 2 - i - (if (revision667) 16 else 12)
+        val offset = buffer.readShort()
+        val length: Int = buffer.length - 2 - offset - (if (revision667) 16 else 12)
         buffer.position(length)
         val instructionCount = buffer.readInt()
         intVariableCount = buffer.readShort()

diff --git a/cache/src/main/kotlin/world/gregs/voidps/cache/definition/encoder/InterfaceEncoder.kt b/cache/src/main/kotlin/world/gregs/voidps/cache/definition/encoder/InterfaceEncoder.kt
@@ -28,11 +28,11 @@ class InterfaceEncoder : DefinitionEncoder<InterfaceComponentDefinitionFull> {
         writeByte(definition.verticalPositionMode.toInt())
         writeShort(definition.parent)
 
-        var flag = 0
+        var hiddenFlag = 0
         if (definition.hidden) {
-            flag = flag or 0x1
+            hiddenFlag = hiddenFlag or 0x1
         }
-        writeByte(flag)
+        writeByte(hiddenFlag)
 
         when (definition.type) {
             0 -> {
@@ -58,14 +58,14 @@ class InterfaceEncoder : DefinitionEncoder<InterfaceComponentDefinitionFull> {
             5 -> {
                 writeInt(definition.defaultImage)
                 writeShort(definition.imageRotation)
-                var flag = 0
+                var imageFlag = 0
                 if (definition.aBoolean4861) {
-                    flag = flag or 0x1
+                    imageFlag = imageFlag or 0x1
                 }
                 if (definition.imageRepeat) {
-                    flag = flag or 0x2
+                    imageFlag = imageFlag or 0x2
                 }
-                writeByte(flag)
+                writeByte(imageFlag)
                 writeByte(definition.alpha)
                 writeByte(definition.rotation)
                 writeInt(definition.backgroundColour)
@@ -121,7 +121,7 @@ class InterfaceEncoder : DefinitionEncoder<InterfaceComponentDefinitionFull> {
         }
 
         writeMedium(definition.setting.setting)
-        var startOffset = 0
+        var startOffset: Int
         val keyRepeat = definition.keyRepeats
         val keyCodes = definition.keyCodes
         val keyModifiers = definition.keyModifiers

diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/Contexts.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/Contexts.kt
@@ -1,7 +1,10 @@
 package world.gregs.voidps.engine
 
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.newSingleThreadContext
 
+@OptIn(ExperimentalCoroutinesApi::class, DelicateCoroutinesApi::class)
 object Contexts {
     val Game = newSingleThreadContext("Game loop")
 }
diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/client/instruction/InstructionTask.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/client/instruction/InstructionTask.kt
@@ -1,6 +1,7 @@
 package world.gregs.voidps.engine.client.instruction
 
 import com.github.michaelbull.logging.InlineLogger
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import world.gregs.voidps.engine.data.definition.InterfaceDefinitions
 import world.gregs.voidps.engine.data.definition.ItemDefinitions
 import world.gregs.voidps.engine.data.definition.NPCDefinitions
@@ -35,6 +36,7 @@ class InstructionTask(
         handler
     )
 
+    @OptIn(ExperimentalCoroutinesApi::class)
     override fun run() {
         players.forEach { player ->
             val instructions = player.instructions

diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/client/update/NPCTask.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/client/update/NPCTask.kt
@@ -14,18 +14,18 @@ class NPCTask(
     override val characters: CharacterList<NPC>
 ) : CharacterTask<NPC>(iterator) {
 
-    override fun run(npc: NPC) {
-        val delay = npc.delay
-        if (!npc.hasClock("delay") && delay != null) {
-            npc.delay = null
+    override fun run(character: NPC) {
+        val delay = character.delay
+        if (!character.hasClock("delay") && delay != null) {
+            character.delay = null
             delay.resume(Unit)
         }
-        if (npc.mode == EmptyMode && wanders(npc)) {
-            npc.mode = Wander(npc)
+        if (character.mode == EmptyMode && wanders(character)) {
+            character.mode = Wander(character)
         }
-        npc.softTimers.run()
-        npc.queue.tick()
-        npc.mode.tick()
-        checkTileFacing(npc)
+        character.softTimers.run()
+        character.queue.tick()
+        character.mode.tick()
+        checkTileFacing(character)
     }
 }
diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/client/update/PlayerTask.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/client/update/PlayerTask.kt
@@ -12,18 +12,18 @@ class PlayerTask(
     override val characters: CharacterList<Player>
 ) : CharacterTask<Player>(iterator) {
 
-    override fun run(player: Player) {
-        val delay = player.delay
-        if (!player.hasClock("delay") && delay != null) {
-            player.delay = null
+    override fun run(character: Player) {
+        val delay = character.delay
+        if (!character.hasClock("delay") && delay != null) {
+            character.delay = null
             delay.resume(Unit)
         }
-        player.queue.tick()
-        if (!player.hasClock("delay") && !player.hasMenuOpen()) {
-            player.timers.run()
+        character.queue.tick()
+        if (!character.hasClock("delay") && !character.hasMenuOpen()) {
+            character.timers.run()
         }
-        player.softTimers.run()
-        player.mode.tick()
-        checkTileFacing(player)
+        character.softTimers.run()
+        character.mode.tick()
+        checkTileFacing(character)
     }
 }
diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/data/definition/AreaDefinition.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/data/definition/AreaDefinition.kt
@@ -14,6 +14,7 @@ data class AreaDefinition(
     companion object {
         val EMPTY = AreaDefinition("", Rectangle(0, 0, 0, 0), emptySet())
 
+        @Suppress("UNCHECKED_CAST")
         fun fromMap(name: String, map: MutableMap<String, Any>): AreaDefinition {
             return AreaDefinition(
                 name = name,

diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/data/definition/data/Smelting.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/data/definition/data/Smelting.kt
@@ -14,6 +14,7 @@ data class Smelting(
     val message: String = ""
 ) {
     companion object {
+        @Suppress("UNCHECKED_CAST")
         operator fun invoke(map: Map<String, Any>) = Smelting(
             level = map["level"] as Int,
             xp = map["xp"] as Double,

diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/queue/ActionQueue.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/queue/ActionQueue.kt
@@ -65,8 +65,8 @@ class ActionQueue(private val character: Character) : CoroutineScope {
         }
     }
 
-    fun clear(name: String) {
-        val removed = queue.removeIf {
+    fun clear(name: String): Boolean {
+        return queue.removeIf {
             it.name == name
         }
     }

diff --git a/engine/src/test/kotlin/world/gregs/voidps/engine/client/variable/VariablesTest.kt b/engine/src/test/kotlin/world/gregs/voidps/engine/client/variable/VariablesTest.kt
@@ -45,8 +45,8 @@ internal class VariablesTest {
         every { player.variables } returns variables
         every { player.events } returns events
         every { definitions.get(key) } returns variable
-        (variables as PlayerVariables).definitions = definitions
-        (variables as PlayerVariables).client = client
+        variables.definitions = definitions
+        variables.client = client
     }
 
     @Test

diff --git a/engine/src/test/kotlin/world/gregs/voidps/engine/entity/character/player/req/RequestTest.kt b/engine/src/test/kotlin/world/gregs/voidps/engine/entity/character/player/req/RequestTest.kt
@@ -21,20 +21,20 @@ internal class RequestTest {
 
     @Test
     fun `Player request`() {
-        val request: (Player, Player) -> Unit = { a, b -> }
+        val request: (Player, Player) -> Unit = { _, _ -> }
         assertTrue(player.request(player2, "trade", request))
     }
 
     @Test
     fun `Has player requested`() {
-        val request: (Player, Player) -> Unit = { a, b -> }
+        val request: (Player, Player) -> Unit = { _, _ -> }
         player.request(player2, "trade", request)
         assertTrue(player.hasRequest(player2, "trade"))
     }
 
     @Test
     fun `Get request`() {
-        val request: (Player, Player) -> Unit = { a, b -> }
+        val request: (Player, Player) -> Unit = { _, _ -> }
         player.request(player2, "trade", request)
         assertTrue(player.hasRequest(player2, "trade"))
         assertFalse(player.hasRequest(player3, "trade"))
@@ -43,7 +43,7 @@ internal class RequestTest {
 
     @Test
     fun `Remove request`() {
-        val request: (Player, Player) -> Unit = { a, b -> }
+        val request: (Player, Player) -> Unit = { _, _ -> }
         player.request(player2, "trade", request)
         player.removeRequest(player2, "trade")
         assertFalse(player.hasRequest(player3, "trade"))

diff --git a/engine/src/test/kotlin/world/gregs/voidps/engine/event/EventsTest.kt b/engine/src/test/kotlin/world/gregs/voidps/engine/event/EventsTest.kt
@@ -8,6 +8,7 @@ import kotlin.test.assertTrue
 internal class EventsTest {
 
     @Test
+    @Suppress("UNCHECKED_CAST")
     fun `Cancelled events stops processing`() {
         val events = Events(mockk())
         val event = object : CancellableEvent() {}

diff --git a/game/src/main/kotlin/world/gregs/voidps/bot/WalkingBot.kts b/game/src/main/kotlin/world/gregs/voidps/bot/WalkingBot.kts
@@ -22,7 +22,7 @@ worldSpawn {
         spaces = Int.MAX_VALUE,
         requirements = emptyList()
     )
-//    if (TaskManager.DEBUG) {
-//        tasks.register(task, true)
-//    }
+    if (TaskManager.DEBUG) {
+        tasks.register(task, true)
+    }
 }
diff --git a/game/src/main/kotlin/world/gregs/voidps/bot/navigation/graph/NavigationGraph.kt b/game/src/main/kotlin/world/gregs/voidps/bot/navigation/graph/NavigationGraph.kt
@@ -73,10 +73,10 @@ class NavigationGraph(
                 }
             }
             val data: Map<String, Any> = yaml.load(path, config)
-            val edges = data["edges"] as Map<String, Any>
+            val edgeMap = data["edges"] as Map<String, Any>
             val map = Object2ObjectOpenHashMap<Any, ObjectOpenHashSet<Edge>>()
             var count = 0
-            flatten("", edges) { path, edges ->
+            flatten("", edgeMap) { path, edges ->
                 for (edge in edges) {
                     count++
                     val start = edge["from"] as Tile
@@ -115,6 +115,7 @@ class NavigationGraph(
         }
     }
 
+    @Suppress("UNCHECKED_CAST")
     private fun flatten(path: String, map: Map<String, Any>, process: (String, List<Map<String, Any>>) -> Unit): List<Map<String, Any>> {
         val list = mutableListOf<Map<String, Any>>()
         for ((key, value) in map) {

diff --git a/game/src/main/kotlin/world/gregs/voidps/bot/skill/combat/TrainingBot.kts b/game/src/main/kotlin/world/gregs/voidps/bot/skill/combat/TrainingBot.kts
@@ -45,8 +45,8 @@ worldSpawn {
         val task = Task(
             name = "train ${if (melee) "melee" else skill.name} at ${area.name}".toLowerSpaceCase(),
             block = {
-                val skill = if (melee) melees.filter { player.levels.getMax(it) in range }.random() else skill
-                train(area, skill, range)
+                val actualSkill = if (melee) melees.filter { player.levels.getMax(it) in range }.random() else skill
+                train(area, actualSkill, range)
             },
             area = area.area,
             spaces = if (melee) 3 else 2,

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/activity/transport/Canoes.kts b/game/src/main/kotlin/world/gregs/voidps/world/activity/transport/Canoes.kts
@@ -34,8 +34,8 @@ interfaceOpen("canoe") { player: Player ->
     }
 }
 
-interfaceOpen("canoe_stations_map") { player: Player ->
+interfaceOpen("canoe_stations_map") { _: Player ->
 }
 
-interfaceOpen("canoe_travel") { player: Player ->
+interfaceOpen("canoe_travel") { _: Player ->
 }
diff --git a/game/src/main/kotlin/world/gregs/voidps/world/command/admin/AdminCommands.kts b/game/src/main/kotlin/world/gregs/voidps/world/command/admin/AdminCommands.kts
@@ -1,3 +1,5 @@
+@file:Suppress("UNCHECKED_CAST")
+
 package world.gregs.voidps.world.command.admin
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/entity/death/DeathPlayer.kts b/game/src/main/kotlin/world/gregs/voidps/world/interact/entity/death/DeathPlayer.kts
@@ -1,3 +1,5 @@
+@file:Suppress("OPT_IN_USAGE")
+
 package world.gregs.voidps.world.interact.entity.death
 
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap

diff --git a/...ain/kotlin/world/gregs/voidps/world/interact/entity/player/combat/prayer/PrayerToggle.kts b/...ain/kotlin/world/gregs/voidps/world/interact/entity/player/combat/prayer/PrayerToggle.kts
@@ -1,3 +1,5 @@
+@file:Suppress("UNCHECKED_CAST")
+
 package world.gregs.voidps.world.interact.entity.player.combat.prayer
 
 import net.pearx.kasechange.toSnakeCase

diff --git a/...src/main/kotlin/world/gregs/voidps/world/interact/entity/player/equip/ItemsKeptOnDeath.kt b/...src/main/kotlin/world/gregs/voidps/world/interact/entity/player/equip/ItemsKeptOnDeath.kt
@@ -26,21 +26,21 @@ object ItemsKeptOnDeath {
         if (items.isEmpty()) {
             return emptyList()
         }
-        val items = LinkedList(items)
+        val queue = LinkedList(items)
         val kept = mutableListOf<Item>()
         val alwaysLost = enums.get(616).map!!
         var count = 0
         while (count < save) {
-            val item = items.peek() ?: break
+            val item = queue.peek() ?: break
             if (alwaysLost.getOrDefault(item.def.id, 0) == 1) {
-                items.pop()
+                queue.pop()
                 continue
             }
             if (item.amount == 1) {
-                kept.add(items.pop())
+                kept.add(queue.pop())
             } else if (item.amount > 1) {
-                items.pop()
-                items.addFirst(item.copy(amount = item.amount - 1))
+                queue.pop()
+                queue.addFirst(item.copy(amount = item.amount - 1))
                 kept.add(item.copy(amount = 1))
             }
             count++

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/entity/player/music/MusicUnlock.kt b/game/src/main/kotlin/world/gregs/voidps/world/interact/entity/player/music/MusicUnlock.kt
@@ -6,6 +6,7 @@ import world.gregs.voidps.engine.entity.character.player.Player
 import world.gregs.voidps.engine.get
 
 object MusicUnlock {
+    @Suppress("UNCHECKED_CAST")
     fun unlockTrack(player: Player, trackIndex: Int): Boolean {
         val name = "unlocked_music_${trackIndex / 32}"
         val list = get<VariableDefinitions>().get(name)?.values as? List<Any>