Backend: for each (#1725)

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

46 files changed, 276 insertions, 289 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
index be947b18c..58882e1f5 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
@@ -33,9 +33,11 @@ object ConfigUpdaterMigrator {
     ) : LorenzEvent() {
 
         init {
-            dynamicPrefix.entries.filter { it.value.isEmpty() }.forEach {
-                logger.log("Dynamic prefix ${it.key} does not resolve to anything.")
-            }
+            dynamicPrefix.entries
+                .filter { it.value.isEmpty() }
+                .forEach {
+                    logger.log("Dynamic prefix ${it.key} does not resolve to anything.")
+                }
         }
 
         fun transform(since: Int, path: String, transform: (JsonElement) -> JsonElement = { it }) {
@@ -91,9 +93,8 @@ object ConfigUpdaterMigrator {
 
     private fun merge(originalObject: JsonObject, overrideObject: JsonObject): Int {
         var count = 0
-        overrideObject.entrySet().forEach {
-            val element = originalObject[it.key]
-            val newElement = it.value
+        for ((key, newElement) in overrideObject.entrySet()) {
+            val element = originalObject[key]
             if (element is JsonObject && newElement is JsonObject) {
                 count += merge(element, newElement)
             } else {
@@ -101,7 +102,7 @@ object ConfigUpdaterMigrator {
                     logger.log("Encountered destructive merge. Erasing $element in favour of $newElement.")
                     count++
                 }
-                originalObject.add(it.key, newElement)
+                originalObject.add(key, newElement)
             }
         }
         return count
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) {
diff --git a/src/main/java/at/hannibal2/skyhanni/events/RenderEntityOutlineEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RenderEntityOutlineEvent.kt
index 85c3211fd..f64dfa27e 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/RenderEntityOutlineEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/RenderEntityOutlineEvent.kt
@@ -4,7 +4,6 @@ import net.minecraft.client.Minecraft
 import net.minecraft.entity.Entity
 import net.minecraft.entity.item.EntityArmorStand
 import net.minecraft.entity.item.EntityItemFrame
-import java.util.function.Consumer
 
 class RenderEntityOutlineEvent(theType: Type?, potentialEntities: HashSet<Entity>?) :
     LorenzEvent() {
@@ -97,11 +96,11 @@ class RenderEntityOutlineEvent(theType: Type?, potentialEntities: HashSet<Entity
         // Only render outlines around non-null entities within the camera frustum
         entitiesToChooseFrom = HashSet(entities.size)
         // Only consider entities that aren't invisible armorstands to increase FPS significantly
-        entities.forEach(Consumer<Entity> { e: Entity? ->
-            if (e != null && !(e is EntityArmorStand && e.isInvisible()) && e !is EntityItemFrame) {
-                entitiesToChooseFrom!!.add(e)
+        for (entity in entities) {
+            if (!(entity is EntityArmorStand && entity.isInvisible()) && entity !is EntityItemFrame) {
+                entitiesToChooseFrom!!.add(entity)
             }
-        })
+        }
         entitiesToOutline = HashMap(entitiesToChooseFrom!!.size)
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
index a3054af48..8632f9d03 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
@@ -328,7 +328,9 @@ object DamageIndicatorManager {
     fun onTick(event: LorenzTickEvent) {
         if (!isEnabled()) return
         data = data.editCopy {
-            EntityUtils.getEntities<EntityLivingBase>().mapNotNull(::checkEntity).forEach { this put it }
+            EntityUtils.getEntities<EntityLivingBase>()
+                .mapNotNull(::checkEntity)
+                .forEach { this put it }
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
index dcc5b01df..2cac59010 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
@@ -171,7 +171,7 @@ object EnderNodeTracker {
         if (!ProfileStorageData.loaded) return emptyMap()
 
         val newProfit = mutableMapOf<EnderNode, Double>()
-        storage.lootCount.forEach { (item, amount) ->
+        for ((item, amount) in storage.lootCount) {
             val price = if (isEnderArmor(item)) {
                 10_000.0
             } else {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt
index 6b96024ed..59b652f66 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt
@@ -205,9 +205,7 @@ object PartyChatCommands {
                 }
             }
         } else {
-            blacklist.forEach {
-                message += "\n§e$it"
-            }
+            blacklist.forEach { message += "\n§e$it" }
         }
         ChatUtils.chat(message)
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/PlayerTabComplete.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/PlayerTabComplete.kt
index e199a47fd..bf4428211 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/PlayerTabComplete.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/PlayerTabComplete.kt
@@ -57,7 +57,8 @@ object PlayerTabComplete {
         return buildList {
 
             if (config.friends && PlayerCategory.FRIENDS !in ignored) {
-                FriendAPI.getAllFriends().filter { it.bestFriend || !config.onlyBestFriends }
+                FriendAPI.getAllFriends()
+                    .filter { it.bestFriend || !config.onlyBestFriends }
                     .forEach { add(it.name) }
             }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/cosmetics/ArrowTrail.kt b/src/main/java/at/hannibal2/skyhanni/features/cosmetics/ArrowTrail.kt
index 0f4d267f7..304ee21f8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/cosmetics/ArrowTrail.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/cosmetics/ArrowTrail.kt
@@ -41,9 +41,9 @@ object ArrowTrail {
         listAllArrow.removeIf { it.deathTime.isInPast() }
         listYourArrow.removeIf { it.deathTime.isInPast() }
 
-        EntityUtils.getEntities<EntityArrow>().forEach {
-            val line = Line(it.getPrevLorenzVec(), it.getLorenzVec(), deathTime)
-            if (it.shootingEntity == Minecraft.getMinecraft().thePlayer) {
+        for (arrow in EntityUtils.getEntities<EntityArrow>()) {
+            val line = Line(arrow.getPrevLorenzVec(), arrow.getLorenzVec(), deathTime)
+            if (arrow.shootingEntity == Minecraft.getMinecraft().thePlayer) {
                 listYourArrow.add(line)
             } else {
                 listAllArrow.add(line)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt
index 801b4f800..ff6c277bb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt
@@ -102,9 +102,7 @@ object CroesusChestTracker {
             pageSetup(event)
 
             if (croesusEmpty) {
-                croesusChests?.forEach {
-                    it.setValuesNull()
-                }
+                croesusChests?.forEach { it.setValuesNull() }
                 return
             }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
index 8b852f1cc..e79abbe7c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
@@ -171,10 +171,10 @@ object DungeonAPI {
                     it.contains(LorenzUtils.getPlayerName())
                 }?.removeColor() ?: ""
 
-            DungeonClass.entries.forEach {
-                if (playerTeam.contains("(${it.scoreboardName} ")) {
+            for (dungeonClass in DungeonClass.entries) {
+                if (playerTeam.contains("(${dungeonClass.scoreboardName} ")) {
                     val level = playerTeam.split(" ").last().trimEnd(')').romanToDecimalIfNecessary()
-                    playerClass = it
+                    playerClass = dungeonClass
                     playerClassLevel = level
                 }
             }
@@ -184,15 +184,14 @@ object DungeonAPI {
     @SubscribeEvent
     fun onTabUpdate(event: TablistFooterUpdateEvent) {
         if (!inDungeon()) return
-        val tabList = event.footer.split("\n")
-        tabList.forEach {
-            if (noBlessingPattern.matches(it)) {
+        for (line in event.footer.split("\n")) {
+            if (noBlessingPattern.matches(line)) {
                 DungeonBlessings.reset()
                 return
             }
-            val matcher = blessingPattern.matcher(it)
+            val matcher = blessingPattern.matcher(line)
             if (matcher.find()) {
-                val type = matcher.group("type") ?: return@forEach
+                val type = matcher.group("type") ?: continue
                 val amount = matcher.group("amount").romanToDecimalIfNecessary()
                 if (DungeonBlessings.valueOf(type.uppercase()).power != amount) {
                     DungeonBlessings.valueOf(type.uppercase()).power = amount
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonsRaceGuide.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonsRaceGuide.kt
index 1a543749d..34d0621cd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonsRaceGuide.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonsRaceGuide.kt
@@ -39,9 +39,9 @@ object DungeonsRaceGuide {
     @SubscribeEvent
     fun onRepoReload(event: RepositoryReloadEvent) {
         val data = event.getConstant<DungeonHubRacesJson>("DungeonHubRaces")
-        data.data.forEach {
-            val nothingNoReturn = it.value["nothing:no_return"]
-            parkourHelpers[it.key] = ParkourHelper(
+        for ((key, map) in data.data) {
+            val nothingNoReturn = map["nothing:no_return"]
+            parkourHelpers[key] = ParkourHelper(
                 nothingNoReturn?.locations ?: listOf(),
                 nothingNoReturn?.shortCuts ?: listOf(),
                 platformSize = 1.0,
@@ -67,17 +67,15 @@ object DungeonsRaceGuide {
             currentRace = group("race").replace(" ", "_").lowercase()
         }
         if (currentRace == null) {
-            parkourHelpers.forEach {
-                it.value.reset()
-            }
+            parkourHelpers.forEach { it.value.reset() }
         }
     }
 
     private fun updateConfig() {
-        parkourHelpers.forEach {
-            it.value.rainbowColor = config.rainbowColor.get()
-            it.value.monochromeColor = config.monochromeColor.get().toChromaColor()
-            it.value.lookAhead = config.lookAhead.get() + 1
+        parkourHelpers.values.forEach {
+            it.rainbowColor = config.rainbowColor.get()
+            it.monochromeColor = config.monochromeColor.get().toChromaColor()
+            it.lookAhead = config.lookAhead.get() + 1
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
index abac5accd..68b70a77a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
@@ -81,7 +81,7 @@ object MythologicalCreatureTracker {
 
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
-        MythologicalCreatureType.entries.forEach { creatureType ->
+        for (creatureType in MythologicalCreatureType.entries) {
             if (creatureType.pattern.matches(event.message)) {
                 BurrowAPI.lastBurrowRelatedChatMessage = SimpleTimeMark.now()
                 tracker.modify {
@@ -102,8 +102,7 @@ object MythologicalCreatureTracker {
     private fun drawDisplay(data: Data): List<List<Any>> = buildList {
         addAsSingletonList("§7Mythological Creature Tracker:")
         val total = data.count.sumAllValues()
-        data.count.entries.sortedByDescending { it.value }.forEach { (creatureType, amount) ->
-
+        for ((creatureType, amount) in data.count.entries.sortedByDescending { it.value }) {
             val percentageSuffix = if (config.showPercentage.get()) {
                 val percentage = LorenzUtils.formatPercentage(amount.toDouble() / total)
                 " §7$percentage"
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt
index 411e08e5e..24c97e45d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt
@@ -11,7 +11,7 @@ data class EventWaypoint(
 
 fun loadEventWaypoints(waypoints: Map<String, List<EventWaypointData>>): Map<String, MutableSet<EventWaypoint>> {
     return buildMap {
-        waypoints.forEach { lobby ->
+        for (lobby in waypoints) {
             val set = mutableSetOf<EventWaypoint>()
             lobby.value.forEach { waypoint -> set.add(EventWaypoint(waypoint.name, waypoint.position)) }
             this[lobby.key] = set
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt
index 26eb2ae1e..64c4171a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt
@@ -108,8 +108,8 @@ object PresentWaypoints {
         waypoints: Set<EventWaypoint>, shouldDraw: Boolean, color: LorenzColor, prefix: String,
     ) {
         if (!shouldDraw) return
-        waypoints.forEach { waypoint ->
-            if (!waypoint.shouldShow()) return@forEach
+        for (waypoint in waypoints) {
+            if (!waypoint.shouldShow()) continue