diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt | 12 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt | 28 |
2 files changed, 6 insertions, 34 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt index 28f78ec3b..599cd8ccb 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt @@ -97,13 +97,11 @@ class CropMoneyDisplay { toolHasBountiful[it] = reforgeName == "bountiful" if (GardenAPI.mushroomCowPet && it != CropType.MUSHROOM) { - if (!GardenCropMilestoneDisplay.mushroom_cow_nether_warts || it != CropType.NETHER_WART) { - val redPrice = NEUItems.getPrice("ENCHANTED_RED_MUSHROOM") / 160 - val brownPrice = NEUItems.getPrice("ENCHANTED_BROWN_MUSHROOM") / 160 - val mushroomPrice = (redPrice + brownPrice) / 2 - val perSecond = 20.0 * it.multiplier * mushroomPrice - extraNetherWartPrices = perSecond * 60 * 60 - } + val redPrice = NEUItems.getPrice("ENCHANTED_RED_MUSHROOM") / 160 + val brownPrice = NEUItems.getPrice("ENCHANTED_BROWN_MUSHROOM") / 160 + val mushroomPrice = (redPrice + brownPrice) / 2 + val perSecond = 20.0 * it.multiplier * mushroomPrice + extraNetherWartPrices = perSecond * 60 * 60 } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt index 2adc340c0..4a12ac29d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt @@ -39,24 +39,6 @@ class GardenCropMilestoneDisplay { private var lastPlaySoundTime = 0L private var needsInventory = false - companion object { - var mushroom_cow_nether_warts = true - } - - @SubscribeEvent - fun onRepoReload(event: RepositoryReloadEvent) { - try { - val constant = event.getConstant("DisabledFeatures") - mushroom_cow_nether_warts = if (constant != null) { - if (constant.has("mushroom_cow_nether_warts")) { - constant["mushroom_cow_nether_warts"].asBoolean - } else false - } else false - } catch (e: Exception) { - e.printStackTrace() - } - } - @SubscribeEvent fun onChatMessage(event: LorenzChatEvent) { if (!isEnabled()) return @@ -319,15 +301,7 @@ class GardenCropMilestoneDisplay { lineMap[6] = Collections.singletonList("§7Percentage: §e$percentageFormat") if (GardenAPI.mushroomCowPet && crop != CropType.MUSHROOM) { - if (mushroom_cow_nether_warts && crop == CropType.NETHER_WART) { - mushroomCowPerkDisplay = listOf( - listOf("§6Mooshroom Cow Perk"), - listOf("§cNether Warts don't give mushrooms."), - listOf("§7(Hypixel please fix this)") - ) - } else { - addMushroomCowData() - } + addMushroomCowData() } return formatDisplay(lineMap) |