Dsgl 15

.editorconfig

@@ -0,0 +1,45 @@
+root = true
+
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+tab_width = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+
+[*.md]
+trim_trailing_whitespace = false
+
+
+[*.{yml,yaml,toml,json}]
+indent_size = 2
+
+
+[*.{kt,kts}]
+max_line_length = 120
+ktlint_code_style = ktlint_official
+ktlint_experimental = disabled
+ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 4
+ktlint_function_signature_body_expression_wrapping = multiline
+ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 1
+ktlint_chain_method_rule_force_multiline_when_chain_operator_count_greater_or_equal_than = 3
+ktlint_function_naming_ignore_when_annotated_with = Composable,DsglDsl
+ktlint_ignore_back_ticked_identifier = true
+
+ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
+ij_kotlin_packages_to_use_import_on_demand = org.dreamfinity.dsgl.core.animation.*,org.dreamfinity.dsgl.core.colorpicker.*,org.dreamfinity.dsgl.core.dnd.*,org.dreamfinity.dsgl.core.dom.elements.*,org.dreamfinity.dsgl.core.dom.elements.support.*,org.dreamfinity.dsgl.core.dom.layout.*,org.dreamfinity.dsgl.core.dsl.*,org.dreamfinity.dsgl.core.event.*,org.dreamfinity.dsgl.core.font.*,org.dreamfinity.dsgl.core.inspector.*,org.dreamfinity.dsgl.core.style.*,org.dreamfinity.dsgl.core.text.*,org.lwjgl.opengl.*
+ij_kotlin_allow_trailing_comma = true
+# ij_kotlin_allow_trailing_comma_on_call_site = true # disabled due to breaking DSL callsite by IDE code linter
+ij_kotlin_indent_before_arrow_on_new_line = false
+ij_formatter_tags_enabled = true
+ij_formatter_off_tag = @formatter:off
+ij_formatter_on_tag = @formatter:on
+
+[**/src/test/kotlin/**/*.kt]
+max_line_length = 160
+ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 4
+ij_kotlin_packages_to_use_import_on_demand = kotlin.test.*,org.dreamfinity.dsgl.core.colorpicker.*,org.dreamfinity.dsgl.core.dnd.*,org.dreamfinity.dsgl.core.event.*

.githooks/pre-commit

@@ -0,0 +1,46 @@
+#!/bin/sh
+# Runs ktlintFormat and detektAll on staged Kotlin files before commit.
+# ktlint auto-correctable violations are fixed and re-staged automatically.
+# Non-auto-correctable ktlint violations or detekt violations abort the commit.
+
+exec 1>&2
+
+STAGED_KT=$(git diff --cached --name-only --diff-filter=ACMR | grep -E '\.(kt|kts)$')
+
+if [ -z "$STAGED_KT" ]; then
+    exit 0
+fi
+
+echo "[pre-commit] Running ktlintFormat..."
+
+./gradlew ktlintFormat
+STATUS=$?
+
+# Re-stage any files that ktlint auto-corrected (only from the originally staged set)
+echo "$STAGED_KT" | tr ' ' '\n' | while IFS= read -r file; do
+    [ -f "$file" ] && git add "$file"
+done
+
+if [ $STATUS -ne 0 ]; then
+    echo ""
+    echo "[pre-commit] ktlintFormat found violations that cannot be auto-corrected."
+    echo "[pre-commit] Fix them manually, then re-run git commit."
+    exit 1
+fi
+
+echo "[pre-commit] ktlintFormat passed."
+
+echo "[pre-commit] Running detektAll..."
+
+./gradlew detektAll
+STATUS=$?
+
+if [ $STATUS -ne 0 ]; then
+    echo ""
+    echo "[pre-commit] detektAll found violations."
+    echo "[pre-commit] Fix them manually or update the baseline, then re-run git commit."
+    exit 1
+fi
+
+echo "[pre-commit] detektAll passed."
+exit 0

.gitignore

@@ -49,3 +49,5 @@ build
 
 # docs generated folder
 /site/
+# Added by code-review-graph
+.code-review-graph/

adapters/mc-forge-1-7-10/adapter-build-logic/settings.gradle.kts

@@ -1,5 +1,3 @@
-import org.gradle.kotlin.dsl.maven
-
 pluginManagement {
     includeBuild("../../../build-logic")
     repositories {
@@ -8,3 +6,11 @@ pluginManagement {
         maven("https://maven.minecraftforge.net")
     }
 }
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../../../gradle/libs.versions.toml"))
+        }
+    }
+}

adapters/mc-forge-1-7-10/build.gradle.kts

@@ -2,16 +2,19 @@ plugins {
     id("dsgl-mc-adapter.conventions")
     id("dsgl-mc-forge-1-7-10.conventions")
     id("dsgl-releaseable-module.conventions")
+    id("dsgl-linter.conventions")
+    id("dsgl-static-analysis.conventions")
 }
 
 dsglRelease {
     syncKeys.add("modVersion")
 }
 
 dependencies {
-    val coreProject = findProject(":core")
-        ?: findProject(":dsgl:core")
-        ?: error("DSGL core project not found (expected :core or :dsgl:core).")
+    val coreProject =
+        findProject(":core")
+            ?: findProject(":dsgl:core")
+            ?: error("DSGL core project not found (expected :core or :dsgl:core).")
     implementation(coreProject)
     testImplementation(kotlin("test-junit"))
     testImplementation(kotlin("test"))

adapters/mc-forge-1-7-10/demo/build.gradle.kts

@@ -1,6 +1,8 @@
 plugins {
     id("dsgl-mc-adapter.conventions")
     id("dsgl-mc-forge-1-7-10.conventions")
+    id("dsgl-linter.conventions")
+    id("dsgl-static-analysis.conventions")
 }
 
 val modId: String by project
@@ -19,20 +21,22 @@ val msdfDebugDecorations: String by project
 val msdfDebugPerformance: String by project
 val rebuildTrace: String by project
 val perfDebug: String by project
-val dsglOverlayDebug: String by project
-val dsglOverlayControls: String by project
+val dsglDomainDebug: String by project
+val dsglDomainControls: String by project
+val dsglColorPickerDebugCounters: String by project
 val hotReloadAgentLibraryName: String? by project
 
-val baseModMetadataTokens = mapOf(
-    "modId" to modId,
-    "modGroup" to modGroup,
-    "modName" to modName,
-    "modAuthor" to modAuthor,
-    "modDescription" to modDescription,
-    "modCredits" to modCredits,
-    "modIcon" to modIcon,
-    "gameVersion" to gameVersion
-)
+val baseModMetadataTokens =
+    mapOf(
+        "modId" to modId,
+        "modGroup" to modGroup,
+        "modName" to modName,
+        "modAuthor" to modAuthor,
+        "modDescription" to modDescription,
+        "modCredits" to modCredits,
+        "modIcon" to modIcon,
+        "gameVersion" to gameVersion,
+    )
 
 fun currentModVersion(): String {
     val dynamic = (findProperty("modVersion") as? String)?.trim()
@@ -41,25 +45,24 @@ fun currentModVersion(): String {
     throw GradleException("Missing required property 'modVersion' for mc-forge-1-7-10-demo module.")
 }
 
-fun currentModMetadataTokens(): Map<String, String> {
-    return baseModMetadataTokens + ("modVersion" to currentModVersion())
-}
+fun currentModMetadataTokens(): Map<String, String> = baseModMetadataTokens + ("modVersion" to currentModVersion())
 
 fun hotReloadAgentLibraryFile(): File {
     val explicitLibraryName = hotReloadAgentLibraryName?.trim()?.takeIf { it.isNotEmpty() }
     val osName = System.getProperty("os.name")?.lowercase()
-    val libraryName = explicitLibraryName ?: when {
-        osName == null -> throw GradleException(
-            "Unable to determine current operating system for DSGL hot-reload agent, and 'hotReloadAgentLibraryName' is not set."
-        )
-
-        osName.startsWith("windows") -> "dsgl_hot_reload_agent.dll"
-        osName.startsWith("linux") -> "libdsgl_hot_reload_agent.so"
-        osName.startsWith("mac") || osName.startsWith("darwin") -> "libdsgl_hot_reload_agent.dylib"
-        else -> throw GradleException(
-            "Unsupported operating system for DSGL hot-reload agent: $osName, and 'hotReloadAgentLibraryName' is not set."
-        )
-    }
+    val libraryName =
+        explicitLibraryName ?: when {
+            osName == null -> throw GradleException(
+                "Unable to determine current operating system for DSGL hot-reload agent, and 'hotReloadAgentLibraryName' is not set.",
+            )
+
+            osName.startsWith("windows") -> "dsgl_hot_reload_agent.dll"
+            osName.startsWith("linux") -> "libdsgl_hot_reload_agent.so"
+            osName.startsWith("mac") || osName.startsWith("darwin") -> "libdsgl_hot_reload_agent.dylib"
+            else -> throw GradleException(
+                "Unsupported operating system for DSGL hot-reload agent: $osName, and 'hotReloadAgentLibraryName' is not set.",
+            )
+        }
 
     return project.rootDir.resolve("dsgl-hot-reload-agent/target/release/$libraryName")
 }
@@ -93,22 +96,24 @@ val generateModMetadata by tasks.registering {
                 const val MOD_CREDITS: String = "${tokens["modCredits"]}"
                 const val MOD_ICON: String = "${tokens["modIcon"]}"
             }
-            """.trimIndent()
+            """.trimIndent() + System.lineSeparator(),
         )
     }
 }
 
 tasks {
     runClient {
-        var jvmArgs = listOf(
-            "-Ddsgl.msdf.debug=$msdfDebug",
-            "-Ddsgl.msdf.debug.decorations=$msdfDebugDecorations",
-            "-Ddsgl.msdf.debug.performance=$msdfDebugPerformance",
-            "-Ddsgl.rebuild.trace=$rebuildTrace",
-            "-Ddsgl.perf.debug=$perfDebug",
-            "-Ddsgl.overlay.debug=$dsglOverlayDebug",
-            "-Ddsgl.overlay.controls=$dsglOverlayControls",
-        )
+        var jvmArgs =
+            listOf(
+                "-Ddsgl.msdf.debug=$msdfDebug",
+                "-Ddsgl.msdf.debug.decorations=$msdfDebugDecorations",
+                "-Ddsgl.msdf.debug.performance=$msdfDebugPerformance",
+                "-Ddsgl.rebuild.trace=$rebuildTrace",
+                "-Ddsgl.perf.debug=$perfDebug",
+                "-Ddsgl.domain.debug=$dsglDomainDebug",
+                "-Ddsgl.domain.controls=$dsglDomainControls",
+                "-Ddsgl.colorPicker.debugCounters=$dsglColorPickerDebugCounters",
+            )
 
         if (hotReload.toBoolean()) {
             jvmArgs = jvmArgs + listOf("-agentpath:${hotReloadAgentLibraryFile().absolutePath}")
@@ -131,7 +136,10 @@ tasks {
 }
 
 kotlin {
-    sourceSets.getByName("main").kotlin.srcDir(generatedModMetadataDir)
+    sourceSets
+        .getByName("main")
+        .kotlin
+        .srcDir(generatedModMetadataDir)
 }
 
 tasks.named("compileKotlin") {
@@ -150,6 +158,10 @@ tasks.named("dokkaGeneratePublicationHtml") {
     dependsOn(generateModMetadata)
 }
 
+tasks.matching { it.name.startsWith("runKtlintCheckOver") || it.name.startsWith("runKtlintFormatOver") }.configureEach {
+    dependsOn(generateModMetadata)
+}
+
 tasks.named<ProcessResources>("processResources") {
     inputs.properties(baseModMetadataTokens)
     inputs.property("modVersion", providers.provider { currentModVersion() })
@@ -182,6 +194,10 @@ listOf(
     }
 }
 
+tasks.named<Test>("test") {
+    mustRunAfter(":adapters:mc-forge-1-7-10:reobf")
+}
+
 tasks.withType<PublishToMavenLocal>().configureEach {
     enabled = false
 }
@@ -203,8 +219,10 @@ repositories {
 }
 
 dependencies {
-    implementation("org.dreamfinity:dsgl-core:0.0.1")
-    implementation("org.dreamfinity:dsgl-mc-forge-1-7-10:0.0.1:dev")
+    implementation(project(":core"))
+    implementation(project(":adapters:mc-forge-1-7-10"))
+//    implementation("org.dreamfinity:dsgl-core:0.0.1")
+//    implementation("org.dreamfinity:dsgl-mc-forge-1-7-10:0.0.1:dev")
     testImplementation(kotlin("test-junit"))
     testImplementation(kotlin("test"))
 }