diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
3 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt index 94d8dd10f..673d5b70e 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt @@ -14,6 +14,7 @@ import io.github.moulberry.notenoughupdates.mixins.AccessorGuiEditSign import io.github.moulberry.notenoughupdates.util.SkyBlockTime import net.minecraft.client.Minecraft import net.minecraft.client.gui.inventory.GuiEditSign +import net.minecraft.entity.Entity import net.minecraft.entity.EntityLivingBase import net.minecraft.entity.SharedMonsterAttributes import net.minecraft.event.ClickEvent @@ -308,16 +309,15 @@ object LorenzUtils { } } - fun <T> MutableList<List<Any>>.addSelector( + inline fun <reified T : Enum<T>> MutableList<List<Any>>.addSelector( prefix: String, - values: Array<T>, getName: (T) -> String, isCurrent: (T) -> Boolean, - onChange: (T) -> Unit, + crossinline onChange: (T) -> Unit, ) { add(buildList { add(prefix) - for (entry in values) { + for (entry in enumValues<T>()) { val display = getName(entry) if (isCurrent(entry)) { add("§a[$display]") diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt index d39c8e757..a7b129349 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt @@ -239,7 +239,7 @@ object SkyBlockItemModifierUtils { ; companion object { - fun getByName(name: String) = GemstoneQuality.values().firstOrNull { it.name == name } + fun getByName(name: String) = entries.firstOrNull { it.name == name } } } @@ -255,7 +255,7 @@ object SkyBlockItemModifierUtils { ; companion object { - fun getByName(name: String) = values().firstOrNull { it.name == name } + fun getByName(name: String) = entries.firstOrNull { it.name == name } } } }
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt index 4f9c1b799..c088ded64 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt @@ -29,7 +29,7 @@ object TimeUtils { // TODO: if this weird offset gets removed, also remove that subtraction from formatDuration(kotlin.time.Duration) var milliseconds = millis + 999 val map = mutableMapOf<TimeUnit, Int>() - for (unit in TimeUnit.values()) { + for (unit in TimeUnit.entries) { if (unit.ordinal >= biggestUnit.ordinal) { val factor = unit.factor map[unit] = (milliseconds / factor).toInt() |