Skip to content
Draft
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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "ferricia"]
path = ferricia
url = https://github.com/AnvilloyDevStudio/TerraModulus-Ferricia-Engine
8 changes: 8 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 11 additions & 5 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/copyright/copyright.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions .idea/modules/src/client/TerraModulus.client.main.iml

This file was deleted.

32 changes: 32 additions & 0 deletions .idea/modules/src/client/TerraModulus.client.test.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions .idea/modules/src/common/TerraModulus.common.main.iml

This file was deleted.

16 changes: 16 additions & 0 deletions .idea/modules/src/common/TerraModulus.common.test.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions .idea/modules/src/server/TerraModulus.server.main.iml

This file was deleted.

17 changes: 17 additions & 0 deletions .idea/modules/src/server/TerraModulus.server.test.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

124 changes: 101 additions & 23 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
kotlin("jvm") version "2.1.0"
kotlin("jvm") version "2.1.20"
kotlin("plugin.serialization") version "2.1.20"
id("org.jetbrains.kotlinx.atomicfu") version "0.27.0"
application
}

configure(listOf(project(":kernel:server"), project(":kernel:client"))) {
apply(plugin = "application")
}

allprojects {
apply(plugin = "org.jetbrains.kotlin.jvm")
apply(plugin = "application")

version = "0.1.0"

Expand All @@ -16,45 +21,118 @@ allprojects {
}
}

subprojects {
sourceSets.main {
kotlin.srcDir("kotlin")
resources.srcDir("resources")
}
configure(listOf(project(":kernel"), project(":internal"))) {
configure(listOf(project("common"), project("client"), project("server"))) {
sourceSets.main {
kotlin.srcDir("kotlin")
resources.srcDir("resources")
}

tasks.compileKotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}

tasks.compileKotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
kotlin {
jvmToolchain(17)
}
}

kotlin {
jvmToolchain(21)
configure(listOf(project("client"), project("server"))) {
dependencies {
implementation(project("${parent!!.path}:common"))
}
}
}

project(":common") {
dependencies {
implementation("org.jetbrains:annotations:26.0.2")
project(":kernel") {
arrayOf("common", "client", "server").forEach {
project(it) {
dependencies {
implementation(project(":internal:$it"))
}
}
}
}

project(":client") {
project(":kernel:common") {
dependencies {
implementation(project(":common"))
api("org.jetbrains:annotations:26.0.2")
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1")
api("org.jetbrains.kotlinx:kotlinx-io-core:0.7.0")
api("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2")
api("org.jetbrains.kotlinx:multik-core:0.2.3")
api("org.jetbrains.kotlinx:multik-default:0.2.3")
api(kotlin("reflect"))
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
implementation("com.github.oshi:oshi-core:6.8.0")
api("com.google.errorprone:error_prone_annotations:2.38.0")
implementation("org.apache.logging.log4j:log4j-core:2.24.3")
implementation("org.apache.logging.log4j:log4j-api:2.24.3")
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.24.3")
implementation(platform("org.apache.logging.log4j:log4j-bom:2.24.3"))
annotationProcessor("org.apache.logging.log4j:log4j-core:2.24.3")
runtimeOnly("com.lmax:disruptor:4.0.0")
api("io.github.oshai:kotlin-logging-jvm:7.0.3")
implementation("net.sf.jopt-simple:jopt-simple:5.0.4")
}
}

project(":kernel:client").dependencies {
implementation("net.sf.jopt-simple:jopt-simple:5.0.4")
}

project(":kernel:server").dependencies {
implementation("net.sf.jopt-simple:jopt-simple:5.0.4")
}

project(":internal:common").dependencies {
implementation("net.java.dev.jna:jna:5.17.0")
implementation("net.java.dev.jna:jna-platform:5.17.0")
}

configure(listOf(project(":kernel:server"), project(":kernel:client"))) {
application {
mainClass = "terramodulus.client.Main"
mainClass = "terramodulus.core.MainKt"
}
}

project(":server") {
dependencies {
implementation(project(":common"))
enum class Target {
CLIENT, SERVER;
}

/** Build Ferricia Engine with Cargo */
fun Exec.configureCargoBuild(target: Target) {
workingDir = rootProject.file("ferricia")
commandLine("cargo", "build")
if (project.hasProperty("release")) args("--release") // use `-Prelease=true`
args("-F")
when (target) {
Target.CLIENT -> args("client")
Target.SERVER -> args("server")
}
}

application {
mainClass = "terramodulus.server.Main"
tasks.register<Exec>("runClient") {
group = "application"
description = "Run client"
finalizedBy(":kernel:client:run")
configureCargoBuild(Target.CLIENT)
}

tasks.register<Exec>("runServer") {
group = "application"
description = "Run server"
finalizedBy(":kernel:server:run")
configureCargoBuild(Target.SERVER)
}

configure(listOf(project(":kernel:server"), project(":kernel:client"))) {
tasks.named<JavaExec>("run") {
jvmArgs("-Djava.library.path=${rootProject.file("ferricia/target/${
if (project.hasProperty("release")) "release" else "debug"
}").path}")
args("--screen-size", "800x500")
}
}
1 change: 1 addition & 0 deletions ferricia
Submodule ferricia added at f1c9c3
Loading