diff options
author | hannibal2 <24389977+hannibal002@users.noreply.github.com> | 2024-06-13 22:21:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-13 22:21:50 +0200 |
commit | 529639fdd0683066eadffe93473a300a2177c008 (patch) | |
tree | d89cd9aa2c04b4a8a839b9c3b1a56d2058fa7956 /src/main/java/at/hannibal2/skyhanni/features/garden | |
parent | 151865bca064421d48ec19279b759134fc428443 (diff) | |
download | skyhanni-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/garden')
4 files changed, 11 insertions, 13 deletions
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'") |