refactor: port to mojmaps

2 files changed, 14 insertions, 14 deletions

diff --git a/src/main/kotlin/features/diana/AncestralSpadeSolver.kt b/src/main/kotlin/features/diana/AncestralSpadeSolver.kt
index a2869f0..72806c9 100644
--- a/src/main/kotlin/features/diana/AncestralSpadeSolver.kt
+++ b/src/main/kotlin/features/diana/AncestralSpadeSolver.kt
@@ -1,9 +1,9 @@
 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
@@ -23,8 +23,8 @@ 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()
@@ -32,7 +32,7 @@ object AncestralSpadeSolver {
 	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) {
@@ -59,7 +59,7 @@ object AncestralSpadeSolver {
 	@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()
@@ -93,7 +93,7 @@ object AncestralSpadeSolver {
 			.let { (a, _, b) -> b.subtract(a) }
 			.normalize()
 
-		nextGuess = event.position.add(lastParticleDirection.multiply(soundDistanceEstimate))
+		nextGuess = event.position.add(lastParticleDirection.scale(soundDistanceEstimate))
 	}
 
 	@Subscribe
diff --git a/src/main/kotlin/features/diana/NearbyBurrowsSolver.kt b/src/main/kotlin/features/diana/NearbyBurrowsSolver.kt
index e1fb856..35af660 100644
--- a/src/main/kotlin/features/diana/NearbyBurrowsSolver.kt
+++ b/src/main/kotlin/features/diana/NearbyBurrowsSolver.kt
@@ -2,10 +2,10 @@ package moe.nea.firmament.features.diana
 
 import me.shedaniel.math.Color
 import kotlin.time.Duration.Companion.seconds
-import net.minecraft.particle.ParticleTypes
-import net.minecraft.util.math.BlockPos
-import net.minecraft.util.math.MathHelper
-import net.minecraft.util.math.Position
+import net.minecraft.core.particles.ParticleTypes
+import net.minecraft.core.BlockPos
+import net.minecraft.util.Mth
+import net.minecraft.core.Position
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.ParticleSpawnEvent
 import moe.nea.firmament.events.ProcessChatEvent
@@ -63,7 +63,7 @@ object NearbyBurrowsSolver {
 	fun onParticles(event: ParticleSpawnEvent) {
 		if (!DianaWaypoints.TConfig.nearbyWaypoints) return
 
-		val position: BlockPos = event.position.toBlockPos().down()
+		val position: BlockPos = event.position.toBlockPos().below()
 
 		if (wasRecentlyDug(position)) return
 
@@ -135,5 +135,5 @@ object NearbyBurrowsSolver {
 }
 
 fun Position.toBlockPos(): BlockPos {
-	return BlockPos(MathHelper.floor(x), MathHelper.floor(y), MathHelper.floor(z))
+	return BlockPos(Mth.floor(x()), Mth.floor(y()), Mth.floor(z()))
 }