aboutsummaryrefslogtreecommitdiff
path: root/src/main/kotlin/com/ambientaddons/features
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/kotlin/com/ambientaddons/features')
-rw-r--r--src/main/kotlin/com/ambientaddons/features/display/WitherShieldOverlay.kt2
-rw-r--r--src/main/kotlin/com/ambientaddons/features/misc/Trapper.kt2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main/kotlin/com/ambientaddons/features/display/WitherShieldOverlay.kt b/src/main/kotlin/com/ambientaddons/features/display/WitherShieldOverlay.kt
index 85801aa..ee3b683 100644
--- a/src/main/kotlin/com/ambientaddons/features/display/WitherShieldOverlay.kt
+++ b/src/main/kotlin/com/ambientaddons/features/display/WitherShieldOverlay.kt
@@ -3,6 +3,7 @@ package com.ambientaddons.features.display
import AmbientAddons.Companion.config
import AmbientAddons.Companion.mc
import com.ambientaddons.utils.Alignment
+import com.ambientaddons.utils.Area
import com.ambientaddons.utils.render.OverlayUtils
import com.ambientaddons.utils.SBLocation
import com.ambientaddons.utils.dungeon.TextStyle
@@ -20,6 +21,7 @@ object WitherShieldOverlay {
fun onRenderOverlay(event: RenderGameOverlayEvent) {
if (event.type != RenderGameOverlayEvent.ElementType.TEXT) return
if (!SBLocation.inSkyblock || config.witherShieldDisplay == 0) return
+ if (config.trapperCooldown != 0 && SBLocation.area == Area.FarmingIslands) return
val diff = ((witherImpactEndTime - System.currentTimeMillis()) / 1000.0).takeIf { it >= 0 } ?: return
val display = ceil(diff).roundToInt().toString()
val resolution = ScaledResolution(mc)
diff --git a/src/main/kotlin/com/ambientaddons/features/misc/Trapper.kt b/src/main/kotlin/com/ambientaddons/features/misc/Trapper.kt
index ce468eb..f850a36 100644
--- a/src/main/kotlin/com/ambientaddons/features/misc/Trapper.kt
+++ b/src/main/kotlin/com/ambientaddons/features/misc/Trapper.kt
@@ -73,7 +73,7 @@ object Trapper {
val display = "§a${ceil(diff).roundToInt()}"
val resolution = ScaledResolution(mc)
val x = resolution.scaledWidth / 2 + 1
- val y = resolution.scaledHeight / 2 - 20
+ val y = resolution.scaledHeight / 2 + 10
val style = TextStyle.fromInt(config.trapperCooldown - 1) ?: return
OverlayUtils.drawString(x, y, display, style, Alignment.Center)
}