Update buildscripts

Author: NotRyken

build.gradle

@@ -129,7 +129,7 @@ subprojects {
 }
 
 String versionChangelog() {
-    List<String> lines = rootProject.file("CHANGELOG.md").readLines()
+    List<String> lines = rootProject.file("changelog.md").readLines()
     StringBuilder builder = new StringBuilder()
     if ("${mod_version}" == lines.get(2).substring(3)) {
         for (int i = 4; i < lines.size(); i++) {

buildSrc/src/main/groovy/multiloader-common.gradle

@@ -16,32 +16,38 @@ java {
 repositories {
     mavenCentral()
     // https://docs.gradle.org/current/userguide/declaring_repositories.html#declaring_content_exclusively_found_in_one_repository
+    // Mixin
     exclusiveContent {
         forRepository {
             maven {
                 name = "Sponge"
                 url = "https://repo.spongepowered.org/repository/maven-public"
             }
         }
-        filter { includeGroupAndSubgroups("org.spongepowered") }
+        filter {
+            includeGroupAndSubgroups("org.spongepowered")
+        }
     }
+    // Parchment
     exclusiveContent {
         forRepositories(
-            maven {
-                name = "ParchmentMC"
-                url = "https://maven.parchmentmc.org"
-            },
-            maven {
-                name = "NeoForge"
-                url = "https://maven.neoforged.net/releases"
-            }
+                maven {
+                    name = "ParchmentMC"
+                    url = "https://maven.parchmentmc.org"
+                },
+                maven {
+                    name = "NeoForge"
+                    url = "https://maven.neoforged.net/releases"
+                }
         )
         filter { includeGroup("org.parchmentmc.data") }
     }
+    // Mods
     maven {
         name = "Modrinth"
         url = "https://api.modrinth.com/maven"
     }
+    // Cloth Config
     maven {
         name = "Shedaniel"
         url = "https://maven.shedaniel.me"
@@ -52,6 +58,7 @@ repositories {
 // Read more about capabilities here: https://docs.gradle.org/current/userguide/component_capabilities.html#sec:declaring-additional-capabilities-for-a-local-component
 ["apiElements", "runtimeElements", "sourcesElements", /*"javadocElements"*/].each { variant ->
     configurations."$variant".outgoing {
+        capability("$group:${project.name}:$version")
         capability("$group:${base.archivesName.get()}:$version")
         capability("$group:$mod_id-${project.name}-${minecraft_version}:$version")
         capability("$group:$mod_id:$version")
@@ -63,13 +70,13 @@ repositories {
 
 sourcesJar {
     from(rootProject.file("LICENSE.txt")) {
-        rename { "${it}_${mod_name}" }
+        rename { "LICENSE_${mod_id}.txt" }
     }
 }
 
 jar {
     from(rootProject.file("LICENSE.txt")) {
-        rename { "${it}_${mod_name}" }
+        rename { "LICENSE_${mod_id}.txt" }
     }
 
     manifest {
@@ -126,9 +133,19 @@ processResources {
             "clothconfig_versions_neoforge": clothconfig_versions_neoforge,
             "modmenu_versions_fabric_list": asJsonList(modmenu_versions_fabric),
     ]
-    filesMatching(["pack.mcmeta", "*.mod.json", "META-INF/*mods.toml", "*.mixins.json"]) {
+
+    var jsonExpandProps = expandProps.collectEntries {
+        key, value -> [(key): value instanceof String ? value.replace("\n", "\\\\n") : value]
+    }
+
+    filesMatching(["pack.mcmeta", "*.mod.json", "*.mixins.json"]) {
+        expand jsonExpandProps
+    }
+
+    filesMatching(["META-INF/*.toml"]) {
         expand expandProps
     }
+
     inputs.properties(expandProps)
 }
 

CHANGELOG.md changelog.mdCHANGELOG.md renamed to changelog.md

@@ -4,17 +4,17 @@ plugins {
 }
 
 dependencies {
+    // Mixin and MixinExtras
     compileOnly("org.spongepowered:mixin:${mixin_version}")
     compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixinextras_version}"))
-    
+
     // Cloth Config API
     api("me.shedaniel.cloth:cloth-config-neoforge:${clothconfig_version}")
 }
 
 neoForge {
     version = neoforge_version // Shut up
     neoFormVersion = neoform_version
-    // Automatically enable AccessTransformers if the file exists
     def at = file("src/main/resources/META-INF/accesstransformer.cfg")
     if (at.exists()) accessTransformers.from(at.absolutePath)
     parchment {

common/build.gradle

@@ -10,20 +10,21 @@ dependencies {
         parchment("org.parchmentmc.data:parchment-${parchment_minecraft_version}:${parchment_version}@zip")
     }
 
-    // Fabric loader and API
+    // Fabric Loader and API
     modImplementation("net.fabricmc:fabric-loader:${fabric_loader_version}")
     modImplementation("net.fabricmc.fabric-api:fabric-api:${fabric_api_version}")
 
-    // JiJ MixinExtras
+    // JiJ MixinExtras if required to be newer than minimum loader-provided version
+    // 0.4.1 since 0.16.8
     include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${mixinextras_version}")))
-    
+
+    // ModMenu
+    modImplementation("maven.modrinth:mOgUt4GM:${modmenu_version}")
+
     // Cloth Config API
     modApi("me.shedaniel.cloth:cloth-config-fabric:${clothconfig_version}") {
         exclude(group: "net.fabricmc.fabric-api")
     }
-
-    // ModMenu
-    modImplementation("maven.modrinth:mOgUt4GM:${modmenu_version}")
 }
 
 loom {

fabric/build.gradle

@@ -28,8 +28,8 @@ java_versions_neoforge=[21,)
 
 # Minecraft
 minecraft_version=1.21
-minecraft_versions_fabric=>1.20.6 <1.22
-minecraft_versions_neoforge=(1.20.6, 1.22)
+minecraft_versions_fabric=>1.20.6 <1.21.2
+minecraft_versions_neoforge=(1.20.6, 1.21.2)
 
 # Parchment https://parchmentmc.org/docs/getting-started#choose-a-version
 parchment_minecraft_version=1.21

gradle.properties

@@ -4,16 +4,16 @@ plugins {
 }
 
 dependencies {
-    // JiJ MixinExtras
+    // JiJ MixinExtras if required to be newer than minimum loader-provided version
+    // 0.4.1 since 21.1.22
     implementation(jarJar("io.github.llamalad7:mixinextras-neoforge:${mixinextras_version}"))
-    
+
     // Cloth Config API
     api("me.shedaniel.cloth:cloth-config-neoforge:${clothconfig_version}")
 }
 
 neoForge {
     version = neoforge_version
-    // Automatically enable neoforge AccessTransformers if the file exists
     def at = project(":common").file("src/main/resources/META-INF/accesstransformer.cfg")
     if (at.exists()) accessTransformers.from(at.absolutePath)
     parchment {
@@ -23,7 +23,7 @@ neoForge {
     runs {
         configureEach {
             systemProperty("neoforge.enabledGameTestNamespaces", "${mod_id}")
-            // Unify the run config names with fabric
+            // Unify the run config names with Fabric
             ideName = "NeoForge ${it.name.capitalize()} (${project.path})"
         }
         client {