diff options
| author | hannibal2 <24389977+hannibal002@users.noreply.github.com> | 2024-05-07 22:41:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-07 22:41:10 +0200 |
| commit | 912c8d8a8c9ad412b2f94827e09a9cf262e5b69a (patch) | |
| tree | 39abdb48d61f5989210e6e73a1254b36992449f3 /src/main/java/at/hannibal2/skyhanni/utils | |
| parent | 50f3954a3c0e15eb18ae864bbd28e0b645aa9d1b (diff) | |
| download | skyhanni-912c8d8a8c9ad412b2f94827e09a9cf262e5b69a.tar.gz skyhanni-912c8d8a8c9ad412b2f94827e09a9cf262e5b69a.tar.bz2 skyhanni-912c8d8a8c9ad412b2f94827e09a9cf262e5b69a.zip | |
Feature: Mining Commissions Blocks Color (#1701)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
3 files changed, 30 insertions, 11 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt index 2da2fbda2..53ae224d9 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt @@ -49,7 +49,7 @@ object CollectionUtils { // Taken and modified from Skytils @JvmStatic - fun <T> T.equalsOneOf(vararg other: T): Boolean { + fun <T> T?.equalsOneOf(vararg other: T): Boolean { for (obj in other) { if (this == obj) return true } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzColor.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzColor.kt index e577ba28f..16fe8cd6e 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzColor.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzColor.kt @@ -1,6 +1,5 @@ package at.hannibal2.skyhanni.utils -import at.hannibal2.skyhanni.test.command.ErrorManager import net.minecraft.item.EnumDyeColor import java.awt.Color @@ -40,11 +39,33 @@ enum class LorenzColor(val chatColorCode: Char, private val color: Color, privat fun toConfigColour(): String = "0:255:${color.red}:${color.green}:${color.blue}" + fun toDyeColor(): EnumDyeColor = when (this) { + WHITE -> EnumDyeColor.WHITE + GOLD -> EnumDyeColor.ORANGE + AQUA -> EnumDyeColor.MAGENTA + BLUE -> EnumDyeColor.LIGHT_BLUE + YELLOW -> EnumDyeColor.YELLOW + GREEN -> EnumDyeColor.LIME + LIGHT_PURPLE -> EnumDyeColor.PINK + DARK_GRAY -> EnumDyeColor.GRAY + GRAY -> EnumDyeColor.SILVER + DARK_AQUA -> EnumDyeColor.CYAN + DARK_PURPLE -> EnumDyeColor.PURPLE + DARK_BLUE -> EnumDyeColor.BLUE +// GOLD -> EnumDyeColor.BROWN + DARK_GREEN -> EnumDyeColor.GREEN + DARK_RED -> EnumDyeColor.RED + BLACK -> EnumDyeColor.BLACK + RED -> EnumDyeColor.RED + + CHROMA -> EnumDyeColor.WHITE + } + companion object { fun EnumDyeColor.toLorenzColor() = when (this) { EnumDyeColor.WHITE -> WHITE - EnumDyeColor.MAGENTA -> LIGHT_PURPLE + EnumDyeColor.MAGENTA -> AQUA EnumDyeColor.PINK -> LIGHT_PURPLE EnumDyeColor.RED -> RED EnumDyeColor.SILVER -> GRAY @@ -54,13 +75,11 @@ enum class LorenzColor(val chatColorCode: Char, private val color: Color, privat EnumDyeColor.BLUE -> BLUE EnumDyeColor.PURPLE -> DARK_PURPLE EnumDyeColor.YELLOW -> YELLOW - else -> { - ErrorManager.logErrorWithData( - Exception("Unknown dye color: $this"), - "Unknown dye color: $this" - ) - null - } + EnumDyeColor.ORANGE -> GOLD + EnumDyeColor.LIGHT_BLUE -> BLUE + EnumDyeColor.CYAN -> DARK_AQUA + EnumDyeColor.BROWN -> GOLD + EnumDyeColor.BLACK -> BLACK } } } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedSet.kt b/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedSet.kt index e64c55213..39dac5247 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedSet.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedSet.kt @@ -8,7 +8,7 @@ class TimeLimitedSet<T>(expireAfterWrite: Duration) { fun add(element: T) = cache.put(element, Unit) - fun contains(element: T): Boolean = cache.containsKey(element) + operator fun contains(element: T): Boolean = cache.containsKey(element) fun clear() = cache.clear() |