rework for 1.21, and it works!

This commit is contained in:
Alex Zenla
2025-04-10 21:42:29 -07:00
parent abd0a47424
commit c0499c0b58
20 changed files with 80 additions and 63 deletions

View File

@ -1,6 +1,6 @@
plugins {
id("gay.pizza.foundation.concrete-base")
id("com.github.johnrengelman.shadow")
id("com.gradleup.shadow")
}
dependencies {
@ -24,6 +24,6 @@ concreteItem {
type.set("tool")
fileInclusion {
tasks.shadowJar.get().outputs.files.associateWith { "tool-jar" }
tasks.getByName("shadowJar").outputs.files.associateWith { "tool-jar" }
}
}

View File

@ -9,7 +9,7 @@ import com.zaxxer.hikari.HikariDataSource
import org.jetbrains.exposed.sql.Database
import java.time.Duration
class GjallarhornCommand : CliktCommand(invokeWithoutSubcommand = true) {
class GjallarhornCommand : CliktCommand() {
private val jdbcConnectionUrl by option("-c", "--connection-url", help = "JDBC Connection URL")
.default("jdbc:postgresql://localhost/heimdall")

View File

@ -1,6 +1,7 @@
package gay.pizza.foundation.heimdall.tool.commands
import com.github.ajalt.clikt.core.CliktCommand
import com.github.ajalt.clikt.core.Context
import com.github.ajalt.clikt.core.requireObject
import com.github.ajalt.clikt.parameters.options.default
import com.github.ajalt.clikt.parameters.options.flag
@ -31,7 +32,7 @@ import java.util.UUID
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.ScheduledThreadPoolExecutor
class BlockChangeTimelapseCommand : CliktCommand("Block Change Timelapse", name = "block-change-timelapse") {
class BlockChangeTimelapseCommand : CliktCommand("block-change-timelapse") {
private val db by requireObject<Database>()
private val timelapseIntervalLimit by option("--timelapse-limit", help = "Timelapse Limit Intervals").int()
private val timelapseMode by option("--timelapse", help = "Timelapse Mode").enum<TimelapseMode> { it.id }.required()

View File

@ -19,7 +19,7 @@ import kotlinx.serialization.json.decodeFromStream
import kotlinx.serialization.json.encodeToStream
import org.jetbrains.exposed.sql.Database
class ChunkExportLoaderCommand : CliktCommand("Chunk Export Loader", name = "chunk-export-loader") {
class ChunkExportLoaderCommand : CliktCommand(name = "chunk-export-loader") {
private val db by requireObject<Database>()
private val exportDirectoryPath by argument("export-directory-path").path()

View File

@ -19,7 +19,7 @@ import org.jetbrains.exposed.sql.transactions.transaction
import kotlin.io.path.deleteIfExists
import kotlin.io.path.outputStream
class GenerateWorldLoadFile : CliktCommand(name = "generate-world-load", help = "Generate World Load File") {
class GenerateWorldLoadFile : CliktCommand(name = "generate-world-load") {
private val db by requireObject<Database>()
val path by argument("load-format-file").path()

View File

@ -15,7 +15,7 @@ import org.jetbrains.exposed.sql.transactions.transaction
import java.time.Instant
import java.util.*
class PlayerPositionExport : CliktCommand(name = "export-player-positions", help = "Export Player Positions") {
class PlayerPositionExport : CliktCommand(name = "export-player-positions") {
private val db by requireObject<Database>()
private val playerIdString by option("--player", help = "Player ID")

View File

@ -12,7 +12,7 @@ import org.jetbrains.exposed.sql.select
import org.jetbrains.exposed.sql.transactions.transaction
import java.util.*
class PlayerSessionExport : CliktCommand(name = "export-player-sessions", help = "Export Player Sessions") {
class PlayerSessionExport : CliktCommand(name = "export-player-sessions") {
private val db by requireObject<Database>()
private val playerIdString by option("--player-id", help = "Player ID")

View File

@ -1,5 +1,6 @@
package gay.pizza.foundation.heimdall.tool
import com.github.ajalt.clikt.core.main
import com.github.ajalt.clikt.core.subcommands
import gay.pizza.foundation.heimdall.tool.commands.*

View File

@ -4,8 +4,11 @@ import gay.pizza.foundation.heimdall.table.PlayerPositionTable
import gay.pizza.foundation.heimdall.tool.state.*
import gay.pizza.foundation.heimdall.tool.util.BlockColorKey
import org.jetbrains.exposed.sql.Database
import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
import org.jetbrains.exposed.sql.SqlExpressionBuilder.lessEq
import org.jetbrains.exposed.sql.and
import org.jetbrains.exposed.sql.select
import org.jetbrains.exposed.sql.selectAll
import org.jetbrains.exposed.sql.transactions.transaction
import java.awt.Color
import java.awt.image.BufferedImage
@ -25,7 +28,7 @@ class PlayerLocationShareRenderer(
val playerSparseMap = BlockCoordinateSparseMap<MutableList<UUID>>()
val allPlayerIds = HashSet<UUID>()
transaction(db) {
PlayerPositionTable.select {
PlayerPositionTable.selectAll().where {
(PlayerPositionTable.time greater start) and
(PlayerPositionTable.time lessEq end)
}.forEach {