Update to ForgeGradle 7

Author: Choonster

build.gradle

@@ -1,10 +1,12 @@
 plugins {
-    id 'eclipse'
+    id 'java'
     id 'idea'
+    id 'eclipse'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '[6.0.46,6.2)'
+    id 'net.minecraftforge.accesstransformers' version '5.0.1'
+    id 'net.minecraftforge.gradle' version '7.0.0-beta.46'
+    id 'net.minecraftforge.jarjar' version '0.2.3'
     id 'org.ajoberstar.grgit' version '5.2.0'
-    id 'org.spongepowered.mixin' version '0.7.+'
 }
 
 final commitId
@@ -19,113 +21,68 @@ mod_version = "${minecraft_version}-${mod_version}-${commitId}"
 
 version = mod_version
 group = mod_group_id
-
-base {
-    archivesName = mod_id
-}
+base.archivesName = mod_id
 
 // Mojang ships Java 21 to end users in 1.20.5+, so your mod should target Java 21.
 java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
-println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
+println "Java: ${providers.systemProperty('java.version').get()}, " +
+        "JVM: ${providers.systemProperty('java.vm.version').get()} (${providers.systemProperty('java.vendor').get()}), " +
+        "Arch: ${providers.systemProperty('os.arch').get()}"
+
 minecraft {
-    // The mappings can be changed at any time and must be in the following format.
-    // Channel:   Version:
-    // official   MCVersion             Official field/method names from Mojang mapping files
-    // parchment  YYYY.MM.DD-MCVersion  Open community-sourced parameter names and javadocs layered on top of official
-    //
-    // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge
-    // Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started
-    //
-    // Simply re-run your setup task after changing the mappings to update your workspace.
     mappings channel: mapping_channel, version: mapping_version
 
-    // Forge 1.20.6 and newer use official mappings at runtime, so we shouldn't reobf from official to SRG
-    reobf = false
-
-    // When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game.
-    // In most cases, it is not necessary to enable.
-    // enableEclipsePrepareRuns = true
-    // enableIdeaPrepareRuns = true
-
-    // This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game.
-    // It is REQUIRED to be set to true for this template to function.
-    // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
-    copyIdeResources = true
-
-    // When true, this property will add the folder name of all declared run configurations to generated IDE run configurations.
-    // The folder name can be set on a run configuration using the "folderName" property.
-    // By default, the folder name of a run configuration is the name of the Gradle project containing it.
-    // generateRunFolders = true
-
-    // This property enables access transformers for use in development, applied to the Minecraft artifact.
-    // The access transformer file can be anywhere in the project.
-    // However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge.
-    // This default location is a best practice to automatically put the file in the right place in the final jar.
-    // See https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ for more information.
-    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
-
-    // Default run configurations.
-    // These can be tweaked, removed, or duplicated as needed.
+    accessTransformers = true
+
     runs {
-        // Applies to all the run configs below
         configureEach {
-            workingDirectory project.file('run')
+            workingDir.convention layout.projectDirectory.dir('run')
 
-            // Optional additional logging. The markers can be added/remove as needed, separated by commas.
-            // "SCAN": For mods scan.
-            // "REGISTRIES": For firing of registry events.
-            // "REGISTRYDUMP": For getting the contents of all registries.
-//            property 'forge.logging.markers', 'REGISTRIES'
+            //systemProperty 'forge.logging.markers', 'REGISTRIES'
 
-            property 'forge.logging.console.level', 'debug'
+            systemProperty 'forge.logging.console.level', 'debug'
 
-            // Recommended for development - enables more descriptive errors at the cost of slower startup and registration.
-            property 'eventbus.api.strictRuntimeChecks', 'true'
+            systemProperty 'eventbus.api.strictRuntimeChecks', 'true'
 
-//            arg "-mixin.config=${mod_id}.mixins.json"
+            //args "-mixin.config=${mod_id}.mixins.json"
         }
 
-        client {
-            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
-            property 'forge.enabledGameTestNamespaces', mod_id
+        register('client') {
+            systemProperty 'forge.enabledGameTestNamespaces', mod_id
         }
 
-        server {
-            property 'forge.enabledGameTestNamespaces', mod_id
+        register('server') {
+            systemProperty 'forge.enabledGameTestNamespaces', mod_id
             args '--nogui'
         }
 
-        // This run config launches GameTestServer and runs all registered gametests, then exits.
-        // By default, the server will crash when no gametests are provided.
-        // The gametest system is also enabled by default for other run configs under the /test command.
-        gameTestServer {
-            property 'forge.enabledGameTestNamespaces', mod_id
+        register('gameTestServer') {
+            systemProperty 'forge.enabledGameTestNamespaces', mod_id
         }
 
-        data {
-            // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-            args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+        register('data') {
+            workingDir = layout.projectDirectory.dir('run-data')
+
+            args '--mod', mod_id, '--all', '--output', layout.projectDirectory.dir('src/generated/resources'), '--existing', layout.projectDirectory.dir('src/main/resources')
         }
     }
 }
 
 // Include resources generated by data generators.
-sourceSets.main.resources { srcDir 'src/generated/resources' }
+sourceSets.main.resources { srcDir layout.projectDirectory.dir('src/generated/resources') }
 
-repositories {
-    // Put repositories for dependencies here
-    mavenCentral()
-
-    maven {
-        name = 'Forge'
-        url = 'https://maven.minecraftforge.net'
-    }
+// This methods registers jarJar for the default jar task.
+// The closure allows you to configure the task, instead of needing to do this:
+// tasks.named('jarJar', net.minecraftforge.jarjar.gradle.JarJar)
+jarJar.register() {
+    archiveClassifier = null
+}
 
-    maven {
-        name = 'Minecraft libraries'
-        url = 'https://libraries.minecraft.net'
-    }
+repositories {
+    maven minecraft.mavenizer
+    maven fg.forgeMaven
+    maven fg.minecraftLibsMaven
 
     exclusiveContent {
         forRepository {
@@ -158,19 +115,15 @@ repositories {
         }
     }
 
+    mavenCentral()
+    mavenLocal()
+
     // If you have mod jar dependencies in ./libs, you can declare them as a repository like so.
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver
-    // flatDir {
-    //     dir 'libs'
-    // }
-}
-
-configurations {
-    embed {
-        transitive = false
-    }
-
-    implementation.extendsFrom embed
+    // NOTE: Support for local dependencies is still experimental in ForgeGradle 7.
+    //flatDir {
+    //    dir 'libs'
+    //}
 }
 
 dependencies {
@@ -179,7 +132,7 @@ dependencies {
     // The "userdev" classifier will be requested and setup by ForgeGradle.
     // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
     // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
-    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
+    implementation minecraft.dependency("net.minecraftforge:forge:$minecraft_version-$forge_version")
 
     // Forge 1.21.6+ uses EventBus 7, which shifts most of its runtime validation to compile-time via an annotation processor
     // to improve performance in production environments. This line is required to enable said compile-time validation
@@ -192,7 +145,7 @@ dependencies {
     // At runtime, use the full JEI jar for Forge
 //    runtimeOnly fg.deobf("mezz.jei:jei-1.21.1-forge:${jei_version}")
 
-    embed "org.apache.httpcomponents:fluent-hc:${httpclient_version}"
+    implementation jarJar("org.apache.httpcomponents:fluent-hc:${httpclient_version}")
 
     // TODO: Jade doesn't support Forge any more
 //    implementation fg.deobf("curse.maven:jade-324717:${jade_file_id}")
@@ -202,13 +155,32 @@ dependencies {
     // Example mod dependency using a mod jar from ./libs with a flat dir repository
     // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
     // The group id is ignored when searching -- in this case, it is "blank"
-    // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")
+    // NOTE: Support for deobfuscated dependencies has not yet been added in ForgeGradle 7.
+    //implementation "blank:coolmod-${mc_version}:${coolmod_version}"
 
     // For more info:
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
 }
 
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+    options.compilerArgs.addAll(['-Xlint:unchecked', '-Xlint:deprecation'])
+}
+
+tasks.withType(Javadoc).configureEach {
+    options.encoding = 'UTF-8'
+
+    var standardOptions = (StandardJavadocDocletOptions) options
+    standardOptions.addStringOption("tag", "apiNote:a:API Note:")
+    standardOptions.addBooleanOption("Xdoclint:all,-missing", true)
+}
+
+tasks.register('javadocJar', Jar) {
+    from javadoc.destinationDir
+
+    archiveClassifier.set('javadoc')
+}
 // This block of code expands all declared replace properties in the specified resource targets.
 // A missing property will result in an error. Properties are expanded using ${} Groovy notation.
 // When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
@@ -222,10 +194,10 @@ tasks.named('processResources', ProcessResources) {
             mod_issue_tracker_url: mod_issue_tracker_url, mod_display_url: mod_display_url,
             mod_authors          : mod_authors, mod_description: mod_description
     ]
-    inputs.properties replaceProperties
+    inputs.property('replaceProperties', replaceProperties)
 
     filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
-        expand replaceProperties + [project: project]
+        expand replaceProperties
     }
 }
 
@@ -242,39 +214,23 @@ tasks.named('jar', Jar) {
         ])
 //        attributes['MixinConfigs'] = "${mod_id}.mixins.json"
     }
+
+    archiveClassifier = 'slim'
 }
 
 // Example configuration to allow publishing using the maven-publish plugin
 publishing {
-    publications {
-        register('mavenJava', MavenPublication) {
-            artifact jar
-        }
-    }
     repositories {
-        maven {
-            url "file://${project.projectDir}/mcmodsrepo"
-        }
+        maven { url = "file://${layout.projectDirectory.asFile}/mcmodsrepo" }
     }
-}
 
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
-    options.compilerArgs.addAll(['-Xlint:unchecked', '-Xlint:deprecation'])
-}
+    publications.register('mavenJava', MavenPublication) {
+        // The java component publishes the jar output as the primary artifact
+        //from components.java
 
-tasks.withType(Javadoc).configureEach {
-    options.encoding = 'UTF-8'
-
-    var standardOptions = (StandardJavadocDocletOptions) options
-    standardOptions.addStringOption("tag", "apiNote:a:API Note:")
-    standardOptions.addBooleanOption("Xdoclint:all,-missing", true)
-}
-
-tasks.register('javadocJar', Jar) {
-    from javadoc.destinationDir
-
-    archiveClassifier.set('javadoc')
+        // The jarJar component publishes the jarJar output as the primary artifact
+        from components.jarJar
+    }
 }
 
 artifacts {
@@ -285,19 +241,12 @@ artifacts {
 idea.module { downloadJavadoc = downloadSources = true }
 
 eclipse {
+    // Eclipse no longer downloads javadocs and sources by default, this tells Gradle to force Eclipse to do it.
+    classpath { downloadJavadoc = downloadSources = true }
+
+    // NOTE: ForgeGradle 7 does not yet support Eclipse run configurations
     // Run everytime eclipse builds the code
     //autoBuildTasks genEclipseRuns
     // Run when importing the project
-    synchronizationTasks 'genEclipseRuns'
-}
-
-// Merge the resources and classes into the same directory, because Java expects modules to be in a single directory.
-// And if we have it in multiple we have to do performance intensive hacks like having the UnionFileSystem
-// This will eventually be migrated to ForgeGradle so modders don't need to manually do it. But that is later.
-sourceSets.each {
-    def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
-    it.output.resourcesDir = dir
-    it.java.destinationDirectory = dir
+    //synchronizationTasks 'genEclipseRuns'
 }
-
-// TODO: Contained dependencies are disabled in 1.14, re-evaluate when they're re-enabled

gradle.properties

@@ -1,15 +1,12 @@
-# Sets default memory used for Gradle commands. Can be overridden by user or command line properties.
-# This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx5G
-org.gradle.daemon=false
+org.gradle.caching=true
+org.gradle.parallel=true
+org.gradle.configureondemand=true
 
-# In the case that Gradle needs to fork to recompile, this will set the memory for that process.
-systemProp.net.minecraftforge.gradle.repo.recompile.fork=true
-systemProp.net.minecraftforge.gradle.repo.recompile.fork.args=-Xmx5G
-
-# Opts-out of ForgeGradle automatically adding mavenCentral(), Forge's maven and MC libs maven to the repositories block
-systemProp.net.minecraftforge.gradle.repo.attach=false
+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.parallel=true
+org.gradle.configuration-cache.problems=warn
 
+net.minecraftforge.gradle.merge-source-sets=true
 
 ## Environment Properties
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME