diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/rift')
3 files changed, 13 insertions, 12 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/colosseum/BlobbercystsHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/colosseum/BlobbercystsHighlight.kt index 900d207a7..02cd3a24e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/colosseum/BlobbercystsHighlight.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/colosseum/BlobbercystsHighlight.kt @@ -26,10 +26,11 @@ object BlobbercystsHighlight { fun onTick(event: LorenzTickEvent) { if (!isEnabled()) return if (!event.isMod(5)) return - EntityUtils.getEntities<EntityOtherPlayerMP>().forEach { - if (it.name == BLOBBER_NAME) { - RenderLivingEntityHelper.setEntityColorWithNoHurtTime(it, Color.RED.withAlpha(80)) { isEnabled() } - entityList.add(it) + val color = Color.RED.withAlpha(80) + for (player in EntityUtils.getEntities<EntityOtherPlayerMP>()) { + if (player.name == BLOBBER_NAME) { + RenderLivingEntityHelper.setEntityColorWithNoHurtTime(player, color) { isEnabled() } + entityList.add(player) } } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt index e5b5d9586..8377e5c76 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt @@ -87,7 +87,7 @@ object VerminTracker { @SubscribeEvent fun onChat(event: LorenzChatEvent) { - VerminType.entries.forEach { verminType -> + for (verminType in VerminType.entries) { if (verminType.pattern.matches(event.message)) { tracker.modify { it.count.addOrPut(verminType, 1) } @@ -152,7 +152,7 @@ object VerminTracker { private fun drawDisplay(data: Data): List<List<Any>> = buildList { addAsSingletonList("§7Vermin Tracker:") - data.count.entries.sortedBy { it.key.order }.forEach { (vermin, amount) -> + for ((vermin, amount) in data.count.entries.sortedBy { it.key.order }) { val verminName = vermin.vermin addAsSingletonList(" §7- §e${amount.addSeparators()} $verminName") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt index a5fa44386..ccdb19fc5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt @@ -62,21 +62,21 @@ object CruxTalismanDisplay { if (displayLine.isNotEmpty()) { addAsSingletonList("§7Crux Talisman Progress: ${if (maxed) "§a§lMAXED!" else "§a$percentValue%"}") if (!maxed) { - displayLine.forEach { + for (line in displayLine) { percent += if (config.compactWhenMaxed) { - if (!it.maxed) { - "(?<progress>\\d+)/\\d+".toRegex().find(it.progress.removeColor())?.groupValues?.get(1) + if (!line.maxed) { + "(?<progress>\\d+)/\\d+".toRegex().find(line.progress.removeColor())?.groupValues?.get(1) ?.toInt() ?: 0 } else 100 } else { - if (it.progress.contains("MAXED")) + if (line.progress.contains("MAXED")) 100 else { - "(?<progress>\\d+)/\\d+".toRegex().find(it.progress.removeColor())?.groupValues?.get(1) + "(?<progress>\\d+)/\\d+".toRegex().find(line.progress.removeColor())?.groupValues?.get(1) ?.toInt() ?: 0 } } - addAsSingletonList(" ${it.tier} ${it.name}: ${it.progress}") + addAsSingletonList(" ${line.tier} ${line.name}: ${line.progress}") } } } |