From d56e3075c7d418e0004f072703e635e83e2a06cf Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Fri, 8 Dec 2023 16:21:41 +0100 Subject: code cleanup --- src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt | 2 ++ .../hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt | 7 +------ 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features') diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt index 41ef944ea..05abfe744 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt @@ -40,6 +40,8 @@ enum class CropType( val multiplier by lazy { if (this == SUGAR_CANE || this == CACTUS) 2 else 1 } + override fun toString(): String = cropName + companion object { fun getByNameOrNull(itemName: String): CropType? { if (itemName == "Red Mushroom" || itemName == "Brown Mushroom") return MUSHROOM diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt index e6f59fe88..d5d1881e2 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt @@ -421,12 +421,7 @@ object GardenNextJacobContest { ) } - private fun warnForCrop(): Boolean { - for(crop in nextContestCrops) { - if (config.warnFor.contains(crop.ordinal)) return true - } - return false - } + private fun warnForCrop(): Boolean = nextContestCrops.any { it in config.warnFor } @SubscribeEvent fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { -- cgit