Backend: for each (#1725)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

4 files changed, 15 insertions, 17 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 94dc84efc..f922ce497 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -227,7 +227,7 @@ object HypixelData {
                 val obj: JsonObject = gson.fromJson(group(), JsonObject::class.java)
                 if (obj.has("server")) {
                     locrawData = obj
-                    locraw.keys.forEach { key ->
+                    for (key in locraw.keys) {
                         locraw[key] = obj[key]?.asString ?: ""
                     }
                     inLimbo = locraw["server"] == "limbo"
diff --git a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt b/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
index ccf74aec2..7ff74aeda 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
@@ -77,9 +77,9 @@ enum class Mayor(
         fun Mayor.setAssumeMayor(perks: List<Perk>) {
             perks.forEach { it.isActive = false }
             activePerks.clear()
-            perks.filter { perks.contains(it) }.forEach {
-                it.isActive = true
-                activePerks.add(it)
+            for (perk in perks.filter { perks.contains(it) }) {
+                perk.isActive = true
+                activePerks.add(perk)
             }
         }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt
index a2235608e..b5d31185a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt
@@ -275,11 +275,7 @@ object SackAPI {
         val sacksData = event.readConstant<NeuSacksJson>("sacks").sacks
         val uniqueSackItems = mutableSetOf<NEUInternalName>()
 
-        sacksData.values.forEach { sackInfo ->
-            sackInfo.contents.forEach { content ->
-                uniqueSackItems.add(content)
-            }
-        }
+        sacksData.values.flatMap { it.contents }.forEach { uniqueSackItems.add(it) }
 
         sackListInternalNames = uniqueSackItems.map { it.asString() }.toSet()
         sackListNames = uniqueSackItems.map { it.itemNameWithoutColor.removeNonAscii().trim().uppercase() }.toSet()
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt
index 03f6d64b6..69b0b85a8 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt
@@ -32,17 +32,19 @@ object MobDebug {
 
     private fun Mob.isNotInvisible() = !this.isInvisible() || (config.showInvisible && this == lastRayHit)
 
-    private fun MobData.MobSet.highlight(event: LorenzRenderWorldEvent, color: (Mob) -> (LorenzColor)) =
-        this.filter { it.isNotInvisible() }.forEach {
-            event.drawFilledBoundingBox_nea(it.boundingBox.expandBlock(), color.invoke(it).toColor(), 0.3f)
+    private fun MobData.MobSet.highlight(event: LorenzRenderWorldEvent, color: (Mob) -> (LorenzColor)) {
+        for (mob in filter { it.isNotInvisible() }) {
+            event.drawFilledBoundingBox_nea(mob.boundingBox.expandBlock(), color.invoke(mob).toColor(), 0.3f)
         }
+    }
 
-    private fun MobData.MobSet.showName(event: LorenzRenderWorldEvent) =
-        this.filter { it.canBeSeen() && it.isNotInvisible() }.map { it.boundingBox.getTopCenter() to it.name }.forEach {
-            event.drawString(
-                it.first.add(y = 0.5), "§5" + it.second, seeThroughBlocks = true
-            )
+    private fun MobData.MobSet.showName(event: LorenzRenderWorldEvent) {
+        val map = filter { it.canBeSeen() && it.isNotInvisible() }
+            .map { it.boundingBox.getTopCenter() to it.name }
+        for ((location, text) in map) {
+            event.drawString(location.add(y = 0.5), "§5$text", seeThroughBlocks = true)
         }
+    }
 
     @SubscribeEvent
     fun onWorldRenderDebug(event: LorenzRenderWorldEvent) {