chore: make spawn-delay configurable & other misc

Author: Boy0000

geary-papermc-spawning/src/main/kotlin/com/mineinabyss/geary/papermc/spawning/SpawningFeature.kt

@@ -94,6 +94,7 @@ class SpawningFeature(context: FeatureContext) : Feature(context) {
         val spawnChooser = SpawnChooser(wg, caps)
         val mobSpawner = MobSpawner(spawnChooser, LocationSpread(triesForNearbyLoc = 10))
         val task = SpawnTask(
+            spawnDelay = config.spawnDelay,
             runTimes = config.runTimes,
             locationChooser = SpawnLocationChooser(config.range),
             spawnAttempts = config.maxSpawnAttemptsPerPlayer,

geary-papermc-spawning/src/main/kotlin/com/mineinabyss/geary/papermc/spawning/choosing/SpawnLocationChooser.kt

@@ -38,11 +38,11 @@ class SpawnLocationChooser(
         val highestY = newLoc.world.getHighestBlockAt(newLoc).y.toDouble() + 1
         if (abs(highestY - newLoc.y) <= range) return newLoc.apply { y = highestY }
         if (!newLoc.block.isPassable) return newLoc
-        (newLoc.y.toInt() downTo newLoc.y.toInt() - range)
-            .forEach {
-                newLoc.y = it.toDouble()
-                if (!newLoc.block.isPassable) return newLoc.up(1)
-            }
+
+        (newLoc.y.toInt() downTo newLoc.y.toInt() - range).forEach {
+            newLoc.y = it.toDouble()
+            if (!newLoc.block.isPassable) return newLoc.up(1)
+        }
         return location
     }
 

geary-papermc-spawning/src/main/kotlin/com/mineinabyss/geary/papermc/spawning/config/SpawnConfig.kt

@@ -3,6 +3,7 @@ package com.mineinabyss.geary.papermc.spawning.config
 import com.charleskorn.kaml.YamlComment
 import com.mineinabyss.geary.papermc.spawning.components.SpawnCategory
 import com.mineinabyss.idofront.serialization.DurationSerializer
+import com.mineinabyss.idofront.time.ticks
 import kotlinx.serialization.Serializable
 import kotlin.time.Duration
 
@@ -22,6 +23,8 @@ data class SpawnConfig(
     ),
     @YamlComment("Options about the spawn range of mobs around each player")
     val range: Range = Range(),
+    @YamlComment("The delay between each spawning-task run")
+    val spawnDelay: @Serializable(DurationSerializer::class) Duration = 1.ticks,
     @YamlComment("How often should each spawn category, attempt spawns. The higher a value, the more time between spawn attempts.")
     val runTimes: Map<SpawnPosition, @Serializable(with = DurationSerializer::class) Duration> = mapOf(),
     @YamlComment("How many times to try and find a valid spawn position around a player before giving up.")

geary-papermc-spawning/src/main/kotlin/com/mineinabyss/geary/papermc/spawning/tasks/SpawnTask.kt

@@ -14,6 +14,7 @@ import org.bukkit.GameMode.SPECTATOR
 import kotlin.time.Duration
 
 class SpawnTask(
+    val spawnDelay: Duration,
     val runTimes: Map<SpawnPosition, Duration>,
     val locationChooser: SpawnLocationChooser,
     val spawnAttempts: Int,
@@ -26,15 +27,15 @@ class SpawnTask(
             }.onFailure {
                 gearyPaper.logger.d { it.stackTraceToString() }
             }
-            delay(1.ticks)
+            delay(spawnDelay)
         }
     }
 
     fun run() {
         val currTick = Bukkit.getCurrentTick()
-        val allowedSpawnPositions: List<SpawnPosition> = SpawnPosition.entries
+        val allowedSpawnPositions = SpawnPosition.entries
             .filter { currTick % runTimes.getOrDefault(it, 1.ticks).inWholeTicks == 0L }
-            .takeUnless { it.isEmpty() } ?: return
+            .ifEmpty { return }
         val onlinePlayers = Bukkit.getOnlinePlayers().filter { !it.isDead && it.gameMode != SPECTATOR }
 
         onlinePlayers.forEach { player ->
@@ -43,8 +44,8 @@ class SpawnTask(
                 if (attemptedPositions.isEmpty()) return@forEach
                 val spawnLoc = locationChooser.chooseSpawnLocationNear(onlinePlayers, player.location) ?: return@repeat
                 val type = SpawnPositionReader.spawnPositionFor(spawnLoc)
-                if (type in allowedSpawnPositions) {
-                    attemptedPositions.remove(type)
+
+                if (attemptedPositions.remove(type)) {
                     mobSpawner.attemptSpawnAt(spawnLoc, type)
                 }
             }