update dependencies and use NG7

Common/libs.versions.toml

@@ -1,20 +1,20 @@
 [versions]
-minecraft = "1.20.1"
+minecraft = "1.20.2"
 
 # The latest versions are available at https://parchmentmc.org/docs/getting-started
-parchment = "2023.09.03"
+parchment = "2023.12.10"
 
 mixin = "0.8.5"
 mixin_extras = "0.3.2"
 asm = "9.6"
 jetbrains_annotations = "24.1.0"
 vanilla_gradle = "0.2.1-SNAPSHOT"
 
-resourcefulconfig = "2.1.1"
+resourcefulconfig = "2.2.2"
 
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
-parchment_mappings = { module = "org.parchmentmc.data:parchment-1.20.1", version.ref = "parchment" }
+parchment_mappings = { module = "org.parchmentmc.data:parchment-1.20.2", version.ref = "parchment" }
 mixin = { module = "org.spongepowered:mixin", version.ref = "mixin" }
 mixin_extras = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixin_extras" }
 asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
@@ -24,9 +24,9 @@ asm_tree = { module = "org.ow2.asm:asm-tree", version.ref = "asm" }
 asm_util = { module = "org.ow2.asm:asm-util", version.ref = "asm" }
 jetbrains_annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains_annotations" }
 
-resourcefulconfig = { module = "com.teamresourceful.resourcefulconfig:resourcefulconfig-common-1.20.1", version.ref = "resourcefulconfig" }
-resourcefulconfig_fabric = { module = "com.teamresourceful.resourcefulconfig:resourcefulconfig-fabric-1.20.1", version.ref = "resourcefulconfig" }
-resourcefulconfig_forge = { module = "com.teamresourceful.resourcefulconfig:resourcefulconfig-forge-1.20.1", version.ref = "resourcefulconfig" }
+resourcefulconfig = { module = "com.teamresourceful.resourcefulconfig:resourcefulconfig-common-1.20.2", version.ref = "resourcefulconfig" }
+resourcefulconfig_fabric = { module = "com.teamresourceful.resourcefulconfig:resourcefulconfig-fabric-1.20.2", version.ref = "resourcefulconfig" }
+resourcefulconfig_neoforge = { module = "com.teamresourceful.resourcefulconfig:resourcefulconfig-neoforge-1.20.2", version.ref = "resourcefulconfig" }
 
 [bundles]
 mixin = ["mixin", "mixin_extras", "asm", "asm_analysis", "asm_commons", "asm_tree", "asm_util"]

NeoForge/build.gradle

@@ -1,29 +1,20 @@
 plugins {
     id 'idea'
     alias neoforge.plugins.neogradle
-    alias neoforge.plugins.mixingradle
 }
 jarJar.enable()
 
 dependencies {
-    minecraft "${neoforge.neoforge.get()}"
+    implementation neoforge.neoforge
     compileOnly project(":Common")
-    annotationProcessor "${libs.mixin.asProvider().get()}:processor"
 
-    implementation fg.deobf(libs.resourcefulconfig.forge.get())
-    minecraftLibrary libs.mixin.extras
+    implementation libs.resourcefulconfig.neoforge
+    implementation libs.mixin.extras
     jarJar(libs.mixin.extras) {
         jarJar.ranged(it, "[${libs.versions.mixin.extras.get()},)")
     }
 }
 
-mixin {
-    add(sourceSets.main, "${mod_id}.refmap.json")
-
-    config("${mod_id}.mixins.json")
-    config("${mod_id}.neoforge.mixins.json")
-}
-
 jar {
     archiveClassifier.set("slim")
 }
@@ -34,73 +25,53 @@ tasks.jarJar.configure {
     finalizedBy 'reobfJarJar'
 }
 
-minecraft {
-    mappings channel: 'official', version: libs.versions.minecraft.get()
+// Automatically enable neoforge AccessTransformers if the file exists
+// This location is hardcoded in FML and can not be changed.
+// https://github.com/neoforged/FancyModLoader/blob/a952595eaaddd571fbc53f43847680b00894e0c1/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFile.java#L118
+if (file('src/main/resources/META-INF/accesstransformer.cfg').exists()) {
+    minecraft.accessTransformers.file file('src/main/resources/META-INF/accesstransformer.cfg')
+}
+
+subsystems {
+    parchment {
+        minecraftVersion = libs.versions.minecraft.get()
+        mappingsVersion = libs.versions.parchment.get()
+    }
+}
 
-    copyIdeResources = true //Calls processResources when in dev
+runs {
+    configureEach {
+        systemProperty 'forge.logging.markers', 'REGISTRIES'
+        systemProperty 'forge.logging.console.level', 'debug'
 
-    // Automatically enable forge AccessTransformers if the file exists
-    // This location is hardcoded in Forge and can not be changed.
-    // https://github.com/MinecraftForge/MinecraftForge/blob/be1698bb1554f9c8fa2f58e32b9ab70bc4385e60/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java#L123
-    if (file('src/main/resources/META-INF/accesstransformer.cfg').exists()) {
-        accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+        workingDirectory project.file('run')
+
+        modSource project.sourceSets.main
     }
+    client {
+        systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
 
-    runs {
-        configureEach {
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
-            args "-mixin.config=${mod_id}.mixins.json", "-mixin.config=${mod_id}.neoforge.mixins.json"
-        }
-        client {
-            workingDirectory project.file('run')
-            ideaModule "${rootProject.name}.${project.name}.main"
-            mods {
-                modClientRun {
-                    source sourceSets.main
-                    source project(":Common").sourceSets.main
-                }
-            }
-
-            if (rootProject.hasProperty('mc_uuid')) {
-                args("--uuid", rootProject.mc_uuid)
-            }
-
-            if (rootProject.hasProperty('mc_username')) {
-                args("--username", rootProject.mc_username)
-            }
-
-            if (rootProject.hasProperty('mc_java_agent_path')) {
-                jvmArg("-javaagent:${rootProject.mc_java_agent_path}")
-            }
+        if (rootProject.hasProperty('mc_uuid')) {
+            programArguments.addAll "--uuid", rootProject.mc_uuid
         }
 
-        server {
-            workingDirectory project.file('run')
-            ideaModule "${rootProject.name}.${project.name}.main"
-            args '--nogui'
-            mods {
-                modServerRun {
-                    source sourceSets.main
-                    source project(":Common").sourceSets.main
-                }
-            }
+        if (rootProject.hasProperty('mc_username')) {
+            programArguments.addAll "--username", rootProject.mc_username
         }
 
-        data {
-            workingDirectory project.file('run')
-            ideaModule "${rootProject.name}.${project.name}.main"
-            args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-            mods {
-                modDataRun {
-                    source sourceSets.main
-                    source project(":Common").sourceSets.main
-                }
-            }
+        if (rootProject.hasProperty('mc_java_agent_path')) {
+            jvmArgument("-javaagent:${rootProject.mc_java_agent_path}")
         }
     }
+
+    server {
+        programArguments.addAll '--nogui'
+        systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+    }
+
+    data {
+        programArguments.addAll '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+    }
 }
 
 sourceSets.main.resources { srcDir 'src/generated/resources' }

NeoForge/libs.versions.toml

@@ -1,12 +1,10 @@
 [versions]
-neogradle = "6.+"
-mixingradle = "0.7.+"
+neogradle = "7.+"
 
-neoforge = "1.20.1-47.1.85"
+neoforge = "20.2.88"
 
 [libraries]
-neoforge = { module = "net.neoforged:forge", version.ref = "neoforge" }
+neoforge = { module = "net.neoforged:neoforge", version.ref = "neoforge" }
 
 [plugins]
-neogradle = { id = "net.neoforged.gradle", version.ref = "neogradle" }
-mixingradle = { id = "org.spongepowered.mixin", version.ref = "mixingradle" }
+neogradle = { id = "net.neoforged.gradle.userdev", version.ref = "neogradle" }

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

@@ -13,6 +13,12 @@ logoFile = "assets/${mod_id}/icon.png" #optional
 authors = "Cammie, Up" #optional
 description = '''${mod_description}''' #mandatory (Supports multiline text)
 
+[[mixins]]
+config = "${mod_id}.mixins.json"
+
+[[mixins]]
+config = "${mod_id}.neoforge.mixins.json"
+
 # https://docs.neoforged.net/docs/gettingstarted/modfiles#dependency-configurations
 [dependencies]
     "${mod_id}" = [

Quilt/libs.versions.toml

@@ -2,20 +2,20 @@
 # The latest versions are available at https://lambdaurora.dev/tools/import_quilt.html
 quilt_loom = "1.4.+"
 
-quilt_loader = "0.23.0"
-quilted_fabric_api = "7.4.0+0.90.0-1.20.1"
+quilt_loader = "0.23.1"
+quilted_fabric_api = "8.0.0-alpha.3+0.91.2-1.20.2"
 
-modmenu = "7.2.2"
+modmenu = "8.0.1"
 lazydfu = "0.1.3"
 
 hephaestus = "1.20.1-3.6.3.241"
 inventorio = "4619078"
 
-universalgraves = "3.0.0+1.20.1"
-sgui = "1.2.2+1.20"
-placeholder-api = "2.1.3+1.20.1"
-polymer = "0.5.15+1.20.1"
-predicate-api = "0.2.1+1.20.1"
+universalgraves = "3.1.1+1.20.2"
+sgui = "1.3.0+1.20.2"
+placeholder-api = "2.2.0+1.20.2"
+polymer = "0.6.0+1.20.2"
+predicate-api = "0.3.0+1.20.2"
 common-protection-api = "1.0.0"
 server-translations-api = "2.0.0+1.20"
 fabric-permissions-api = "0.2-SNAPSHOT"