replace enum.getEntries() to enum.entries and using .addSelector<Enum>

44 files changed, 112 insertions, 101 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
index 83a2abbec..157883909 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
@@ -437,9 +437,8 @@ class DamageIndicatorManager {
     }
 
     private fun checkBlazeSlayer(entity: EntityLiving, entityData: EntityData, health: Int, maxHealth: Int): String {
-        val shields = HellionShield.values()
         var found = false
-        for (shield in shields) {
+        for (shield in HellionShield.entries) {
             val armorStand = entity.getNameTagWith(3, shield.name)
             if (armorStand != null) {
                 val number = armorStand.name.split(" ♨")[1].substring(0, 1)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
index 7f6ee3670..f843ff942 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
@@ -78,12 +78,12 @@ class BurrowWarpHelper {
         }
 
         private fun getNearestWarpPoint(location: LorenzVec): WarpPoint {
-            val map = WarpPoint.values().filter { it.enabled }.map { it to it.distance(location) }
+            val map = WarpPoint.entries.filter { it.enabled }.map { it to it.distance(location) }
             return map.sorted().first().first
         }
 
         fun resetDisabledWarps() {
-            WarpPoint.values().forEach { it.enabled = true }
+            WarpPoint.entries.forEach { it.enabled = true }
             LorenzUtils.chat("§e[SkyHanni] Reset disabled burrow warps.")
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
index 47ba57337..f8bf9943d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
@@ -131,7 +131,7 @@ class GriffinBurrowParticleFinder {
 
             fun getParticleType(packet: S2APacketParticles): ParticleType? {
                 if (!packet.isLongDistance) return null
-                for (type in values()) {
+                for (type in entries) {
                     if (type.check(packet)) {
                         return type
                     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyRarity.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyRarity.kt
index 2e61e1e80..7f3ff8524 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyRarity.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyRarity.kt
@@ -11,6 +11,6 @@ enum class TrophyRarity(val formatCode: String) {
     val formattedString get() = "$formatCode${name.firstLetterUppercase()}"
 
     companion object {
-        fun getByName(rawName: String) = values().firstOrNull { rawName.uppercase().endsWith(it.name) }
+        fun getByName(rawName: String) = entries.firstOrNull { rawName.uppercase().endsWith(it.name) }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt
index 4c5f30ad3..1a761f0ae 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt
@@ -32,7 +32,7 @@ class AnitaMedalProfit {
         ;
     }
 
-    private fun getMedal(name: String) = MedalType.values().firstOrNull { it.displayName == name }
+    private fun getMedal(name: String) = MedalType.entries.firstOrNull { it.displayName == name }
 
     @SubscribeEvent
     fun onInventoryClose(event: InventoryCloseEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/CropAccessory.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/CropAccessory.kt
index b895c6511..c4269ce2e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/CropAccessory.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/CropAccessory.kt
@@ -8,7 +8,7 @@ enum class CropAccessory(val internalName: String, private val affectedCrops: Se
         setOf(CropType.WHEAT, CropType.POTATO, CropType.CARROT, CropType.COCOA_BEANS, CropType.MELON, CropType.PUMPKIN),
         20.0, Pair("SQUASH", 128)
     ),
-    FERMENTO("FERMENTO_ARTIFACT", CropType.values().toSet(), 30.0, Pair("CONDENSED_FERMENTO", 8)),
+    FERMENTO("FERMENTO_ARTIFACT", CropType.entries.toSet(), 30.0, Pair("CONDENSED_FERMENTO", 8)),
     ;
 
     fun getFortune(cropType: CropType): Double {
@@ -16,6 +16,6 @@ enum class CropAccessory(val internalName: String, private val affectedCrops: Se
     }
 
     companion object {
-        fun getByName(internalName: String) = values().firstOrNull { it.internalName == internalName }
+        fun getByName(internalName: String) = entries.firstOrNull { it.internalName == internalName }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt
index ed6138082..084c8d9e9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt
@@ -36,7 +36,7 @@ enum class CropType(
         fun getByNameOrNull(itemName: String): CropType? {
             if (itemName == "Red Mushroom" || itemName == "Brown Mushroom") return MUSHROOM
             if (itemName == "Seeds") return WHEAT
-            return values().firstOrNull { it.cropName == itemName }
+            return entries.firstOrNull { it.cropName == itemName }
         }
 
         fun getByName(name: String) = getByNameOrNull(name) ?: throw RuntimeException("No valid crop type '$name'")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
index 72d1d1dc6..64952a625 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
@@ -127,7 +127,7 @@ object GardenAPI {
 
     fun ItemStack.getCropType(): CropType? {
         val internalName = getInternalName()
-        return CropType.values().firstOrNull { internalName.startsWith(it.toolName) }
+        return CropType.entries.firstOrNull { internalName.startsWith(it.toolName) }
     }
 
     fun readCounter(itemStack: ItemStack): Long = itemStack.getHoeCounter() ?: itemStack.getCultivatingCounter() ?: -1L
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt
index 7905890ec..6f5e9abe0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt
@@ -38,7 +38,7 @@ class GardenOptimalSpeed {
 
     @SubscribeEvent
     fun onGuiOpen(event: GuiOpenEvent) {
-        rancherOverlayList = CropType.values().map { crop ->
+        rancherOverlayList = CropType.entries.map { crop ->
             listOf(crop.icon, Renderable.link("${crop.cropName} - ${crop.getOptimalSpeed()}") {
                 LorenzUtils.setTextIntoSign("${crop.getOptimalSpeed()}")
             })
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
index 9b06240ad..38132e8b6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
@@ -117,7 +117,7 @@ class ComposterDisplay {
             }
             if (next) {
                 if (line == "") break
-                for (type in DataType.values()) {
+                for (type in DataType.entries) {
                     type.pattern.matchMatcher(line) {
                         newData[type] = group(1)
                     }
@@ -125,7 +125,7 @@ class ComposterDisplay {
             }
         }
 
-        for (type in DataType.values()) {
+        for (type in DataType.entries) {
             if (!newData.containsKey(type)) {
                 tabListData = emptyMap()
                 return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
index 8943a2092..76825184a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
@@ -122,7 +122,7 @@ class ComposterOverlay {
     fun onTooltip(event: ItemTooltipEvent) {
         if (inComposterUpgrades) {
             update()
-            for (upgrade in ComposterUpgrade.values()) {
+            for (upgrade in ComposterUpgrade.entries) {
                 event.itemStack?.name?.let {
                     if (it.contains(upgrade.displayName)) {
                         maxLevel = ComposterUpgrade.regex.matchMatcher(it) {
@@ -276,13 +276,15 @@ class ComposterOverlay {
         val fuelItem = currentFuelItem ?: return
         if (organicMatterItem == "" || fuelItem == "") return
 
-        newList.addSelector("§7Per ", TimeType.values(),
+        newList.addSelector<TimeType>(
+            "§7Per ",
             getName = { type -> type.display },
             isCurrent = { it == currentTimeType },
             onChange = {
                 currentTimeType = it
                 update()
-            })
+            }
+        )
 
         val list = mutableListOf<Any>()
         list.add("§7Using: ")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestAPI.kt
index d0a22dc25..e0b0961be 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestAPI.kt
@@ -104,7 +104,7 @@ object FarmingContestAPI {
             cropPattern.matchMatcher(it) { CropType.getByName(group("crop")) }
         } ?: error("Crop not found in lore!")
 
-        val brackets = ContestBracket.values().associateWith { bracket ->
+        val brackets = ContestBracket.entries.associateWith { bracket ->
             lore.firstNotNullOfOrNull {
                 bracket.pattern.matchMatcher(it) {
                     group("amount").replace(",", "").toInt()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt
index a2b5c10a8..a6ef0d4f1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt
@@ -59,14 +59,14 @@ class JacobContestFFNeededDisplay {
 
         val crop = contest.crop
         add(listOf("§7For this ", crop.icon, "§7${crop.cropName} contest:"))
-        for (bracket in ContestBracket.values()) {
+        for (bracket in ContestBracket.entries) {
             addAsSingletonList(getLine(bracket, contest.brackets, crop))
         }
         addAsSingletonList("")
 
         val (size, averages) = FarmingContestAPI.calculateAverages(crop)
         add(listOf("§7For the last §e$size ", crop.icon, "§7${crop.cropName} contests:"))
-        for (bracket in ContestBracket.values()) {
+        for (bracket in ContestBracket.entries) {
             addAsSingletonList(getLine(bracket, averages, crop))
         }
         addAsSingletonList("")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt
index 09167dd76..7b0f01015 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt
@@ -34,7 +34,7 @@ class JacobContestTimeNeeded {
     private fun update() {
         val sorted = mutableMapOf<CropType, Double>()
         val map = mutableMapOf<CropType, Renderable>()
-        for (crop in CropType.values()) {
+        for (crop in CropType.entries) {
             val speed = crop.getSpeed()
             if (speed == null) {
                 sorted[crop] = Double.MAX_VALUE
@@ -98,13 +98,15 @@ class JacobContestTimeNeeded {
         this.display = buildList {
             addAsSingletonList("§e§lTime Needed for ${currentBracket.displayName} §eMedal!")
 
-            addSelector("§7Bracket: ", ContestBracket.values(),
+            addSelector<ContestBracket>(
+                "§7Bracket: ",
                 getName = { type -> type.name.lowercase() },
                 isCurrent = { it == currentBracket },
                 onChange = {
                     currentBracket = it
                     update()
-                })
+                }
+            )
             addAsSingletonList("")
             for (crop in sorted.sorted().keys) {
                 val text = map[crop]!!
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt
index b079782a8..08882db71 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt
@@ -75,7 +75,7 @@ class CropSpeedMeter {
     fun onCropMilestoneUpdate(event: CropMilestoneUpdateEvent) {
         if (!isEnabled()) return
         val counters = mutableMapOf<CropType, Long>()
-        for (cropType in CropType.values()) {
+        for (cropType in CropType.entries) {
             counters[cropType] = cropType.getCounter()
         }
         if (startCrops.isEmpty()) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt
index e4faf5f61..ea685338f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt
@@ -32,7 +32,7 @@ class FarmingArmorDrops {
 
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
-        for (dropType in ArmorDropType.values()) {
+        for (dropType in ArmorDropType.entries) {
             if (dropType.chatMessage == event.message) {
                 addDrop(dropType)
                 if (config.farmingArmorDropsHideChat) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
index e2b5190c6..cbf4596c4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
@@ -337,7 +337,7 @@ class FarmingWeightDisplay {
         private fun calculateCollectionWeight(): MutableMap<CropType, Double> {
             val weightPerCrop = mutableMapOf<CropType, Double>()
             var totalWeight = 0.0
-            for (crop in CropType.values()) {
+            for (crop in CropType.entries) {
                 val weight = crop.getLocalCounter() / crop.getFactor()
                 weightPerCrop[crop] = weight
                 totalWeight += weight
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenBestCropTime.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenBestCropTime.kt
index ad9f98e6e..efdf267ef 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenBestCropTime.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenBestCropTime.kt
@@ -26,7 +26,7 @@ class GardenBestCropTime {
         }
 
         fun updateTimeTillNextCrop() {
-            for (crop in CropType.values()) {
+            for (crop in CropType.entries) {
                 val speed = crop.getSpeed() ?: continue
                 if (crop.isMaxed()) continue
 
@@ -50,7 +50,7 @@ class GardenBestCropTime {
 
     fun drawBestDisplay(currentCrop: CropType?): List<List<Any>> {
         val newList = mutableListOf<List<Any>>()
-        if (timeTillNextCrop.size < CropType.values().size) {
+        if (timeTillNextCrop.size < CropType.entries.size) {
             updateTimeTillNextCrop()
         }
 
@@ -93,7 +93,7 @@ class GardenBestCropTime {
         for (crop in sorted.keys) {
             if (crop.isMaxed()) continue
             val millis = timeTillNextCrop[crop]!!
-            val biggestUnit = TimeUnit.values()[config.cropMilestoneHighestTimeFormat.get()]
+            val biggestUnit = TimeUnit.entries[config.cropMilestoneHighestTimeFormat.get()]
             val duration = TimeUtils.formatDuration(millis, biggestUnit, maxUnits = 2)
             val isCurrent = crop == currentCrop
             number++
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 460908ccd..f6d0fe0b4 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
@@ -182,7 +182,7 @@ object GardenCropMilestoneDisplay {
                 val missingTimeSeconds = missing / farmingFortuneSpeed
                 val millis = missingTimeSeconds * 1000
                 GardenBestCropTime.timeTillNextCrop[crop] = millis
-                val biggestUnit = TimeUnit.values()[config.cropMilestoneHighestTimeFormat.get()]
+                val biggestUnit = TimeUnit.entries[config.cropMilestoneHighestTimeFormat.get()]
                 val duration = TimeUtils.formatDuration(millis, biggestUnit)
                 tryWarn(millis, "§b${crop.cropName} $nextTier in $duration")
                 val speedText = "§7In §b$duration"
@@ -276,7 +276,7 @@ object GardenCropMilestoneDisplay {
 
             val missingTimeSeconds = missing / blocksPerSecond
             val millis = missingTimeSeconds * 1000
-            val biggestUnit = TimeUnit.values()[config.cropMilestoneHighestTimeFormat.get()]
+            val biggestUnit = TimeUnit.entries[config.cropMilestoneHighestTimeFormat.get()]
             val duration = TimeUtils.formatDuration(millis.toLong(), biggestUnit)
             lineMap[3] = Collections.singletonList("§7In §b$duration")
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
index 424bec2a6..c9c645429 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
@@ -54,7 +54,7 @@ class CaptureFarmingGear {
                 //todo better fall back items
                 //todo Daedalus axe
             } else {
-                for (item in FarmingItems.values()) {
+                for (item in Farm