Switch to the other version catalog style

[no ci] [chore]

Author: robotgryphon

core-api/build.gradle.kts

@@ -32,6 +32,12 @@ java {
 
 neoForge {
     version = neoforged.versions.neoforge
+
+    parchment {
+        enabled = true
+        mappingsVersion = libs.versions.parchment
+        minecraftVersion = libs.versions.parchmentMC
+    }
 }
 
 repositories {

gradle/compactmods.versions.toml

@@ -0,0 +1,14 @@
+[versions.feather]
+require = "0.1.8"
+
+[versions.spatial]
+require = "[0.2.0, 0.3)"
+prefer = "0.2.1"
+
+[libraries.feather]
+module = "dev.compactmods:feather"
+version.ref = "feather"
+
+[libraries.spatial]
+module = "dev.compactmods:spatial"
+version.ref = "spatial"

gradle/libs.versions.toml

@@ -0,0 +1,8 @@
+[versions]
+jnanoid = "[2.0.0, 3)"
+parchmentMC = "1.21"
+parchment = "2024.07.28"
+
+[libraries.jnanoid]
+module = "com.aventrix.jnanoid:jnanoid"
+version.ref = "jnanoid"

gradle/mojang.versions.toml

@@ -0,0 +1,7 @@
+[versions]
+minecraft = "1.21.1"
+
+[versions.minecraftRange]
+require = "[1.21.1, 1.21.2)"
+prefer = "1.21.1"
+

gradle/neoforged.versions.toml

@@ -0,0 +1,13 @@
+[versions]
+neoforge = "21.1.79"
+mdg = "2.0.42-beta"
+neoforgeRange = { require = "[21.1.79,)", prefer = "21.1.79" }
+
+[libraries.testframework]
+module = "net.neoforged:testframework"
+version.ref = "neoforge"
+
+[plugins.moddev]
+id = "net.neoforged.moddev"
+version.ref = "mdg"
+

neoforge-main/build.gradle.kts

@@ -69,6 +69,12 @@ neoForge {
         testedMod = mods.named(modId)
     }
 
+    parchment {
+        enabled = true
+        mappingsVersion = libs.versions.parchment
+        minecraftVersion = libs.versions.parchmentMC
+    }
+
     runs {
         // applies to all the run configs below
         configureEach {
@@ -166,9 +172,9 @@ repositories {
 dependencies {
     // Core Projects and Libraries
     this {
-        compileOnly(libraries.jnanoid)
-        testImplementation(libraries.jnanoid)
-        jarJar(libraries.jnanoid)
+        compileOnly(libs.jnanoid)
+        testImplementation(libs.jnanoid)
+        jarJar(libs.jnanoid)
 
         compileOnly(coreApi)
         testCompileOnly(coreApi)
@@ -180,7 +186,7 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
-    additionalRuntimeClasspath(libraries.jnanoid)
+    additionalRuntimeClasspath(libs.jnanoid)
 
     compileOnly(compactmods.feather)
     testImplementation(compactmods.feather)

settings.gradle.kts

@@ -1,56 +1,7 @@
 dependencyResolutionManagement {
-    versionCatalogs.create("neoforged") {
-        val nf = "21.1.79"
-
-        version("neoforge", nf)
-        version("mdg", "2.0.42-beta")
-
-        version("neoforgeRange") {
-            require("[$nf,)")
-            prefer(nf)
-        }
-
-//        plugin("neogradle", "net.neoforged.gradle.userdev")
-//            .versionRef("neogradle")
-
-        plugin("moddev", "net.neoforged.moddev")
-            .versionRef("mdg")
-
-        library("neoforge", "net.neoforged", "neoforge")
-            .versionRef("neoforge")
-
-        library("testframework", "net.neoforged", "testframework")
-            .versionRef("neoforge")
-    }
-
-    versionCatalogs.create("mojang") {
-        version("minecraft", "1.21.1")
-        version("minecraftRange") {
-            this.require("[1.21, 1.21.2)")
-            this.prefer("1.21.1")
-        }
-    }
-
-    versionCatalogs.create("compactmods") {
-        version("feather", "0.1.8")
-        version("spatial", "0.2.1")
-
-        library("feather", "dev.compactmods", "feather")
-            .versionRef("feather")
-
-        library("spatial", "dev.compactmods", "spatial")
-            .versionRef("spatial")
-    }
-
-    versionCatalogs.create("libraries") {
-        library("jnanoid", "com.aventrix.jnanoid", "jnanoid")
-            .versionRef("jnanoid")
-
-        version("jnanoid", "[2.0.0, 3)")
-
-        version("parchment-mc", "1.21")
-        version("parchment", "2024.07.28")
-    }
+    addVersionCatalog(this, "neoforged")
+    addVersionCatalog(this, "mojang")
+    addVersionCatalog(this, "compactmods")
 
     versionCatalogs.create("mods") {
         this.library("jei-common", "mezz.jei", "jei-1.20.4-common-api").versionRef("jei")
@@ -94,3 +45,8 @@ include(":core-api")
 include(":neoforge-main")
 include(":neoforge-datagen")
 
+fun addVersionCatalog(dependencyResolutionManagement: DependencyResolutionManagement, name: String) {
+    dependencyResolutionManagement.versionCatalogs.create(name) {
+        from(files("./gradle/$name.versions.toml"))
+    }
+}