snapshot

3 files changed, 139 insertions, 133 deletions

diff --git a/src/main/kotlin/features/world/FairySouls.kt b/src/main/kotlin/features/world/FairySouls.kt
index 477fbe6..9191a80 100644
--- a/src/main/kotlin/features/world/FairySouls.kt
+++ b/src/main/kotlin/features/world/FairySouls.kt
@@ -1,133 +1,123 @@
-
-
 package moe.nea.firmament.features.world
 
 import io.github.moulberry.repo.data.Coordinate
 import me.shedaniel.math.Color
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.serializer
-import net.minecraft.text.Text
-import net.minecraft.util.math.BlockPos
-import net.minecraft.util.math.Vec3d
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.ProcessChatEvent
 import moe.nea.firmament.events.SkyblockServerUpdateEvent
 import moe.nea.firmament.events.WorldRenderLastEvent
-import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.repo.RepoManager
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.SBData
 import moe.nea.firmament.util.SkyBlockIsland
 import moe.nea.firmament.util.blockPos
 import moe.nea.firmament.util.data.Config
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.data.ProfileSpecificDataHolder
-import moe.nea.firmament.util.render.RenderInWorldContext
 import moe.nea.firmament.util.render.RenderInWorldContext.Companion.renderInWorld
 import moe.nea.firmament.util.unformattedString
 
 
-object FairySouls : FirmamentFeature {
-
+object FairySouls {
 
-    @Serializable
-    data class Data(
-        val foundSouls: MutableMap<SkyBlockIsland, MutableSet<Int>> = mutableMapOf()
-    )
 
-    override val config: ManagedConfig
-        get() = TConfig
+	@Serializable
+	data class Data(
+		val foundSouls: MutableMap<SkyBlockIsland, MutableSet<Int>> = mutableMapOf()
+	)
 
 	@Config
-    object DConfig : ProfileSpecificDataHolder<Data>(serializer(), "found-fairysouls", ::Data)
+	object DConfig : ProfileSpecificDataHolder<Data>(serializer(), "found-fairysouls", ::Data)
 
 	@Config
-    object TConfig : ManagedConfig("fairy-souls", Category.MISC) {
-        val displaySouls by toggle("show") { false }
-        val resetSouls by button("reset") {
-            DConfig.data?.foundSouls?.clear() != null
-            updateMissingSouls()
-        }
-    }
-
-
-    override val identifier: String get() = "fairy-souls"
-
-    val playerReach = 5
-    val playerReachSquared = playerReach * playerReach
-
-    var currentLocationName: SkyBlockIsland? = null
-    var currentLocationSouls: List<Coordinate> = emptyList()
-    var currentMissingSouls: List<Coordinate> = emptyList()
-
-    fun updateMissingSouls() {
-        currentMissingSouls = emptyList()
-        val c = DConfig.data ?: return
-        val fi = c.foundSouls[currentLocationName] ?: setOf()
-        val cms = currentLocationSouls.toMutableList()
-        fi.asSequence().sortedDescending().filter { it in cms.indices }.forEach { cms.removeAt(it) }
-        currentMissingSouls = cms
-    }
-
-    fun updateWorldSouls() {
-        currentLocationSouls = emptyList()
-        val loc = currentLocationName ?: return
-        currentLocationSouls = RepoManager.neuRepo.constants.fairySouls.soulLocations[loc.locrawMode] ?: return
-    }
-
-    fun findNearestClickableSoul(): Coordinate? {
-        val player = MC.player ?: return null
-        val pos = player.pos
-        val location = SBData.skyblockLocation ?: return null
-        val soulLocations: List<Coordinate> =
-            RepoManager.neuRepo.constants.fairySouls.soulLocations[location.locrawMode] ?: return null
-        return soulLocations
-            .map { it to it.blockPos.getSquaredDistance(pos) }
-            .filter { it.second < playerReachSquared }
-            .minByOrNull { it.second }
-            ?.first
-    }
-
-    private fun markNearestSoul() {
-        val nearestSoul = findNearestClickableSoul() ?: return
-        val c = DConfig.data ?: return
-        val loc = currentLocationName ?: return
-        val idx = currentLocationSouls.indexOf(nearestSoul)
-        c.foundSouls.computeIfAbsent(loc) { mutableSetOf() }.add(idx)
-        DConfig.markDirty()
-        updateMissingSouls()
-    }
-
-    @Subscribe
-    fun onWorldRender(it: WorldRenderLastEvent) {
-        if (!TConfig.displaySouls) return
-        renderInWorld(it) {
-            currentMissingSouls.forEach {
-                block(it.blockPos, Color.ofRGBA(176, 0, 255, 128).color)
-            }
-            currentLocationSouls.forEach {
-                wireframeCube(it.blockPos)
-            }
-        }
-    }
-
-    @Subscribe
-    fun onProcessChat(it: ProcessChatEvent) {
-        when (it.text.unformattedString) {
-            "You have already found that Fairy Soul!" -> {
-                markNearestSoul()
-            }
-
-            "SOUL! You found a Fairy Soul!" -> {
-                markNearestSoul()
-            }
-        }
-    }
-
-    @Subscribe
-    fun onLocationChange(it: SkyblockServerUpdateEvent) {
-        currentLocationName = it.newLocraw?.skyblockLocation
-        updateWorldSouls()
-        updateMissingSouls()
-    }
+	object TConfig : ManagedConfig("fairy-souls", Category.MISC) {
+		val displaySouls by toggle("show") { false }
+		val resetSouls by button("reset") {
+			DConfig.data?.foundSouls?.clear() != null
+			updateMissingSouls()
+		}
+	}
+
+
+	val identifier: String get() = "fairy-souls"
+
+	val playerReach = 5
+	val playerReachSquared = playerReach * playerReach
+
+	var currentLocationName: SkyBlockIsland? = null
+	var currentLocationSouls: List<Coordinate> = emptyList()
+	var currentMissingSouls: List<Coordinate> = emptyList()
+
+	fun updateMissingSouls() {
+		currentMissingSouls = emptyList()
+		val c = DConfig.data ?: return
+		val fi = c.foundSouls[currentLocationName] ?: setOf()
+		val cms = currentLocationSouls.toMutableList()
+		fi.asSequence().sortedDescending().filter { it in cms.indices }.forEach { cms.removeAt(it) }
+		currentMissingSouls = cms
+	}
+
+	fun updateWorldSouls() {
+		currentLocationSouls = emptyList()
+		val loc = currentLocationName ?: return
+		currentLocationSouls = RepoManager.neuRepo.constants.fairySouls.soulLocations[loc.locrawMode] ?: return
+	}
+
+	fun findNearestClickableSoul(): Coordinate? {
+		val player = MC.player ?: return null
+		val pos = player.pos
+		val location = SBData.skyblockLocation ?: return null
+		val soulLocations: List<Coordinate> =
+			RepoManager.neuRepo.constants.fairySouls.soulLocations[location.locrawMode] ?: return null
+		return soulLocations
+			.map { it to it.blockPos.getSquaredDistance(pos) }
+			.filter { it.second < playerReachSquared }
+			.minByOrNull { it.second }
+			?.first
+	}
+
+	private fun markNearestSoul() {
+		val nearestSoul = findNearestClickableSoul() ?: return
+		val c = DConfig.data ?: return
+		val loc = currentLocationName ?: return
+		val idx = currentLocationSouls.indexOf(nearestSoul)
+		c.foundSouls.computeIfAbsent(loc) { mutableSetOf() }.add(idx)
+		DConfig.markDirty()
+		updateMissingSouls()
+	}
+
+	@Subscribe
+	fun onWorldRender(it: WorldRenderLastEvent) {
+		if (!TConfig.displaySouls) return
+		renderInWorld(it) {
+			currentMissingSouls.forEach {
+				block(it.blockPos, Color.ofRGBA(176, 0, 255, 128).color)
+			}
+			currentLocationSouls.forEach {
+				wireframeCube(it.blockPos)
+			}
+		}
+	}
+
+	@Subscribe
+	fun onProcessChat(it: ProcessChatEvent) {
+		when (it.text.unformattedString) {
+			"You have already found that Fairy Soul!" -> {
+				markNearestSoul()
+			}
+
+			"SOUL! You found a Fairy Soul!" -> {
+				markNearestSoul()
+			}
+		}
+	}
+
+	@Subscribe
+	fun onLocationChange(it: SkyblockServerUpdateEvent) {
+		currentLocationName = it.newLocraw?.skyblockLocation
+		updateWorldSouls()
+		updateMissingSouls()
+	}
 }
diff --git a/src/main/kotlin/features/world/TemporaryWaypoints.kt b/src/main/kotlin/features/world/TemporaryWaypoints.kt
index 3c8e895..f5653ad 100644
--- a/src/main/kotlin/features/world/TemporaryWaypoints.kt
+++ b/src/main/kotlin/features/world/TemporaryWaypoints.kt
@@ -1,8 +1,6 @@
 package moe.nea.firmament.features.world
 
 import me.shedaniel.math.Color
-import kotlin.compareTo
-import kotlin.text.clear
 import kotlin.time.Duration.Companion.seconds
 import net.minecraft.text.Text
 import net.minecraft.util.math.BlockPos
diff --git a/src/main/kotlin/features/world/Waypoints.kt b/src/main/kotlin/features/world/Waypoints.kt
index 72bd9e8..318b6c2 100644
--- a/src/main/kotlin/features/world/Waypoints.kt
+++ b/src/main/kotlin/features/world/Waypoints.kt
@@ -16,16 +16,15 @@ import moe.nea.firmament.events.CommandEvent
 import moe.nea.firmament.events.TickEvent
 import moe.nea.firmament.events.WorldReadyEvent
 import moe.nea.firmament.events.WorldRenderLastEvent
-import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.data.Config
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.mc.asFakeServer
 import moe.nea.firmament.util.render.RenderInWorldContext
 import moe.nea.firmament.util.tr
 
-object Waypoints : FirmamentFeature {
-	override val identifier: String
+object Waypoints {
+	val identifier: String
 		get() = "waypoints"
 
 	@Config
@@ -37,7 +36,6 @@ object Waypoints : FirmamentFeature {
 		// TODO: look ahead size
 	}
 
-	override val config get() = TConfig
 	var waypoints: FirmWaypoints? = null
 	var orderedIndex = 0
 
@@ -56,11 +54,13 @@ object Waypoints : FirmamentFeature {
 				orderedIndex %= w.waypoints.size
 				val firstColor = Color.ofRGBA(0, 200, 40, 180)
 				tracer(w.waypoints[orderedIndex].blockPos.toCenterPos(), color = firstColor.color, lineWidth = 3f)
-				w.waypoints.withIndex().toList().wrappingWindow(orderedIndex, 3).zip(listOf(
-					firstColor,
-					Color.ofRGBA(180, 200, 40, 150),
-					Color.ofRGBA(180, 80, 20, 140),
-				)).reversed().forEach { (waypoint, col) ->
+				w.waypoints.withIndex().toList().wrappingWindow(orderedIndex, 3).zip(
+					listOf(
+						firstColor,
+						Color.ofRGBA(180, 200, 40, 150),
+						Color.ofRGBA(180, 80, 20, 140),
+					)
+				).reversed().forEach { (waypoint, col) ->
 					val (index, pos) = waypoint
 					block(pos.blockPos, col.color)
 					if (TConfig.showIndex) withFacingThePlayer(pos.blockPos.toCenterPos()) {
@@ -123,10 +123,14 @@ object Waypoints : FirmamentFeature {
 					val position = pos.get(this).toAbsoluteBlockPos(source.asFakeServer())
 					val w = useEditableWaypoints()
 					w.waypoints.add(FirmWaypoints.Waypoint.from(position))
-					source.sendFeedback(Text.stringifiedTranslatable("firmament.command.waypoint.added",
-					                                                 position.x,
-					                                                 position.y,
-					                                                 position.z))
+					source.sendFeedback(
+						Text.stringifiedTranslatable(
+							"firmament.command.waypoint.added",
+							position.x,
+							position.y,
+							position.z
+						)
+					)
 				}
 			}
 		}
@@ -134,9 +138,12 @@ object Waypoints : FirmamentFeature {
 			thenLiteral("reset") {
 				thenExecute {
 					orderedIndex = 0
-					source.sendFeedback(tr(
-						"firmament.command.waypoint.reset",
-						"Reset your ordered waypoint index back to 0. If you want to delete all waypoints use /firm waypoints clear instead."))
+					source.sendFeedback(
+						tr(
+							"firmament.command.waypoint.reset",
+							"Reset your ordered waypoint index back to 0. If you want to delete all waypoints use /firm waypoints clear instead."
+						)
+					)
 				}
 			}
 			thenLiteral("changeindex") {
@@ -158,10 +165,13 @@ object Waypoints : FirmamentFeature {
 							w.waypoints.add(
 								if (toIndex > fromIndex) toIndex - 1
 								else toIndex,
-								waypoint)
+								waypoint
+							)
 							source.sendFeedback(
-								tr("firmament.command.waypoint.indexchange",
-								   "Moved waypoint from index $fromIndex to $toIndex. Note that this only matters for ordered waypoints.")
+								tr(
+									"firmament.command.waypoint.indexchange",
+									"Moved waypoint from index $fromIndex to $toIndex. Note that this only matters for ordered waypoints."
+								)
 							)
 						}
 					}
@@ -203,8 +213,12 @@ object Waypoints : FirmamentFeature {
 						val w = useNonEmptyWaypoints()
 						if (w != null && index in w.waypoints.indices) {
 							w.waypoints.removeAt(index)
-							source.sendFeedback(Text.stringifiedTranslatable("firmament.command.waypoint.remove",
-							                                                 index))
+							source.sendFeedback(
+								Text.stringifiedTranslatable(
+									"firmament.command.waypoint.remove",
+									index
+								)
+							)
 						} else {
 							source.sendError(Text.stringifiedTranslatable("firmament.command.waypoint.remove.error"))
 						}
@@ -215,12 +229,16 @@ object Waypoints : FirmamentFeature {
 	}
 
 	fun textInvalidIndex(index: Int) =
-		tr("firmament.command.waypoint.invalid-index",
-		   "Invalid index $index provided.")
+		tr(
+			"firmament.command.waypoint.invalid-index",
+			"Invalid index $index provided."
+		)
 
 	fun textNothingToExport(): Text =
-		tr("firmament.command.waypoint.export.nowaypoints",
-		   "No waypoints to export found. Add some with /firm waypoint ~ ~ ~.")
+		tr(
+			"firmament.command.waypoint.export.nowaypoints",
+			"No waypoints to export found. Add some with /firm waypoint ~ ~ ~."
+		)
 }
 
 fun <E> List<E>.wrappingWindow(startIndex: Int, windowSize: Int): List<E> {