aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/kotlin/moe/nea/firmament/features/diana/DianaWaypoints.kt5
-rw-r--r--src/main/kotlin/moe/nea/firmament/features/diana/NearbyBurrowsSolver.kt4
-rw-r--r--src/main/resources/assets/firmament/lang/en_us.json6
3 files changed, 13 insertions, 2 deletions
diff --git a/src/main/kotlin/moe/nea/firmament/features/diana/DianaWaypoints.kt b/src/main/kotlin/moe/nea/firmament/features/diana/DianaWaypoints.kt
index 6422f67..9f72967 100644
--- a/src/main/kotlin/moe/nea/firmament/features/diana/DianaWaypoints.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/diana/DianaWaypoints.kt
@@ -17,11 +17,12 @@ import moe.nea.firmament.features.FirmamentFeature
import moe.nea.firmament.gui.config.ManagedConfig
object DianaWaypoints : FirmamentFeature {
- override val identifier get() = "diana-waypoints"
+ override val identifier get() = "diana"
override val config get() = TConfig
object TConfig : ManagedConfig(identifier) {
- val ancestralSpadeSolver by toggle("ancestral-spade") { false }
+ val ancestralSpadeSolver by toggle("ancestral-spade") { true }
+ val nearbyWaypoints by toggle("nearby-waypoints") { true }
}
override fun onLoad() {
diff --git a/src/main/kotlin/moe/nea/firmament/features/diana/NearbyBurrowsSolver.kt b/src/main/kotlin/moe/nea/firmament/features/diana/NearbyBurrowsSolver.kt
index 9fd7792..1ab7e01 100644
--- a/src/main/kotlin/moe/nea/firmament/features/diana/NearbyBurrowsSolver.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/diana/NearbyBurrowsSolver.kt
@@ -63,6 +63,7 @@ object NearbyBurrowsSolver {
}
fun onParticles(event: ParticleSpawnEvent) {
+ if (!DianaWaypoints.TConfig.nearbyWaypoints) return
val position: BlockPos = event.position.toBlockPos().down()
@@ -106,6 +107,7 @@ object NearbyBurrowsSolver {
}
fun onRender(event: WorldRenderLastEvent) {
+ if (!DianaWaypoints.TConfig.nearbyWaypoints) return
renderInWorld(event) {
for ((location, burrow) in burrows) {
when (burrow) {
@@ -126,6 +128,8 @@ object NearbyBurrowsSolver {
}
fun onBlockClick(blockPos: BlockPos) {
+ if (!DianaWaypoints.TConfig.nearbyWaypoints) return
+ burrows.remove(blockPos)
lastBlockClick = blockPos
}
}
diff --git a/src/main/resources/assets/firmament/lang/en_us.json b/src/main/resources/assets/firmament/lang/en_us.json
index d6454ec..897365f 100644
--- a/src/main/resources/assets/firmament/lang/en_us.json
+++ b/src/main/resources/assets/firmament/lang/en_us.json
@@ -20,6 +20,12 @@
"firmament.tooltip.bazaar.buy-order": "Bazaar Buy Order: %s",
"firmament.tooltip.ah.lowestbin": "Lowest BIN: %d",
"firmament.pv.pets": "Pets",
+ "firmament.config.diana": "Diana",
+ "firmament.config.diana.ancestral-spade": "Ancestral Spade Solver",
+ "firmament.config.diana.nearby-waypoints": "Nearby Waypoints Highlighter",
+ "firmament.config.pristine-profit": "Pristine Profit Tracker",
+ "firmament.config.pristine-profit.timeout": "Timeout (0 = disabled)",
+ "firmament.config.pristine-profit.position": "Position",
"firmament.debug.skyblockid": "SkyBlock ID: %s",
"firmament.debug.skyblockid.copy": "Click to copy SkyBlock ID",
"firmament.price.bazaar.sell.price": "Sell Price: %s",