Buildscripts + cleanup

Author: robotgryphon

.github/workflows/announce-latest-nightly.yml

@@ -16,20 +16,26 @@ jobs:
     name: Get Variables
     runs-on: ubuntu-22.04
     outputs:
-      mcVersion: ${{steps.gradle_props.outputs.minecraft_version}}
+      mcVersion: ${{steps.minecraft.outputs.version}}
+      neoVersion: ${{steps.neoforge.outputs.version}}
 
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: Read MC and Forge versions
-        id: gradle_props
-        uses: christian-draeger/[email protected]
-        with:
-          path: "gradle.properties"
-          properties: "minecraft_version"
+      - name: MC Version
+        id: minecraft
+        run: ./gradlew mcVersion -q >> "$GITHUB_OUTPUT"
+        env:
+          VERSION: ${{ steps.version.outputs.version }}
+
+      - name: NeoForge Version
+        id: neoforge
+        run: ./gradlew neoVersion -q >> "$GITHUB_OUTPUT"
+        env:
+          VERSION: ${{ steps.version.outputs.version }}
 
   get-package-info:
     name: Get Latest Package Info

build.gradle.kts

@@ -5,6 +5,20 @@ plugins {
     alias(neoforged.plugins.moddev).apply(false)
 }
 
+tasks.create("mcVersion") {
+    doFirst {
+        val mc = mojang.versions.minecraft.get()
+        println("version=$mc")
+    }
+}
+
+tasks.create("neoVersion") {
+    doFirst {
+        val neo = neoforged.versions.neoforge.get()
+        println("version=$neo")
+    }
+}
+
 subprojects {
     repositories {
         mavenLocal()

gradle.properties

@@ -3,21 +3,10 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-minecraft_version=1.20.6
-minecraft_version_range=[1.20.6]
-
-neo_version_range=[20.6,20.7)
-loader_version_range=[1,)
-
 org.gradle.configuration-cache=true
 
-neogradle.subsystems.conventions.runs.enabled=false
-neogradle.subsystems.conventions.runs.create-default-run-per-type=false
-
 neoForge.parchment.minecraftVersion=1.20.6
 neoForge.parchment.mappingsVersion=2024.05.01
 
-mod_id=compactmachines
-
 # Curseforge
 cf_project=224218

neoforge-datagen/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
     alias(neoforged.plugins.moddev)
 }
 
-val modId: String = rootProject.property("mod_id") as String
+val modId: String = "compactmachines"
 val mainProject: Project = project(":neoforge-main")
 evaluationDependsOn(mainProject.path)
 

neoforge-main/build.gradle.kts

@@ -7,7 +7,7 @@ var envVersion: String = System.getenv("VERSION") ?: "9.9.9"
 if (envVersion.startsWith("v"))
     envVersion = envVersion.trimStart('v')
 
-val modId: String = property("mod_id") as String
+val modId: String = "compactmachines"
 val isRelease: Boolean = (System.getenv("RELEASE") ?: "false").equals("true", true)
 
 val coreApi = project(":core-api")
@@ -221,6 +221,23 @@ tasks.withType<Jar> {
     }
 }
 
+tasks.withType<ProcessResources>().configureEach {
+    var replaceProperties: Map<String, Any> = mapOf(
+        "minecraft_version" to mojang.versions.minecraft.get(),
+        "neo_version" to neoforged.versions.neoforge.get(),
+        "minecraft_version_range" to mojang.versions.minecraftRange.get(),
+        "neo_version_range" to neoforged.versions.neoforgeRange.get(),
+        "loader_version_range" to "[1,)",
+        "mod_id" to modId,
+        "mod_version" to envVersion
+    )
+
+    inputs.properties(replaceProperties)
+    filesMatching("META-INF/neoforge.mods.toml") {
+        expand(replaceProperties)
+    }
+}
+
 tasks.jar {
     from(sourceSets.main.get().output)
     from(coreApi.sourceSets.main.get().output)

neoforge-main/src/main/resources/META-INF/neoforge.mods.toml

@@ -7,7 +7,7 @@ file = "META-INF/accesstransformer.cfg"
 
 [[mods]] #mandatory
 modId = "compactmachines"
-version = "${file.jarVersion}"
+version = "${mod_version}"
 displayName = "Compact Machines 6"
 authors = "Davenonymous, RobotGryphon" #optional
 description = "It's all so tiny!"

settings.gradle.kts

@@ -4,6 +4,10 @@ dependencyResolutionManagement {
     versionCatalogs.create("neoforged") {
         version("mdg", "0.1.79")
         version("neoforge", "21.0.2-beta")
+        version("neoforgeRange") {
+            require("[21.0,22)")
+            prefer("21.0.2-beta")
+        }
 
         plugin("moddev", "net.neoforged.moddev")
             .versionRef("mdg")
@@ -19,6 +23,10 @@ dependencyResolutionManagement {
 
     versionCatalogs.create("mojang") {
         version("minecraft", "1.20.6")
+        version("minecraftRange") {
+            this.require("[1.21, 1.21.1)")
+            this.prefer("1.21")
+        }
     }
 
     versionCatalogs.create("libraries") {