From 02ac961b3f1a371302963559e875698de8eb7a1d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 7 Aug 2023 23:37:18 +0200
Subject: replace enum.getEntries() to enum.entries and using
 .addSelector<Enum>

---
 src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt          | 2 +-
 src/main/java/at/hannibal2/skyhanni/data/IslandType.kt             | 2 +-
 src/main/java/at/hannibal2/skyhanni/data/model/ComposterUpgrade.kt | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/data')

diff --git a/src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt b/src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt
index df8c511ee..3c1643dad 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt
@@ -103,7 +103,7 @@ class ApiDataLoader {
     private fun findApiCandidatesFromOtherMods(): Map<String, String> {
         LorenzUtils.consoleLog("Trying to find the api key from the config of other mods..")
         val candidates = mutableMapOf<String, String>()
-        for (mod in OtherMod.values()) {
+        for (mod in OtherMod.entries) {
             val modName = mod.modName
             val file = File(mod.configPath)
             if (file.exists()) {
diff --git a/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt b/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt
index 91f2bed9a..ae68e34e2 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt
@@ -27,7 +27,7 @@ enum class IslandType(val displayName: String, val apiName: String = "null") {
 
     companion object {
         fun getBySidebarName(name: String): IslandType {
-            return values().firstOrNull { it.displayName == name } ?: UNKNOWN
+            return entries.firstOrNull { it.displayName == name } ?: UNKNOWN
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/ComposterUpgrade.kt b/src/main/java/at/hannibal2/skyhanni/data/model/ComposterUpgrade.kt
index cc0a82a2d..f9f33d6cf 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/ComposterUpgrade.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/ComposterUpgrade.kt
@@ -9,10 +9,10 @@ enum class ComposterUpgrade(val displayName: String, val slotNumber: Int) {
     ;
 
     companion object {
-        private fun regexValues() = values().joinToString("|") { it.displayName }
+        private fun regexValues() = entries.joinToString("|") { it.displayName }
 
         val regex = "§a(?<name>${regexValues()})(?: (?<level>.*))?".toPattern()
 
-        fun getByName(name: String) = values().firstOrNull { it.displayName == name }
+        fun getByName(name: String) = entries.firstOrNull { it.displayName == name }
     }
 }
\ No newline at end of file
-- 
cgit