Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 27 additions & 23 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

plugins {
kotlin("jvm") version "1.8.10"
kotlin("plugin.serialization") version "1.8.10"
kotlin("jvm") version "2.1.0"
kotlin("plugin.serialization") version "2.1.0"
java
id("fabric-loom") version "1.1-SNAPSHOT"
id("com.github.johnrengelman.shadow") version "7.1.2"
id("fabric-loom") version "1.9.2"
id("com.github.johnrengelman.shadow") version "8.1.1"
id("com.modrinth.minotaur") version "2.+"
}

Expand Down Expand Up @@ -113,31 +113,35 @@ tasks {
}

java {
val javaVersion = JavaVersion.toVersion(targetJavaVersion)
if (JavaVersion.current() < javaVersion) {
toolchain.languageVersion.set(JavaLanguageVersion.of(targetJavaVersion))
}
val javaVersion = JavaVersion.toVersion(targetJavaVersion)
if (JavaVersion.current() < javaVersion) {
toolchain.languageVersion.set(JavaLanguageVersion.of(targetJavaVersion))
}
}

kotlin {

}

val modrinth_id: String by project

modrinth {
token.set(System.getenv("MODRINTH_TOKEN"))
projectId.set(modrinth_id)
versionNumber.set("$mod_version")
versionName.set("CTM Fabric $mod_version")
gameVersions.add(minecraft_version)
loaders.add("fabric")
loaders.add("quilt")
dependencies {
required.project("create-fabric")
required.project("fabric-api")
required.project("fabric-language-kotlin")
}
token.set(System.getenv("MODRINTH_TOKEN"))
projectId.set(modrinth_id)
versionNumber.set("$mod_version")
versionName.set("CTM Fabric $mod_version")
gameVersions.add(minecraft_version)
loaders.add("fabric")
loaders.add("quilt")
dependencies {
required.project("create-fabric")
required.project("fabric-api")
required.project("fabric-language-kotlin")
}

uploadFile.set { tasks.remapJar.get().archiveFile }
changelog.set(project.file("CHANGELOG.md").readText())
syncBodyFrom.set(project.file("README.md").readText())
uploadFile.set { tasks.remapJar.get().archiveFile }
changelog.set(project.file("CHANGELOG.md").readText())
syncBodyFrom.set(project.file("README.md").readText())
}

tasks.modrinth.get().dependsOn(tasks.modrinthSyncBody)
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ mod_version = 1.4
modrinth_id = gxoNIjg6

minecraft_version = 1.20.1
fabric_loader_version = 0.14.21
fabric_api_version = 0.90.0+1.20.1
fabric_kotlin_version = 1.10.10+kotlin.1.9.10
fabric_loader_version = 0.16.9
fabric_api_version = 0.92.2+1.20.1
fabric_kotlin_version = 1.13.0+kotlin.2.1.0

create_version = 0.5.1-d-build.1161
create_version_short = 0.5.1
porting_lib_version = 2.1.1127+1.20
ktor_version = 2.3.0
kotlin_json_version = 1.4.1
kotlin_css_version = 1.0.0-pre.511
ktor_version = 3.0.1
kotlin_json_version = 1.7.3
kotlin_css_version = 1.0.0-pre.840
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion src/main/kotlin/littlechasiu/ctm/Server.kt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Server {
"trains" to LayerConfig(label = "Trains"),
)

private var server: CIOApplicationEngine? = null
private var server: EmbeddedServer<CIOApplicationEngine, CIOApplicationEngine.Configuration>? = null

fun start() {
if (!enable) {
Expand Down