diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed0e4b8..f355280 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - uses: gradle/actions/setup-gradle@v4 - run: chmod +x gradlew - name: Check formatting - run: ./gradlew spotlessCheck + run: ./gradlew formatCheck unit-tests: runs-on: ubuntu-latest steps: @@ -25,19 +25,22 @@ jobs: java-version: '25' - uses: gradle/actions/setup-gradle@v4 - run: chmod +x gradlew + # Unit tests run in every Stonecutter node, against that Minecraft version. - name: Run unit tests run: | ./gradlew test - # Once test sources exist, the run must produce results. - if [ -d src/test/java ]; then compgen -G 'build/test-results/test/TEST-*.xml' > /dev/null; fi + # Once test sources exist, every node must produce results. + if [ -d src/test/java ]; then + for node in versions/*/; do compgen -G "${node}build/test-results/test/TEST-*.xml" > /dev/null; done + fi - name: Upload unit test results if: always() uses: actions/upload-artifact@v4 with: name: Unit-test-results path: | - build/test-results/test/*.xml - build/reports/tests/test/ + versions/*/build/test-results/test/*.xml + versions/*/build/reports/tests/test/ if-no-files-found: ignore build: runs-on: ubuntu-latest @@ -49,8 +52,9 @@ jobs: java-version: '25' - uses: gradle/actions/setup-gradle@v4 - run: chmod +x gradlew + # Builds every Stonecutter node (Minecraft version). - run: ./gradlew build - uses: actions/upload-artifact@v4 with: name: TrajectoryProjected - path: build/libs/*.jar + path: versions/*/build/libs/*.jar diff --git a/.gitignore b/.gitignore index 89bb619..210d96b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,8 @@ bin/ # Logo sources and drafts; the chosen icon ships from src/main/resources. /logo/ -# Local development settings +# Local development settings and build additions +/local.*.gradle .idea/ .vscode/ *.iml diff --git a/build.fabric.gradle.kts b/build.fabric.gradle.kts new file mode 100644 index 0000000..dfae67f --- /dev/null +++ b/build.fabric.gradle.kts @@ -0,0 +1,156 @@ +plugins { + id("net.fabricmc.fabric-loom") +} + +fun prop(key: String): String = sc.properties.get(key) + +val archives = prop("mod.archives") +// The Minecraft part of the version names the releases the jar covers. +version = "${prop("mod.version")}+${prop("mod.mc_label")}" +group = prop("mod.group") +base.archivesName = archives + +repositories { + mavenCentral() + maven("https://api.modrinth.com/maven") +} + +dependencies { + minecraft("com.mojang:minecraft:${sc.current.version}") + implementation("net.fabricmc:fabric-loader:${prop("deps.fabric_loader")}") + implementation("net.fabricmc.fabric-api:fabric-api:${prop("deps.fabric_api")}") + // Optional rendering mods for local runs only: -PwithSodium, -PwithIris (Iris needs Sodium). + if (project.hasProperty("withSodium") || project.hasProperty("withIris")) { + runtimeOnly("maven.modrinth:sodium:${prop("deps.sodium")}") + } + if (project.hasProperty("withIris")) { + runtimeOnly("maven.modrinth:iris:${prop("deps.iris")}") + } + // Unit tests run in every node: the parity tests compare the core with that version's vanilla. + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") + testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.2") +} + +java { + withSourcesJar() + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 +} + +tasks.withType().configureEach { + options.release = 25 + options.encoding = "UTF-8" +} + +tasks.withType().configureEach { + useJUnitPlatform() +} + +val metadata = + mapOf( + "version" to version.toString(), + "minecraft" to prop("mod.mc_compat"), + "fabric_api" to prop("deps.fabric_api_min"), + "loader" to prop("deps.fabric_loader"), + ) + +tasks.processResources { + inputs.properties(metadata) + filesMatching("fabric.mod.json") { expand(metadata) } +} + +tasks.jar { + from(rootProject.file("LICENSE")) { rename { "${it}_$archives" } } +} + +tasks.named("sourcesJar") { + includeEmptyDirs = false + from(rootProject.file("LICENSE")) +} + +// Development tools live in a separate add-on mod, outside the release jar. +val main = sourceSets.main.get() +val dev = + sourceSets.create("dev") { + java.setSrcDirs(listOf(rootProject.file("src/dev/java"))) + resources.setSrcDirs(listOf(rootProject.file("src/dev/resources"))) + compileClasspath += main.output + main.compileClasspath + runtimeClasspath += main.output + main.runtimeClasspath + } + +tasks.named("processDevResources") { + inputs.property("version", version.toString()) + filesMatching("fabric.mod.json") { expand("version" to version.toString()) } +} + +val devJar = + tasks.register("devJar") { + archiveBaseName = "$archives-dev" + from(dev.output) + from(rootProject.file("LICENSE")) { rename { "${it}_$archives-dev" } } + } + +tasks.assemble { + dependsOn(devJar) +} + +loom { + mods { + register("trajectory_projected") { sourceSet(main) } + register("trajectory_projected_dev") { sourceSet(dev) } + } + runs { + named("client") { + // Development runs record predicted against real arrows (trajectory-reports/). + setSource(dev) + } + } +} + +// Starts the built jars from a real mods folder; requires local fixtures in src/releaseSmoke. +// The release jar alone by default, with the development add-on under -PsmokeWithDev. +val releaseSmoke = + sourceSets.create("releaseSmoke") { + java.setSrcDirs(listOf(rootProject.file("src/releaseSmoke/java"))) + resources.setSrcDirs(listOf(rootProject.file("src/releaseSmoke/resources"))) + compileClasspath += main.output + main.compileClasspath + } + +val releaseSmokeMods: Configuration by configurations.creating { isTransitive = false } + +dependencies { + releaseSmokeMods("net.fabricmc.fabric-api:fabric-api:${prop("deps.fabric_api")}") + releaseSmokeMods(fabricApi.module("fabric-client-gametest-api-v1", prop("deps.fabric_api"))) +} + +val releaseSmokeJar = + tasks.register("releaseSmokeJar") { + archiveBaseName = "$archives-release-smoke" + destinationDirectory = layout.buildDirectory.dir("release-smoke") + from(releaseSmoke.output) + } + +val syncReleaseSmokeMods = + tasks.register("syncReleaseSmokeMods") { + from(tasks.jar, releaseSmokeJar, releaseSmokeMods) + if (project.hasProperty("smokeWithDev")) { + from(devJar) + } + into(layout.buildDirectory.dir("run/releaseSmoke/mods")) + } + +tasks.register("runReleaseSmoke") { + group = "verification" + onlyIf("local fixtures are available") { !releaseSmoke.allJava.isEmpty } + // A check, not a build step: it runs every time it is asked for. + outputs.upToDateWhen { false } + dependsOn(syncReleaseSmokeMods) + jvmArgs.add("-Dfabric.client.gametest") + if (project.hasProperty("smokeWithDev")) { + jvmArgs.add("-Dtrajectory.smoke.dev=true") + } + runDir = layout.buildDirectory.dir("run/releaseSmoke") +} + +// Optional local build additions (native fixtures), kept outside Git. +rootProject.file("local.fabric.gradle").takeIf { it.exists() }?.let { apply(from = it) } diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 99cb217..0000000 --- a/build.gradle +++ /dev/null @@ -1,176 +0,0 @@ -import net.fabricmc.loom.task.prod.ClientProductionRunTask - -plugins { - id 'net.fabricmc.fabric-loom' version "${loom_version}" - id 'com.diffplug.spotless' version '8.10.4' -} - -version = project.mod_version -group = project.maven_group - -base { - archivesName = project.archives_base_name -} - -repositories { - mavenCentral() - maven { url = "https://api.modrinth.com/maven" } -} - -dependencies { - minecraft "com.mojang:minecraft:${project.minecraft_version}" - implementation "net.fabricmc:fabric-loader:${project.loader_version}" - - implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" - // Optional rendering mods for local runs only: -PwithSodium, -PwithIris (Iris needs Sodium). - if (project.hasProperty("withSodium") || project.hasProperty("withIris")) runtimeOnly "maven.modrinth:sodium:mc26.2-0.9.2-fabric" - if (project.hasProperty("withIris")) runtimeOnly "maven.modrinth:iris:1.11.4+26.2-fabric" - testImplementation "org.junit.jupiter:junit-jupiter:5.10.2" - testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.10.2" -} - -processResources { - inputs.property "version", project.version - - filesMatching("fabric.mod.json") { - expand "version": inputs.properties.version - } -} - -tasks.withType(JavaCompile).configureEach { - it.options.release = 25 - it.options.encoding = 'UTF-8' -} - -tasks.withType(Test).configureEach { - useJUnitPlatform() -} - -java { - // Minecraft 26.2 uses official names; the normal jar is the distributable artifact. - withSourcesJar() - - sourceCompatibility = JavaVersion.VERSION_25 - targetCompatibility = JavaVersion.VERSION_25 -} - -tasks.named('sourcesJar') { - includeEmptyDirs = false - from("LICENSE") -} - -jar { - inputs.property "archivesName", project.base.archivesName - - from("LICENSE") { - rename { "${it}_${inputs.properties.archivesName}"} - } -} - -// Development tools live in a separate add-on mod, outside the release jar. -sourceSets { - dev { - compileClasspath += main.output + main.compileClasspath - runtimeClasspath += main.output + main.runtimeClasspath - } -} - -processDevResources { - inputs.property "version", project.version - - filesMatching("fabric.mod.json") { - expand "version": inputs.properties.version - } -} - -tasks.register('devJar', Jar) { - archiveBaseName = "${project.archives_base_name}-dev" - from sourceSets.dev.output - from("LICENSE") { - rename { "${it}_${archiveBaseName.get()}" } - } -} - -tasks.named('assemble') { - dependsOn tasks.named('devJar') -} - -loom { - mods { - trajectory_projected { - sourceSet sourceSets.main - } - trajectory_projected_dev { - sourceSet sourceSets.dev - } - } - runs { - client { - // Development runs record predicted against real arrows (trajectory-reports/). - source sourceSets.dev - } - } -} - -// Native client fixtures live in a separate local mod (src/gametest), outside the release jar. -fabricApi.configureTests { - createSourceSet = true - modId = "trajectory_projected_test" - enableGameTests = false - enableClientGameTests = true - eula = true -} - -// The local fixtures run with the development add-on, so they can log shots. -sourceSets { - gametest { - compileClasspath += dev.output - runtimeClasspath += dev.output - } -} - -// Starts the built jars from a real mods folder; requires local fixtures. -// The release jar alone by default, with the development add-on under -PsmokeWithDev. -sourceSets { - releaseSmoke { - compileClasspath += main.output + main.compileClasspath - } -} - -configurations { - releaseSmokeMods { - transitive = false - } -} - -dependencies { - releaseSmokeMods "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" - releaseSmokeMods fabricApi.module("fabric-client-gametest-api-v1", project.fabric_api_version) -} - -def releaseSmokeJar = tasks.register('releaseSmokeJar', Jar) { - archiveBaseName = 'trajectory-projected-release-smoke' - destinationDirectory = layout.buildDirectory.dir('release-smoke') - from sourceSets.releaseSmoke.output -} - -def syncReleaseSmokeMods = tasks.register('syncReleaseSmokeMods', Sync) { - from tasks.named('jar'), releaseSmokeJar, configurations.releaseSmokeMods - if (project.hasProperty('smokeWithDev')) { - from tasks.named('devJar') - } - into layout.buildDirectory.dir('run/releaseSmoke/mods') -} - -tasks.register('runReleaseSmoke', ClientProductionRunTask) { - group = 'verification' - onlyIf('local fixtures are available') { !sourceSets.releaseSmoke.allJava.empty } - dependsOn syncReleaseSmokeMods - jvmArgs.add('-Dfabric.client.gametest') - if (project.hasProperty('smokeWithDev')) { - jvmArgs.add('-Dtrajectory.smoke.dev=true') - } - runDir = layout.buildDirectory.dir('run/releaseSmoke') -} - -apply from: 'gradle/quality.gradle' diff --git a/gradle/quality.gradle b/gradle/quality.gradle deleted file mode 100644 index 961a172..0000000 --- a/gradle/quality.gradle +++ /dev/null @@ -1,15 +0,0 @@ -spotless { - java { - target 'src/**/*.java' - googleJavaFormat('1.31.0') - removeUnusedImports() - trimTrailingWhitespace() - endWithNewline() - } - format('gradle') { - target '*.gradle', 'gradle/*.gradle' - leadingTabsToSpaces(4) - trimTrailingWhitespace() - endWithNewline() - } -} diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 53cdf49..0000000 --- a/settings.gradle +++ /dev/null @@ -1,11 +0,0 @@ -pluginManagement { - repositories { - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - mavenCentral() - gradlePluginPortal() - } -} -rootProject.name = "TrajectoryProjected" diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..d436c4f --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,26 @@ +pluginManagement { + repositories { + maven("https://maven.fabricmc.net/") { name = "Fabric" } + maven("https://maven.kikugie.dev/releases") { name = "KikuGie Releases" } + mavenCentral() + gradlePluginPortal() + } + plugins { + // Fabric Loom for Minecraft 26.x: official names, no remapping. + id("net.fabricmc.fabric-loom") version "1.17.21" + } +} + +plugins { + id("dev.kikugie.stonecutter") version "0.9.8" +} + +stonecutter { + create(rootProject) { + // One node per Minecraft version, all built by build.fabric.gradle.kts. + version("26.2", "26.2").buildscript("build.fabric.gradle.kts") + vcsVersion = "26.2" + } +} + +rootProject.name = "TrajectoryProjected" diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 9f4e0ce..faa2a1b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -11,10 +11,10 @@ "icon": "assets/trajectory_projected/icon.png", "environment": "client", "depends": { - "fabricloader": ">=0.19.3", - "minecraft": "~26.2", + "fabricloader": ">=${loader}", + "minecraft": "${minecraft}", "java": ">=25", - "fabric-api": ">=0.161.0" + "fabric-api": ">=${fabric_api}" }, "entrypoints": { "client": [ diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts new file mode 100644 index 0000000..7488191 --- /dev/null +++ b/stonecutter.gradle.kts @@ -0,0 +1,55 @@ +plugins { + id("dev.kikugie.stonecutter") +} + +stonecutter active "26.2" + +stonecutter parameters { + // Version-specific values from `stonecutter.properties.toml`. + properties { + tags(current.version) + } +} + +// Formatting: google-java-format over every Java source. Spotless is not used, because it +// makes the Stonecutter root buildable and only formats files inside one project's directory. +repositories { + mavenCentral() +} + +val googleJavaFormat: Configuration by configurations.creating { + // The root has no Java plugin, so ask for the standard JVM runtime variants explicitly. + attributes { + attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME)) + attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, objects.named(TargetJvmEnvironment.STANDARD_JVM)) + } +} + +dependencies { + googleJavaFormat("com.google.googlejavaformat:google-java-format:1.31.0") +} + +val javaSources = fileTree(rootDir) { + include("src/**/*.java") + // Version seams hold Stonecutter conditions (`//? if`), which google-java-format would turn + // into plain comments (`// ? if`). + exclude("src/main/java/ru/wilyfox/trajectory/compat/**") +} + +fun registerFormat(name: String, description: String, vararg mode: String) = + tasks.register(name) { + group = "formatting" + this.description = description + classpath = googleJavaFormat + mainClass = "com.google.googlejavaformat.java.Main" + jvmArgs( + listOf("api", "code", "file", "parser", "tree", "util").map { + "--add-exports=jdk.compiler/com.sun.tools.javac.$it=ALL-UNNAMED" + }, + ) + inputs.files(javaSources) + argumentProviders.add(CommandLineArgumentProvider { mode.toList() + javaSources.files.map { it.path } }) + } + +registerFormat("formatCheck", "Fails if any Java source is not google-java-format clean.", "--dry-run", "--set-exit-if-changed") +registerFormat("format", "Rewrites Java sources with google-java-format.", "--replace") diff --git a/stonecutter.properties.toml b/stonecutter.properties.toml new file mode 100644 index 0000000..e15708a --- /dev/null +++ b/stonecutter.properties.toml @@ -0,0 +1,17 @@ +mod.version = "1.0.0" +mod.group = "ru.wilyfox.trajectory" +mod.archives = "trajectory-projected" + +deps.fabric_loader = "0.19.3" + +["26.2"] +# Shown in the jar's version and name. +mod.mc_label = "26.2" +# Compatibility range written into fabric.mod.json. +mod.mc_compat = "~26.2" +deps.fabric_api = "0.161.0+26.2" +# The oldest Fabric API the jar declares. +deps.fabric_api_min = "0.161.0" +# Optional rendering mods for local runs only (-PwithSodium, -PwithIris). +deps.sodium = "mc26.2-0.9.2-fabric" +deps.iris = "1.11.4+26.2-fabric"