diff options
author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2024-06-22 09:33:15 +0200 |
---|---|---|
committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2024-06-22 09:33:15 +0200 |
commit | 8f3314c9397a62085941ece6d9fe2114f5338889 (patch) | |
tree | 298798c38d4875893787446b3af351660b4d3436 /src/main/java/at/hannibal2/skyhanni/features/garden | |
parent | c52a71ee63c633d17d7a935c0aa92ddda904c750 (diff) | |
download | skyhanni-8f3314c9397a62085941ece6d9fe2114f5338889.tar.gz skyhanni-8f3314c9397a62085941ece6d9fe2114f5338889.tar.bz2 skyhanni-8f3314c9397a62085941ece6d9fe2114f5338889.zip |
enum is singular
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/garden')
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingReforge.kt (renamed from src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingReforges.kt) | 4 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingSet.kt (renamed from src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingSets.kt) | 2 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingReforges.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingReforge.kt index 6ac7171fb..75eccf4cc 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingReforges.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingReforge.kt @@ -1,7 +1,7 @@ package at.hannibal2.skyhanni.features.garden.fortuneguide // TODO replace with ReforgeAPI -enum class FarmingReforges( +enum class FarmingReforge( val reforgeName: String, val reforgeItem: String, val common: Int, @@ -22,7 +22,7 @@ enum class FarmingReforges( GREEN_THUMB("Green Thumb", "", 1, 2, 3, 4, 5, 6) } -operator fun FarmingReforges.get(index: Int, current: Double = 0.0): Double? { +operator fun FarmingReforge.get(index: Int, current: Double = 0.0): Double? { return when (index) { 0 -> common - current 1 -> uncommon - current diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingSets.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingSet.kt index e0b74ce8a..4e1c3d521 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingSets.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingSet.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.features.garden.fortuneguide -enum class FarmingSets( +enum class FarmingSet( val helmetIncrease: Double, val chestplateIncrease: Double, val leggingsIncrease: Double, diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt index 43289dc62..cd76262c0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt @@ -107,11 +107,11 @@ object FortuneUpgrades { when (item.getReforgeName()) { "rooted" -> {} "blooming" -> { - reforgeItem(item, FarmingReforges.ROOTED, genericUpgrades) + reforgeItem(item, FarmingReforge.ROOTED, genericUpgrades) } else -> { - reforgeItem(item, FarmingReforges.BLOOMING, genericUpgrades) + reforgeItem(item, FarmingReforge.BLOOMING, genericUpgrades) } } } @@ -126,11 +126,11 @@ object FortuneUpgrades { when (item.getReforgeName()) { "mossy" -> {} "bustling" -> { - reforgeItem(item, FarmingReforges.MOSSY, genericUpgrades) + reforgeItem(item, FarmingReforge.MOSSY, genericUpgrades) } else -> { - reforgeItem(item, FarmingReforges.BUSTLING, genericUpgrades, 100) + reforgeItem(item, FarmingReforge.BUSTLING, genericUpgrades, 100) } } } @@ -242,7 +242,7 @@ object FortuneUpgrades { "blessed" -> {} "bountiful" -> {} else -> { - reforgeItem(tool, FarmingReforges.BLESSED, cropSpecificUpgrades) + reforgeItem(tool, FarmingReforge.BLESSED, cropSpecificUpgrades) } } cropSpecificUpgrades.populateAndSort(0) @@ -251,7 +251,7 @@ object FortuneUpgrades { private fun recombobulateItem(item: ItemStack, list: MutableList<FortuneUpgrade>) { if (item.isRecombobulated()) return val reforge = item.getReforgeName()?.let { - FarmingReforges.entries.find { enumValue -> + FarmingReforge.entries.find { enumValue -> enumValue.name == it.uppercase() } } ?: return @@ -265,7 +265,7 @@ object FortuneUpgrades { private fun reforgeItem( item: ItemStack, - reforge: FarmingReforges, + reforge: FarmingReforge, list: MutableList<FortuneUpgrade>, copperPrice: Int? = null, ) { |