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

feat: Add relative waypoints to import coords relative to a structure

Browse Source
This commit is contained in:
Linnea Gräf
2025-03-17 21:20:46 +01:00
parent 03cf4e465c
commit 16cc3b2a7c
3 changed files with 113 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/main/kotlin/features/world/Waypoints.kt
View File

@@ -208,32 +208,60 @@ object Waypoints : FirmamentFeature {
it.z)
})
ClipboardUtils.setTextContent(data)
source.sendFeedback(tr("firmament.command.waypoint.export", "Copied ${waypoints.size} waypoints to clipboard"))
source.sendFeedback(tr("firmament.command.waypoint.export",
"Copied ${waypoints.size} waypoints to clipboard"))
}
}
thenLiteral("exportrelative") {
thenExecute {
val playerPos = MC.player!!.blockPos
val x = playerPos.x
val y = playerPos.y
val z = playerPos.z
val data = Firmament.tightJson.encodeToString<List<ColeWeightWaypoint>>(waypoints.map {
ColeWeightWaypoint(it.x - x,
it.y - y,
it.z - z)
})
ClipboardUtils.setTextContent(data)
source.sendFeedback(tr("firmament.command.waypoint.export.relative",
"Copied ${waypoints.size} relative waypoints to clipboard. Make sure to stand in the same position when importing."))
}
}
thenLiteral("import") {
thenExecute {
val contents = ClipboardUtils.getTextContents()
val data = try {
Firmament.tightJson.decodeFromString<List<ColeWeightWaypoint>>(contents)
} catch (ex: Exception) {
Firmament.logger.error("Could not load waypoints from clipboard", ex)
source.sendError(Text.translatable("firmament.command.waypoint.import.error"))
return@thenExecute
}
waypoints.clear()
data.mapTo(waypoints) { BlockPos(it.x, it.y, it.z) }
source.sendFeedback(
Text.stringifiedTranslatable(
"firmament.command.waypoint.import",
data.size
)
importRelative(BlockPos.ORIGIN)
?: Text.stringifiedTranslatable("firmament.command.waypoint.import", waypoints.size),
)
}
}
thenLiteral("importrelative") {
thenExecute {
source.sendFeedback(
importRelative(MC.player!!.blockPos)
?: tr("firmament.command.waypoint.import.relative",
"Imported ${waypoints.size} relative waypoints from clipboard. Make sure you stand in the same position as when you exported these waypoints for them to line up correctly."),
)
}
}
}
}
fun importRelative(pos: BlockPos): Text? {
val contents = ClipboardUtils.getTextContents()
val data = try {
Firmament.tightJson.decodeFromString<List<ColeWeightWaypoint>>(contents)
} catch (ex: Exception) {
Firmament.logger.error("Could not load waypoints from clipboard", ex)
return (Text.translatable("firmament.command.waypoint.import.error"))
}
waypoints.clear()
data.mapTo(waypoints) { BlockPos(it.x + pos.x, it.y + pos.y, it.z + pos.z) }
return null
}
@Subscribe
fun onRenderTemporaryWaypoints(event: WorldRenderLastEvent) {
temporaryPlayerWaypointList.entries.removeIf { it.value.postedAt.passedTime() > TConfig.tempWaypointDuration }