summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal002@users.noreply.github.com>2024-06-13 22:21:50 +0200
committerGitHub <noreply@github.com>2024-06-13 22:21:50 +0200
commit529639fdd0683066eadffe93473a300a2177c008 (patch)
treed89cd9aa2c04b4a8a839b9c3b1a56d2058fa7956 /src/main/java/at/hannibal2/skyhanni/features
parent151865bca064421d48ec19279b759134fc428443 (diff)
downloadskyhanni-529639fdd0683066eadffe93473a300a2177c008.tar.gz
skyhanni-529639fdd0683066eadffe93473a300a2177c008.tar.bz2
skyhanni-529639fdd0683066eadffe93473a300a2177c008.zip
Backend: for each (#1725)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/PlayerTabComplete.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/cosmetics/ArrowTrail.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt15
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonsRaceGuide.kt18
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolver.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt14
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/MatriarchHelper.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt19
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/colosseum/BlobbercystsHighlight.kt9
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt211
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt43
33 files changed, 223 insertions, 232 deletions
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
this.drawWaypointFilled(waypoint.position, color.toColor())
this.drawDynamicText(waypoint.position, "$prefix${waypoint.name}", 1.5)
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
index 39b372c9b..d241b6a19 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
@@ -77,7 +77,7 @@ object SeaCreatureTracker {
val realAmount = data.amount.filter { filter(it.key) }
val total = realAmount.sumAllValues()
- realAmount.entries.sortedByDescending { it.value }.forEach { (name, amount) ->
+ for ((name, amount) in realAmount.entries.sortedByDescending { it.value }) {
val displayName = SeaCreatureManager.allFishingMobs[name]?.displayName ?: run {
ErrorManager.logErrorStateWithData(
"Sea Creature Tracker can not display a name correctly",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt
index 9a24fec89..882c4daff 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt
@@ -319,7 +319,7 @@ object FarmingFortuneDisplay {
fun getAbilityFortune(internalName: NEUInternalName, lore: List<String>): Double {
var pieces = 0
- lore.forEach { line ->
+ for (line in lore) {
if (internalName.contains("LOTUS")) {
lotusAbilityPattern.matchMatcher(line) {
return group("bonus").toDouble()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt
index 0d3cadfac..2ac40e252 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt
@@ -203,14 +203,14 @@ object PestAPI {
val plotList = group("plots").removeColor().split(", ").map { it.toInt() }
if (plotList.sorted() == getInfestedPlots().map { it.id }.sorted()) return
- GardenPlotAPI.plots.forEach {
- if (plotList.contains(it.id)) {
- if (!it.isPestCountInaccurate && it.pests == 0) {
- it.isPestCountInaccurate = true
+ for (plot in GardenPlotAPI.plots) {
+ if (plotList.contains(plot.id)) {
+ if (!plot.isPestCountInaccurate && plot.pests == 0) {
+ plot.isPestCountInaccurate = true
}
} else {
- it.pests = 0
- it.isPestCountInaccurate = false
+ plot.pests = 0
+ plot.isPestCountInaccurate = false
}
}
updatePests()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
index 54adcebad..88ea75b57 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
@@ -69,13 +69,11 @@ object HighlightVisitorsOutsideOfGarden {
@SubscribeEvent
fun onSecondPassed(event: SecondPassedEvent) {
if (!config.highlightVisitors) return
+ val color = LorenzColor.DARK_RED.toColor().withAlpha(50)
EntityUtils.getEntities<EntityLivingBase>()
.filter { it !is EntityArmorStand && isVisitor(it) }
.forEach {
- RenderLivingEntityHelper.setEntityColor(
- it,
- LorenzColor.DARK_RED.toColor().withAlpha(50)
- ) { config.highlightVisitors }
+ RenderLivingEntityHelper.setEntityColor(it, color) { config.highlightVisitors }
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt
index 31f8db263..2914aa1c3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt
@@ -77,8 +77,8 @@ object VisitorListener {
val visitorsInTab = VisitorAPI.visitorsInTabList(event.tabList)
if (LorenzUtils.lastWorldSwitch.passedSince() > 2.seconds) {
- VisitorAPI.getVisitors().forEach {
- val name = it.visitorName
+ for (visitor in VisitorAPI.getVisitors()) {
+ val name = visitor.visitorName
val removed = name !in visitorsInTab
if (removed) {
logger.log("Removed old visitor: '$name'")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
index b43a95b08..6fb1caaa2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
@@ -174,7 +174,7 @@ object SackDisplay {
else -> sackItems.sortedByDescending { it.second.stored }
}.toMap().toMutableMap()
- sortedPairs.toList().forEach { (k, v) ->
+ for ((k, v) in sortedPairs.toList()) {
if (v.stored == 0 && !config.showEmpty) {
sortedPairs.remove(k)
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt
index 0b3a2830e..c34b08125 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt
@@ -100,7 +100,8 @@ class SkyblockGuideHighlightFeature private constructor(
if (!isEnabled()) return
if (activeObject == null) return
- event.gui.inventorySlots.inventorySlots.filter { missing.contains(it.slotNumber) }
+ event.gui.inventorySlots.inventorySlots
+ .filter { missing.contains(it.slotNumber) }
.forEach { it highlight LorenzColor.RED }
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolver.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolver.kt
index 7af22d701..f3687e23e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolver.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolver.kt
@@ -100,9 +100,9 @@ object FossilSolver {
}
}
- possibleClickPositions.filter { it.key in foundPositions }.forEach {
- possibleClickPositions.remove(it.key)
- }
+ possibleClickPositions
+ .filter { it.key in foundPositions }.keys
+ .forEach { possibleClickPositions.remove(it) }
val bestPosition = possibleClickPositions.maxByOrNull { it.value } ?: run {
if (fossilLocations.isNotEmpty()) {
@@ -125,7 +125,7 @@ object FossilSolver {
private fun isValidFossilPosition(
fossil: FossilShape,
invalidPositions: Set<FossilTile>,
- foundPositions: Set<FossilTile>
+ foundPositions: Set<FossilTile>,
): Boolean {
if (fossil.tiles.any { !isValidPosition(it, invalidPositions) }) {
return false
diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt
index 9cf785503..a0545dc1c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt
@@ -82,7 +82,7 @@ object MinionXp {
}
return if (storage != null) {
- storage.xpList.forEach { (type, amount) ->
+ for ((type, amount) in storage.xpList) {
xpTotal.compute(type) { _, currentAmount -> (currentAmount ?: 0.0) + amount }
}
false
@@ -96,12 +96,14 @@ object MinionXp {
private fun handleItems(inventoryItems: Map<Int, ItemStack>, isMinion: Boolean): EnumMap<SkillType, Double> {
val xpTotal = EnumMap<SkillType, Double>(SkillType::class.java)
- inventoryItems.filter {
- it.value.getLore().isNotEmpty() && (!isMinion || it.key in listWithMissingName.flatten())
- }.forEach { (_, itemStack) ->
- val item = toPrimitiveItemStack(itemStack)
+ val list = inventoryItems.filter {
+ it.value.getLore().isNotEmpty() &&
+ (!isMinion || it.key in listWithMissingName.flatten())
+ }.values
+ .map { toPrimitiveItemStack(it) }
+ for (item in list) {
val name = item.internalName
- val xp = xpInfoMap[name] ?: return@forEach
+ val xp = xpInfoMap[name] ?: continue
// TODO add wisdom and temporary skill exp (Events) to calculation
val baseXp = xp.amount * item.amount
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt
index 57e355ecd..0996701f2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt
@@ -148,15 +148,15 @@ object LimboPlaytime {
val firstList = mutableListOf<String>()
val lastList = mutableListOf<String>()
var hasPassed = false
- toolTip.forEach {
- if (!(hoursPattern.matches(it) || minutesPattern.matches(it)) && !hasPassed) {
- firstList.add(it)
+ for (line in toolTip) {
+ if (!(hoursPattern.matches(line) || minutesPattern.matches(line)) && !hasPassed) {
+ firstList.add(line)
} else hasPassed = true
}
hasPassed = false
- toolTip.forEach {
- if (!(hoursPattern.matches(it) || minutesPattern.matches(it)) && hasPassed) {
- lastList.add(it)
+ for (line in toolTip) {
+ if (!(hoursPattern.matches(line) || minutesPattern.matches(line)) && hasPassed) {
+ lastList.add(line)
} else hasPassed = true
}
toolTip.clear()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt
index 8a594259e..ab61b400d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt
@@ -96,7 +96,7 @@ object DefaultConfigFeatures {
resetSuggestionState: MutableMap<Category, ResetSuggestio