Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ancestral spade solver being visible outside hub

Browse Source
This commit is contained in:
Linnea Gräf
2024-02-26 15:35:39 +01:00
parent 602112724d
commit 6eb8fd4d3c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/kotlin/moe/nea/firmament/features/diana/AncestralSpadeSolver.kt
View File

@@ -16,6 +16,7 @@ import moe.nea.firmament.events.SoundReceiveEvent
import moe.nea.firmament.events.WorldKeyboardEvent import moe.nea.firmament.events.WorldKeyboardEvent
import moe.nea.firmament.events.WorldReadyEvent import moe.nea.firmament.events.WorldReadyEvent
import moe.nea.firmament.events.WorldRenderLastEvent import moe.nea.firmament.events.WorldRenderLastEvent
import moe.nea.firmament.util.SBData
import moe.nea.firmament.util.TimeMark import moe.nea.firmament.util.TimeMark
import moe.nea.firmament.util.WarpUtil import moe.nea.firmament.util.WarpUtil
import moe.nea.firmament.util.render.RenderInWorldContext import moe.nea.firmament.util.render.RenderInWorldContext
@@ -30,8 +31,10 @@ object AncestralSpadeSolver {
private var lastTeleportAttempt = TimeMark.farPast() private var lastTeleportAttempt = TimeMark.farPast()
fun isEnabled() =
DianaWaypoints.TConfig.ancestralSpadeSolver && SBData.skyblockLocation == "hub"
fun onKeyBind(event: WorldKeyboardEvent) { fun onKeyBind(event: WorldKeyboardEvent) {
if (!DianaWaypoints.TConfig.ancestralSpadeSolver) return if (!isEnabled()) return
if (!event.matches(DianaWaypoints.TConfig.ancestralSpadeTeleport)) return if (!event.matches(DianaWaypoints.TConfig.ancestralSpadeTeleport)) return
if (lastTeleportAttempt.passedTime() < 3.seconds) return if (lastTeleportAttempt.passedTime() < 3.seconds) return
@@ -40,7 +43,7 @@ object AncestralSpadeSolver {
} }
fun onParticleSpawn(event: ParticleSpawnEvent) { fun onParticleSpawn(event: ParticleSpawnEvent) {
if (!DianaWaypoints.TConfig.ancestralSpadeSolver) return if (!isEnabled()) return
if (event.particleEffect != ParticleTypes.DRIPPING_LAVA) return if (event.particleEffect != ParticleTypes.DRIPPING_LAVA) return
if (event.offset.x != 0.0F || event.offset.y != 0F || event.offset.z != 0F) if (event.offset.x != 0.0F || event.offset.y != 0F || event.offset.z != 0F)
return return
@@ -51,7 +54,7 @@ object AncestralSpadeSolver {
} }
fun onPlaySound(event: SoundReceiveEvent) { fun onPlaySound(event: SoundReceiveEvent) {
if (!DianaWaypoints.TConfig.ancestralSpadeSolver) return if (!isEnabled()) return
if (!SoundEvents.BLOCK_NOTE_BLOCK_HARP.matchesId(event.sound.value().id)) return if (!SoundEvents.BLOCK_NOTE_BLOCK_HARP.matchesId(event.sound.value().id)) return
if (lastDing.passedTime() > 1.seconds) { if (lastDing.passedTime() > 1.seconds) {
@@ -90,7 +93,7 @@ object AncestralSpadeSolver {
} }
fun onWorldRender(event: WorldRenderLastEvent) { fun onWorldRender(event: WorldRenderLastEvent) {
if (!DianaWaypoints.TConfig.ancestralSpadeSolver) return if (!isEnabled()) return
RenderInWorldContext.renderInWorld(event) { RenderInWorldContext.renderInWorld(event) {
nextGuess?.let { nextGuess?.let {
color(1f, 1f, 0f, 0.5f) color(1f, 1f, 0f, 0.5f)