diff options
| author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2023-08-28 05:18:28 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-27 21:18:28 +0200 |
| commit | 27f629589aeba6f2209f6c2e2c28af575b4ce022 (patch) | |
| tree | 554c1badb15082482f7746afc9a574b870436279 /src/main/java/at/hannibal2/skyhanni/features/misc | |
| parent | 0f375522e6a4ac326c27b1f8b02e5de2b8491c4f (diff) | |
| download | skyhanni-27f629589aeba6f2209f6c2e2c28af575b4ce022.tar.gz skyhanni-27f629589aeba6f2209f6c2e2c28af575b4ce022.tar.bz2 skyhanni-27f629589aeba6f2209f6c2e2c28af575b4ce022.zip | |
Merge pull request #402
* garden exp
* refactored a lot of stuff
* make it not break
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/misc')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt index 5b4102a15..e50a845da 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt @@ -4,9 +4,9 @@ package at.hannibal2.skyhanni.features.misc.discordrpc import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.* -import at.hannibal2.skyhanni.data.GardenCropMilestones.Companion.getCounter -import at.hannibal2.skyhanni.data.GardenCropMilestones.Companion.getTierForCrops -import at.hannibal2.skyhanni.data.GardenCropMilestones.Companion.progressToNextLevel +import at.hannibal2.skyhanni.data.GardenCropMilestones.getCounter +import at.hannibal2.skyhanni.data.GardenCropMilestones.getTierForCropCount +import at.hannibal2.skyhanni.data.GardenCropMilestones.progressToNextLevel import at.hannibal2.skyhanni.features.garden.GardenAPI.getCropType import at.hannibal2.skyhanni.features.rift.RiftAPI import at.hannibal2.skyhanni.utils.InventoryUtils @@ -264,7 +264,7 @@ enum class DiscordStatus(private val displayMessageSupplier: Supplier<String>?) CROP_MILESTONES({ val crop = InventoryUtils.getItemInHand()?.getCropType() val cropCounter = crop?.getCounter() - val tier = cropCounter?.let { getTierForCrops(it) } + val tier = cropCounter?.let { getTierForCropCount(it, crop) } val progress = tier?.let { LorenzUtils.formatPercentage(crop.progressToNextLevel()) |