aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Cole <40234707+DavidArthurCole@users.noreply.github.com>2024-10-13 06:45:06 -0400
committerGitHub <noreply@github.com>2024-10-13 12:45:06 +0200
commitd8bb53773ba3f1e36e8822e58f3175c2847f7b61 (patch)
tree5a224f3b2d51498ee3c2ef235ffba0a2def24c10
parent6f52ce2e3e42ac794c28a8a6eb7f0ae04553b1f6 (diff)
downloadskyhanni-d8bb53773ba3f1e36e8822e58f3175c2847f7b61.tar.gz
skyhanni-d8bb53773ba3f1e36e8822e58f3175c2847f7b61.tar.bz2
skyhanni-d8bb53773ba3f1e36e8822e58f3175c2847f7b61.zip
Fix: Farming Weight Overlay (#2731)
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
index 3da9945b5..640661bd9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
@@ -360,12 +360,9 @@ object FarmingWeightDisplay {
)
}
- private fun isEnabled() = (
- config.display && (
- OutsideSbFeature.FARMING_WEIGHT.isSelected() && !LorenzUtils.inSkyBlock
- ) ||
- (LorenzUtils.inSkyBlock && (GardenAPI.inGarden() || config.showOutsideGarden))
- )
+ private fun isEnabled() = config.display && (outsideEnabled() || inGardenEnabled())
+ private fun outsideEnabled() = OutsideSbFeature.FARMING_WEIGHT.isSelected() && !LorenzUtils.inSkyBlock
+ private fun inGardenEnabled() = (LorenzUtils.inSkyBlock && GardenAPI.inGarden()) || config.showOutsideGarden
private fun isEtaEnabled() = config.overtakeETA