Dependencies upgrade and upgrade to Kotlin 1.8.10

This commit is contained in:
2023-02-05 21:49:53 -08:00
parent ee6d3b37c0
commit 233c601595
5 changed files with 17 additions and 17 deletions

View File

@ -6,8 +6,8 @@ plugins {
dependencies {
api(project(":common-heimdall"))
implementation("com.github.ajalt.clikt:clikt:3.5.0")
implementation("org.slf4j:slf4j-simple:1.7.36")
implementation("com.github.ajalt.clikt:clikt:3.5.1")
implementation("org.slf4j:slf4j-simple:2.0.6")
}
tasks.jar {

View File

@ -74,10 +74,10 @@ class BlockChangeTimelapseCommand : CliktCommand("Block Change Timelapse", name
val trim = maybeBuildTrim()
val filter = compose(
combine = { a, b -> a and b },
{ trim?.first?.x != null } to { BlockChangeView.x greaterEq trim!!.first.x },
{ trim?.first?.z != null } to { BlockChangeView.z greaterEq trim!!.first.z },
{ trim?.second?.x != null } to { BlockChangeView.x lessEq trim!!.second.x },
{ trim?.second?.z != null } to { BlockChangeView.z lessEq trim!!.second.z }
{ trim?.first?.x != null } to { BlockChangeView.x greaterEq trim!!.first.x.toDouble() },
{ trim?.first?.z != null } to { BlockChangeView.z greaterEq trim!!.first.z.toDouble() },
{ trim?.second?.x != null } to { BlockChangeView.x lessEq trim!!.second.x.toDouble() },
{ trim?.second?.z != null } to { BlockChangeView.z lessEq trim!!.second.z.toDouble() }
)
val changelog = BlockChangelog.query(db, filter)