aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/fishing
diff options
context:
space:
mode:
authorCalMWolfs <94038482+CalMWolfs@users.noreply.github.com>2024-09-29 19:41:58 +1000
committerGitHub <noreply@github.com>2024-09-29 11:41:58 +0200
commit8988f7d34d706b909012dceea8bad65b4863ea44 (patch)
treebe907ec20f3cfbd46f0ea314d615a47596e177ba /src/main/java/at/hannibal2/skyhanni/features/fishing
parent3569dec0ab32c357eb34cff79c200f379f3d19ce (diff)
downloadskyhanni-8988f7d34d706b909012dceea8bad65b4863ea44.tar.gz
skyhanni-8988f7d34d706b909012dceea8bad65b4863ea44.tar.bz2
skyhanni-8988f7d34d706b909012dceea8bad65b4863ea44.zip
Backend: Detekt Fixes Part 4 (#2610)
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/fishing')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt10
2 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
index 12f3accd1..a3e869087 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
@@ -98,8 +98,8 @@ object FishingProfitTracker {
private val MAGMA_FISH by lazy { "MAGMA_FISH".asInternalName() }
- private val nameAll: CategoryName = "All"
- private var currentCategory: CategoryName = nameAll
+ private const val NAME_ALL: CategoryName = "All"
+ private var currentCategory: CategoryName = NAME_ALL
private var itemCategories = mapOf<String, List<NEUInternalName>>()
@@ -110,7 +110,7 @@ object FishingProfitTracker {
private fun getCurrentCategories(data: Data): Map<CategoryName, Int> {
val map = mutableMapOf<CategoryName, Int>()
- map[nameAll] = data.items.size
+ map[NAME_ALL] = data.items.size
for ((name, items) in itemCategories) {
val amount = items.count { it in data.items }
if (amount > 0) {
@@ -145,7 +145,7 @@ object FishingProfitTracker {
checkMissingItems(data)
val list = amounts.keys.toList()
if (currentCategory !in list) {
- currentCategory = nameAll
+ currentCategory = NAME_ALL
}
if (tracker.isInventoryOpen()) {
@@ -160,7 +160,7 @@ object FishingProfitTracker {
)
}
- val filter: (NEUInternalName) -> Boolean = if (currentCategory == nameAll) {
+ val filter: (NEUInternalName) -> Boolean = if (currentCategory == NAME_ALL) {
{ true }
} else {
val items = itemCategories[currentCategory]!!
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
index b293c2736..f050e56cd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
@@ -55,12 +55,12 @@ object SeaCreatureTracker {
}
}
- private val nameAll: CategoryName = "All"
- private var currentCategory: CategoryName = nameAll
+ private const val NAME_ALL: CategoryName = "All"
+ private var currentCategory: CategoryName = NAME_ALL
private fun getCurrentCategories(data: Data): Map<CategoryName, Int> {
val map = mutableMapOf<CategoryName, Int>()
- map[nameAll] = data.amount.size
+ map[NAME_ALL] = data.amount.size
for ((category, names) in SeaCreatureManager.allVariants) {
val amount = names.count { it in data.amount }
if (amount > 0) {
@@ -103,7 +103,7 @@ object SeaCreatureTracker {
val amounts = getCurrentCategories(data)
val list = amounts.keys.toList()
if (currentCategory !in list) {
- currentCategory = nameAll
+ currentCategory = NAME_ALL
}
if (tracker.isInventoryOpen()) {
@@ -118,7 +118,7 @@ object SeaCreatureTracker {
)
}
- return if (currentCategory == nameAll) {
+ return if (currentCategory == NAME_ALL) {
{ true }
} else filterCurrentCategory()
}