1 files changed, 11 insertions, 20 deletions

diff --git a/src/main/kotlin/features/diana/AncestralSpadeSolver.kt b/src/main/kotlin/features/diana/AncestralSpadeSolver.kt
index ff85c00..72806c9 100644
--- a/src/main/kotlin/features/diana/AncestralSpadeSolver.kt
+++ b/src/main/kotlin/features/diana/AncestralSpadeSolver.kt
@@ -1,33 +1,30 @@
 package moe.nea.firmament.features.diana
 
 import kotlin.time.Duration.Companion.seconds
-import net.minecraft.particle.ParticleTypes
-import net.minecraft.sound.SoundEvents
-import net.minecraft.util.math.Vec3d
+import net.minecraft.core.particles.ParticleTypes
+import net.minecraft.sounds.SoundEvents
+import net.minecraft.world.phys.Vec3
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.ParticleSpawnEvent
 import moe.nea.firmament.events.SoundReceiveEvent
 import moe.nea.firmament.events.WorldKeyboardEvent
 import moe.nea.firmament.events.WorldReadyEvent
 import moe.nea.firmament.events.WorldRenderLastEvent
-import moe.nea.firmament.events.subscription.SubscriptionOwner
-import moe.nea.firmament.features.FirmamentFeature
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.SBData
 import moe.nea.firmament.util.SkyBlockIsland
-import moe.nea.firmament.util.SkyblockId
 import moe.nea.firmament.util.TimeMark
 import moe.nea.firmament.util.WarpUtil
 import moe.nea.firmament.util.render.RenderInWorldContext
 import moe.nea.firmament.util.skyBlockId
 import moe.nea.firmament.util.skyblock.SkyBlockItems
 
-object AncestralSpadeSolver : SubscriptionOwner {
+object AncestralSpadeSolver {
 	var lastDing = TimeMark.farPast()
 		private set
 	private val pitches = mutableListOf<Float>()
-	val particlePositions = mutableListOf<Vec3d>()
-	var nextGuess: Vec3d? = null
+	val particlePositions = mutableListOf<Vec3>()
+	var nextGuess: Vec3? = null
 		private set
 
 	private var lastTeleportAttempt = TimeMark.farPast()
@@ -35,7 +32,7 @@ object AncestralSpadeSolver : SubscriptionOwner {
 	fun isEnabled() =
 		DianaWaypoints.TConfig.ancestralSpadeSolver
 			&& SBData.skyblockLocation == SkyBlockIsland.HUB
-			&& MC.player?.inventory?.containsAny { it.skyBlockId == SkyBlockItems.ANCESTRAL_SPADE } == true // TODO: add a reactive property here
+			&& MC.player?.inventory?.hasAnyMatching { it.skyBlockId == SkyBlockItems.ANCESTRAL_SPADE } == true // TODO: add a reactive property here
 
 	@Subscribe
 	fun onKeyBind(event: WorldKeyboardEvent) {
@@ -62,7 +59,7 @@ object AncestralSpadeSolver : SubscriptionOwner {
 	@Subscribe
 	fun onPlaySound(event: SoundReceiveEvent) {
 		if (!isEnabled()) return
-		if (!SoundEvents.BLOCK_NOTE_BLOCK_HARP.matchesId(event.sound.value().id)) return
+		if (!SoundEvents.NOTE_BLOCK_HARP.`is`(event.sound.value().location)) return
 
 		if (lastDing.passedTime() > 1.seconds) {
 			particlePositions.clear()
@@ -96,7 +93,7 @@ object AncestralSpadeSolver : SubscriptionOwner {
 			.let { (a, _, b) -> b.subtract(a) }
 			.normalize()
 
-		nextGuess = event.position.add(lastParticleDirection.multiply(soundDistanceEstimate))
+		nextGuess = event.position.add(lastParticleDirection.scale(soundDistanceEstimate))
 	}
 
 	@Subscribe
@@ -106,13 +103,11 @@ object AncestralSpadeSolver : SubscriptionOwner {
 			nextGuess?.let {
 				tinyBlock(it, 1f, 0x80FFFFFF.toInt())
 				// TODO: replace this
-				color(1f, 1f, 0f, 1f)
-				tracer(it, lineWidth = 3f)
+				tracer(it, lineWidth = 3f, color = 0x80FFFFFF.toInt())
 			}
 			if (particlePositions.size > 2 && lastDing.passedTime() < 10.seconds && nextGuess != null) {
 				// TODO: replace this // TODO: add toggle
-				color(0f, 1f, 0f, 0.7f)
-				line(particlePositions)
+				line(particlePositions, color = 0x80FFFFFF.toInt())
 			}
 		}
 	}
@@ -124,8 +119,4 @@ object AncestralSpadeSolver : SubscriptionOwner {
 		pitches.clear()
 		lastDing = TimeMark.farPast()
 	}
-
-	override val delegateFeature: FirmamentFeature
-		get() = DianaWaypoints
-
 }