diff options
| author | My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> | 2021-10-09 09:33:44 -0400 |
|---|---|---|
| committer | My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> | 2021-10-09 11:32:24 -0400 |
| commit | bfbdfe3c6ce66151633f12481d9a37c041d45025 (patch) | |
| tree | 5aaf1cdd17c1f866464e351919a5f742b6ccf035 /src/main | |
| parent | 5d06b43807389234e42e6c98fff73aa35ee4904e (diff) | |
| download | SkytilsMod-bfbdfe3c6ce66151633f12481d9a37c041d45025.tar.gz SkytilsMod-bfbdfe3c6ce66151633f12481d9a37c041d45025.tar.bz2 SkytilsMod-bfbdfe3c6ce66151633f12481d9a37c041d45025.zip | |
fix wrong timer direction
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/kotlin/skytils/skytilsmod/features/impl/dungeons/DungeonFeatures.kt | 4 | ||||
| -rw-r--r-- | src/main/kotlin/skytils/skytilsmod/utils/ItemRarity.kt | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/kotlin/skytils/skytilsmod/features/impl/dungeons/DungeonFeatures.kt b/src/main/kotlin/skytils/skytilsmod/features/impl/dungeons/DungeonFeatures.kt index 8bcd3fd8..2b445e83 100644 --- a/src/main/kotlin/skytils/skytilsmod/features/impl/dungeons/DungeonFeatures.kt +++ b/src/main/kotlin/skytils/skytilsmod/features/impl/dungeons/DungeonFeatures.kt @@ -579,12 +579,12 @@ class DungeonFeatures { class SpiritBearSpawnTimer : GuiElement("Spirit Bear Spawn Timer", FloatPair(0.05f, 0.4f)) { override fun render() { - if (toggled && hasBossSpawned && dungeonFloor?.endsWith('4') == true) { + if (toggled && lastLitUpTime != -1L) { val sr = UResolution val leftAlign = actualX < sr.scaledWidth / 2f val alignment = if (leftAlign) TextAlignment.LEFT_RIGHT else TextAlignment.RIGHT_LEFT ScreenRenderer.fontRenderer.drawString( - "Spirit Bear ${System.currentTimeMillis() - lastLitUpTime + 3400}", + "Spirit Bear ${lastLitUpTime + 3400 - System.currentTimeMillis()}", if (leftAlign) 0f else width.toFloat(), 0f, CommonColors.PURPLE, diff --git a/src/main/kotlin/skytils/skytilsmod/utils/ItemRarity.kt b/src/main/kotlin/skytils/skytilsmod/utils/ItemRarity.kt index 4f3d2313..219a6912 100644 --- a/src/main/kotlin/skytils/skytilsmod/utils/ItemRarity.kt +++ b/src/main/kotlin/skytils/skytilsmod/utils/ItemRarity.kt @@ -46,7 +46,8 @@ enum class ItemRarity(val rarityName: String, val baseColor: EnumChatFormatting, init { values().forEach { rarity -> VALUES[rarity.ordinal] = rarity } - RARITY_PATTERN = Regex("(§[0-9a-f]§l§ka§r )?([§0-9a-fk-or]+)(?<rarity>${VALUES.joinToString("|") { it.rarityName }})") + RARITY_PATTERN = + Regex("(§[0-9a-f]§l§ka§r )?([§0-9a-fk-or]+)(?<rarity>${VALUES.joinToString("|") { it.rarityName }})") } } |